From 1163ad0a461144838b45c228ef4d5d6ab6d8d934 Mon Sep 17 00:00:00 2001 From: Shashank Date: Mon, 12 Jun 2023 22:14:39 +0530 Subject: [PATCH 1/2] fixed-bottom-view-lost-issue --- .../library/LocalLibraryFragment.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt index 4df53a773..3d8f5f4a4 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt @@ -90,6 +90,7 @@ import java.io.File import javax.inject.Inject private const val WAS_IN_ACTION_MODE = "WAS_IN_ACTION_MODE" +private const val MATERIAL_BOTTOM_VIEW_ENTER_ANIMATION_DURATION = 225L class LocalLibraryFragment : BaseFragment() { @@ -196,6 +197,7 @@ class LocalLibraryFragment : BaseFragment() { } } disposable.add(sideEffects()) + disposable.add(fileSelectActions()) zimManageViewModel.deviceListIsRefreshing.observe(viewLifecycleOwner) { fragmentDestinationLibraryBinding?.zimSwiperefresh?.isRefreshing = it!! } @@ -334,6 +336,23 @@ class LocalLibraryFragment : BaseFragment() { }, Throwable::printStackTrace ) + private fun fileSelectActions() = zimManageViewModel.fileSelectActions + .observeOn(AndroidSchedulers.mainThread()) + .filter { it === FileSelectActions.RequestDeleteMultiSelection } + .subscribe( + { + animateBottomViewToOrigin() + }, + Throwable::printStackTrace + ) + + private fun animateBottomViewToOrigin() { + getBottomNavigationView().animate() + .translationY(0F) + .setDuration(MATERIAL_BOTTOM_VIEW_ENTER_ANIMATION_DURATION) + .start() + } + private fun render(state: FileSelectListState) { val items: List = state.bookOnDiskListItems bookDelegate.selectionMode = state.selectionMode From a6d9251c1d8cfa056577bd8f216646b68286aca8 Mon Sep 17 00:00:00 2001 From: Shashank Date: Tue, 13 Jun 2023 18:36:00 +0530 Subject: [PATCH 2/2] minor fixes --- .../nav/destination/library/LocalLibraryFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt index 3d8f5f4a4..3d05d9909 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/library/LocalLibraryFragment.kt @@ -85,6 +85,7 @@ import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel.FileSelectActions import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel.FileSelectActions.RequestMultiSelection import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel.FileSelectActions.RequestNavigateTo import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel.FileSelectActions.RequestSelect +import org.kiwix.kiwixmobile.zimManager.ZimManageViewModel.FileSelectActions.RequestDeleteMultiSelection import org.kiwix.kiwixmobile.zimManager.fileselectView.FileSelectListState import java.io.File import javax.inject.Inject @@ -338,7 +339,7 @@ class LocalLibraryFragment : BaseFragment() { private fun fileSelectActions() = zimManageViewModel.fileSelectActions .observeOn(AndroidSchedulers.mainThread()) - .filter { it === FileSelectActions.RequestDeleteMultiSelection } + .filter { it === RequestDeleteMultiSelection } .subscribe( { animateBottomViewToOrigin()