mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-02 07:08:55 +01:00
Code Issues 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
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
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/menu/browse_extensions.xml
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>

4
app/src/main/res/menu/browse_migrate.xml
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>

4
app/src/main/res/menu/browse_sources.xml
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>

4
app/src/main/res/menu/category_selection.xml
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>

14
app/src/main/res/menu/chapter_selection.xml
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" />

2
app/src/main/res/menu/extension_details.xml
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

6
app/src/main/res/menu/full_cover.xml
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>

4
app/src/main/res/menu/generic_selection.xml
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>

2
app/src/main/res/menu/global_search.xml
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>

4
app/src/main/res/menu/history.xml
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>

6
app/src/main/res/menu/library.xml
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" />
</menu>

10
app/src/main/res/menu/library_selection.xml
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_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" />
@@ -31,7 +31,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" />
@@ -39,7 +39,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" />

4
app/src/main/res/menu/manga.xml
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

4
app/src/main/res/menu/reader.xml
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>

2
app/src/main/res/menu/settings_main.xml
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>

2
app/src/main/res/menu/settings_tracking.xml
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>

8
app/src/main/res/menu/source_browse.xml
View File

@@ -6,13 +6,13 @@
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: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">
@@ -33,14 +33,14 @@
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_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>

2
app/src/main/res/menu/updates.xml
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>

12
app/src/main/res/menu/updates_chapter_selection.xml
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" />

4
app/src/main/res/menu/webview.xml
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