Fix bug where search icon appears in places where it shouldn't be

blacktemplar · Jan 9, 2022 · d6818c6 · d6818c6
1 parent 8e59e19
commit d6818c6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/app/src/main/java/xyz/hisname/fireflyiii/ui/base/BaseDetailFragment.kt b/app/src/main/java/xyz/hisname/fireflyiii/ui/base/BaseDetailFragment.kt
@@ -19,33 +19,13 @@
 package xyz.hisname.fireflyiii.ui.base
 
 import android.content.Context
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.appcompat.widget.Toolbar
 import xyz.hisname.fireflyiii.R
-import xyz.hisname.fireflyiii.ui.transaction.details.TransactionDetailsFragment
 import xyz.hisname.fireflyiii.util.extension.consume
 
 abstract class BaseDetailFragment: BaseFragment(){
 
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setHasOptionsMenu(true)
- }
-
- override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
- // TODO: Remove this...
- if(this.javaClass != TransactionDetailsFragment::class.java){
- inflater.inflate(R.menu.detail_menu, menu)
- super.onCreateOptionsMenu(menu, inflater)
- }
- requireActivity().findViewById<Toolbar>(R.id.activity_toolbar)
- .menu.findItem(R.id.appWideSearch)
- .isVisible = false
- }
-
  override fun onAttach(context: Context) {
  super.onAttach(context)
  requireActivity().findViewById<Toolbar>(R.id.activity_toolbar).title = resources.getString(R.string.details)

diff --git a/app/src/main/java/xyz/hisname/fireflyiii/ui/base/BaseFragment.kt b/app/src/main/java/xyz/hisname/fireflyiii/ui/base/BaseFragment.kt
@@ -19,10 +19,9 @@
 package xyz.hisname.fireflyiii.ui.base
 
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.FrameLayout
+import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -31,6 +30,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import xyz.hisname.fireflyiii.R
 import xyz.hisname.fireflyiii.repository.GlobalViewModel
+import xyz.hisname.fireflyiii.ui.dashboard.DashboardFragment
+import xyz.hisname.fireflyiii.ui.transaction.details.TransactionDetailsFragment
 import xyz.hisname.fireflyiii.util.animation.CircularReveal
 import xyz.hisname.fireflyiii.util.extension.bindView
 import xyz.hisname.fireflyiii.util.extension.getViewModel
@@ -56,4 +57,20 @@ abstract class BaseFragment: Fragment() {
  protected fun showReveal(rootLayout: View) = CircularReveal(rootLayout).showReveal(revealX, revealY)
 
  protected fun isDarkMode() = globalViewModel.isDark
+
+
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ // TODO: Remove this...
+ if(this.javaClass != TransactionDetailsFragment::class.java
+ && this.javaClass != DashboardFragment::class.java){
+ inflater.inflate(R.menu.detail_menu, menu)
+ super.onCreateOptionsMenu(menu, inflater)
+ }
+ if(this.javaClass != DashboardFragment::class.java){
+ setHasOptionsMenu(true)
+ requireActivity().findViewById<Toolbar>(R.id.activity_toolbar)
+ .menu.findItem(R.id.appWideSearch).isVisible = false
+ }
+ }
+
 }