prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI tweaks

Browse Source
This commit is contained in:
Zakhar Timoshenko
2023-10-11 19:23:51 +03:00
parent e4efd0f696
commit 2b2498cb38
14 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/color-v23/dim_statusbar.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.6" android:color="?android:colorBackground" />
</selector>

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

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.6" android:color="@android:color/black" />
</selector>

7
app/src/main/res/values-night-v23/color_themes.xml
View File

@@ -38,6 +38,7 @@
<item name="colorOutlineVariant">#3F4947</item>
<item name="m3ColorBackground">@color/background_miku</item>
<item name="m3ColorExploreButton">#1D2020</item>
<item name="m3ColorCardBackground">#282C2C</item>
<item name="m3ColorBottomMenuBackground">#272B2A</item>
</style>
@@ -78,6 +79,7 @@
<item name="colorOutlineVariant">#534342</item>
<item name="m3ColorBackground">@color/background_asuka</item>
<item name="m3ColorExploreButton">#251E1E</item>
<item name="m3ColorCardBackground">#2E2525</item>
<item name="m3ColorBottomMenuBackground">#2F2828</item>
</style>
@@ -118,6 +120,7 @@
<item name="colorOutlineVariant">#404943</item>
<item name="m3ColorBackground">@color/background_mion</item>
<item name="m3ColorExploreButton">#1D201E</item>
<item name="m3ColorCardBackground">#262B28</item>
<item name="m3ColorBottomMenuBackground">#272B28</item>
</style>
@@ -158,6 +161,7 @@
<item name="colorOutlineVariant">#524343</item>
<item name="m3ColorBackground">@color/background_rikka</item>
<item name="m3ColorExploreButton">#241E1E</item>
<item name="m3ColorCardBackground">#302828</item>
<item name="m3ColorBottomMenuBackground">#2F2828</item>
</style>
@@ -198,6 +202,7 @@
<item name="colorOutlineVariant">#40484B</item>
<item name="m3ColorBackground">@color/background_sakura</item>
<item name="m3ColorExploreButton">#1D2021</item>
<item name="m3ColorCardBackground">#25292B</item>
<item name="m3ColorBottomMenuBackground">#272A2C</item>
</style>
@@ -238,6 +243,7 @@
<item name="colorOutlineVariant">#524344</item>
<item name="m3ColorBackground">@color/background_mamimi</item>
<item name="m3ColorExploreButton">#241E1E</item>
<item name="m3ColorCardBackground">#2B2323</item>
<item name="m3ColorBottomMenuBackground">#2F2828</item>
</style>
@@ -278,6 +284,7 @@
<item name="colorOutlineVariant">#494949</item>
<item name="m3ColorBackground">@color/background_kanade</item>
<item name="m3ColorExploreButton">#292929</item>
<item name="m3ColorCardBackground">#303030</item>
<item name="m3ColorBottomMenuBackground">#2C2C2C</item>
</style>
</resources>

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

@@ -57,6 +57,7 @@
<item name="android:colorBackground">@android:color/system_neutral2_900</item>
<item name="m3ColorBackground">@android:color/system_neutral2_900</item>
<item name="m3ColorExploreButton">@android:color/system_neutral2_800</item>
<item name="m3ColorCardBackground">@android:color/system_neutral2_700</item>
<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_800</item>
<!-- Default Framework Text Colors. -->
<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text

1
app/src/main/res/values-night/colors_kotatsu.xml
View File

@@ -43,5 +43,6 @@
<color name="kotatsu_scrim">#000000</color>
<color name="kotatsu_m3_background">#1A1B1F</color>
<color name="kotatsu_m3_exploreButton">#292A2D</color>
<color name="kotatsu_m3_cardBackground">#313235</color>
<color name="kotatsu_m3_bottom_menu">#2F3033</color>
</resources>

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

@@ -8,6 +8,7 @@
<item name="android:colorBackground">@color/background_amoled</item>
<item name="m3ColorBackground">@color/background_amoled</item>
<item name="m3ColorExploreButton">@color/surface_amoled</item>
<item name="m3ColorCardBackground">@color/surface_amoled</item>
<item name="m3ColorBottomMenuBackground">@color/surface_amoled</item>
</style>

7
app/src/main/res/values-v23/color_themes.xml
View File

@@ -38,6 +38,7 @@
<item name="colorOutlineVariant">#BEC9C6</item>
<item name="m3ColorBackground">@color/background_miku</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#C4FFF7</item>
</style>
@@ -78,6 +79,7 @@
<item name="colorOutlineVariant">#D8C1C0</item>
<item name="m3ColorBackground">@color/background_asuka</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#FFDAD7</item>
</style>
@@ -118,6 +120,7 @@
<item name="colorOutlineVariant">#C0C9C1</item>
<item name="m3ColorBackground">@color/background_mion</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#CDFFE1</item>
</style>
@@ -158,6 +161,7 @@
<item name="colorOutlineVariant">#C8C5D0</item>
<item name="m3ColorBackground">@color/background_rikka</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#F0EBFF</item>
</style>
@@ -198,6 +202,7 @@
<item name="colorOutlineVariant">#D5C2C6</item>
<item name="m3ColorBackground">@color/background_sakura</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#FFE8ED</item>
</style>
@@ -238,6 +243,7 @@
<item name="colorOutlineVariant">#D7C1C2</item>
<item name="m3ColorBackground">@color/background_mamimi</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#FFE1E2</item>
</style>
@@ -278,6 +284,7 @@
<item name="colorOutlineVariant">#D5D5D5</item>
<item name="m3ColorBackground">@color/background_kanade</item>
<item name="m3ColorExploreButton">#FFFFFF</item>
<item name="m3ColorCardBackground">#FFFFFF</item>
<item name="m3ColorBottomMenuBackground">#DCDCDC</item>
</style>
</resources>

10
app/src/main/res/values-v23/themes.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Base.V23.Kotatsu" parent="Base.Theme.Kotatsu">
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="Theme.Kotatsu" parent="Base.V23.Kotatsu" />
</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.Kotatsu" parent="Base.Theme.Kotatsu">
<style name="Base.V27.Kotatsu" parent="Base.V23.Kotatsu">
<item name="android:navigationBarColor">@color/navigation_bar_scrim</item>
<item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
</style>

1
app/src/main/res/values-v31/themes.xml
View File

@@ -68,6 +68,7 @@
<item name="android:colorBackground">@android:color/system_neutral2_50</item>
<item name="m3ColorBackground">@android:color/system_neutral2_50</item>
<item name="m3ColorExploreButton">@android:color/white</item>
<item name="m3ColorCardBackground">@android:color/white</item>
<item name="m3ColorBottomMenuBackground">@android:color/system_neutral2_100</item>
<!-- Default Framework Text Colors. -->
<item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>

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

@@ -10,6 +10,7 @@
<attr name="tipViewStyle" />
<attr name="m3ColorBackground" />
<attr name="m3ColorExploreButton" />
<attr name="m3ColorCardBackground" />
<attr name="m3ColorBottomMenuBackground" />
<!--CoverImageView attrs-->

1
app/src/main/res/values/colors_kotatsu.xml
View File

@@ -45,6 +45,7 @@
<color name="kotatsu_m3_background">#EDF0FF</color>
<!-- White -->
<color name="kotatsu_m3_exploreButton">#FFFFFF</color>
<color name="kotatsu_m3_cardBackground">#FFFFFF</color>
<!-- Primary 90 -->
<color name="kotatsu_m3_bottom_menu">#D9E2FF</color>
</resources>

6
app/src/main/res/values/styles.xml
View File

@@ -78,8 +78,8 @@
<item name="cardBackgroundColor">?attr/colorSurfaceContainerLow</item>
</style>
<style name="Widget.Kotatsu.MaterialCardView.Filled" parent="Widget.Material3.CardView.Filled">
<item name="cardBackgroundColor">?attr/m3ColorExploreButton</item>
<style name="Widget.Kotatsu.CardView.Filled" parent="Widget.Material3.CardView.Filled">
<item name="cardBackgroundColor">?attr/m3ColorCardBackground</item>
<item name="shapeAppearance">?attr/shapeAppearanceCornerExtraLarge</item>
</style>
@@ -226,7 +226,7 @@
</style>
<style name="ThemeOverlay.Kotatsu.CardContainer" parent="">
<item name="android:colorBackground">?m3ColorExploreButton</item>
<item name="android:colorBackground">?m3ColorCardBackground</item>
</style>
<style name="ThemeOverlay.Kotatsu.ActionMode" parent="">

5
app/src/main/res/values/themes.xml
View File

@@ -37,6 +37,7 @@
<item name="android:colorBackground">@color/kotatsu_m3_background</item>
<item name="m3ColorBackground">@color/kotatsu_m3_background</item>
<item name="m3ColorExploreButton">@color/kotatsu_m3_exploreButton</item>
<item name="m3ColorCardBackground">@color/kotatsu_m3_cardBackground</item>
<item name="m3ColorBottomMenuBackground">@color/kotatsu_m3_bottom_menu</item>
<item name="colorOnBackground">@color/kotatsu_onSurface</item>
<item name="colorError">@color/error</item>
@@ -54,7 +55,7 @@
<!-- Themes -->
<item name="android:windowLightStatusBar" tools:targetApi="M">@bool/light_status_bar</item>
<item name="android:statusBarColor">@color/dim_statusbar</item>
<item name="android:statusBarColor">@color/dim</item>
<item name="android:navigationBarColor">@color/surface_amoled</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
@@ -79,7 +80,7 @@
@style/Widget.Kotatsu.BottomNavigationView.ColoredIndicators
</item>
<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
<item name="materialCardViewStyle">@style/Widget.Kotatsu.MaterialCardView.Filled</item>
<item name="materialCardViewStyle">@style/Widget.Kotatsu.CardView.Filled</item>
<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
<item name="fastScrollerStyle">@style/Widget.Kotatsu.FastScroller</item>
<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>