admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround cleanup (#6350)

Browse Source 
* Remove material-components workaround that was fixed upstream

* Remove unused toolbar workaround

* Fix cover dialog navigation icon

(cherry picked from commit 38d131be37)

# Conflicts:
#	app/src/main/res/menu/library_selection.xml
#	app/src/main/res/menu/reader.xml
This commit is contained in:
Ivan Iskandar
2021-12-17 21:32:42 +07:00
committed by Jobobby04
parent 9fd8d5aa7c
commit ae9fe06f7d
40 changed files with 99 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/color/ripple_toolbar_fainter.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 34% of 12% = ~4% -->
<item android:alpha="0.34" android:color="?attr/rippleColorToolbar" />
<item android:alpha="0.34" android:color="?attr/colorControlHighlight" />
</selector>
app/src/main/res/color/tabs_selector.xml
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Based on mtrl_tabs_icon_color_selector_colored.
We want to use the accent color in some themes, but sometimes colorPrimary doesn't work well with
it (i.e. blue themes).
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorPrimary" android:state_selected="true" />
<item android:alpha="0.60" android:color="?attr/colorOnToolbar" />
</selector>
app/src/main/res/layout/extension_detail_header.xml
-2
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
app/src/main/res/layout/main_activity.xml
+1 -1
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"
app/src/main/res/layout/manga_full_cover_dialog.xml
+1 -1
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"
app/src/main/res/layout/pref_more_header.xml
+2 -2
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>
app/src/main/res/layout/pref_theme_item.xml
+1 -3
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" />
app/src/main/res/layout/reader_activity.xml
+23 -23
View File
@@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="8dp"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
android:text="@string/eh_autoscroll" />
<EditText
@@ -105,7 +105,7 @@
android:layout_width="40dp"
android:layout_height="wrap_content"
android:text="\?"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
tools:ignore="HardcodedText" />
</LinearLayout>
@@ -122,7 +122,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
android:text="@string/eh_retry_all" />
<Button
@@ -131,7 +131,7 @@
android:layout_width="40dp"
android:layout_height="wrap_content"
android:text="\?"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
tools:ignore="HardcodedText" />
<Button
@@ -140,7 +140,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
android:text="@string/eh_boost_page" />
<Button
@@ -149,7 +149,7 @@
android:layout_width="40dp"
android:layout_height="wrap_content"
android:text="\?"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
tools:ignore="HardcodedText" />
</LinearLayout>
@@ -162,7 +162,7 @@
android:layout_height="wrap_content"
android:padding="0dp"
app:srcCompat="@drawable/ic_keyboard_arrow_down_white_32dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
</com.google.android.material.appbar.AppBarLayout>
@@ -207,7 +207,7 @@
android:padding="@dimen/screen_edge_margin"
android:rotation="90"
app:srcCompat="@drawable/ic_skip_previous_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<LinearLayout
android:id="@+id/reader_seekbar_vert"
@@ -225,7 +225,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:gravity="center"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
android:textSize="15sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -259,7 +259,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:gravity="center"
android:textColor="?attr/colorOnToolbar"
android:textColor="?attr/colorOnSurface"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -280,7 +280,7 @@
android:padding="@dimen/screen_edge_margin"
android:rotation="90"
app:srcCompat="@drawable/ic_skip_next_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
</LinearLayout>
@@ -322,7 +322,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"
@@ -339,7 +339,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" />
@@ -360,7 +360,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" />
@@ -374,7 +374,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>
@@ -398,7 +398,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_format_list_numbered_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/action_web_view"
@@ -412,7 +412,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_public_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/action_reading_mode"
@@ -426,7 +426,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_reader_default_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/action_crop_borders"
@@ -440,7 +440,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_crop_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/action_rotation"
@@ -454,7 +454,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_screen_rotation_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/double_page"
@@ -468,7 +468,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_book_open_variant_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/shift_page_button"
@@ -482,7 +482,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_page_next_outline_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/action_settings"
@@ -496,7 +496,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:srcCompat="@drawable/ic_settings_24dp"
app:tint="?attr/colorOnToolbar" />
app:tint="?attr/colorOnSurface" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/menu/browse_extensions.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:icon="@drawable/ic_search_24dp"
android:title="@string/action_search"
app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="collapseActionView|ifRoom" />
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_translate_24dp"
android:title="@string/action_filter"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/browse_migrate.xml
+2 -2
View File
@@ -5,7 +5,7 @@
android:id="@+id/action_sort"
android:icon="@drawable/ic_sort_24dp"
android:title="@string/action_sort"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="collapseActionView|ifRoom" >
<menu>
<item
@@ -41,7 +41,7 @@
android:id="@+id/action_source_migration_help"
android:icon="@drawable/ic_help_24dp"
android:title="@string/migration_help_guide"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/browse_sources.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:icon="@drawable/ic_travel_explore_24dp"
android:title="@string/action_global_search"
app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="collapseActionView|ifRoom" />
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_filter_list_24dp"
android:title="@string/action_filter"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/category_selection.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:id="@+id/action_edit"
android:icon="@drawable/ic_edit_24dp"
android:title="@string/action_edit"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_delete"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/chapter_selection.xml
+7 -7
View File
@@ -7,7 +7,7 @@
android:id="@+id/action_download"
android:icon="@drawable/ic_get_app_24dp"
android:title="@string/action_download"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -15,7 +15,7 @@
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_delete"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -23,7 +23,7 @@
android:id="@+id/action_bookmark"
android:icon="@drawable/ic_bookmark_border_24dp"
android:title="@string/action_bookmark"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -31,7 +31,7 @@
android:id="@+id/action_remove_bookmark"
android:icon="@drawable/ic_bookmark_24dp"
android:title="@string/action_remove_bookmark"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -39,7 +39,7 @@
android:id="@+id/action_mark_as_read"
android:icon="@drawable/ic_done_24dp"
android:title="@string/action_mark_as_read"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -47,7 +47,7 @@
android:id="@+id/action_mark_as_unread"
android:icon="@drawable/ic_done_outline_24dp"
android:title="@string/action_mark_as_unread"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -55,7 +55,7 @@
android:id="@+id/action_mark_previous_as_read"
android:icon="@drawable/ic_done_prev_24dp"
android:title="@string/action_mark_previous_as_read"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
app/src/main/res/menu/extension_details.xml
+1 -1
View File
@@ -5,7 +5,7 @@
android:id="@+id/action_history"
android:icon="@drawable/ic_history_24dp"
android:title="@string/whats_new"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
app/src/main/res/menu/full_cover.xml
+3 -3
View File
@@ -6,19 +6,19 @@
android:id="@+id/action_share_cover"
android:icon="@drawable/ic_share_24dp"
android:title="@string/action_share"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_save_cover"
android:icon="@drawable/ic_save_24dp"
android:title="@string/action_save"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_edit_cover"
android:icon="@drawable/ic_edit_24dp"
android:title="@string/action_edit"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/generic_selection.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:id="@+id/action_select_all"
android:icon="@drawable/ic_select_all_24dp"
android:title="@string/action_select_all"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_select_inverse"
android:icon="@drawable/ic_flip_to_back_24dp"
android:title="@string/action_select_inverse"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/global_search.xml
+1 -1
View File
@@ -6,7 +6,7 @@
android:icon="@drawable/ic_search_24dp"
android:title="@string/action_search"
app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="collapseActionView|ifRoom" />
</menu>
app/src/main/res/menu/history.xml
+2 -2
View File
@@ -7,14 +7,14 @@
android:icon="@drawable/ic_search_24dp"
android:title="@string/action_search"
app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom|collapseActionView" />
<item
android:id="@+id/action_clear_history"
android:icon="@drawable/ic_delete_sweep_24dp"
android:title="@string/pref_clear_history"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/library.xml
+3 -3
View File
@@ -8,21 +8,21 @@
android:icon="@drawable/ic_search_24dp"
android:title="@string/action_search"
app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="collapseActionView|ifRoom" />
<item
android:id="@+id/action_filter"
android:icon="@drawable/ic_filter_list_24dp"
android:title="@string/action_filter"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_update_library"
android:icon="@drawable/ic_refresh_24dp"
android:title="@string/action_update_library"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
app/src/main/res/menu/library_selection.xml
+8 -8
View File
@@ -7,7 +7,7 @@
android:id="@+id/action_move_to_category"
android:icon="@drawable/ic_label_24dp"
android:title="@string/action_move_category"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -15,7 +15,7 @@
android:id="@+id/action_download_unread"
android:icon="@drawable/ic_get_app_24dp"
android:title="@string/action_download_unread"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -23,7 +23,7 @@
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_delete"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -31,7 +31,7 @@
android:id="@+id/action_mark_as_read"
android:icon="@drawable/ic_done_24dp"
android:title="@string/action_mark_as_read"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -39,7 +39,7 @@
android:id="@+id/action_mark_as_unread"
android:icon="@drawable/ic_done_outline_24dp"
android:title="@string/action_mark_as_unread"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom"
tools:ignore="AlwaysShowAction" />
@@ -47,21 +47,21 @@
android:id="@+id/action_clean"
android:icon="@drawable/baseline_swap_calls_24"
android:title="@string/action_clean_titles"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_migrate"
android:icon="@drawable/baseline_swap_calls_24"
android:title="@string/migrate"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_push_to_mdlist"
android:icon="@drawable/baseline_swap_calls_24"
android:title="@string/mangadex_add_to_follows"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/manga.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:id="@+id/action_share"
android:icon="@drawable/ic_share_24dp"
android:title="@string/action_share"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/download_group"
android:icon="@drawable/ic_get_app_24dp"
android:title="@string/manga_download"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom">
<menu>
<item
app/src/main/res/menu/migration_list.xml
+2 -2
View File
@@ -6,12 +6,12 @@
android:id="@+id/action_copy_manga"
android:icon="@drawable/ic_copy_24dp"
android:title="@string/copy"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_migrate_manga"
android:icon="@drawable/ic_done_all_24dp"
android:title="@string/migrate"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/pre_migration.xml
+4 -4
View File
@@ -6,24 +6,24 @@
android:id="@+id/action_select_none"
android:icon="@drawable/ic_select_none_24dp"
android:title="@string/select_none"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_select_all"
android:icon="@drawable/ic_select_all_24dp"
android:title="@string/action_select_all"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_match_enabled"
android:icon="@drawable/ic_browse_filled_24dp"
android:title="@string/match_enabled_sources"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_match_pinned"
android:icon="@drawable/ic_pin_24dp"
android:title="@string/match_pinned_sources"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/reader.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:id="@+id/action_bookmark"
android:icon="@drawable/ic_bookmark_border_24dp"
android:title="@string/action_bookmark"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_remove_bookmark"
android:icon="@drawable/ic_bookmark_24dp"
android:title="@string/action_remove_bookmark"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />-->
</menu>
app/src/main/res/menu/settings_main.xml
+1 -1
View File
@@ -6,7 +6,7 @@
android:icon="@drawable/ic_search_24dp"
android:title="@string/action_search"
app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="collapseActionView|ifRoom" />
</menu>
app/src/main/res/menu/settings_sources.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:title="@string/action_search"
android:icon="@drawable/ic_search_24dp"
app:showAsAction="collapseActionView|ifRoom"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"/>
<item
android:id="@+id/action_sort"
android:title="@string/action_sort"
android:icon="@drawable/ic_filter_list_24dp"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom">
<menu>
<group android:id="@+id/group"
app/src/main/res/menu/settings_tracking.xml
+1 -1
View File
@@ -5,7 +5,7 @@
android:id="@+id/action_tracking_help"
android:icon="@drawable/ic_help_24dp"
android:title="@string/tracking_guide"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/sort_tags.xml
+1 -1
View File
@@ -6,7 +6,7 @@
android:id="@+id/action_help"
android:icon="@drawable/ic_help_24dp"
android:title="@string/label_help"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always" />
</menu>
app/src/main/res/menu/source_browse.xml
+5 -5
View File
@@ -6,14 +6,14 @@
android:icon="@drawable/ic_search_24dp"
android:title="@string/action_search"
app:actionViewClass="eu.kanade.tachiyomi.widget.TachiyomiSearchView"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="collapseActionView|ifRoom" />
<item
android:id="@+id/action_display_mode"
android:icon="@drawable/ic_view_module_24dp"
android:title="@string/action_display_mode"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom">
<menu>
<group android:checkableBehavior="single">
@@ -37,21 +37,21 @@
android:id="@+id/action_open_in_web_view"
android:icon="@drawable/ic_public_24dp"
android:title="@string/action_open_in_web_view"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_settings_24dp"
android:title="@string/action_settings"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_local_source_help"
android:icon="@drawable/ic_help_24dp"
android:title="@string/local_source_help_guide"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/updates.xml
+1 -1
View File
@@ -7,7 +7,7 @@
android:id="@+id/action_update_library"
android:icon="@drawable/ic_refresh_24dp"
android:title="@string/action_update_library"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
</menu>
app/src/main/res/menu/updates_chapter_selection.xml
+6 -6
View File
@@ -7,7 +7,7 @@
android:id="@+id/action_download"
android:icon="@drawable/ic_get_app_24dp"
android:title="@string/action_download"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -15,7 +15,7 @@
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_delete"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -23,7 +23,7 @@
android:id="@+id/action_bookmark"
android:icon="@drawable/ic_bookmark_border_24dp"
android:title="@string/action_bookmark"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -31,7 +31,7 @@
android:id="@+id/action_remove_bookmark"
android:icon="@drawable/ic_bookmark_24dp"
android:title="@string/action_remove_bookmark"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -39,7 +39,7 @@
android:id="@+id/action_mark_as_read"
android:icon="@drawable/ic_done_24dp"
android:title="@string/action_mark_as_read"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
@@ -47,7 +47,7 @@
android:id="@+id/action_mark_as_unread"
android:icon="@drawable/ic_done_outline_24dp"
android:title="@string/action_mark_as_unread"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />
app/src/main/res/menu/webview.xml
+2 -2
View File
@@ -6,14 +6,14 @@
android:id="@+id/action_web_back"
android:icon="@drawable/ic_arrow_back_24dp"
android:title="@string/action_webview_back"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_web_forward"
android:icon="@drawable/ic_arrow_forward_24dp"
android:title="@string/action_webview_forward"
app:iconTint="?attr/colorOnToolbar"
app:iconTint="?attr/colorOnSurface"
app:showAsAction="ifRoom" />
<item
app/src/main/res/values/attrs.xml
-13
View File
@@ -13,19 +13,6 @@
</declare-styleable>
<attr name="colorFilterActive" format="reference|integer"/>
<attr name="colorTertiary" format="reference|integer"/>
<attr name="colorOnTertiary" format="reference|integer"/>
<!-- Ripple color for toolbar elements -->
<attr name="rippleColorToolbar" format="reference|color"/>
<!-- Toolbar color. Not actually used by the toolbar. -->
<attr name="colorToolbar" format="reference|color"/>
<!-- For anything that is drawn on the toolbar -->
<attr name="colorOnToolbar" format="reference|integer"/>
<attr name="lightSystemBarsOnPrimary" format="reference|boolean"/>
<!-- Setting chip color values for specific themes -->
<attr name="chipTextColor" format="reference|integer"/>
app/src/main/res/values/styles.xml
+2 -11
View File
@@ -5,21 +5,12 @@
<!--Toolbars-->
<!--========-->
<style name="ThemeOverlay.Tachiyomi.ActionBar" parent="ThemeOverlay.Material3.ActionBar">
<item name="android:colorControlHighlight">?attr/rippleColorToolbar</item>
<item name="android:tint">?attr/colorOnToolbar</item>
</style>
<style name="Widget.Tachiyomi.ActionMode" parent="Widget.Material3.ActionMode">
<item name="background">?attr/colorToolbar</item>
</style>
<style name="Theme.Tachiyomi.ActionMode.CloseButton" parent="Widget.AppCompat.ActionButton.CloseMode">
<item name="android:tint">?attr/colorOnToolbar</item>
<item name="android:tint">?attr/colorOnSurface</item>
</style>
<style name="Theme.Tachiyomi.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
<item name="android:tint">?attr/colorOnToolbar</item>
<item name="android:tint">?attr/colorOnSurface</item>
</style>
app/src/main/res/values/themes.xml
-7
View File
@@ -38,14 +38,11 @@
<item name="colorErrorContainer">@color/errorContainer</item>
<item name="colorOnErrorContainer">@color/onErrorContainer</item>
<item name="colorToolbar">?attr/colorSurface</item>
<item name="colorOnToolbar">?attr/colorOnSurface</item>
<item name="android:divider">@color/divider_default</item>
<item name="android:listDivider">@drawable/line_divider</item>
<!-- Ripples -->
<item name="colorControlHighlight">?attr/colorSurfaceVariant</item>
<item name="rippleColorToolbar">?attr/colorControlHighlight</item>
<!-- Handles RTL Text -->
<item name="android:textAlignment">gravity</item>
@@ -65,11 +62,9 @@
<item name="android:buttonStyle">?attr/borderlessButtonStyle</item>
<item name="android:backgroundDimAmount">0.32</item>
<item name="windowActionModeOverlay">true</item>
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
<item name="actionOverflowButtonStyle">@style/Theme.Tachiyomi.ActionButton.Overflow</item>
<item name="actionModeCloseButtonStyle">@style/Theme.Tachiyomi.ActionMode.CloseButton</item>
<item name="actionModeCloseDrawable">@drawable/ic_close_24dp</item>
<item name="actionBarTheme">@style/ThemeOverlay.Tachiyomi.ActionBar</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Tachiyomi</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Tachiyomi.BottomSheetDialog</item>
<item name="chipStyle">@style/Widget.Tachiyomi.Chip.Action</item>
@@ -84,7 +79,6 @@
<item name="switchStyle">@style/Widget.Tachiyomi.Switch</item>
<item name="sliderStyle">@style/Widget.Tachiyomi.Slider</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="lightSystemBarsOnPrimary">false</item>
<!-- Custom Attributes-->
<item name="colorFilterActive">@color/filter_light</item>
@@ -125,7 +119,6 @@
<item name="colorOnSurfaceInverse">@color/greenapple_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/greenapple_inverseSurface</item>
<item name="colorPrimaryInverse">@color/greenapple_primaryInverse</item>
<item name="lightSystemBarsOnPrimary">true</item>
</style>
<!--== Midnight Dusk Theme ==-->