KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Fix themes

Browse Source
master
Koitharu 11 months ago
parent fa37c72923
commit cc6f004e0e
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File

3
app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt
Unescape Escape View File

@ -20,7 +20,7 @@ enum class ColorScheme(
RENA(R.style.ThemeOverlay_Kotatsu_Asuka, R.string.theme_name_asuka), RENA(R.style.ThemeOverlay_Kotatsu_Asuka, R.string.theme_name_asuka),
FROG(R.style.ThemeOverlay_Kotatsu_Mion, R.string.theme_name_mion), FROG(R.style.ThemeOverlay_Kotatsu_Mion, R.string.theme_name_mion),
BLUEBERRY(R.style.ThemeOverlay_Kotatsu_Rikka, R.string.theme_name_rikka), BLUEBERRY(R.style.ThemeOverlay_Kotatsu_Rikka, R.string.theme_name_rikka),
NAME2(R.style.ThemeOverlay_Kotatsu_Sakura, R.string.theme_name_sakura), SAKURA(R.style.ThemeOverlay_Kotatsu_Sakura, R.string.theme_name_sakura),
MAMIMI(R.style.ThemeOverlay_Kotatsu_Mamimi, R.string.theme_name_mamimi), MAMIMI(R.style.ThemeOverlay_Kotatsu_Mamimi, R.string.theme_name_mamimi),
KANADE(R.style.Theme_Kotatsu_Kanade, R.string.theme_name_kanade) KANADE(R.style.Theme_Kotatsu_Kanade, R.string.theme_name_kanade)
; ;
@ -38,6 +38,7 @@ enum class ColorScheme(
val list = ColorScheme.entries.toMutableList() val list = ColorScheme.entries.toMutableList()
if (!DynamicColors.isDynamicColorAvailable()) { if (!DynamicColors.isDynamicColorAvailable()) {
list.remove(MONET) list.remove(MONET)
list.remove(EXPRESSIVE)
} }
return list return list
} }

2
app/src/main/res/drawable/ic_empty_feed.xml
Unescape Escape View File

@ -30,7 +30,7 @@
android:strokeWidth="1" android:strokeWidth="1"
android:strokeColor="?colorOnSurface" /> android:strokeColor="?colorOnSurface" />
<path <path
android:fillColor="?colorSurface" android:fillColor="?android:colorBackground"
android:pathData="M31.54,84.88l0,60.92a4.52,4.52 0,0 0,0.4 2.28,4.66 4.66,0 0,0 1.52,1.37c12.43,8.11 17.64,12.94 30.07,21.05 1.28,0.83 4.49,3.75 6,4 6,1 8.09,2.19 9.57,2.38 16.52,2.14 32.76,2.57 49.43,2.62 0,-22 0.44,-43.4 0.45,-65.43a1.69,1.69 0,0 0,-0.2 -1,1.79 1.79,0 0,0 -1.43,-0.55l-45.25,-2.78a40.24,40.24 0,0 1,-9.35 -1.31,37.7 37.7,0 0,1 -7,-3.19A284.06,284.06 0,0 1,32.57 83.87" /> android:pathData="M31.54,84.88l0,60.92a4.52,4.52 0,0 0,0.4 2.28,4.66 4.66,0 0,0 1.52,1.37c12.43,8.11 17.64,12.94 30.07,21.05 1.28,0.83 4.49,3.75 6,4 6,1 8.09,2.19 9.57,2.38 16.52,2.14 32.76,2.57 49.43,2.62 0,-22 0.44,-43.4 0.45,-65.43a1.69,1.69 0,0 0,-0.2 -1,1.79 1.79,0 0,0 -1.43,-0.55l-45.25,-2.78a40.24,40.24 0,0 1,-9.35 -1.31,37.7 37.7,0 0,1 -7,-3.19A284.06,284.06 0,0 1,32.57 83.87" />
<path <path
android:fillColor="?colorOnSurface" android:fillColor="?colorOnSurface"

10
app/src/main/res/layout/activity_reader_tap_actions.xml
Unescape Escape View File

@ -145,7 +145,7 @@
<View <View
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="?android:divider" android:background="?colorOutline"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_right" app:layout_constraintEnd_toEndOf="@id/guideline_right"
app:layout_constraintStart_toStartOf="@id/guideline_right" app:layout_constraintStart_toStartOf="@id/guideline_right"
@ -154,7 +154,7 @@
<View <View
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="?android:divider" android:background="?colorOutline"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_left" app:layout_constraintEnd_toEndOf="@id/guideline_left"
app:layout_constraintStart_toStartOf="@id/guideline_left" app:layout_constraintStart_toStartOf="@id/guideline_left"
@ -163,7 +163,7 @@
<View <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?android:divider" android:background="?colorOutline"
app:layout_constraintBottom_toBottomOf="@id/guideline_top" app:layout_constraintBottom_toBottomOf="@id/guideline_top"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -172,7 +172,7 @@
<View <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?android:divider" android:background="?colorOutline"
app:layout_constraintBottom_toBottomOf="@id/guideline_bottom" app:layout_constraintBottom_toBottomOf="@id/guideline_bottom"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -181,7 +181,7 @@
<View <View
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?android:divider" android:background="?colorOutline"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/values-night/themes.xml
Unescape Escape View File

@ -8,6 +8,8 @@
<style name="ThemeOverlay.Kotatsu.Amoled" parent=""> <style name="ThemeOverlay.Kotatsu.Amoled" parent="">
<item name="colorSurface">@color/surface_amoled</item> <item name="colorSurface">@color/surface_amoled</item>
<item name="android:colorBackground">@color/background_amoled</item> <item name="android:colorBackground">@color/background_amoled</item>
<item name="android:windowBackground">@color/background_amoled</item>
<item name="colorBackgroundFloating">@color/background_amoled</item>
</style> </style>
<!-- Monet theme only support S+ --> <!-- Monet theme only support S+ -->

Write Preview
Loading…
Cancel
Save