Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify base themes

Browse source 
Simplify Theme.Base so that a change in the single Theme.Base will affect all modes regardless of version or theme.
This commit is contained in:
OxygenCobalt 2021-01-30 09:16:27 -07:00
parent 15dbe59db5
commit 4438fb9970
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
5 changed files with 12 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/values-de/strings.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Info namespace | App labels -->
<string name="info_app_desc">Ein einfacher und flexibeler Musik-Player für Android</string>
<string name="info_app_desc">Ein einfacher und flexibeler Musik-Player für Android.</string>
<string name="info_channel_name">Musikwiedergabe</string>
<string name="info_service_desc">der Musikwiedergabe-Service von Auxio</string>

23
app/src/main/res/values-night-v27/styles.xml
View file

@ -1,30 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Base theme -->
<style name="Theme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowBackground">@color/background</item>
<item name="android:fontFamily">@font/inter</item>
<item name="android:textCursorDrawable">@drawable/ui_cursor</item>
<item name="android:scrollbars">none</item>
<item name="android:windowIsFloating">false</item>
<!-- Template theme that handles edge-to-edge on other styles variants -->
<style name="Theme.Template" parent="Theme.Master">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@color/nav_color</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:windowLightNavigationBar">false</item>
<item name="popupMenuStyle">@style/Widget.CustomPopup</item>
<item name="colorControlNormal">@color/control_color</item>
<item name="alertDialogTheme">@style/Theme.CustomDialog</item>
<item name="indicatorFastScrollerStyle">@style/FastScrollTheme</item>
<item name="colorControlHighlight">@color/selection_color</item>
<item name="colorControlActivated">?attr/colorPrimary</item>
<item name="cornerRadius">0dp</item>
<item name="md_background_color">@color/background</item>
<item name="md_corner_radius">0dp</item>
<item name="md_color_button_text">@color/control_color</item>
<item name="md_font_title">@font/inter_black</item>
</style>
<style name="Theme.BottomSheetFix" parent="@style/Theme.Design.BottomSheetDialog">

23
app/src/main/res/values-v27/styles.xml
View file

@ -1,30 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Base theme -->
<style name="Theme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowBackground">@color/background</item>
<item name="android:fontFamily">@font/inter</item>
<item name="android:textCursorDrawable">@drawable/ui_cursor</item>
<item name="android:scrollbars">none</item>
<item name="android:windowIsFloating">false</item>
<!-- Template theme that handles edge-to-edge on other styles variants -->
<style name="Theme.Template" parent="Theme.Master">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@color/nav_color</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="popupMenuStyle">@style/Widget.CustomPopup</item>
<item name="colorControlNormal">@color/control_color</item>
<item name="alertDialogTheme">@style/Theme.CustomDialog</item>
<item name="indicatorFastScrollerStyle">@style/FastScrollTheme</item>
<item name="colorControlHighlight">@color/selection_color</item>
<item name="colorControlActivated">?attr/colorPrimary</item>
<item name="cornerRadius">0dp</item>
<item name="md_background_color">@color/background</item>
<item name="md_corner_radius">0dp</item>
<item name="md_color_button_text">@color/control_color</item>
<item name="md_font_title">@font/inter_black</item>
</style>
<style name="Theme.BottomSheetFix" parent="@style/Theme.Design.BottomSheetDialog">

2
app/src/main/res/values/strings.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Info namespace | App labels -->
<string name="info_app_desc">A sensible and customizable music player for Android</string>
<string name="info_app_desc">A sensible and customizable music player for Android.</string>
<string name="info_channel_name">Music Playback</string>
<string name="info_service_desc">The music playback service for Auxio</string>

7
app/src/main/res/values/styles.xml
View file

@ -1,7 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Master parent theme based off of Theme.AppCompat.Daynight.NoActionBar [TODO: Switch to material?] -->
<style name="Theme.Master" parent="Theme.AppCompat.DayNight.NoActionBar" />
<!-- Template theme that handles edge-to-edge on other styles variants -->
<style name="Theme.Template" parent="Theme.Master" />
<!-- Base theme -->
<style name="Theme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
<style name="Theme.Base" parent="Theme.Template">
<item name="android:windowBackground">@color/background</item>
<item name="android:fontFamily">@font/inter</item>
<item name="android:textCursorDrawable">@drawable/ui_cursor</item>