acbc4c48fa
* Prepare for edge-to-edge MangaController * Fix derpy liftToScroll with our own implementation * Edge-to-edge MangaController Except when legacy blue theme is used. * Save app bar lift state for controller backstack * Fix expanded cover position after the view recycled * Handle overlap changes when incognito mode disabled * Tablet fixes * Revert "Handle overlap changes when incognito mode disabled" This reverts commit 1f492449 Breaks on rotation changes. * Fix MangaController's swipe refresh position * All controllers are now doing lift app bar on scroll by default They are already doing that before so this pretty much just a cleanups. * TachiyomiCoordinatorLayout: Support ViewPager for app bar lift state check I'm willing to revert this if this minute detail solution is deemed too hacky xD * Fix app bar not lifted when scrolled without fling * Save app bar lift state across configuration changes * Fix MangaController's swipe refresh position after configuration change * TachiyomiCoordinatorLayout: Update ViewPager reference when controller is changed (cherry picked from commit da16110e1c571526baea34275db41937f68c7e8c) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
89 lines
3.3 KiB
XML
Executable File
89 lines
3.3 KiB
XML
Executable File
<?xml version="1.0" encoding="utf-8"?>
|
|
<eu.kanade.tachiyomi.widget.TachiyomiCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:id="@+id/root_coordinator"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<eu.kanade.tachiyomi.widget.TachiyomiChangeHandlerFrameLayout
|
|
android:id="@+id/controller_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent" />
|
|
|
|
<eu.kanade.tachiyomi.widget.ElevationAppBarLayout
|
|
android:id="@+id/appbar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:fitsSystemWindows="true"
|
|
app:elevation="0dp"
|
|
app:statusBarForeground="?attr/colorToolbar">
|
|
|
|
<com.google.android.material.appbar.MaterialToolbar
|
|
android:id="@+id/toolbar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="?attr/actionBarSize"
|
|
android:theme="?attr/actionBarTheme"
|
|
app:layout_scrollFlags="scroll|enterAlways" />
|
|
|
|
<com.google.android.material.tabs.TabLayout
|
|
android:id="@+id/tabs"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone" />
|
|
|
|
<FrameLayout
|
|
android:id="@+id/downloaded_only"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?attr/colorTertiary"
|
|
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="?attr/colorOnTertiary" />
|
|
|
|
</FrameLayout>
|
|
|
|
<FrameLayout
|
|
android:id="@+id/incognito_mode"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?attr/colorPrimary"
|
|
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="?attr/colorOnPrimary" />
|
|
|
|
</FrameLayout>
|
|
|
|
</eu.kanade.tachiyomi.widget.ElevationAppBarLayout>
|
|
|
|
<include
|
|
android:id="@+id/fab_layout"
|
|
layout="@layout/main_activity_fab" />
|
|
|
|
<com.google.android.material.bottomnavigation.BottomNavigationView
|
|
android:id="@+id/bottom_nav"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="bottom"
|
|
android:clickable="true"
|
|
app:layout_insetEdge="bottom"
|
|
app:menu="@menu/main_nav"
|
|
tools:ignore="KeyboardInaccessibleWidget" />
|
|
|
|
</eu.kanade.tachiyomi.widget.TachiyomiCoordinatorLayout>
|