From 6a7d4f6e3e197124946bd7f63ba719cebd4ba694 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Wed, 17 Jul 2024 20:15:50 +0700 Subject: [PATCH] UpdatesFragment: Restore update all button as action button Signed-off-by: Aayush Gupta --- .../store/view/ui/updates/UpdatesFragment.kt | 50 +++++++------------ app/src/main/res/layout/fragment_updates.xml | 7 +-- .../main/res/layout/view_header_update.xml | 12 ++--- 3 files changed, 24 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt index 1a7bfb898..95053378b 100644 --- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt @@ -101,37 +101,6 @@ class UpdatesFragment : BaseFragment() { updateController(map) viewModel.updateAllEnqueued = map?.values?.all { it?.isRunning == true } ?: false - - if (!map.isNullOrEmpty()) { - binding.updateFab.apply { - visibility = View.VISIBLE - if (viewModel.updateAllEnqueued) { - setImageDrawable( - ContextCompat.getDrawable( - requireContext(), - R.drawable.ic_cancel - ) - ) - } else { - setImageDrawable( - ContextCompat.getDrawable( - requireContext(), - R.drawable.ic_installation - ) - ) - } - setOnClickListener { - if (viewModel.updateAllEnqueued) { - cancelAll() - } else { - map.keys.forEach { updateSingle(it, true) } - } - binding.recycler.requestModelBuild() - } - } - } else { - binding.updateFab.visibility = View.GONE - } } } @@ -145,6 +114,10 @@ class UpdatesFragment : BaseFragment() { binding.swipeRefreshLayout.setOnRefreshListener { viewModel.fetchUpdates() } + + binding.searchFab.setOnClickListener { + findNavController().navigate(R.id.searchSuggestionFragment) + } } private fun updateController(appList: Map?) { @@ -179,9 +152,20 @@ class UpdatesFragment : BaseFragment() { else getString(R.string.updates_available) ) - .action(getString(R.string.action_manage)) + .action( + if (viewModel.updateAllEnqueued) { + getString(R.string.action_cancel) + } else { + getString(R.string.action_update_all) + } + ) .click { _ -> - findNavController().navigate(R.id.blacklistFragment) + if (viewModel.updateAllEnqueued) { + cancelAll() + } else { + appList.keys.forEach { updateSingle(it, true) } + } + requestModelBuild() } ) diff --git a/app/src/main/res/layout/fragment_updates.xml b/app/src/main/res/layout/fragment_updates.xml index 8eaca2a16..7a03b2dac 100644 --- a/app/src/main/res/layout/fragment_updates.xml +++ b/app/src/main/res/layout/fragment_updates.xml @@ -52,17 +52,14 @@ diff --git a/app/src/main/res/layout/view_header_update.xml b/app/src/main/res/layout/view_header_update.xml index 2c9036444..4fcd92616 100644 --- a/app/src/main/res/layout/view_header_update.xml +++ b/app/src/main/res/layout/view_header_update.xml @@ -51,13 +51,11 @@ + android:layout_alignParentEnd="true" + android:layout_marginHorizontal="@dimen/margin_small" + android:layout_marginVertical="@dimen/margin_xsmall" + android:text="@string/action_update_all" />