From c64d780c865702f9ef04dd2172c524bb3ef6d705 Mon Sep 17 00:00:00 2001 From: alihaider334 Date: Tue, 6 Aug 2019 17:30:00 -0400 Subject: [PATCH 1/2] Initial Commit --- .idea/runConfigurations.xml | 12 ++++++++++++ .../favoritepicturesgallery/DetailsActivity.kt | 12 +++++++++++- .../favoritepicturesgallery/FullscreenActivity.kt | 6 ++++++ .../favoritepicturesgallery/ImageData.kt | 2 +- .../favoritepicturesgallery/MainActivity.kt | 3 +++ 5 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 .idea/runConfigurations.xml 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..38680eb 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt @@ -5,11 +5,13 @@ 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 import android.widget.ImageView import android.widget.TextView +import android.widget.Toast import kotlinx.android.synthetic.main.activity_details.* class DetailsActivity : AppCompatActivity() { @@ -19,24 +21,32 @@ class DetailsActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_details) + Toast.makeText(this, "Lifecycle - onCreate", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "onCreate") val intent = intent data = intent.getSerializableExtra("object") as ImageData val context = this this.window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN) - +//AH pressing the image will open a full screen window and start the full screen activity image.setOnClickListener { val intent = Intent(context, FullscreenActivity::class.java) intent.putExtra("image", data?.fileUriString) startActivity(intent) } + + + } override fun onStart() { super.onStart() + Toast.makeText(this, "Lifecycle - onStart", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "onStart") + //AH- Setting and Showing up all the Image data to the screen image.setImageURI(data?.fileUri) // image.setImageDrawable(getResources().getDrawable(android.R.drawable.btn_star)); text_name.text = data?.name diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt index 3720f26..2cc548e 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt @@ -8,9 +8,11 @@ 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 +import android.widget.Toast /** * An example full-screen activity that shows and hides the system UI (i.e. @@ -55,6 +57,8 @@ class FullscreenActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Toast.makeText(this, "Lifecycle - onCreate", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "onCreate") val stringArray = arrayOfNulls(5) @@ -79,6 +83,8 @@ class FullscreenActivity : AppCompatActivity() { override fun onPostCreate(savedInstanceState: Bundle?) { super.onPostCreate(savedInstanceState) + Toast.makeText(this, "Lifecycle - onPostCreate", Toast.LENGTH_SHORT).show() + 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 diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/ImageData.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/ImageData.kt index 8dd46c0..b2720cd 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/ImageData.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/ImageData.kt @@ -3,7 +3,7 @@ package com.lambdaschool.favoritepicturesgallery import android.net.Uri import java.io.Serializable - +//AH - Getting all the Image data in this class class ImageData(fullPhotoUri: Uri) : Serializable { var name: String? = null var description: String? = null diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt index 0539b53..d16b6fb 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt @@ -14,6 +14,7 @@ import android.view.View import android.widget.Button import android.widget.LinearLayout import android.widget.TextView +import android.widget.Toast import kotlinx.android.synthetic.main.activity_main.* import java.util.ArrayList @@ -26,6 +27,8 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Toast.makeText(this, "Lifecycle - onCreate", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "onCreate") setContentView(R.layout.activity_main) val context = this From 55e5ec3daaaeb3b6b20ba678997ef9149f587bbd Mon Sep 17 00:00:00 2001 From: alihaider334 Date: Tue, 6 Aug 2019 18:57:53 -0400 Subject: [PATCH 2/2] Second Commit --- .../DetailsActivity.kt | 37 +++++++++++++++++- .../FullscreenActivity.kt | 38 ++++++++++++++++++- .../favoritepicturesgallery/MainActivity.kt | 37 +++++++++++++++++- 3 files changed, 108 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt index 38680eb..609ae07 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/DetailsActivity.kt @@ -22,7 +22,7 @@ class DetailsActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_details) Toast.makeText(this, "Lifecycle - onCreate", Toast.LENGTH_SHORT).show() - Log.i(javaClass.simpleName, "onCreate") + Log.i(javaClass.simpleName, "Lifecycle-onCreate") val intent = intent data = intent.getSerializableExtra("object") as ImageData @@ -44,7 +44,7 @@ class DetailsActivity : AppCompatActivity() { override fun onStart() { super.onStart() Toast.makeText(this, "Lifecycle - onStart", Toast.LENGTH_SHORT).show() - Log.i(javaClass.simpleName, "onStart") + Log.i(javaClass.simpleName, "Lifecycle-onStart") //AH- Setting and Showing up all the Image data to the screen image.setImageURI(data?.fileUri) @@ -64,4 +64,37 @@ class DetailsActivity : AppCompatActivity() { setResult(Activity.RESULT_OK, resultIntent) finish() } + + override fun onResume() { + super.onResume() + Toast.makeText(this, "Lifecycle - onResume", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onResume") + + } + override fun onPause() { + super.onPause() + Toast.makeText(this, "Lifecycle - onPause", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onPause") + + } + override fun onStop() { + super.onStop() + Toast.makeText(this, "Lifecycle - onStop", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onStop") + + } + override fun onDestroy() { + Toast.makeText(this, "Lifecycle - onDestroy", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onDestroy") + super.onDestroy() + } + override fun onRestart() { + Toast.makeText(this, "Lifecycle - onRestart", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onRestart") + super.onRestart() + } + + + + } diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt index 2cc548e..ef0ebf7 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/FullscreenActivity.kt @@ -58,7 +58,7 @@ class FullscreenActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) Toast.makeText(this, "Lifecycle - onCreate", Toast.LENGTH_SHORT).show() - Log.i(javaClass.simpleName, "onCreate") + Log.i(javaClass.simpleName, "Lifecycle-onCreate") val stringArray = arrayOfNulls(5) @@ -151,4 +151,40 @@ class FullscreenActivity : AppCompatActivity() { */ private val UI_ANIMATION_DELAY = 300 } + + override fun onStart() { + super.onStart() + Toast.makeText(this, "Lifecycle - onStart", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onStart") + } + + override fun onResume() { + super.onResume() + Toast.makeText(this, "Lifecycle - onResume", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onResume") + + } + override fun onPause() { + super.onPause() + Toast.makeText(this, "Lifecycle - onPause", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onPause") + + } + override fun onStop() { + super.onStop() + Toast.makeText(this, "Lifecycle - onStop", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onStop") + + } + override fun onDestroy() { + Toast.makeText(this, "Lifecycle - onDestroy", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onDestroy") + super.onDestroy() + } + override fun onRestart() { + Toast.makeText(this, "Lifecycle - onRestart", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onRestart") + super.onRestart() + } + } diff --git a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt index d16b6fb..d39ebea 100644 --- a/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt +++ b/app/src/main/java/com/lambdaschool/favoritepicturesgallery/MainActivity.kt @@ -28,7 +28,7 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) Toast.makeText(this, "Lifecycle - onCreate", Toast.LENGTH_SHORT).show() - Log.i(javaClass.simpleName, "onCreate") + Log.i(javaClass.simpleName, "Lifecycle-onCreate") setContentView(R.layout.activity_main) val context = this @@ -89,4 +89,39 @@ class MainActivity : AppCompatActivity() { internal const val REQUEST_IMAGE_GET = 1 internal const val EDIT_IMAGE_REQUEST = 2 } + override fun onRestart() { + Toast.makeText(this, "Lifecycle - onRestart", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onRestart") + super.onRestart() + } + override fun onDestroy() { + Toast.makeText(this, "Lifecycle - onDestroy", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onDestroy") + super.onDestroy() + } + override fun onStop() { + super.onStop() + Toast.makeText(this, "Lifecycle - onStop", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onStop") + + } + override fun onPause() { + super.onPause() + Toast.makeText(this, "Lifecycle - onPause", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onPause") + + } + override fun onResume() { + super.onResume() + Toast.makeText(this, "Lifecycle - onResume", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onResume") + + } + override fun onStart() { + super.onStart() + Toast.makeText(this, "Lifecycle - onStart", Toast.LENGTH_SHORT).show() + Log.i(javaClass.simpleName, "Lifecycle-onStart") + } + + }