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..4fd3e0f 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 @@ -17,6 +18,7 @@ class DetailsActivity : AppCompatActivity() { private var data: ImageData? = null override fun onCreate(savedInstanceState: Bundle?) { + Log.i("LifeCycle", "${javaClass.simpleName} onCreate") super.onCreate(savedInstanceState) setContentView(R.layout.activity_details) @@ -30,12 +32,13 @@ class DetailsActivity : AppCompatActivity() { val intent = Intent(context, FullscreenActivity::class.java) intent.putExtra("image", data?.fileUriString) startActivity(intent) - } + } //set on clck listener if pressed on image to display Fullscreen activity -VDT } override fun onStart() { super.onStart() + Log.i("LifeCycle", "${javaClass.simpleName} onStart") image.setImageURI(data?.fileUri) // image.setImageDrawable(getResources().getDrawable(android.R.drawable.btn_star)); @@ -44,9 +47,10 @@ class DetailsActivity : AppCompatActivity() { text_uri.text = data?.fileUri.toString() text_description.text = data?.description edit_description.setText(data?.description) - } + } //sets information and details for selected image override fun onBackPressed() { + Log.i("LifeCycle", "${javaClass.simpleName} onBackPressed") data?.name = edit_name.text.toString() data?.description = edit_description.text.toString() val resultIntent = Intent() diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt index 3720f26..3adab28 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,6 +56,7 @@ class FullscreenActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Log.i("LifeCycle", "${javaClass.simpleName} onCreate") val stringArray = arrayOfNulls(5) @@ -79,7 +81,7 @@ class FullscreenActivity : AppCompatActivity() { override fun onPostCreate(savedInstanceState: Bundle?) { super.onPostCreate(savedInstanceState) - + Log.i("LifeCycle", "${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. diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/ImageListAdapter.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/ImageListAdapter.kt index 1e35129..52d0cc9 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/ImageListAdapter.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/ImageListAdapter.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.support.v7.widget.RecyclerView +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -34,6 +35,7 @@ class ImageListAdapter// Provide a suitable constructor (depends on the kind of // Create new views (invoked by the layout manager) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ImageListAdapter.ViewHolder { + Log.i("LifeCycle", "${javaClass.simpleName} onCreateViewHolder") context = parent.context // create a new view @@ -45,6 +47,7 @@ class ImageListAdapter// Provide a suitable constructor (depends on the kind of // Replace the contents of a view (invoked by the layout manager) override fun onBindViewHolder(holder: ImageListAdapter.ViewHolder, position: Int) { + Log.i("LifeCycle", "${javaClass.simpleName} onBindViewHolder") // - get element from your dataset at this position // - replace the contents of the view with that element val data = imageList[position] diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt index 0539b53..9c11b26 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt @@ -26,11 +26,14 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Log.i("LifeCycle", "${javaClass.simpleName} onCreate") + //line 31 sets the view to the layout of activity_main.xml - VDT setContentView(R.layout.activity_main) + val context = this imageList = ArrayList() - + //sets on click listener to request image - VDT button_add.setOnClickListener { val intent = Intent(Intent.ACTION_GET_CONTENT) intent.type = "image/*" @@ -57,9 +60,10 @@ class MainActivity : AppCompatActivity() { private fun refreshListView() { listAdapter!!.notifyDataSetChanged() - } + } //gets the newly chosen images? -VDT override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + Log.i("LifeCycle", "${javaClass.simpleName} onActivityResult") if (requestCode == REQUEST_IMAGE_GET && resultCode == RESULT_OK) { val fullPhotoUri = data!!.data if (fullPhotoUri != null) { @@ -78,7 +82,7 @@ class MainActivity : AppCompatActivity() { } refreshListView() - + //displays the image chosen along with list of other images -VDT } companion object { 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..b423d50 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 16:13:24 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