diff --git a/.idea/misc.xml b/.idea/misc.xml index 40f7aef8a..99c712693 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,11 +9,19 @@ + + + + + + + + diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt index 7700ed8f2..da163f722 100644 --- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt +++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt @@ -55,6 +55,7 @@ abstract class MangaListFragment : BaseFragment(), spanSizeLookup.invalidateCache() } open val isSwipeRefreshEnabled = true + private var drawer: DrawerLayout? = null protected abstract val viewModel: MangaListViewModel @@ -70,7 +71,8 @@ abstract class MangaListFragment : BaseFragment(), override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.drawer?.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) + drawer = binding.root as? DrawerLayout + drawer?.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) listAdapter = MangaListAdapter(get(), viewLifecycleOwner, this, ::resolveException) paginationListener = PaginationScrollListener(4, this) with(binding.recyclerView) { @@ -101,6 +103,7 @@ abstract class MangaListFragment : BaseFragment(), } override fun onDestroyView() { + drawer = null listAdapter = null paginationListener = null spanSizeLookup.invalidateCache() @@ -118,15 +121,15 @@ abstract class MangaListFragment : BaseFragment(), true } R.id.action_filter -> { - binding.drawer?.toggleDrawer(GravityCompat.END) + drawer?.toggleDrawer(GravityCompat.END) true } else -> super.onOptionsItemSelected(item) } override fun onPrepareOptionsMenu(menu: Menu) { - menu.findItem(R.id.action_filter).isVisible = binding.drawer != null && - binding.drawer?.getDrawerLockMode(GravityCompat.END) != DrawerLayout.LOCK_MODE_LOCKED_CLOSED + menu.findItem(R.id.action_filter).isVisible = drawer != null && + drawer?.getDrawerLockMode(GravityCompat.END) != DrawerLayout.LOCK_MODE_LOCKED_CLOSED super.onPrepareOptionsMenu(menu) } @@ -199,7 +202,7 @@ abstract class MangaListFragment : BaseFragment(), state = config.currentFilter, listener = this ) - binding.drawer?.setDrawerLockMode( + drawer?.setDrawerLockMode( if (config.sortOrders.isEmpty() && config.tags.isEmpty()) { DrawerLayout.LOCK_MODE_LOCKED_CLOSED } else { @@ -214,7 +217,7 @@ abstract class MangaListFragment : BaseFragment(), @CallSuper override fun onFilterChanged(filter: MangaFilter) { - binding.drawer?.closeDrawers() + drawer?.closeDrawers() } override fun onWindowInsetsChanged(insets: Insets) { diff --git a/app/src/main/res/layout-w600dp/fragment_list.xml b/app/src/main/res/layout-w600dp/fragment_list.xml index 2df1d9fe6..befce9ebf 100644 --- a/app/src/main/res/layout-w600dp/fragment_list.xml +++ b/app/src/main/res/layout-w600dp/fragment_list.xml @@ -19,6 +19,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" + android:padding="@dimen/grid_spacing_outer" + android:scrollbarStyle="outsideOverlay" android:scrollbars="vertical" app:fastScrollEnabled="true" app:fastScrollHorizontalThumbDrawable="@drawable/list_thumb" diff --git a/app/src/main/res/layout/fragment_chapters.xml b/app/src/main/res/layout/fragment_chapters.xml index bca60d6f7..cecae9f2a 100644 --- a/app/src/main/res/layout/fragment_chapters.xml +++ b/app/src/main/res/layout/fragment_chapters.xml @@ -28,6 +28,7 @@ android:orientation="vertical" android:scrollbars="vertical" app:fastScrollEnabled="true" + android:scrollbarStyle="outsideOverlay" app:fastScrollHorizontalThumbDrawable="@drawable/list_thumb" app:fastScrollHorizontalTrackDrawable="@drawable/list_track" app:fastScrollVerticalThumbDrawable="@drawable/list_thumb" diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml index 81dbf4d9a..e8bc75f1d 100644 --- a/app/src/main/res/layout/fragment_feed.xml +++ b/app/src/main/res/layout/fragment_feed.xml @@ -8,6 +8,8 @@ android:layout_height="match_parent" android:clipToPadding="false" android:orientation="vertical" + android:padding="@dimen/grid_spacing_outer" + android:scrollbarStyle="outsideOverlay" android:scrollbars="vertical" app:fastScrollEnabled="true" app:fastScrollHorizontalThumbDrawable="@drawable/list_thumb" diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml index d7180ceef..2cc769f1a 100644 --- a/app/src/main/res/layout/fragment_list.xml +++ b/app/src/main/res/layout/fragment_list.xml @@ -1,50 +1,45 @@ - + android:layout_height="match_parent"> - - - - - - - + tools:listitem="@layout/item_manga_list" /> - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_manga_grid.xml b/app/src/main/res/layout/item_manga_grid.xml index 7f13544f4..ea10b632e 100644 --- a/app/src/main/res/layout/item_manga_grid.xml +++ b/app/src/main/res/layout/item_manga_grid.xml @@ -23,6 +23,7 @@ android:ellipsize="end" android:gravity="center_vertical|start" android:lines="2" + android:elegantTextHeight="true" android:padding="6dp" android:textColor="?android:textColorPrimary" tools:text="@tools:sample/lorem" /> diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml index 7d4bdf55c..442ae059a 100644 --- a/app/src/main/res/values-w600dp/dimens.xml +++ b/app/src/main/res/values-w600dp/dimens.xml @@ -1,5 +1,6 @@ 4dp + 2dp 140dp \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 72f06e47f..1c8ad4b37 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,6 +1,7 @@ 2.5dp + 2dp 84dp 120dp 46dp