Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,23 @@ 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 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
Expand All @@ -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
Expand All @@ -47,11 +51,33 @@ 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()
resultIntent.putExtra("object", data)
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")
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -55,7 +56,7 @@ class FullscreenActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

Log.i(javaClass.simpleName, "onCreate")
val stringArray = arrayOfNulls<String>(5)

setContentView(R.layout.activity_fullscreen)
Expand All @@ -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.
Expand Down Expand Up @@ -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")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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) {
Expand All @@ -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")
}
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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