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..cf6330a 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 @@ -12,12 +13,15 @@ import android.widget.ImageView import android.widget.TextView import kotlinx.android.synthetic.main.activity_details.* + + class DetailsActivity : AppCompatActivity() { private var data: ImageData? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Log.i(javaClass.simpleName, "onCreate") setContentView(R.layout.activity_details) val intent = intent @@ -36,7 +40,7 @@ class DetailsActivity : AppCompatActivity() { override fun onStart() { super.onStart() - + Log.i(javaClass.simpleName, "onStart") image.setImageURI(data?.fileUri) // image.setImageDrawable(getResources().getDrawable(android.R.drawable.btn_star)); text_name.text = data?.name @@ -47,6 +51,7 @@ class DetailsActivity : AppCompatActivity() { } override fun onBackPressed() { + Log.i(javaClass.simpleName, "onBackPressed") data?.name = edit_name.text.toString() data?.description = edit_description.text.toString() val resultIntent = Intent() @@ -54,4 +59,25 @@ class DetailsActivity : AppCompatActivity() { setResult(Activity.RESULT_OK, resultIntent) finish() } + + override fun onResume() { + super.onResume() + Log.i(javaClass.simpleName, "onResume") + } + + override fun onPause() { + super.onPause() + Log.i(javaClass.simpleName, "onPause") + } + + override fun onStop() { + super.onStop() + Log.i(javaClass.simpleName, "onStop") + } + + override fun onDestroy() { + super.onDestroy() + Log.i(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..042323f 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 @@ -55,7 +56,7 @@ class FullscreenActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + Log.i(javaClass.simpleName, "onCreate") val stringArray = arrayOfNulls(5) setContentView(R.layout.activity_fullscreen) @@ -79,7 +80,7 @@ class FullscreenActivity : AppCompatActivity() { override fun onPostCreate(savedInstanceState: Bundle?) { super.onPostCreate(savedInstanceState) - + Log.i(javaClass.simpleName, "onPostCreate") // Trigger the initial hide() shortly after the activity has been // created, to briefly hint to the user that UI controls // are available. @@ -145,4 +146,29 @@ class FullscreenActivity : AppCompatActivity() { */ private val UI_ANIMATION_DELAY = 300 } + + override fun onStart() { + super.onStart() + Log.i(javaClass.simpleName, "onStart") + } + + override fun onResume() { + super.onResume() + Log.i(javaClass.simpleName, "onResume") + } + + override fun onPause() { + super.onPause() + Log.i(javaClass.simpleName, "onPause") + } + + override fun onStop() { + super.onStop() + Log.i(javaClass.simpleName, "onStop") + } + + override fun onDestroy() { + super.onDestroy() + Log.i(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..e4f8156 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt @@ -26,6 +26,7 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Log.i(javaClass.simpleName, "onCreate") setContentView(R.layout.activity_main) val context = this @@ -60,6 +61,7 @@ class MainActivity : AppCompatActivity() { } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + Log.i(javaClass.simpleName, "onActivityResult") if (requestCode == REQUEST_IMAGE_GET && resultCode == RESULT_OK) { val fullPhotoUri = data!!.data if (fullPhotoUri != null) { @@ -86,4 +88,29 @@ class MainActivity : AppCompatActivity() { internal const val REQUEST_IMAGE_GET = 1 internal const val EDIT_IMAGE_REQUEST = 2 } + + override fun onStart() { + super.onStart() + Log.i(javaClass.simpleName, "onStart") + } + + override fun onResume() { + super.onResume() + Log.i(javaClass.simpleName, "onResume") + } + + override fun onPause() { + super.onPause() + Log.i(javaClass.simpleName, "onPause") + } + + override fun onStop() { + super.onStop() + Log.i(javaClass.simpleName, "onStop") + } + + override fun onDestroy() { + super.onDestroy() + Log.i(javaClass.simpleName, "onDestroy") + } } diff --git a/build.gradle b/build.gradle index 0865a37..776fff1 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c33322e..c8c6fd5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Oct 11 14:14:46 MDT 2018 +#Tue Aug 06 17:00:45 EDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip