Merge pull request #106 from ebraminio/master

Cleanup around up navigation setup code
bubelov · Nov 26, 2021 · 615ee8b · 615ee8b
2 parents b3e4554 + a8ce977
commit 615ee8b
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 39 deletions.
diff --git a/app/src/main/java/auth/DirectAuthFragment.kt b/app/src/main/java/auth/DirectAuthFragment.kt
@@ -35,8 +35,7 @@ class DirectAuthFragment : AppFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         toolbar.apply {
-            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-            setNavigationOnClickListener { findNavController().popBackStack() }
+            setupUpNavigation()
             setTitle(R.string.nextcloud_login)
         }
 

diff --git a/app/src/main/java/auth/MinifluxAuthFragment.kt b/app/src/main/java/auth/MinifluxAuthFragment.kt
@@ -38,8 +38,7 @@ class MinifluxAuthFragment : AppFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         toolbar.apply {
-            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-            setNavigationOnClickListener { findNavController().popBackStack() }
+            setupUpNavigation()
             setTitle(R.string.miniflux_login)
         }
 

diff --git a/app/src/main/java/common/AppFragment.kt b/app/src/main/java/common/AppFragment.kt
@@ -2,9 +2,12 @@ package common
 
 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.graphics.drawable.DrawerArrowDrawable
 import androidx.core.view.isVisible
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.appbar.MaterialToolbar
 import timber.log.Timber
 
 abstract class AppFragment(
@@ -51,4 +54,12 @@ abstract class AppFragment(
         super.onResume()
         Timber.d("Resuming fragment (class = ${javaClass.simpleName})")
     }
+
+    protected fun MaterialToolbar.setupUpNavigation(hideKeyboard: Boolean = false) {
+        navigationIcon = DrawerArrowDrawable(context).also { it.progress = 1f }
+        setNavigationOnClickListener {
+            if (hideKeyboard) requireContext().hideKeyboard(searchPanelText)
+            findNavController().popBackStack()
+        }
+    }
 }
diff --git a/app/src/main/java/entries/EntriesFragment.kt b/app/src/main/java/entries/EntriesFragment.kt
@@ -281,11 +281,7 @@ class EntriesFragment : AppFragment(), Scrollable {
             }
 
             is EntriesFilter.BelongToFeed -> {
-                toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-
-                toolbar.setNavigationOnClickListener {
-                    findNavController().popBackStack()
-                }
+                setupUpNavigation()
 
                 lifecycleScope.launchWhenResumed {
                     title = model.getFeed(filter.feedId)?.title

diff --git a/app/src/main/java/entry/EntryFragment.kt b/app/src/main/java/entry/EntryFragment.kt
@@ -49,8 +49,7 @@ class EntryFragment : AppFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         toolbar.apply {
-            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-            setNavigationOnClickListener { findNavController().popBackStack() }
+            setupUpNavigation()
             inflateMenu(R.menu.menu_entry)
         }
 

diff --git a/app/src/main/java/feedsettings/FeedSettingsFragment.kt b/app/src/main/java/feedsettings/FeedSettingsFragment.kt
@@ -48,8 +48,7 @@ class FeedSettingsFragment : AppFragment() {
         }
 
         toolbar.apply {
-            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-            setNavigationOnClickListener { findNavController().popBackStack() }
+            setupUpNavigation()
             title = feed.title
         }
 

diff --git a/app/src/main/java/log/ExceptionFragment.kt b/app/src/main/java/log/ExceptionFragment.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
 import co.appreactor.news.R
 import co.appreactor.news.databinding.FragmentExceptionBinding
 import common.AppFragment
@@ -39,8 +38,7 @@ class ExceptionFragment : AppFragment() {
             val log = model.selectById(args.logId) ?: return@launchWhenResumed
 
             toolbar.apply {
-                setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-                setNavigationOnClickListener { findNavController().popBackStack() }
+                setupUpNavigation()
                 title = getString(R.string.stack_trace)
                 inflateMenu(R.menu.menu_exception)
 

diff --git a/app/src/main/java/log/LogFragment.kt b/app/src/main/java/log/LogFragment.kt
@@ -43,8 +43,7 @@ class LogFragment : AppFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         toolbar.apply {
-            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-            setNavigationOnClickListener { findNavController().popBackStack() }
+            setupUpNavigation()
             setTitle(R.string.event_log)
             inflateMenu(R.menu.menu_log_entries)
 

diff --git a/app/src/main/java/search/SearchFragment.kt b/app/src/main/java/search/SearchFragment.kt
@@ -80,14 +80,7 @@ class SearchFragment : AppFragment() {
 
         searchPanel.isVisible = true
 
-        toolbar.apply {
-            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-
-            setNavigationOnClickListener {
-                requireContext().hideKeyboard(searchPanelText)
-                findNavController().popBackStack()
-            }
-        }
+        toolbar.setupUpNavigation(hideKeyboard = true)
 
         lifecycleScope.launch {
             model.searchString.collect {

diff --git a/app/src/main/java/settings/SettingsFragment.kt b/app/src/main/java/settings/SettingsFragment.kt
@@ -75,8 +75,7 @@ class SettingsFragment : AppFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         toolbar.apply {
-            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-            setNavigationOnClickListener { findNavController().popBackStack() }
+            setupUpNavigation()
             setTitle(R.string.settings)
         }
 

diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml