yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Adjust tablet layout (closes #5113)

Browse Source
This commit is contained in:
arkon 2021-05-19 23:18:24 -04:00
parent 68286b2acc
commit cf99446a12
6 changed files with 155 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
View File

@ -70,7 +70,7 @@ class BrowseController :
override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) { override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
super.onChangeStarted(handler, type) super.onChangeStarted(handler, type)
if (type.isEnter) { if (type.isEnter) {
(activity as? MainActivity)?.binding?.toolbarLayout?.tabs?.apply { (activity as? MainActivity)?.binding?.tabs?.apply {
setupWithViewPager(binding.pager) setupWithViewPager(binding.pager)
// Show badge on tab for extension updates // Show badge on tab for extension updates
@ -92,7 +92,7 @@ class BrowseController :
} }
fun setExtensionUpdateBadge() { fun setExtensionUpdateBadge() {
(activity as? MainActivity)?.binding?.toolbarLayout?.tabs?.apply { (activity as? MainActivity)?.binding?.tabs?.apply {
val updates = preferences.extensionUpdatesCount().get() val updates = preferences.extensionUpdatesCount().get()
if (updates > 0) { if (updates > 0) {
val badge: BadgeDrawable? = getTabAt(1)?.orCreateBadge val badge: BadgeDrawable? = getTabAt(1)?.orCreateBadge

4
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -218,7 +218,7 @@ class LibraryController(
override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) { override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
super.onChangeStarted(handler, type) super.onChangeStarted(handler, type)
if (type.isEnter) { if (type.isEnter) {
(activity as? MainActivity)?.binding?.toolbarLayout?.tabs?.setupWithViewPager(binding.libraryPager) (activity as? MainActivity)?.binding?.tabs?.setupWithViewPager(binding.libraryPager)
presenter.subscribeLibrary() presenter.subscribeLibrary()
} }
} }
@ -297,7 +297,7 @@ class LibraryController(
// Delay the scroll position to allow the view to be properly measured. // Delay the scroll position to allow the view to be properly measured.
view.post { view.post {
if (isAttached) { if (isAttached) {
(activity as? MainActivity)?.binding?.toolbarLayout?.tabs?.setScrollPosition(binding.libraryPager.currentItem, 0f, true) (activity as? MainActivity)?.binding?.tabs?.setScrollPosition(binding.libraryPager.currentItem, 0f, true)
} }
} }

36
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -96,11 +96,11 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
} }
setContentView(binding.root) setContentView(binding.root)
setSupportActionBar(binding.toolbarLayout.toolbar) setSupportActionBar(binding.toolbar)
// Draw edge-to-edge // Draw edge-to-edge
WindowCompat.setDecorFitsSystemWindows(window, false) WindowCompat.setDecorFitsSystemWindows(window, false)
binding.toolbarLayout.appbar.applyInsetter { binding.appbar.applyInsetter {
type(navigationBars = true, statusBars = true) { type(navigationBars = true, statusBars = true) {
padding(left = true, top = true, right = true) padding(left = true, top = true, right = true)
} }
@ -131,13 +131,13 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
insets insets
} }
tabAnimator = ViewHeightAnimator(binding.toolbarLayout.tabs, 0L) tabAnimator = ViewHeightAnimator(binding.tabs, 0L)
if (binding.bottomNav != null) { if (binding.bottomNav != null) {
bottomNavAnimator = ViewHeightAnimator(binding.bottomNav!!) bottomNavAnimator = ViewHeightAnimator(binding.bottomNav!!)
// If bottom nav is hidden, make it visible again when the app bar is expanded // If bottom nav is hidden, make it visible again when the app bar is expanded
binding.toolbarLayout.appbar.addOnOffsetChangedListener( binding.appbar.addOnOffsetChangedListener(
AppBarLayout.OnOffsetChangedListener { _, verticalOffset -> AppBarLayout.OnOffsetChangedListener { _, verticalOffset ->
if (verticalOffset == 0) { if (verticalOffset == 0) {
showNav(visible = true) showNav(visible = true)
@ -186,7 +186,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
} }
} }
binding.toolbarLayout.toolbar.setNavigationOnClickListener { binding.toolbar.setNavigationOnClickListener {
onBackPressed() onBackPressed()
} }
@ -227,13 +227,13 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
preferences.downloadedOnly() preferences.downloadedOnly()
.asImmediateFlow { binding.toolbarLayout.downloadedOnly.isVisible = it } .asImmediateFlow { binding.downloadedOnly.isVisible = it }
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
preferences.incognitoMode().asFlow() preferences.incognitoMode().asFlow()
.drop(1) .drop(1)
.onEach { .onEach {
binding.toolbarLayout.incognitoMode.isVisible = it binding.incognitoMode.isVisible = it
// Close BrowseSourceController and its MangaController child when incognito mode is disabled // Close BrowseSourceController and its MangaController child when incognito mode is disabled
if (!it) { if (!it) {
@ -355,7 +355,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
// Binding sometimes isn't actually instantiated yet somehow // Binding sometimes isn't actually instantiated yet somehow
nav.setOnItemSelectedListener(null) nav.setOnItemSelectedListener(null)
binding?.toolbarLayout?.toolbar.setNavigationOnClickListener(null) binding?.toolbar.setNavigationOnClickListener(null)
} }
override fun onBackPressed() { override fun onBackPressed() {
@ -408,7 +408,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
supportActionBar?.setDisplayHomeAsUpEnabled(router.backstackSize != 1) supportActionBar?.setDisplayHomeAsUpEnabled(router.backstackSize != 1)
// Always show appbar again when changing controllers // Always show appbar again when changing controllers
binding.toolbarLayout.appbar.setExpanded(true) binding.appbar.setExpanded(true)
if ((from == null || from is RootController) && to !is RootController) { if ((from == null || from is RootController) && to !is RootController) {
showNav(visible = false, collapse = true) showNav(visible = false, collapse = true)
@ -419,14 +419,14 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
} }
if (from is TabbedController) { if (from is TabbedController) {
from.cleanupTabs(binding.toolbarLayout.tabs) from.cleanupTabs(binding.tabs)
} }
if (to is TabbedController) { if (to is TabbedController) {
tabAnimator.expand() tabAnimator.expand()
to.configureTabs(binding.toolbarLayout.tabs) to.configureTabs(binding.tabs)
} else { } else {
tabAnimator.collapse() tabAnimator.collapse()
binding.toolbarLayout.tabs.setupWithViewPager(null) binding.tabs.setupWithViewPager(null)
} }
if (from is FabController) { if (from is FabController) {
@ -440,13 +440,13 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
when (to) { when (to) {
is NoToolbarElevationController -> { is NoToolbarElevationController -> {
binding.toolbarLayout.appbar.disableElevation() binding.appbar.disableElevation()
} }
is ToolbarLiftOnScrollController -> { is ToolbarLiftOnScrollController -> {
binding.toolbarLayout.appbar.enableElevation(true) binding.appbar.enableElevation(true)
} }
else -> { else -> {
binding.toolbarLayout.appbar.enableElevation(false) binding.appbar.enableElevation(false)
} }
} }
} }
@ -489,16 +489,16 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
*/ */
fun fixViewToBottom(view: View) { fun fixViewToBottom(view: View) {
val listener = AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset -> val listener = AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
val maxAbsOffset = appBarLayout.measuredHeight - binding.toolbarLayout.tabs.measuredHeight val maxAbsOffset = appBarLayout.measuredHeight - binding.tabs.measuredHeight
view.translationY = -maxAbsOffset - verticalOffset.toFloat() + appBarLayout.marginTop view.translationY = -maxAbsOffset - verticalOffset.toFloat() + appBarLayout.marginTop
} }
binding.toolbarLayout.appbar.addOnOffsetChangedListener(listener) binding.appbar.addOnOffsetChangedListener(listener)
fixedViewsToBottom[view] = listener fixedViewsToBottom[view] = listener
} }
fun clearFixViewToBottom(view: View) { fun clearFixViewToBottom(view: View) {
val listener = fixedViewsToBottom.remove(view) val listener = fixedViewsToBottom.remove(view)
binding.toolbarLayout.appbar.removeOnOffsetChangedListener(listener) binding.appbar.removeOnOffsetChangedListener(listener)
} }
private fun setBottomNavBehaviorOnScroll() { private fun setBottomNavBehaviorOnScroll() {

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
View File

@ -277,7 +277,7 @@ class MangaController :
else -> min(binding.recycler.computeVerticalScrollOffset(), 255) else -> min(binding.recycler.computeVerticalScrollOffset(), 255)
} }
(activity as? MainActivity)?.binding?.toolbarLayout?.toolbar?.setTitleTextColor( (activity as? MainActivity)?.binding?.toolbar?.setTitleTextColor(
Color.argb( Color.argb(
calculatedAlpha, calculatedAlpha,
toolbarTextColor.red, toolbarTextColor.red,

84
app/src/main/res/layout-sw600dp/main_activity.xml
View File

@ -1,41 +1,105 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_coordinator" android:id="@+id/root_coordinator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<include
android:id="@+id/toolbar_layout"
layout="@layout/main_activity_toolbar" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<eu.kanade.tachiyomi.widget.ElevationAppBarLayout
android:id="@+id/appbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme" />
</eu.kanade.tachiyomi.widget.ElevationAppBarLayout>
<FrameLayout
android:id="@+id/downloaded_only"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@color/green"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appbar"
tools:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="4dp"
android:text="@string/label_downloaded_only"
android:textColor="@color/md_white_1000" />
</FrameLayout>
<FrameLayout
android:id="@+id/incognito_mode"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@color/md_grey_800"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/downloaded_only"
tools:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="4dp"
android:text="@string/pref_incognito_mode"
android:textColor="@color/md_white_1000" />
</FrameLayout>
<com.google.android.material.navigationrail.NavigationRailView <com.google.android.material.navigationrail.NavigationRailView
android:id="@+id/side_nav" android:id="@+id/side_nav"
style="@style/Widget.MaterialComponents.NavigationRailView.Colored" style="@style/Widget.MaterialComponents.NavigationRailView.Colored"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="0dp"
app:itemIconTint="@color/nav_selector" app:itemIconTint="@color/nav_selector"
app:itemTextColor="@color/nav_selector" app:itemTextColor="@color/nav_selector"
app:labelVisibilityMode="labeled" app:labelVisibilityMode="labeled"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/incognito_mode"
app:menu="@menu/main_nav" /> app:menu="@menu/main_nav" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/Theme.Widget.Tabs"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/side_nav"
app:layout_constraintTop_toBottomOf="@+id/incognito_mode" />
<com.bluelinelabs.conductor.ChangeHandlerFrameLayout <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
android:id="@+id/controller_container" android:id="@+id/controller_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/side_nav" app:layout_constraintStart_toEndOf="@+id/side_nav"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/tabs" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

61
app/src/main/res/layout/main_activity.xml
View File

@ -1,14 +1,69 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_coordinator" android:id="@+id/root_coordinator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<include <eu.kanade.tachiyomi.widget.ElevationAppBarLayout
android:id="@+id/toolbar_layout" android:id="@+id/appbar"
layout="@layout/main_activity_toolbar" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme"
app:layout_scrollFlags="scroll|enterAlways" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/Theme.Widget.Tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@+id/downloaded_only"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/green"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="4dp"
android:text="@string/label_downloaded_only"
android:textColor="@color/md_white_1000" />
</FrameLayout>
<FrameLayout
android:id="@+id/incognito_mode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/md_grey_800"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="4dp"
android:text="@string/pref_incognito_mode"
android:textColor="@color/md_white_1000" />
</FrameLayout>
</eu.kanade.tachiyomi.widget.ElevationAppBarLayout>
<com.bluelinelabs.conductor.ChangeHandlerFrameLayout <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
android:id="@+id/controller_container" android:id="@+id/controller_container"