0.9 - fixes issue #2

hanggrian · Oct 22, 2017 · 5d13d8a · 5d13d8a
1 parent ae43555
commit 5d13d8a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-rc1'
+        classpath 'com.android.tools.build:gradle:3.0.0-rc2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
         classpath 'com.novoda:bintray-release:0.5.0'
     }

diff --git a/example/AndroidManifest.xml b/example/AndroidManifest.xml
@@ -17,6 +17,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".NextActivity" />
+        <activity
+            android:name=".NextActivity" />
     </application>
 </manifest>
diff --git a/example/build.gradle b/example/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 ext.rxkotlin = '2.1.0'
-ext.kota = '0.15'
+ext.kota = '0.16'
 
 android {
     compileSdkVersion versions.sdk.target
@@ -44,6 +44,5 @@ dependencies {
     implementation "com.android.support:design:$versions.support"
 
     implementation "com.hendraanggrian:kota-appcompat-v7:$kota"
-    implementation "com.hendraanggrian:kota-design:$kota"
     implementation "com.hendraanggrian:kota-preference-v7:$kota"
 }
diff --git a/example/src/com/example/rxactivity/MainActivity.kt b/example/src/com/example/rxactivity/MainActivity.kt
@@ -2,6 +2,7 @@ package com.example.rxactivity
 
 import android.content.Intent
 import android.os.Bundle
+import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.preference.ListPreference
 import android.support.v7.preference.Preference
@@ -19,11 +20,17 @@ import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity(), View.OnClickListener {
 
+    companion object {
+        const val TAG_RETAINED_FRAGMENT = "RetainedFragment"
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         setSupportActionBar(toolbar)
-        supportFragmentManager.replaceNow(R.id.container, Content())
+        if (supportFragmentManager.findNullable<Fragment>(TAG_RETAINED_FRAGMENT) == null) {
+            supportFragmentManager.addNow(R.id.container, Content(), TAG_RETAINED_FRAGMENT)
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

diff --git a/rx-activity/src/com/hendraanggrian/app/ActivityResultException.kt b/rx-activity/src/com/hendraanggrian/app/ActivityResultException.kt
@@ -14,7 +14,7 @@ open class ActivityResultException : Exception {
 
     constructor(message: String, cause: Throwable) : super(message, cause)
 
-    internal constructor(requestCode: Int, resultCode: Int, data: Intent?) : this("Activity with request code $requestCode fails expected result code check.") {
+    internal constructor(requestCode: Int, resultCode: Int, data: Intent?) : this("Returned Activity fails expected result code check, cast this Throwable to ActivityResultException for more information.") {
         mRequestCode = requestCode
         mResultCode = resultCode
         mData = data