2020-04-28 Version 4.1.1: Fixed navigation

fartem · Apr 28, 2020 · 24bdf98 · 24bdf98
1 parent a50b598
commit 24bdf98
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/MainActivity.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/MainActivity.kt
@@ -22,15 +22,15 @@ class MainActivity : AppCompatActivity() {
         supportFragmentManager.addOnBackStackChangedListener(
             fragmentsStack
         )
-        showNotesListFragment()
-    }
-
-    fun showNotesListFragment() {
         showBaseFragment(
             NotesListFragment()
         )
     }
 
+    fun authComplete() {
+        onBackPressed()
+    }
+
     fun showAuthFragment() {
         showBaseFragment(
             CloudAuthFragment()

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/BaseFragment.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/components/BaseFragment.kt
@@ -16,7 +16,7 @@ abstract class BaseFragment : Fragment() {
         setHasOptionsMenu(true)
     }
 
-    fun resume() {
+    open fun resume() {
         (activity as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(
             showHomeAsUpEnabled()
         )

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/presenter/list/NotesListPresenter.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/presenter/list/NotesListPresenter.kt
@@ -28,6 +28,7 @@ interface NotesListPresenter {
         success: Boolean
     )
 
+    fun authChanged()
     fun handleAuthRequest()
 
 }
diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/presenter/list/NotesListPresenterImpl.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/presenter/list/NotesListPresenterImpl.kt
@@ -25,11 +25,6 @@ class NotesListPresenterImpl : NotesListPresenter {
 
         notes.addAll(dataRepository.allNotes())
         this.notesListView.refreshNotesList(notes)
-        if (this.cloudAuth.isAuthorized()) {
-            this.notesListView.setAuthenticated()
-        } else {
-            this.notesListView.setUnauthenticated()
-        }
     }
 
     override fun shareNotes() {
@@ -92,6 +87,14 @@ class NotesListPresenterImpl : NotesListPresenter {
         }
     }
 
+    override fun authChanged() {
+        if (cloudAuth.isAuthorized()) {
+            notesListView.setAuthenticated()
+        } else {
+            notesListView.setUnauthenticated()
+        }
+    }
+
     override fun handleAuthRequest() {
         if (cloudAuth.isAuthorized()) {
             cloudAuth.logOut {

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/view/auth/CloudAuthFragment.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/view/auth/CloudAuthFragment.kt
@@ -70,7 +70,7 @@ class CloudAuthFragment : BaseFragment(), CloudAuthView {
     }
 
     override fun authSuccess() {
-        (activity as MainActivity).showNotesListFragment()
+        (activity as MainActivity).authComplete()
     }
 
     override fun authError() {

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/view/list/NotesListFragment.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/view/list/NotesListFragment.kt
@@ -74,6 +74,11 @@ class NotesListFragment : BaseFragment(), NotesListView,
         }
     }
 
+    override fun resume() {
+        super.resume()
+        notesListPresenter.authChanged()
+    }
+
     override fun showHomeAsUpEnabled(): Boolean {
         return false
     }
@@ -142,7 +147,7 @@ class NotesListFragment : BaseFragment(), NotesListView,
     }
 
     override fun setAuthenticated() {
-        if (getMenu() == null) {
+        if (getMenu()?.findItem(R.id.menu_auth_action) == null) {
             menuInitTasks.add(object : MenuTask {
                 override fun execute() {
                     validateAuthMenuIcon(true)
@@ -154,7 +159,7 @@ class NotesListFragment : BaseFragment(), NotesListView,
     }
 
     override fun setUnauthenticated() {
-        if (getMenu() == null) {
+        if (getMenu()?.findItem(R.id.menu_auth_action) == null) {
             menuInitTasks.add(object : MenuTask {
                 override fun execute() {
                     validateAuthMenuIcon(false)