diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt index 713027d..df7e58c 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt @@ -5,6 +5,7 @@ import android.content.Context import android.content.Intent import android.support.v7.app.AppCompatActivity import android.os.Bundle +import android.util.Log import android.view.View import android.view.WindowManager import android.widget.EditText @@ -16,8 +17,18 @@ class DetailsActivity : AppCompatActivity() { private var data: ImageData? = null + + companion object { + const val CLASS_NAME = "CLASS NAME" + } + + + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Log.i(CLASS_NAME, javaClass.simpleName + "- onCreate") + + setContentView(R.layout.activity_details) val intent = intent @@ -36,6 +47,7 @@ class DetailsActivity : AppCompatActivity() { override fun onStart() { super.onStart() + Log.i(CLASS_NAME,javaClass.simpleName +"- onStart") image.setImageURI(data?.fileUri) // image.setImageDrawable(getResources().getDrawable(android.R.drawable.btn_star)); @@ -44,6 +56,8 @@ class DetailsActivity : AppCompatActivity() { text_uri.text = data?.fileUri.toString() text_description.text = data?.description edit_description.setText(data?.description) + + } override fun onBackPressed() { @@ -54,4 +68,27 @@ class DetailsActivity : AppCompatActivity() { setResult(Activity.RESULT_OK, resultIntent) finish() } + + + override fun onResume() { + super.onResume() + Log.i(CLASS_NAME,javaClass.simpleName + "- onResume") + } + + override fun onPause() { + super.onPause() + Log.i(CLASS_NAME,javaClass.simpleName +"- onPause") + } + + override fun onStop() { + super.onStop() + Log.i(CLASS_NAME, javaClass.simpleName + "- onStop") + } + + override fun onDestroy() { + super.onDestroy() + Log.i(CLASS_NAME,javaClass.simpleName + "- onDestroy") + } + } + diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt index 3720f26..dab61e9 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt @@ -8,6 +8,7 @@ import android.net.Uri import android.os.Bundle import android.os.Handler import android.support.v7.app.AppCompatActivity +import android.util.Log import android.view.MotionEvent import android.view.View import android.widget.ImageView @@ -17,6 +18,7 @@ import android.widget.ImageView * status bar and navigation/system bar) with user interaction. */ class FullscreenActivity : AppCompatActivity() { + private val mHideHandler = Handler() private var mContentView: View? = null private val mHidePart2Runnable = Runnable { @@ -54,6 +56,7 @@ class FullscreenActivity : AppCompatActivity() { } override fun onCreate(savedInstanceState: Bundle?) { + Log.i(CLASS_NAME, javaClass.simpleName + "- onCreate") super.onCreate(savedInstanceState) val stringArray = arrayOfNulls(5) @@ -144,5 +147,36 @@ class FullscreenActivity : AppCompatActivity() { * and a change of the status and navigation bar. */ private val UI_ANIMATION_DELAY = 300 + + const val CLASS_NAME = "CLASS NAME" + } + + override fun onStart() { + super.onStart() + Log.i(CLASS_NAME, javaClass.simpleName + "- onStart") + + } + + override fun onResume() { + super.onResume() + Log.i(CLASS_NAME,javaClass.simpleName + "- onResume") + } + + override fun onPause() { + super.onPause() + Log.i(CLASS_NAME,javaClass.simpleName +"- onPause") + } + + override fun onStop() { + super.onStop() + Log.i(CLASS_NAME, javaClass.simpleName + "- onStop") + } + + override fun onDestroy() { + super.onDestroy() + Log.i(CLASS_NAME,javaClass.simpleName + "- onDestroy") } + + + } diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt index 0539b53..9a6fb4b 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt @@ -20,11 +20,15 @@ import java.util.ArrayList class MainActivity : AppCompatActivity() { +// had to change something + + internal var imageList: ArrayList = ArrayList() private var layoutManager: LinearLayoutManager? = null private var listAdapter: ImageListAdapter? = null override fun onCreate(savedInstanceState: Bundle?) { + Log.i(CLASS_NAME, javaClass.simpleName + "- onCreate") super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) val context = this @@ -85,5 +89,32 @@ class MainActivity : AppCompatActivity() { internal const val REQUEST_IMAGE_GET = 1 internal const val EDIT_IMAGE_REQUEST = 2 + const val CLASS_NAME = "CLASS NAME" } + + override fun onStart() { + super.onStart() + Log.i(CLASS_NAME, javaClass.simpleName + "- onStart") + + } + + override fun onResume() { + super.onResume() + Log.i(CLASS_NAME,javaClass.simpleName + "- onResume") + } + + override fun onPause() { + super.onPause() + Log.i(CLASS_NAME,javaClass.simpleName +"- onPause") + } + + override fun onStop() { + super.onStop() + Log.i(CLASS_NAME, javaClass.simpleName + "- onStop") + } + + override fun onDestroy() { + super.onDestroy() + Log.i(CLASS_NAME,javaClass.simpleName + "- onDestroy") + } }