add "material you" theme

This commit is contained in:
Cloudburst 2022-09-23 16:32:38 +02:00
parent c4295f55ae
commit c714b77687
7 changed files with 42 additions and 38 deletions

View file

@ -166,12 +166,14 @@ object CommonActivity {
"Light" -> R.style.LightMode "Light" -> R.style.LightMode
"Amoled" -> R.style.AmoledMode "Amoled" -> R.style.AmoledMode
"AmoledLight" -> R.style.AmoledModeLight "AmoledLight" -> R.style.AmoledModeLight
"Monet" -> R.style.MonetMode
else -> R.style.AppTheme else -> R.style.AppTheme
} }
val currentOverlayTheme = val currentOverlayTheme =
when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) { when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
"Normal" -> R.style.OverlayPrimaryColorNormal "Normal" -> R.style.OverlayPrimaryColorNormal
"Monet" -> R.style.OverlayPrimaryColorMonet
"CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink "CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
"DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen "DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
"Maroon" -> R.style.OverlayPrimaryColorMaroon "Maroon" -> R.style.OverlayPrimaryColorMaroon

View file

@ -14,19 +14,6 @@
<item>@id/cast_button_type_forward_30_seconds</item> <item>@id/cast_button_type_forward_30_seconds</item>
</array> </array>
<array name="media_type_pref">
<item>Todos</item>
<item>Películas y TV</item>
<item>Anime</item>
<item>Documental</item>
</array>
<array name="media_type_pref_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</array>
<array name="limit_title_rez_pref_names"> <array name="limit_title_rez_pref_names">
<item>@string/resolution_and_title</item> <item>@string/resolution_and_title</item>
<item>@string/title</item> <item>@string/title</item>
@ -207,6 +194,7 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Normal</item> <item>Normal</item>
<item>Material You</item>
<item>Rosa clavel</item> <item>Rosa clavel</item>
<item>Verde oscuro</item> <item>Verde oscuro</item>
<item>Vino</item> <item>Vino</item>
@ -225,6 +213,7 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
@ -247,12 +236,14 @@
<item>Gris</item> <item>Gris</item>
<item>Amoled</item> <item>Amoled</item>
<item>Destello</item> <item>Destello</item>
<item>Material You</item>
</string-array> </string-array>
<string-array name="themes_names_values"> <string-array name="themes_names_values">
<item>AmoledLight</item> <item>AmoledLight</item>
<item>Black</item> <item>Black</item>
<item>Amoled</item> <item>Amoled</item>
<item>Light</item> <item>Light</item>
<item>Monet</item>
</string-array> </string-array>
<!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266--> <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->

View file

@ -203,6 +203,7 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Normalny</item> <item>Normalny</item>
<item>Material You</item>
<item>Goździk różowy</item> <item>Goździk różowy</item>
<item>Ciemnozielony</item> <item>Ciemnozielony</item>
<item>Kasztanowaty</item> <item>Kasztanowaty</item>
@ -221,6 +222,7 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
@ -243,12 +245,14 @@
<item>Szary</item> <item>Szary</item>
<item>Amoled</item> <item>Amoled</item>
<item>Flashbang</item> <item>Flashbang</item>
<item>Material You</item>
</string-array> </string-array>
<string-array name="themes_names_values"> <string-array name="themes_names_values">
<item>AmoledLight</item> <item>AmoledLight</item>
<item>Black</item> <item>Black</item>
<item>Amoled</item> <item>Amoled</item>
<item>Light</item> <item>Light</item>
<item>Monet</item>
</string-array> </string-array>
<!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266--> <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->

View file

@ -14,19 +14,6 @@
<item>@id/cast_button_type_forward_30_seconds</item> <item>@id/cast_button_type_forward_30_seconds</item>
</array> </array>
<array name="media_type_pref">
<item>Hepsi</item>
<item>Film ve Dizi</item>
<item>Anime</item>
<item>Belgesel</item>
</array>
<array name="media_type_pref_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</array>
<array name="limit_title_rez_pref_names"> <array name="limit_title_rez_pref_names">
<item>@string/resolution_and_title</item> <item>@string/resolution_and_title</item>
<item>@string/title</item> <item>@string/title</item>
@ -207,6 +194,7 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Normal</item> <item>Normal</item>
<item>Material You</item>
<item>Karanfil Pembesi</item> <item>Karanfil Pembesi</item>
<item>Koyu Yeşil</item> <item>Koyu Yeşil</item>
<item>Kestane</item> <item>Kestane</item>
@ -225,6 +213,7 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
@ -247,12 +236,14 @@
<item>Gri</item> <item>Gri</item>
<item>Amoled</item> <item>Amoled</item>
<item>Flaş Bombası</item> <item>Flaş Bombası</item>
<item>Material You</item>
</string-array> </string-array>
<string-array name="themes_names_values"> <string-array name="themes_names_values">
<item>AmoledLight</item> <item>AmoledLight</item>
<item>Black</item> <item>Black</item>
<item>Amoled</item> <item>Amoled</item>
<item>Light</item> <item>Light</item>
<item>Monet</item>
</string-array> </string-array>
<!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266--> <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->

View file

@ -14,18 +14,6 @@
<item>@id/cast_button_type_forward_30_seconds</item> <item>@id/cast_button_type_forward_30_seconds</item>
</array> </array>
<array name="media_type_pref">
<item>Tất cả</item>
<item>Phim lẻ và Phim bộ</item>
<item>Anime</item>
<item>Phim tài liệu</item>
</array>
<array name="media_type_pref_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</array>
<array name="limit_title_rez_pref_names"> <array name="limit_title_rez_pref_names">
<item>@string/resolution_and_title</item> <item>@string/resolution_and_title</item>
@ -207,6 +195,7 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Mặc định</item> <item>Mặc định</item>
<item>Material You</item>
<item>Hồng nhạt</item> <item>Hồng nhạt</item>
<item>Xanh lam đậm</item> <item>Xanh lam đậm</item>
<item>Nâu sẫm</item> <item>Nâu sẫm</item>
@ -225,6 +214,7 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
@ -247,12 +237,14 @@
<item>Xám</item> <item>Xám</item>
<item>Amoled</item> <item>Amoled</item>
<item>Sáng</item> <item>Sáng</item>
<item>Material You</item>
</string-array> </string-array>
<string-array name="themes_names_values"> <string-array name="themes_names_values">
<item>AmoledLight</item> <item>AmoledLight</item>
<item>Black</item> <item>Black</item>
<item>Amoled</item> <item>Amoled</item>
<item>Light</item> <item>Light</item>
<item>Monet</item>
</string-array> </string-array>
<!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266--> <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->

View file

@ -213,6 +213,7 @@
<string-array name="themes_overlay_names"> <string-array name="themes_overlay_names">
<item>Normal</item> <item>Normal</item>
<item>Material You</item>
<item>Carnation Pink</item> <item>Carnation Pink</item>
<item>Dark Green</item> <item>Dark Green</item>
<item>Maroon</item> <item>Maroon</item>
@ -231,6 +232,7 @@
</string-array> </string-array>
<string-array name="themes_overlay_names_values"> <string-array name="themes_overlay_names_values">
<item>Normal</item> <item>Normal</item>
<item>Monet</item>
<item>CarnationPink</item> <item>CarnationPink</item>
<item>DarkGreen</item> <item>DarkGreen</item>
<item>Maroon</item> <item>Maroon</item>
@ -253,12 +255,14 @@
<item>Gray</item> <item>Gray</item>
<item>Amoled</item> <item>Amoled</item>
<item>Flashbang</item> <item>Flashbang</item>
<item>Material You</item>
</string-array> </string-array>
<string-array name="themes_names_values"> <string-array name="themes_names_values">
<item>AmoledLight</item> <item>AmoledLight</item>
<item>Black</item> <item>Black</item>
<item>Amoled</item> <item>Amoled</item>
<item>Light</item> <item>Light</item>
<item>Monet</item>
</string-array> </string-array>
<string-array name="extension_statuses"> <string-array name="extension_statuses">

View file

@ -95,6 +95,16 @@
<item name="white">#000</item> <item name="white">#000</item>
</style> </style>
<style name="MonetMode">
<item name="primaryGrayBackground">@color/material_dynamic_neutral30</item>
<item name="primaryBlackBackground">@color/material_dynamic_neutral10</item>
<item name="iconGrayBackground">@color/material_dynamic_neutral30</item>
<item name="boxItemBackground">@color/material_dynamic_neutral30</item>
<item name="textColor">@color/material_dynamic_neutral90</item>
<item name="grayTextColor">@color/material_dynamic_neutral60</item>
<item name="white">@color/material_dynamic_neutral90</item>
</style>
<style name="OverlayPrimaryColorNormal"> <style name="OverlayPrimaryColorNormal">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="android:colorPrimary">@color/colorPrimary</item> <item name="android:colorPrimary">@color/colorPrimary</item>
@ -105,6 +115,16 @@
<item name="android:colorAccent">@color/colorAccent</item> <item name="android:colorAccent">@color/colorAccent</item>
</style> </style>
<style name="OverlayPrimaryColorMonet">
<item name="colorPrimary">@color/material_dynamic_primary80</item>
<item name="android:colorPrimary">@color/material_dynamic_primary80</item>
<item name="colorPrimaryDark">@color/material_dynamic_primary30</item>
<item name="colorAccent">@color/material_dynamic_primary80</item>
<item name="colorOnPrimary">@color/material_dynamic_primary20</item>
<!-- Needed for leanback fuckery -->
<item name="android:colorAccent">@color/material_dynamic_primary30</item>
</style>
<style name="OverlayPrimaryColorBlue"> <style name="OverlayPrimaryColorBlue">
<item name="colorPrimary">@color/colorPrimaryBlue</item> <item name="colorPrimary">@color/colorPrimaryBlue</item>
<item name="android:colorPrimary">@color/colorPrimaryBlue</item> <item name="android:colorPrimary">@color/colorPrimaryBlue</item>