mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-31 06:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

More themes cleanup (#5410)

Browse Source 
* More themes cleanup

* Tweak some things

* Fix 'Clear History' icon

* Split out ripple colored to its own drawable

* Tidy up things

* Unify background dim amount

* Use primaryColor for Account login button

* More colored ripples

* use colorOnPrimary for selected comfortable library item title

Co-authored-by: Soitora <simon.mattila@protonmail.com>
This commit is contained in:
Ivan Iskandar
2021-06-20 02:45:16 +07:00
committed by GitHub
parent 05771ddf6d
commit 932c92412c
108 changed files with 556 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/color/background_color_chip_state.xml
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/rippleColor" android:state_selected="true" />
<item android:color="?attr/rippleColor" android:state_pressed="true" />
<item android:color="?attr/rippleColor" android:state_focused="true" />
<item android:color="@android:color/transparent" />
</selector>

4
app/src/main/res/color/button_action_selector.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccent" android:state_activated="true" />
<item android:color="?android:attr/textColorHint" android:state_activated="false" />
<item android:alpha="1.00" android:color="?attr/colorPrimary" android:state_activated="true" />
<item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_activated="false" />
</selector>

6
app/src/main/res/color/draggable_card_foreground.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:alpha="0.08" android:color="?attr/colorPrimary" app:state_dragged="true" />
<item android:color="@android:color/transparent" />
</selector>

5
app/src/main/res/color/library_item_background.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:alpha="0.75" android:color="?attr/colorPrimary" />
<item android:state_activated="true" android:alpha="0.75" android:color="?attr/colorPrimary" />
</selector>

5
app/src/main/res/color/library_item_foreground.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:alpha="0.2" android:color="?attr/colorPrimary" />
<item android:state_activated="true" android:alpha="0.2" android:color="?attr/colorPrimary" />
</selector>

4
app/src/main/res/color/nav_selector.xml
View File

@@ -3,6 +3,6 @@
Based on mtrl_bottom_nav_colored_item_tint
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="1.0" android:color="?attr/colorAccentOnPrimary" android:state_checked="true" />
<item android:alpha="0.6" android:color="?attr/colorOnPrimary" />
<item android:alpha="1.0" android:color="?attr/colorPrimary" android:state_checked="true" />
<item android:alpha="0.6" android:color="?attr/colorOnSurface" />
</selector>

4
app/src/main/res/color/selector_overlay.xml → app/src/main/res/color/ripple_colored.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.2" android:color="?attr/colorAccent" />
</selector>
<item android:alpha="0.12" android:color="?attr/colorPrimary" />
</selector>

5
app/src/main/res/color/ripple_toolbar_fainter.xml Normal file
View File

@@ -0,0 +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" />
</selector>

6
app/src/main/res/color/source_comfortable_item_title.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="?attr/colorOnPrimary" />
<item android:state_activated="true" android:color="?attr/colorOnPrimary" />
<item android:color="?android:attr/textColorPrimary" />
</selector>

4
app/src/main/res/color/tabs_selector.xml
View File

@@ -6,6 +6,6 @@
it (i.e. blue themes).
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccentOnPrimary" android:state_selected="true" />
<item android:alpha="0.60" android:color="?attr/colorOnPrimary" />
<item android:color="?attr/colorPrimary" android:state_selected="true" />
<item android:alpha="0.60" android:color="?attr/colorOnToolbar" />
</selector>

10
app/src/main/res/color/tabs_selector_background.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Based on mtrl_tabs_icon_color_selector_colored.
Ensures visibility on top of the background color.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccent" android:state_selected="true" />
<item android:alpha="0.60" android:color="?attr/colorOnBackground" />
</selector>

11
app/src/main/res/color/text_input_stroke.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
The regular version uses ?attr/colorPrimary when focused, which doesn't work well with our themes.
https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/textfield/res/color/mtrl_filled_stroke_color.xml
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorSecondary" android:state_focused="true" />
<item android:alpha="0.87" android:color="?attr/colorOnSurface" android:state_hovered="true" />
<item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false" />
<item android:alpha="0.38" android:color="?attr/colorOnSurface" />
</selector>

6
app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/colorPrimary"/>
<background android:drawable="@color/accent_lightblue"/>
<foreground>
<vector
android:width="120dp"
@@ -11,10 +11,10 @@
android:translateX="16"
android:translateY="16">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z"/>
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z"/>
</group>
</vector>

4
app/src/main/res/drawable-v26/sc_explore_48dp.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/colorPrimary"/>
<background android:drawable="@color/accent_lightblue"/>
<foreground>
<vector
android:width="120dp"
@@ -11,7 +11,7 @@
android:translateX="16"
android:translateY="16">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
</group>
</vector>

4
app/src/main/res/drawable-v26/sc_history_48dp.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/colorPrimary"/>
<background android:drawable="@color/accent_lightblue"/>
<foreground>
<vector
android:width="120dp"
@@ -11,7 +11,7 @@
android:translateX="16"
android:translateY="16">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
</group>
</vector>

4
app/src/main/res/drawable-v26/sc_new_releases_48dp.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/colorPrimary"/>
<background android:drawable="@color/accent_lightblue"/>
<foreground>
<vector
android:width="120dp"
@@ -11,7 +11,7 @@
android:translateX="16"
android:translateY="16">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
</group>
</vector>

48
app/src/main/res/drawable/library_item_selector.xml
View File

@@ -1,42 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorLibrarySelection">
android:color="?attr/colorPrimary">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="#80FFFFFF" />
</shape>
</item>
<item>
<selector>
<item
android:state_selected="true"
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?attr/colorLibrarySelectionActive" />
</shape>
</item>
<item
android:state_activated="true"
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?attr/colorLibrarySelectionActive" />
</shape>
</item>
<item
android:top="2dp"
android:right="2dp"
android:bottom="2dp"
android:left="2dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="?android:attr/colorBackground" />
</shape>
</item>
</selector>
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/library_item_background" />
</shape>
</item>
</ripple>

23
app/src/main/res/drawable/library_item_selector_overlay.xml
View File

@@ -1,21 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorLibrarySelection">
android:color="?attr/colorPrimary">
<item>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/selector_overlay" />
</shape>
</item>
<item android:state_activated="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/selector_overlay" />
</shape>
</item>
</selector>
<shape android:shape="rectangle">
<corners android:radius="@dimen/card_selector_radius" />
<solid android:color="@color/library_item_foreground" />
</shape>
</item>
</ripple>
</ripple>

6
app/src/main/res/drawable/list_item_selector.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item android:state_selected="true">
<color android:color="?attr/rippleColor" />
<color android:color="?attr/colorControlHighlight" />
</item>
<item android:state_activated="true">
<color android:color="?attr/rippleColor" />
<color android:color="?attr/colorControlHighlight" />
</item>
<item>

6
app/src/main/res/drawable/list_item_selector_background.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item android:state_selected="true">
<color android:color="?attr/rippleColor" />
<color android:color="?attr/colorControlHighlight" />
</item>
<item android:state_activated="true">
<color android:color="?attr/rippleColor" />
<color android:color="?attr/colorControlHighlight" />
</item>
<item>

2
app/src/main/res/drawable/reader_seekbar_background.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="?attr/actionBarSize" />
<solid android:color="?attr/colorPrimary" />
<solid android:color="?attr/colorToolbar" />
</shape>

2
app/src/main/res/drawable/reader_seekbar_ripple.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">

5
app/src/main/res/drawable/ripple_background.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor">
<item android:drawable="?android:attr/colorBackground" />
</ripple>

3
app/src/main/res/drawable/ripple_regular.xml
View File

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/rippleColor" />

6
app/src/main/res/drawable/sc_collections_bookmark_48dp.xml
View File

@@ -6,17 +6,17 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z" />
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_explore_48dp.xml
View File

@@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_history_48dp.xml
View File

@@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
</group>
</vector>

4
app/src/main/res/drawable/sc_new_releases_48dp.xml
View File

@@ -6,14 +6,14 @@
android:viewportHeight="48">
<path
android:fillColor="@color/colorPrimary"
android:fillColor="@color/accent_lightblue"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
android:translateX="12"
android:translateY="12">
<path
android:fillColor="@color/textColorPrimaryDark"
android:fillColor="@color/md_white_1000"
android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
</group>
</vector>

3
app/src/main/res/drawable/selectable_item_background.xml
View File

@@ -1,3 +0,0 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ripple_regular" />
</selector>

2
app/src/main/res/drawable/splash_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?attr/colorBackgroundSplash" />
<item android:drawable="@color/splash" />
<item
android:width="72dp"

2
app/src/main/res/drawable/tab_indicator.xml
View File

@@ -3,5 +3,5 @@
<corners
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
<solid android:color="?attr/colorAccentOnPrimary" />
<solid android:color="@android:color/white" />
</shape>

4
app/src/main/res/layout-sw720dp/main_activity.xml
View File

@@ -77,7 +77,7 @@
android:layout_height="0dp"
app:elevation="0dp"
app:itemIconTint="@color/nav_selector"
app:itemRippleColor="?attr/rippleSecondaryColor"
app:itemRippleColor="?attr/colorControlHighlight"
app:itemTextColor="@color/nav_selector"
app:labelVisibilityMode="labeled"
app:layout_constraintBottom_toBottomOf="parent"
@@ -87,7 +87,7 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/Theme.Widget.Tabs"
style="@style/Widget.Tachiyomi.TabLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"

10
app/src/main/res/layout-sw720dp/manga_info_header.xml
View File

@@ -149,7 +149,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_favorite"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -158,7 +158,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_tracking"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -169,7 +169,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_webview"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -219,7 +219,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/manga_info_toggle_more"
style="@style/Theme.Widget.Button.TextButton"
style="@style/Widget.Tachiyomi.Button.InlineButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"
@@ -231,7 +231,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/manga_info_toggle_less"
style="@style/Theme.Widget.Button.TextButton"
style="@style/Widget.Tachiyomi.Button.InlineButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"

2
app/src/main/res/layout/action_toolbar.xml
View File

@@ -19,8 +19,6 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme"
app:contentInsetEnd="8dp"
app:contentInsetStart="8dp">

6
app/src/main/res/layout/categories_item.xml
View File

@@ -6,12 +6,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?android:attr/colorBackground"
app:cardElevation="0dp">
app:cardElevation="0dp"
app:cardForegroundColor="@color/draggable_card_foreground">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_item_selector_background">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/reorder"

2
app/src/main/res/layout/chapter_download_view.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="42dp"
android:layout_height="42dp"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp">
<ImageView

2
app/src/main/res/layout/common_spinner_item.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="@style/Theme.Widget.SpinnerItem"
style="@style/Widget.Tachiyomi.SpinnerItem"
android:layout_width="match_parent"
android:layout_height="?attr/dropdownListPreferredItemHeight"
android:ellipsize="end"

10
app/src/main/res/layout/common_tabbed_sheet.xml
View File

@@ -12,8 +12,8 @@
<!-- Remove background color so rounded sheet corners work -->
<com.google.android.material.tabs.TabLayout
style="@style/Widget.Tachiyomi.TabLayout"
android:id="@+id/tabs"
style="@style/Theme.Widget.Tabs"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
@@ -22,15 +22,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tabGravity="fill"
app:tabIndicatorColor="?attr/colorAccent"
app:tabMode="fixed"
app:tabTextColor="@color/tabs_selector_background" />
app:tabMode="fixed" />
<ImageButton
android:id="@+id/menu"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu"
android:paddingStart="10dp"
android:paddingEnd="10dp"
@@ -39,7 +37,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_overflow_24dp"
app:tint="?attr/colorOnBackground"
app:tint="?attr/colorOnSurface"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/download_item.xml
View File

@@ -7,12 +7,12 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:cardBackgroundColor="?android:attr/colorBackground"
app:cardElevation="0dp">
app:cardElevation="0dp"
app:cardForegroundColor="@color/draggable_card_foreground">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_item_selector_background">
android:layout_height="wrap_content">
<ImageView
android:id="@+id/reorder"
@@ -98,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/download_progress_text"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu"
android:paddingHorizontal="10dp"
android:paddingVertical="16dp"

2
app/src/main/res/layout/extension_card_item.xml
View File

@@ -76,7 +76,7 @@
<Button
android:id="@+id/ext_button"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"

3
app/src/main/res/layout/extension_detail_header.xml
View File

@@ -20,7 +20,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/colorToolbar"
android:elevation="2dp"
android:padding="16dp">
@@ -98,7 +98,6 @@
<Button
android:id="@+id/extension_uninstall_button"
style="@style/Theme.Widget.Button.FilledAccent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"

4
app/src/main/res/layout/global_search_controller_card.xml
View File

@@ -10,7 +10,7 @@
android:id="@+id/title_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selectable_item_background">
android:background="?attr/selectableItemBackground">
<TextView
android:id="@+id/title"
@@ -67,7 +67,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

3
app/src/main/res/layout/global_search_controller_card_item.xml
View File

@@ -22,7 +22,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -50,7 +50,6 @@
android:lineSpacingExtra="-4dp"
android:maxLines="2"
android:padding="4dp"
android:shadowColor="@color/textColorPrimaryLight"
app:layout_constraintEnd_toEndOf="@+id/card"
app:layout_constraintStart_toStartOf="@+id/card"
app:layout_constraintTop_toBottomOf="@+id/card"

6
app/src/main/res/layout/history_item.xml
View File

@@ -9,7 +9,7 @@
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:paddingBottom="8dp"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:orientation="horizontal">
<ImageView
@@ -57,7 +57,7 @@
android:id="@+id/remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_resume"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -70,7 +70,7 @@
android:id="@+id/resume"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_resume"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/library_controller.xml
View File

@@ -12,7 +12,7 @@
<Button
android:id="@+id/btn_global_search"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"

2
app/src/main/res/layout/library_grid_recycler.xml
View File

@@ -2,7 +2,7 @@
<eu.kanade.tachiyomi.widget.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/library_grid"
style="@style/Theme.Widget.GridView.Source"
style="@style/Widget.Tachiyomi.GridView.Source"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"

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

@@ -17,13 +17,11 @@
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" />
@@ -77,13 +75,10 @@
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_nav"
style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:itemIconTint="@color/nav_selector"
app:itemRippleColor="?attr/rippleSecondaryColor"
app:itemTextColor="@color/nav_selector"
app:itemRippleColor="@color/ripple_toolbar_fainter"
app:labelVisibilityMode="labeled"
app:layout_insetEdge="bottom"
app:menu="@menu/main_nav" />

6
app/src/main/res/layout/main_activity_fab.xml
View File

@@ -2,7 +2,11 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_fab"
style="@style/Theme.Widget.FAB"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_gravity="bottom|end"
android:minWidth="0dp"
android:visibility="gone"
tools:icon="@drawable/ic_add_24dp"
tools:text="Action"

3
app/src/main/res/layout/main_activity_toolbar.xml
View File

@@ -11,13 +11,10 @@
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" />

6
app/src/main/res/layout/manga_chapters_header.xml
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="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:paddingStart="16dp"
android:paddingTop="4dp"
android:paddingEnd="12dp"
@@ -28,12 +28,12 @@
android:id="@+id/btn_chapters_filter"
android:layout_width="28dp"
android:layout_height="28dp"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_filter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_filter_list_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnBackground" />
</androidx.constraintlayout.widget.ConstraintLayout>

10
app/src/main/res/layout/manga_info_header.xml
View File

@@ -137,7 +137,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_favorite"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -146,7 +146,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_tracking"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -157,7 +157,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_webview"
style="@style/Theme.Widget.Button.Action"
style="@style/Widget.Tachiyomi.Button.ActionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -206,7 +206,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/manga_info_toggle_more"
style="@style/Theme.Widget.Button.TextButton"
style="@style/Widget.Tachiyomi.Button.InlineButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"
@@ -218,7 +218,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/manga_info_toggle_less"
style="@style/Theme.Widget.Button.TextButton"
style="@style/Widget.Tachiyomi.Button.InlineButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"

2
app/src/main/res/layout/navigation_view_checkbox.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd">

2
app/src/main/res/layout/navigation_view_checkedtext.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd">

2
app/src/main/res/layout/navigation_view_group.xml
View File

@@ -24,6 +24,6 @@
android:id="@+id/expand_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnBackground" />
</LinearLayout>

2
app/src/main/res/layout/navigation_view_radio.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd">

2
app/src/main/res/layout/navigation_view_spinner.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd">

4
app/src/main/res/layout/navigation_view_text.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:baselineAligned="false"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
@@ -10,7 +10,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/nav_view_item_wrapper"
style="@style/Theme.Widget.TextInputLayout.OutlinedBox.Dense"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"

4
app/src/main/res/layout/pref_account_login.xml
View File

@@ -41,7 +41,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/login"
android:textColor="@android:color/white"
android:textColor="?attr/colorOnPrimary"
app:pb_colorNormal="?attr/colorPrimary"
app:pb_colorPressed="?attr/colorPrimary"
app:pb_textComplete="@string/login_success"
app:pb_textError="@string/invalid_login"
app:pb_textProgress="@string/loading" />

4
app/src/main/res/layout/pref_more_header.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/colorToolbar"
android:elevation="2dp"
android:padding="32dp">
@@ -12,6 +12,6 @@
android:layout_height="56dp"
android:layout_gravity="center"
app:srcCompat="@drawable/ic_tachi"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
</FrameLayout>

2
app/src/main/res/layout/pref_settings.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/label_settings"
android:padding="8dp"
app:srcCompat="@drawable/ic_settings_24dp"

28
app/src/main/res/layout/reader_activity.xml
View File

@@ -61,7 +61,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:background="?attr/colorToolbar"
android:minHeight="?attr/actionBarSize" />
<LinearLayout
@@ -90,7 +90,7 @@
android:contentDescription="@string/action_previous_chapter"
android:padding="@dimen/screen_edge_margin"
app:srcCompat="@drawable/ic_skip_previous_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<LinearLayout
android:id="@+id/reader_seekbar"
@@ -106,7 +106,7 @@
android:layout_width="32dp"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="?attr/colorOnPrimary"
android:textColor="?attr/colorOnToolbar"
android:textSize="15sp"
tools:text="1" />
@@ -127,7 +127,7 @@
android:layout_width="32dp"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="?attr/colorOnPrimary"
android:textColor="?attr/colorOnToolbar"
android:textSize="15sp"
tools:text="15" />
@@ -142,7 +142,7 @@
android:contentDescription="@string/action_next_chapter"
android:padding="@dimen/screen_edge_margin"
app:srcCompat="@drawable/ic_skip_next_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
</LinearLayout>
@@ -150,59 +150,59 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary">
android:background="?attr/colorToolbar">
<ImageButton
android:id="@+id/action_reading_mode"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/viewer"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/action_crop_borders"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_reader_default_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/action_crop_borders"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/pref_crop_borders"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/action_rotation"
app:layout_constraintStart_toEndOf="@+id/action_reading_mode"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_crop_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/action_rotation"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/pref_rotation_type"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toStartOf="@id/action_settings"
app:layout_constraintStart_toEndOf="@+id/action_crop_borders"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_screen_rotation_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
<ImageButton
android:id="@+id/action_settings"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_settings"
android:padding="@dimen/screen_edge_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/action_rotation"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_settings_24dp"
app:tint="?attr/colorOnPrimary" />
app:tint="?attr/colorOnToolbar" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/reader_page_sheet.xml
View File

@@ -11,7 +11,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp">
@@ -37,7 +37,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp">
@@ -63,7 +63,7 @@
android:layout_height="56dp"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selectable_item_background"
android:foreground="?attr/selectableItemBackground"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp">

2
app/src/main/res/layout/settings_search_controller_card.xml
View File

@@ -4,7 +4,7 @@
android:id="@+id/title_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:orientation="vertical"
android:padding="16dp">

4
app/src/main/res/layout/source_comfortable_grid_item.xml
View File

@@ -88,7 +88,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -107,7 +107,7 @@
android:lineSpacingExtra="-4dp"
android:maxLines="2"
android:padding="4dp"
android:shadowColor="@color/textColorPrimaryLight"
android:textColor="@color/source_comfortable_item_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card"
tools:text="Sample name" />

4
app/src/main/res/layout/source_compact_grid_item.xml
View File

@@ -96,7 +96,7 @@
android:lineSpacingExtra="-4dp"
android:maxLines="2"
android:padding="8dp"
android:shadowColor="@color/textColorPrimaryLight"
android:shadowColor="@color/md_black_1000"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="4"
@@ -105,7 +105,7 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="@style/Theme.Widget.CircularProgressIndicator.Small"
style="@style/Widget.Tachiyomi.CircularProgressIndicator.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

3
app/src/main/res/layout/source_filter_sheet.xml
View File

@@ -16,7 +16,7 @@
<Button
android:id="@+id/reset_btn"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_reset"
@@ -26,7 +26,6 @@
<Button
android:id="@+id/filter_btn"
style="@style/Theme.Widget.Button.FilledAccent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"

4
app/src/main/res/layout/source_main_controller_card_item.xml
View File

@@ -52,7 +52,7 @@
<Button
android:id="@+id/source_latest"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxHeight="48dp"
@@ -72,7 +72,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="8dp"
android:background="@drawable/ripple_regular"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_pin"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/source_recycler_autofit.xml
View File

@@ -2,7 +2,7 @@
<eu.kanade.tachiyomi.widget.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/source_grid"
style="@style/Theme.Widget.GridView.Source"
style="@style/Widget.Tachiyomi.GridView.Source"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"

4
app/src/main/res/layout/spinner_preference.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="@drawable/selectable_item_background"
android:background="?attr/selectableItemBackground"
android:paddingStart="16dp"
android:paddingEnd="16dp">
@@ -47,7 +47,7 @@
app:layout_constraintBottom_toBottomOf="@id/details"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/details"
app:tint="?android:attr/textColorSecondary"
app:tint="?android:attr/colorControlNormal"
tools:ignore="ContentDescription" />
<androidx.constraintlayout.widget.Guideline

4
app/src/main/res/layout/track_item.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/track"
style="@style/Theme.Widget.CardView.Item"
style="@style/Widget.Tachiyomi.CardView.Item"
android:padding="0dp">
<LinearLayout
@@ -45,7 +45,7 @@
<Button
android:id="@+id/track_set"
style="@style/Theme.Widget.Button"
style="?attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
app/src/main/res/layout/track_search_dialog.xml
View File

@@ -42,7 +42,7 @@
<ListView
android:id="@+id/track_search_list"
style="@style/Theme.Widget.CardView"
style="@style/Widget.Tachiyomi.CardView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:choiceMode="singleChoice"

2
app/src/main/res/layout/track_search_item.xml
View File

@@ -2,7 +2,7 @@
<androidx.cardview.widget.CardView 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"
style="@style/Theme.Widget.CardView.Item"
style="@style/Widget.Tachiyomi.CardView.Item"
android:layout_margin="0dp"
android:padding="0dp">

2
app/src/main/res/layout/webview_activity.xml
View File

@@ -14,8 +14,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarTheme"
app:navigationIcon="@drawable/ic_close_24dp" />
</com.google.android.material.appbar.AppBarLayout>

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="androidx.appcompat.widget.SearchView"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="collapseActionView|ifRoom" />
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_translate_24dp"
android:title="@string/action_filter"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
</menu>

2
app/src/main/res/menu/browse_migrate.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/action_source_migration_help"
android:icon="@drawable/ic_help_24dp"
android:title="@string/migration_help_guide"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
</menu>

4
app/src/main/res/menu/browse_sources.xml
View File

@@ -6,14 +6,14 @@
android:icon="@drawable/ic_search_24dp"
android:title="@string/action_search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="collapseActionView|ifRoom" />
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_translate_24dp"
android:title="@string/action_filter"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_delete"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
</menu>

14
app/src/main/res/menu/chapter_selection.xml
View File

@@ -6,49 +6,49 @@
android:id="@+id/action_download"
android:icon="@drawable/ic_get_app_24dp"
android:title="@string/action_download"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_delete"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_bookmark"
android:icon="@drawable/ic_bookmark_border_24dp"
android:title="@string/action_bookmark"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_remove_bookmark"
android:icon="@drawable/ic_bookmark_24dp"
android:title="@string/action_remove_bookmark"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_mark_as_read"
android:icon="@drawable/ic_done_24dp"
android:title="@string/action_mark_as_read"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_mark_as_unread"
android:icon="@drawable/ic_done_outline_24dp"
android:title="@string/action_mark_as_unread"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
</menu>

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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
<item

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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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="androidx.appcompat.widget.SearchView"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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="androidx.appcompat.widget.SearchView"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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="androidx.appcompat.widget.SearchView"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
</menu>

10
app/src/main/res/menu/library_selection.xml
View File

@@ -6,35 +6,35 @@
android:id="@+id/action_move_to_category"
android:icon="@drawable/ic_label_24dp"
android:title="@string/action_move_category"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_download_unread"
android:icon="@drawable/ic_get_app_24dp"
android:title="@string/action_download_unread"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_mark_as_read"
android:icon="@drawable/ic_done_24dp"
android:title="@string/action_mark_as_read"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_mark_as_unread"
android:icon="@drawable/ic_done_outline_24dp"
android:title="@string/action_mark_as_unread"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_delete"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
</menu>

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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
<item
android:id="@+id/download_group"
android:icon="@drawable/ic_get_app_24dp"
android:title="@string/manga_download"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom">
<menu>
<item

2
app/src/main/res/menu/migration.xml
View File

@@ -6,7 +6,7 @@
android:id="@+id/action_change_source"
android:icon="@drawable/ic_filter_list_24dp"
android:title="@string/action_filter"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
</menu>

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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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="androidx.appcompat.widget.SearchView"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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="androidx.appcompat.widget.SearchView"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="collapseActionView|ifRoom" />
<item
android:icon="@drawable/ic_view_module_24dp"
android:title="@string/action_display_mode"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
</menu>

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

@@ -6,28 +6,28 @@
android:id="@+id/action_download"
android:icon="@drawable/ic_get_app_24dp"
android:title="@string/action_download"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_delete"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_mark_as_read"
android:icon="@drawable/ic_done_24dp"
android:title="@string/action_mark_as_read"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
<item
android:id="@+id/action_mark_as_unread"
android:icon="@drawable/ic_done_outline_24dp"
android:title="@string/action_mark_as_unread"
app:iconTint="?attr/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="always" />
</menu>

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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
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/colorOnPrimary"
app:iconTint="?attr/colorOnToolbar"
app:showAsAction="ifRoom" />
<item

4
app/src/main/res/values-night/colors.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="splash">@color/background_dark</color>
</resources>

15
app/src/main/res/values-night/themes.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--===============-->
<!-- Launch Screen -->
<!--===============-->
<style name="Theme.Splash" parent="Theme.Tachiyomi.Dark">
<item name="colorBackgroundSplash">@color/backgroundDark</item>
<item name="android:windowBackground">@drawable/splash_background</item>
<item name="android:statusBarColor">?attr/colorBackgroundSplash</item>
<item name="android:navigationBarColor">?attr/colorBackgroundSplash</item>
</style>
</resources>

2
app/src/main/res/values-v26/colors.xml
View File

@@ -2,6 +2,6 @@
<resources>
<!-- Reader Theme -->
<color name="readerColorDarkPrimary">#BF212121</color>
<color name="reader_toolbar">#BF212121</color>
</resources>

2
app/src/main/res/values-v27/themes.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Base.V27.Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light">
<item name="android:navigationBarColor">?attr/colorPrimary</item>
<item name="android:navigationBarColor">?attr/colorSurface</item>
<item name="android:windowLightNavigationBar">true</item>
</style>

15
app/src/main/res/values/attrs.xml
View File

@@ -17,14 +17,17 @@
<attr name="summary" format="reference|string" />
</declare-styleable>
<attr name="colorLibrarySelection" format="reference|integer"/>
<attr name="colorLibrarySelectionActive" format="reference|integer"/>
<attr name="colorFilterActive" format="reference|integer"/>
<attr name="colorBackgroundSplash" format="reference|integer"/>
<attr name="colorAccentOnPrimary" format="reference|integer"/>
<attr name="colorTertiary" format="reference|integer"/>
<attr name="colorOnTertiary" format="reference|integer"/>
<attr name="rippleSecondaryColor" format="reference|integer"/>
<attr name="rippleToolbarColor" 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"/>
</resources>

112
app/src/main/res/values/colors.xml
View File

@@ -1,104 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Application Colors -->
<color name="colorPrimary">#54759E</color>
<color name="colorPrimaryDark">#435E7E</color>
<color name="colorPrimary_70">#B354759E</color>
<!-- Dark Application Colors -->
<color name="colorDarkPrimary">#242529</color>
<color name="colorDarkPrimaryDark">#202125</color>
<!-- AMOLED Application Colors -->
<color name="colorAmoledPrimary">@color/md_black_1000</color>
<!-- Splash Color -->
<color name="splashBackgroundColor">@color/colorPrimary</color>
<color name="splash">@color/accent_lightblue</color>
<!-- Light Theme -->
<color name="colorAccentLight">@color/md_blue_A400</color>
<color name="textColorPrimaryLight">@color/md_black_1000_87</color>
<color name="textColorSecondaryLight">@color/md_black_1000_54</color>
<color name="textColorHintLight">@color/md_black_1000_38</color>
<color name="dividerLight">@color/md_black_1000_12</color>
<color name="rippleColorLight">@color/md_black_1000_6</color>
<color name="rippleSecondaryColorLight">@color/md_blue_A400_4</color>
<color name="rippleToolbarColorLight">@color/rippleColorLight</color>
<color name="backgroundLight">@color/md_grey_50</color>
<color name="dialogLight">@color/md_white_1000</color>
<color name="selectorColorLight">@color/md_blue_A400_75</color>
<color name="accent_light">@color/md_blue_A400</color>
<color name="divider_light">@color/md_black_1000_12</color>
<color name="surface_light">@color/md_white_1000</color>
<color name="background_light">@color/md_grey_50</color>
<!-- Light Blue Theme -->
<color name="accent_lightblue">#54759E</color>
<color name="ripple_colored_lightblue">#1F54759E</color>
<!-- Strawberry Daiquiri Theme -->
<color name="colorAccentStrawberry">#ED4A65</color>
<color name="rippleSecondaryColorStrawberry">#0AED4A65</color>
<color name="selectorColorStrawberry">#BFED4A65</color>
<color name="accent_strawberry">#ED4A65</color>
<!-- Yotsuba Theme -->
<color name="colorAccentYotsuba">#FC8C5C</color>
<color name="rippleSecondaryColorYotsuba">#0AFC8C5C</color>
<color name="selectorColorYotsuba">#BFFC8C5C</color>
<color name="accent_yotsuba">#FC8C5C</color>
<!-- Dark Theme -->
<color name="colorAccentDark">#3399FF</color>
<color name="textColorPrimaryDark">@color/md_white_1000</color>
<color name="textColorSecondaryDark">@color/md_white_1000_70</color>
<color name="textColorHintDark">@color/md_white_1000_50</color>
<color name="dividerDark">@android:color/transparent</color>
<color name="rippleColorDark">@color/md_white_1000_6</color>
<color name="rippleSecondaryColorDark">#0A3399FF</color>
<color name="rippleToolbarColorDark">@color/rippleColorDark</color>
<color name="backgroundDark">@color/colorDarkPrimaryDark</color>
<color name="dialogDark">@color/colorDarkPrimary</color>
<color name="selectorColorDark">@color/md_blue_A200_50</color>
<color name="accent_dark">#3399FF</color>
<color name="divider_dark">@color/md_white_1000_12</color>
<color name="surface_dark">#242529</color>
<color name="background_dark">#202125</color>
<!-- Dark Blue Theme -->
<color name="accent_darkblue">#54759E</color>
<color name="ripple_colored_darkblue">#1F54759E</color>
<!-- Green Apple Theme -->
<color name="colorAccentApple">#48E484</color>
<color name="colorOnSecondaryApple">@color/md_black_1000</color>
<color name="rippleSecondaryColorApple">#0A48E484</color>
<color name="selectorColorApple">#BF48E484</color>
<color name="accent_greenapple">#48E484</color>
<!-- Midnight Dusk Theme -->
<color name="colorAccentDusk">#F02475</color>
<color name="textColorPrimaryDusk">@color/md_white_1000</color>
<color name="textColorSecondaryDusk">@color/md_white_1000_70</color>
<color name="textColorHintDusk">@color/md_white_1000_50</color>
<color name="dividerDusk">#12ffffff</color>
<color name="rippleSecondaryColorDusk">#0FF02475</color>
<color name="backgroundDusk">#16151D</color>
<color name="dialogDusk">#201F27</color>
<color name="selectorColorDusk">#BFF02475</color>
<color name="accent_midnightdusk">#F02475</color>
<color name="background_midnightdusk">#16151D</color>
<color name="surface_midnightdusk">#201F27</color>
<!-- AMOLED Theme -->
<color name="colorAccentAmoled">#3399FF</color>
<color name="textColorPrimaryAmoled">@color/md_white_1000</color>
<color name="textColorSecondaryAmoled">@color/md_white_1000_70</color>
<color name="textColorHintAmoled">@color/md_white_1000_50</color>
<color name="dividerAmoled">@android:color/transparent</color>
<color name="rippleColorAmoled">@color/md_white_1000_8</color>
<color name="rippleSecondaryColorAmoled">#0A3399FF</color>
<color name="rippleToolbarColorAmoled">@color/rippleColorAmoled</color>
<color name="backgroundAmoled">@color/colorAmoledPrimary</color>
<color name="dialogAmoled">@color/colorAmoledPrimary</color>
<color name="selectorColorAmoled">@color/md_blue_A200_75</color>
<color name="accent_amoled">#3399FF</color>
<color name="divider_amoled">@android:color/transparent</color>
<color name="surface_amoled">@color/md_black_1000</color>
<color name="background_amoled">@color/md_black_1000</color>
<!-- Hot Pink Theme -->
<color name="colorAccentPink">#FF3399</color>
<color name="textColorPrimaryPink">@color/md_white_1000</color>
<color name="textColorSecondaryPink">@color/md_white_1000_70</color>
<color name="textColorHintPink">@color/md_white_1000_50</color>
<color name="rippleSecondaryColorPink">#0AFF3399</color>
<color name="selectorColorPink">#BFFF69B4</color>
<color name="accent_hotpink">#FF3399</color>
<!-- Reader Theme -->
<color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>
<color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
<color name="pageNumberBackgroundDark">@color/md_grey_900_75</color>
<color name="reader_toolbar">#242529</color>
<color name="filterColorLight">#FFC107</color>
<color name="filterColorDark">#FFEB3B</color>
<color name="filterColorAmoled">#FFEB3B</color>
<!-- Text Colors -->
<!-- Material Design Colors -->
<color name="md_black_1000">#000000</color>
<color name="md_black_1000_87">#DE000000</color>
<color name="md_black_1000_54">#8A000000</color>
<color name="md_black_1000_38">#61000000</color>
@@ -115,9 +70,6 @@
<color name="md_white_1000_8">#14FFFFFF</color>
<color name="md_white_1000_6">#0FFFFFFF</color>
<!-- Material Design Colors -->
<color name="md_black_1000">#000000</color>
<color name="md_grey_50">#FAFAFA</color>
<color name="md_grey_50_75">#BFFAFAFA</color>
<color name="md_grey_100">#F5F5F5</color>
@@ -133,7 +85,7 @@
<color name="md_blue_A400">#2979FF</color>
<color name="md_blue_A400_75">#BF2979FF</color>
<color name="md_blue_A400_38">#612979FF</color>
<color name="md_blue_A400_4">#0A2979FF</color>
<color name="md_blue_A400_12">#1F2979FF</color>
<color name="md_blue_grey_900">#263238</color>
<color name="md_blue_grey_800">#37474F</color>

3
app/src/main/res/values/dimens.xml
View File

@@ -17,4 +17,7 @@
<dimen name="screen_edge_margin">16dp</dimen>
<dimen name="tablet_horizontal_cover_margin">128dp</dimen>
<!-- material-dialogs button radius -->
<dimen name="md_action_button_corner_radius">4dp</dimen>
</resources>

Some files were not shown because too many files have changed in this diff Show More