diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt index 1e5e9434c..8c30b9532 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt @@ -210,6 +210,12 @@ class FavoritesScene : SearchBarScene() { mAdapter?.type = Settings.listMode } + private val SceneFavoritesBinding.fastScroller get() = contentLayout.fastScroller + private val SceneFavoritesBinding.refreshLayout get() = contentLayout.refreshLayout + private val SceneFavoritesBinding.recyclerView get() = contentLayout.recyclerView + private val SceneFavoritesBinding.progress get() = contentLayout.progress + private val SceneFavoritesBinding.tip get() = contentLayout.tip + override fun onCreateViewWithToolbar( inflater: LayoutInflater, container: ViewGroup?, diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt index 12dac6b86..e24f6bacd 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt @@ -310,6 +310,12 @@ class GalleryListScene : SearchBarScene() { } } + private val SceneGalleryListBinding.fastScroller get() = contentLayout.fastScroller + private val SceneGalleryListBinding.refreshLayout get() = contentLayout.refreshLayout + private val SceneGalleryListBinding.recyclerView get() = contentLayout.recyclerView + private val SceneGalleryListBinding.progress get() = contentLayout.progress + private val SceneGalleryListBinding.tip get() = contentLayout.tip + override fun onCreateViewWithToolbar( inflater: LayoutInflater, container: ViewGroup?, @@ -329,7 +335,7 @@ class GalleryListScene : SearchBarScene() { mSearchFab.parent as View, ), ) - mViewTransition = BringOutTransition(binding.contentLayout, binding.searchLayout) + mViewTransition = BringOutTransition(binding.contentLayout.contentView, binding.searchLayout) binding.fastScroller.setOnDragHandlerListener(object : OnDragHandlerListener { override fun onStartDragHandler() {} override fun onEndDragHandler() { diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml index 39a43b4d5..95658bc49 100644 --- a/app/src/main/res/layout/scene_favorites.xml +++ b/app/src/main/res/layout/scene_favorites.xml @@ -17,57 +17,9 @@ - - - - - - - - - - - - - - + layout="@layout/widget_content_layout" /> - + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:background="?attr/colorPrimaryContainer" + android:elevation="4dp" + android:orientation="horizontal" + android:visibility="invisible" + app:fitsSystemWindowsInsets="bottom"> - + + + android:background="?selectableItemBackgroundBorderless" + android:clickable="true" + android:focusable="true" + android:padding="16dp" + app:tint="?colorOnPrimaryContainer" /> - - - - - - + - - - - - - - - - - - - - - + layout="@layout/widget_content_layout" /> + + + + + + + + + + + + + + + +