Fix saving selected tab on activity recreating (#319)

vase4kin · Apr 18, 2020 · f98d1ed · f98d1ed
1 parent be3907f
commit f98d1ed
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 18 deletions.
diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/AppNavigationInteractor.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/AppNavigationInteractor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Andrey Tolpeev
+ * Copyright 2020 Andrey Tolpeev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,18 @@
 
 package com.github.vase4kin.teamcityapp.app_navigation
 
+import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import com.github.vase4kin.teamcityapp.R
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavTransactionOptions
 
+const val ARG_SELECTED_TAB = "arg_selected_tab"
+
 interface AppNavigationInteractor {
-    fun initNavigation()
+    fun initNavigation(savedInstanceState: Bundle?)
+    fun onSaveInstanceState(outState: Bundle?)
     fun switchTab(index: Int)
 }
 
@@ -42,16 +46,21 @@ class AppNavigationInteractorImpl constructor(
 
     private lateinit var fragNavController: FragNavController
 
-    override fun initNavigation() {
+    override fun initNavigation(savedInstanceState: Bundle?) {
         fragNavController = FragNavController(fragmentManager, R.id.container).apply {
             fragmentHideStrategy = FragNavController.DETACH_ON_NAVIGATE_HIDE_ON_SWITCH
             rootFragmentListener = this@AppNavigationInteractorImpl
             defaultTransactionOptions = defaultTransition
         }
-        fragNavController.initialize(FragNavController.TAB1)
+        fragNavController.initialize(savedInstanceState = savedInstanceState)
     }
 
     override fun switchTab(index: Int) {
         fragNavController.switchTab(index)
     }
+
+    override fun onSaveInstanceState(outState: Bundle?) {
+        fragNavController.onSaveInstanceState(outState)
+        outState?.putInt(ARG_SELECTED_TAB, fragNavController.currentStackIndex)
+    }
 }
diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt
@@ -16,6 +16,7 @@
 
 package com.github.vase4kin.teamcityapp.app_navigation
 
+import android.os.Bundle
 import android.os.Handler
 import android.widget.TextView
 import androidx.annotation.StringRes
@@ -35,7 +36,7 @@ interface BottomNavigationView {
     /**
      * Init bottom navigation
      */
-    fun initViews(listener: ViewListener)
+    fun initViews(listener: ViewListener, savedInstanceState: Bundle?)
 
     fun showFavoritesFab()
     fun showFilterFab()
@@ -62,12 +63,15 @@ class BottomNavigationViewImpl(
 
     private lateinit var listener: BottomNavigationView.ViewListener
 
-    override fun initViews(listener: BottomNavigationView.ViewListener) {
+    override fun initViews(
+        listener: BottomNavigationView.ViewListener,
+        savedInstanceState: Bundle?
+    ) {
         this.listener = listener
         initViews()
         initBottomNavView()
         initFab()
-        interactor.initNavigation()
+        interactor.initNavigation(savedInstanceState)
     }
 
     private fun initViews() {

diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/home/dagger/HomeModule.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/home/dagger/HomeModule.kt
@@ -70,6 +70,7 @@ class HomeModule {
     @Provides
     fun providesFragmentFactory(): FragmentFactory = FragmentFactoryImpl()
 
+    @HomeActivityScope
     @Provides
     fun providesAppNavigationInteractor(
         activity: HomeActivity,

diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/home/presenter/HomePresenter.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/home/presenter/HomePresenter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Andrey Tolpeev
+ * Copyright 2020 Andrey Tolpeev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,15 @@
 
 package com.github.vase4kin.teamcityapp.home.presenter
 
+import android.os.Bundle
 import com.github.vase4kin.teamcityapp.app_navigation.AppNavigationItem
 
 interface HomePresenter {
 
     /**
      * On activity create callback
      */
-    fun onCreate()
+    fun onCreate(savedInstanceState: Bundle? = null)
 
     /**
      * On activity destroy callback

diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/home/presenter/HomePresenterImpl.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/home/presenter/HomePresenterImpl.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Andrey Tolpeev
+ * Copyright 2020 Andrey Tolpeev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
 
 package com.github.vase4kin.teamcityapp.home.presenter
 
+import android.os.Bundle
 import com.github.vase4kin.teamcityapp.R
 import com.github.vase4kin.teamcityapp.account.create.data.OnLoadingListener
+import com.github.vase4kin.teamcityapp.app_navigation.ARG_SELECTED_TAB
 import com.github.vase4kin.teamcityapp.app_navigation.AppNavigationItem
 import com.github.vase4kin.teamcityapp.app_navigation.BottomNavigationView
 import com.github.vase4kin.teamcityapp.buildlog.data.BuildLogInteractor
@@ -48,11 +50,18 @@ class HomePresenterImpl @Inject constructor(
     /**
      * {@inheritDoc}
      */
-    override fun onCreate() {
-        start()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        start(savedInstanceState)
         view.initViews(this)
-        // Set title for Projects tab
-        bottomNavigationView.setTitle(R.string.projects_drawer_item)
+        // Set title for Projects tab if nothing is saved
+        if (savedInstanceState == null) {
+            bottomNavigationView.setTitle(R.string.projects_drawer_item)
+        } else {
+            val selectedTab = savedInstanceState.getInt(ARG_SELECTED_TAB)
+            AppNavigationItem.values().getOrNull(selectedTab)?.let {
+                bottomNavigationView.setTitle(it.title)
+            }
+        }
         // Load notifications
         loadNotificationsCount()
     }
@@ -118,9 +127,9 @@ class HomePresenterImpl @Inject constructor(
     /**
      * Open root projects if active user is available
      */
-    fun start() {
+    fun start(savedInstanceState: Bundle?) {
         baseUrl = dataManager.activeUser.teamcityUrl
-        bottomNavigationView.initViews(this)
+        bottomNavigationView.initViews(this, savedInstanceState)
     }
 
     /**

diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeActivity.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Andrey Tolpeev
+ * Copyright 2020 Andrey Tolpeev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import android.content.Intent
 import android.os.Bundle
 import com.github.vase4kin.teamcityapp.R
 import com.github.vase4kin.teamcityapp.TeamCityApplication
+import com.github.vase4kin.teamcityapp.app_navigation.AppNavigationInteractor
 import com.github.vase4kin.teamcityapp.app_navigation.AppNavigationItem
 import com.github.vase4kin.teamcityapp.base.extractor.BundleExtractorValues
 import com.github.vase4kin.teamcityapp.drawer.view.DrawerTimeOut
@@ -39,10 +40,13 @@ class HomeActivity : DaggerAppCompatActivity() {
     @Inject
     lateinit var sharedUserStorage: SharedUserStorage
 
+    @Inject
+    lateinit var appNavigationInteractor: AppNavigationInteractor
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_home)
-        presenter.onCreate()
+        presenter.onCreate(savedInstanceState)
     }
 
     override fun onResume() {
@@ -76,6 +80,11 @@ class HomeActivity : DaggerAppCompatActivity() {
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        appNavigationInteractor.onSaveInstanceState(outState)
+        super.onSaveInstanceState(outState)
+    }
+
     private fun reinitDeps() {
         (this.applicationContext as TeamCityApplication).buildRestApiInjectorWithBaseUrl(
             sharedUserStorage.activeUser.teamcityUrl