Moved calling #setLiftOnScrollTargetView to MultiSelectListFragment

grzesiek2010 · grzesiek2010 · commit e1f735f81339 · 2024-09-11T20:06:56.000+02:00
diff --git a/collect_app/src/main/java/org/odk/collect/android/formlists/blankformlist/DeleteBlankFormFragment.kt b/collect_app/src/main/java/org/odk/collect/android/formlists/blankformlist/DeleteBlankFormFragment.kt
@@ -12,8 +12,6 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle.State
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.map
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.odk.collect.android.R
 import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
@@ -44,8 +42,6 @@ class DeleteBlankFormFragment(
             }
         )
     }
-    private var appBarLayout: AppBarLayout? = null
-    private lateinit var list: RecyclerView
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -61,8 +57,7 @@ class DeleteBlankFormFragment(
                     it.empty.setTitle(getString(string.empty_list_of_forms_to_delete_title))
                     it.empty.setSubtitle(getString(string.empty_list_of_blank_forms_to_delete_subtitle))
 
-                    list = it.list
-                    list.addItemDecoration(RecyclerViewUtils.verticalLineDivider(context))
+                    it.list.addItemDecoration(RecyclerViewUtils.verticalLineDivider(context))
                 }
             }
             .build()
@@ -85,17 +80,11 @@ class DeleteBlankFormFragment(
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        appBarLayout = requireActivity().findViewById(org.odk.collect.androidshared.R.id.appBarLayout)
         val blankFormListMenuProvider =
             BlankFormListMenuProvider(requireActivity(), blankFormListViewModel)
         menuHost.addMenuProvider(blankFormListMenuProvider, viewLifecycleOwner, State.RESUMED)
     }
 
-    override fun onResume() {
-        super.onResume()
-        appBarLayout?.setLiftOnScrollTargetView(list)
-    }
-
     private fun onDeleteSelected(selected: LongArray) {
         MaterialAlertDialogBuilder(requireContext())
             .setTitle(string.delete_file)
diff --git a/collect_app/src/main/java/org/odk/collect/android/formlists/savedformlist/DeleteSavedFormFragment.kt b/collect_app/src/main/java/org/odk/collect/android/formlists/savedformlist/DeleteSavedFormFragment.kt
@@ -11,8 +11,6 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.map
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.odk.collect.analytics.Analytics
 import org.odk.collect.android.R
@@ -48,8 +46,6 @@ class DeleteSavedFormFragment(
             }
         )
     }
-    private var appBarLayout: AppBarLayout? = null
-    private lateinit var list: RecyclerView
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -65,8 +61,7 @@ class DeleteSavedFormFragment(
                     it.empty.setTitle(getString(string.empty_list_of_forms_to_delete_title))
                     it.empty.setSubtitle(getString(string.empty_list_of_saved_forms_to_delete_subtitle))
 
-                    list = it.list
-                    list.addItemDecoration(RecyclerViewUtils.verticalLineDivider(context))
+                    it.list.addItemDecoration(RecyclerViewUtils.verticalLineDivider(context))
                 }
             }
             .build()
@@ -93,7 +88,6 @@ class DeleteSavedFormFragment(
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        appBarLayout = requireActivity().findViewById(org.odk.collect.androidshared.R.id.appBarLayout)
         menuHost?.addMenuProvider(
             SavedFormListListMenuProvider(requireContext(), savedFormListViewModel),
             viewLifecycleOwner,
@@ -111,11 +105,6 @@ class DeleteSavedFormFragment(
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        appBarLayout?.setLiftOnScrollTargetView(list)
-    }
-
     private fun onDeleteSelected(selected: LongArray) {
         MaterialAlertDialogBuilder(requireContext())
             .setTitle(string.delete_file)
diff --git a/lists/src/main/java/org/odk/collect/lists/selects/MultiSelectListFragment.kt b/lists/src/main/java/org/odk/collect/lists/selects/MultiSelectListFragment.kt
@@ -8,6 +8,8 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.appbar.AppBarLayout
 import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
 import org.odk.collect.lists.R
 import org.odk.collect.lists.databinding.MultiSelectListBinding
@@ -19,6 +21,9 @@ class MultiSelectListFragment<T, VH : MultiSelectAdapter.ViewHolder<T>>(
     private val onViewCreated: (MultiSelectListBinding) -> Unit = {}
 ) : Fragment() {
 
+    private var appBarLayout: AppBarLayout? = null
+    private lateinit var list: RecyclerView
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
 
@@ -50,15 +55,19 @@ class MultiSelectListFragment<T, VH : MultiSelectAdapter.ViewHolder<T>>(
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        appBarLayout = requireActivity().findViewById(org.odk.collect.androidshared.R.id.appBarLayout)
+
         val binding = MultiSelectListBinding.bind(view)
         onViewCreated(binding)
 
-        binding.list.layoutManager = LinearLayoutManager(requireContext())
+        list = binding.list
+        list.layoutManager = LinearLayoutManager(requireContext())
         val adapter = MultiSelectAdapter(
             multiSelectViewModel,
             viewHolderFactory
         )
-        binding.list.adapter = adapter
+        list.adapter = adapter
+
         multiSelectViewModel.getData().observe(viewLifecycleOwner) {
             adapter.data = it
             binding.empty.isVisible = it.isEmpty()
@@ -68,4 +77,9 @@ class MultiSelectListFragment<T, VH : MultiSelectAdapter.ViewHolder<T>>(
             adapter.selected = it
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        appBarLayout?.setLiftOnScrollTargetView(list)
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ import androidx.fragment.app.viewModels`
`12`	`12`	`import androidx.lifecycle.Lifecycle.State`
`13`	`13`	`import androidx.lifecycle.ViewModelProvider`
`14`	`14`	`import androidx.lifecycle.map`
`15`		`-import androidx.recyclerview.widget.RecyclerView`
`16`		`-import com.google.android.material.appbar.AppBarLayout`
`17`	`15`	`import com.google.android.material.dialog.MaterialAlertDialogBuilder`
`18`	`16`	`import org.odk.collect.android.R`
`19`	`17`	`import org.odk.collect.androidshared.ui.FragmentFactoryBuilder`
`@@ -44,8 +42,6 @@ class DeleteBlankFormFragment(`
`44`	`42`	`}`
`45`	`43`	`)`
`46`	`44`	`}`
`47`		`- private var appBarLayout: AppBarLayout? = null`
`48`		`- private lateinit var list: RecyclerView`
`49`	`45`
`50`	`46`	`override fun onAttach(context: Context) {`
`51`	`47`	`super.onAttach(context)`
`@@ -61,8 +57,7 @@ class DeleteBlankFormFragment(`
`61`	`57`	`it.empty.setTitle(getString(string.empty_list_of_forms_to_delete_title))`
`62`	`58`	`it.empty.setSubtitle(getString(string.empty_list_of_blank_forms_to_delete_subtitle))`
`63`	`59`
`64`		`- list = it.list`
`65`		`- list.addItemDecoration(RecyclerViewUtils.verticalLineDivider(context))`
	`60`	`+ it.list.addItemDecoration(RecyclerViewUtils.verticalLineDivider(context))`
`66`	`61`	`}`
`67`	`62`	`}`
`68`	`63`	`.build()`
`@@ -85,17 +80,11 @@ class DeleteBlankFormFragment(`
`85`	`80`	`}`
`86`	`81`
`87`	`82`	`override fun onViewCreated(view: View, savedInstanceState: Bundle?) {`
`88`		`- appBarLayout = requireActivity().findViewById(org.odk.collect.androidshared.R.id.appBarLayout)`
`89`	`83`	`val blankFormListMenuProvider =`
`90`	`84`	`BlankFormListMenuProvider(requireActivity(), blankFormListViewModel)`
`91`	`85`	`menuHost.addMenuProvider(blankFormListMenuProvider, viewLifecycleOwner, State.RESUMED)`
`92`	`86`	`}`
`93`	`87`
`94`		`- override fun onResume() {`
`95`		`- super.onResume()`
`96`		`- appBarLayout?.setLiftOnScrollTargetView(list)`
`97`		`- }`
`98`		`-`
`99`	`88`	`private fun onDeleteSelected(selected: LongArray) {`
`100`	`89`	`MaterialAlertDialogBuilder(requireContext())`
`101`	`90`	`.setTitle(string.delete_file)`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ import androidx.fragment.app.viewModels`
`11`	`11`	`import androidx.lifecycle.Lifecycle`
`12`	`12`	`import androidx.lifecycle.ViewModelProvider`
`13`	`13`	`import androidx.lifecycle.map`
`14`		`-import androidx.recyclerview.widget.RecyclerView`
`15`		`-import com.google.android.material.appbar.AppBarLayout`
`16`	`14`	`import com.google.android.material.dialog.MaterialAlertDialogBuilder`
`17`	`15`	`import org.odk.collect.analytics.Analytics`
`18`	`16`	`import org.odk.collect.android.R`
`@@ -48,8 +46,6 @@ class DeleteSavedFormFragment(`
`48`	`46`	`}`
`49`	`47`	`)`
`50`	`48`	`}`
`51`		`- private var appBarLayout: AppBarLayout? = null`
`52`		`- private lateinit var list: RecyclerView`
`53`	`49`
`54`	`50`	`override fun onAttach(context: Context) {`
`55`	`51`	`super.onAttach(context)`
`@@ -65,8 +61,7 @@ class DeleteSavedFormFragment(`
`65`	`61`	`it.empty.setTitle(getString(string.empty_list_of_forms_to_delete_title))`
`66`	`62`	`it.empty.setSubtitle(getString(string.empty_list_of_saved_forms_to_delete_subtitle))`
`67`	`63`
`68`		`- list = it.list`
`69`		`- list.addItemDecoration(RecyclerViewUtils.verticalLineDivider(context))`
	`64`	`+ it.list.addItemDecoration(RecyclerViewUtils.verticalLineDivider(context))`
`70`	`65`	`}`
`71`	`66`	`}`
`72`	`67`	`.build()`
`@@ -93,7 +88,6 @@ class DeleteSavedFormFragment(`
`93`	`88`	`}`
`94`	`89`
`95`	`90`	`override fun onViewCreated(view: View, savedInstanceState: Bundle?) {`
`96`		`- appBarLayout = requireActivity().findViewById(org.odk.collect.androidshared.R.id.appBarLayout)`
`97`	`91`	`menuHost?.addMenuProvider(`
`98`	`92`	`SavedFormListListMenuProvider(requireContext(), savedFormListViewModel),`
`99`	`93`	`viewLifecycleOwner,`
`@@ -111,11 +105,6 @@ class DeleteSavedFormFragment(`
`111`	`105`	`}`
`112`	`106`	`}`
`113`	`107`
`114`		`- override fun onResume() {`
`115`		`- super.onResume()`
`116`		`- appBarLayout?.setLiftOnScrollTargetView(list)`
`117`		`- }`
`118`		`-`
`119`	`108`	`private fun onDeleteSelected(selected: LongArray) {`
`120`	`109`	`MaterialAlertDialogBuilder(requireContext())`
`121`	`110`	`.setTitle(string.delete_file)`