Move state restoring to base code

Author: nekocode

app/src/main/java/cn/nekocode/gank/base/BaseActivity.kt

@@ -17,7 +17,9 @@
 package cn.nekocode.gank.base
 
 import android.annotation.SuppressLint
+import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.evernote.android.state.StateSaver
 import com.uber.autodispose.*
 import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
 import io.reactivex.*
@@ -31,6 +33,16 @@ import io.reactivex.parallel.ParallelFlowable
 open class BaseActivity : AppCompatActivity() {
     private val scopeProvider by lazy { AndroidLifecycleScopeProvider.from(this) }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        StateSaver.restoreInstanceState(this, savedInstanceState)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        StateSaver.saveInstanceState(this, outState)
+    }
+
     /**
      * Modified from https://github.com/uber/AutoDispose
      */

app/src/main/java/cn/nekocode/gank/base/BaseFragment.kt

@@ -1,6 +1,8 @@
 package cn.nekocode.gank.base
 
+import android.os.Bundle
 import androidx.fragment.app.Fragment
+import com.evernote.android.state.StateSaver
 import com.uber.autodispose.*
 import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
 import io.reactivex.*
@@ -13,6 +15,16 @@ import io.reactivex.parallel.ParallelFlowable
 open class BaseFragment : Fragment() {
     private val scopeProvider by lazy { AndroidLifecycleScopeProvider.from(this) }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        StateSaver.restoreInstanceState(this, savedInstanceState)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        StateSaver.saveInstanceState(this, outState)
+    }
+
     /**
      * Modified from https://github.com/uber/AutoDispose
      */

app/src/main/java/cn/nekocode/gank/ui/MainActivity.kt

@@ -21,27 +21,19 @@ import androidx.navigation.findNavController
 import androidx.navigation.ui.setupActionBarWithNavController
 import cn.nekocode.gank.R
 import cn.nekocode.gank.base.BaseActivity
-import com.evernote.android.state.StateSaver
 
 /**
  * @author nekocode ([email protected])
  */
 class MainActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        StateSaver.restoreInstanceState(this, savedInstanceState)
-
         setContentView(R.layout.activity_main)
 
         val navController = findNavController(R.id.frag_nav_host)
         setupActionBarWithNavController(navController)
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        StateSaver.saveInstanceState(this, outState)
-    }
-
     override fun onSupportNavigateUp() =
         findNavController(R.id.frag_nav_host).navigateUp()
 }

app/src/main/java/cn/nekocode/gank/ui/home/HomeFragment.kt

@@ -24,20 +24,16 @@ import android.view.ViewGroup
 import androidx.navigation.fragment.findNavController
 import cn.nekocode.gank.R
 import cn.nekocode.gank.base.BaseFragment
-import com.evernote.android.state.StateSaver
 import kotlinx.android.synthetic.main.fragment_home.*
 
 /**
  * @author nekocode ([email protected])
  */
 class HomeFragment : BaseFragment() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        StateSaver.restoreInstanceState(this, savedInstanceState)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         return inflater.inflate(R.layout.fragment_home, container, false)
     }
 
@@ -49,9 +45,4 @@ class HomeFragment : BaseFragment() {
             findNavController().navigate(HomeFragmentDirections.actionHomeToPic())
         }
     }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        StateSaver.saveInstanceState(this, outState)
-    }
 }

app/src/main/java/cn/nekocode/gank/ui/pic/PicFragment.kt

@@ -22,11 +22,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import cn.nekocode.gank.R
-import cn.nekocode.gank.backend.model.MeiziPic
 import cn.nekocode.gank.apis
+import cn.nekocode.gank.backend.model.MeiziPic
 import cn.nekocode.gank.base.BaseFragment
 import com.evernote.android.state.State
-import com.evernote.android.state.StateSaver
 import com.squareup.picasso.Picasso
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -40,13 +39,10 @@ class PicFragment : BaseFragment() {
     @State
     var pic: MeiziPic? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        StateSaver.restoreInstanceState(this, savedInstanceState)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         return inflater.inflate(R.layout.fragment_pic, container, false)
     }
 
@@ -76,9 +72,4 @@ class PicFragment : BaseFragment() {
                 Toast.makeText(requireActivity(), R.string.sth_went_wrong, Toast.LENGTH_SHORT).show()
             })
     }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        StateSaver.saveInstanceState(this, outState)
-    }
 }