Use Toolbar as MenuHost

getodk · Mar 13, 2024 · 35e0c17 · 35e0c17
1 parent ea69e99
commit 35e0c17
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/entities/src/main/java/org/odk/collect/entities/DatasetsFragment.kt b/entities/src/main/java/org/odk/collect/entities/DatasetsFragment.kt
@@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import org.odk.collect.entities.databinding.DatasetItemLayoutBinding
 import org.odk.collect.entities.databinding.ListLayoutBinding
 
-class DatasetsFragment(private val viewModelFactory: ViewModelProvider.Factory, private val menuHost: MenuHost) : Fragment() {
+class DatasetsFragment(private val viewModelFactory: ViewModelProvider.Factory, private val menuHost: () -> MenuHost) : Fragment() {
 
     private val entitiesViewModel by viewModels<EntitiesViewModel> { viewModelFactory }
 
@@ -40,7 +40,7 @@ class DatasetsFragment(private val viewModelFactory: ViewModelProvider.Factory,
             binding.list.adapter = DatasetsAdapter(it, findNavController())
         }
 
-        menuHost.addMenuProvider(DatasetsMenuProvider(entitiesViewModel), viewLifecycleOwner)
+        menuHost().addMenuProvider(DatasetsMenuProvider(entitiesViewModel), viewLifecycleOwner)
     }
 }
 

diff --git a/entities/src/main/java/org/odk/collect/entities/EntityBrowserActivity.kt b/entities/src/main/java/org/odk/collect/entities/EntityBrowserActivity.kt
@@ -27,7 +27,7 @@ class EntityBrowserActivity : LocalizedActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         supportFragmentManager.fragmentFactory = FragmentFactoryBuilder()
-            .forClass(DatasetsFragment::class) { DatasetsFragment(viewModelFactory, this) }
+            .forClass(DatasetsFragment::class) { DatasetsFragment(viewModelFactory, ::getToolbar) }
             .forClass(EntitiesFragment::class) { EntitiesFragment(viewModelFactory) }
             .build()
 
@@ -42,8 +42,8 @@ class EntityBrowserActivity : LocalizedActivity() {
         val navController = navHostFragment.navController
 
         val appBarConfiguration = AppBarConfiguration(navController.graph)
-        val toolbar = findViewById<Toolbar>(org.odk.collect.androidshared.R.id.toolbar)
-        toolbar.setupWithNavController(navController, appBarConfiguration)
-        setSupportActionBar(toolbar)
+        getToolbar().setupWithNavController(navController, appBarConfiguration)
     }
+
+    private fun getToolbar() = findViewById<Toolbar>(org.odk.collect.androidshared.R.id.toolbar)
 }