Workaround cleanup (#6350)

* Remove material-components workaround that was fixed upstream

* Remove unused toolbar workaround

* Fix cover dialog navigation icon
This commit is contained in:
Ivan Iskandar
2021-12-17 21:32:42 +07:00
committed by GitHub
parent aeff846e1f
commit 38d131be37
35 changed files with 70 additions and 221 deletions

View File

@@ -20,8 +20,6 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorToolbar"
android:elevation="2dp"
android:padding="16dp">
<ImageView

View File

@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="?attr/actionBarTheme"
app:layout_scrollFlags="scroll|enterAlways" />
app:layout_scrollFlags="scroll|enterAlways|snap" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"

View File

@@ -12,7 +12,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"

View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorToolbar"
android:background="?attr/colorSurface"
android:elevation="2dp"
android:padding="32dp">
@@ -13,7 +13,7 @@
android:layout_height="56dp"
android:layout_gravity="center"
app:srcCompat="@drawable/ic_tachi"
app:tint="?attr/colorOnToolbar"
app:tint="?attr/colorOnSurface"
tools:ignore="ContentDescription" />
</FrameLayout>

View File

@@ -30,7 +30,6 @@
android:id="@+id/top_nav"
android:layout_width="0dp"
android:layout_height="32dp"
android:background="?attr/colorToolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -44,7 +43,7 @@
app:layout_constraintBottom_toBottomOf="@+id/top_nav"
app:layout_constraintStart_toStartOf="@+id/top_nav"
app:layout_constraintTop_toTopOf="@+id/top_nav"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageView
android:id="@+id/cover_container"
@@ -85,7 +84,6 @@
android:id="@+id/bottom_nav"
android:layout_width="0dp"
android:layout_height="32dp"
android:background="?attr/colorToolbar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

View File

@@ -81,7 +81,7 @@
android:contentDescription="@string/action_previous_chapter"
android:padding="@dimen/screen_edge_margin"
app:srcCompat="@drawable/ic_skip_previous_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<LinearLayout
android:id="@+id/reader_seekbar"
@@ -98,7 +98,7 @@
android:layout_width="32dp"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
android:textSize="15sp"
tools:text="1" />
@@ -119,7 +119,7 @@
android:layout_width="32dp"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
android:textSize="15sp"
tools:text="15" />
@@ -133,7 +133,7 @@
android:contentDescription="@string/action_next_chapter"
android:padding="@dimen/screen_edge_margin"
app:srcCompat="@drawable/ic_skip_next_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
</LinearLayout>
@@ -156,7 +156,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_reader_default_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/action_crop_borders"
@@ -169,7 +169,7 @@
app:layout_constraintStart_toEndOf="@+id/action_reading_mode"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_crop_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/action_rotation"
@@ -182,7 +182,7 @@
app:layout_constraintStart_toEndOf="@+id/action_crop_borders"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_screen_rotation_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/action_settings"
@@ -195,7 +195,7 @@
app:layout_constraintStart_toEndOf="@id/action_rotation"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_settings_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
</androidx.constraintlayout.widget.ConstraintLayout>