commit d6374a8cd5101b498010ce89b7148da5812743de Author: Phillip Kühne Date: Fri Nov 2 17:21:42 2018 +0100 first commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fd45b12 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.iml +.gradle +/local.properties +/.idea/caches/build_file_checksums.ser +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..34dc27c --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e0d5b93 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + \ No newline at end of file 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/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..f9cc13b --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,33 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "de.htwk.s3" + minSdkVersion 21 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/de/htwk/s3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/de/htwk/s3/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..fc84c0f --- /dev/null +++ b/app/src/androidTest/java/de/htwk/s3/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package de.htwk.s3 + +import android.support.test.InstrumentationRegistry +import android.support.test.runner.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getTargetContext() + assertEquals("de.htwk.s3", appContext.packageName) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..58dde7b --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/de/htwk/s3/MainActivity.kt b/app/src/main/java/de/htwk/s3/MainActivity.kt new file mode 100644 index 0000000..dc56bf2 --- /dev/null +++ b/app/src/main/java/de/htwk/s3/MainActivity.kt @@ -0,0 +1,45 @@ +package de.htwk.s3 + +import android.content.Intent +import android.support.v7.app.AppCompatActivity +import android.os.Bundle +import android.util.Log +import kotlinx.android.synthetic.main.activity_main.* + +class MainActivity : AppCompatActivity() { + + val SAVED_PARCEL_KEY = "saved_parcel_key" + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + button.setOnClickListener { + val intent = Intent(this,SecondActivity::class.java) + val parameterObject = ParameterObject(editText.text.toString(),checkBox.isChecked,seekBar.progress) + intent.putExtra(SecondActivity.PARAMETER_OBJECT_KEY,parameterObject) + startActivity(intent) + } + } + + override fun onSaveInstanceState(outState: Bundle?) { + super.onSaveInstanceState(outState) + val parameterObject = ParameterObject(editText.text.toString(),checkBox.isChecked,seekBar.progress) + outState?.putParcelable(SAVED_PARCEL_KEY,parameterObject) + } + + override fun onRestoreInstanceState(savedInstanceState: Bundle?) { + super.onRestoreInstanceState(savedInstanceState) + savedInstanceState?.let { + if (it.containsKey(SAVED_PARCEL_KEY)){ + + val parameterObject: ParameterObject? = it.getParcelable(SAVED_PARCEL_KEY) + Log.i("Parcel",parameterObject.toString()) + editText.setText(parameterObject?.string) + checkBox.isChecked = parameterObject?.bool ?: false + seekBar.progress = parameterObject?.int ?: 50 + } + } + } + +} diff --git a/app/src/main/java/de/htwk/s3/ParameterObject.kt b/app/src/main/java/de/htwk/s3/ParameterObject.kt new file mode 100644 index 0000000..695b0e7 --- /dev/null +++ b/app/src/main/java/de/htwk/s3/ParameterObject.kt @@ -0,0 +1,33 @@ +package de.htwk.s3 + +import android.os.Parcel +import android.os.Parcelable + +data class ParameterObject(val string: String?, val bool: Boolean, val int: Int) : Parcelable{ + constructor(parcel: Parcel) : this( + parcel.readString(), + parcel.readByte() != 0.toByte(), + parcel.readInt() + ) { + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.writeString(string) + parcel.writeByte(if (bool) 1 else 0) + parcel.writeInt(int) + } + + override fun describeContents(): Int { + return 0 + } + + companion object CREATOR : Parcelable.Creator { + override fun createFromParcel(parcel: Parcel): ParameterObject { + return ParameterObject(parcel) + } + + override fun newArray(size: Int): Array { + return arrayOfNulls(size) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/htwk/s3/SecondActivity.kt b/app/src/main/java/de/htwk/s3/SecondActivity.kt new file mode 100644 index 0000000..1da69a1 --- /dev/null +++ b/app/src/main/java/de/htwk/s3/SecondActivity.kt @@ -0,0 +1,29 @@ +package de.htwk.s3 + +import android.support.v7.app.AppCompatActivity +import android.os.Bundle +import kotlinx.android.synthetic.main.activity_second.* + +class SecondActivity : AppCompatActivity() { + + companion object { + val EDITTEXT_KEY = "edittext_key" + val CHECKBOX_KEY = "checkbox_key" + val SEEKBAR_KEY = "seekbar_key" + val PARAMETER_OBJECT_KEY = "parameter_object_key" + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_second) + + intent.extras?.let { + if(it.containsKey(PARAMETER_OBJECT_KEY)) { + val parameterObject: ParameterObject? = it.getParcelable(PARAMETER_OBJECT_KEY) + textView.text = parameterObject?.string + textView2.text = parameterObject?.bool.toString() + textView3.text = parameterObject?.int.toString() + } + } + } +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..6348baa --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..a0ad202 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..5841632 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,35 @@ + + + + + +