lasers
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up pre-Lollipop theming

This commit is contained in:
litetex 2022-07-06 17:46:57 -04:00 committed by Stypox
parent b125780991
commit 9648525ac1
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
7 changed files with 41 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/values-night-v21/styles.xml → app/src/main/res/values-night/styles.xml
View File

@ -2,7 +2,7 @@
<resources>
<!-- Opening Theme -->
<style name="Base.V21.OpeningTheme" parent="Base.V19.OpeningTheme">
<style name="Base.OpeningTheme" parent="Base.V21.OpeningTheme">
<item name="android:navigationBarColor">@color/dark_youtube_primary_color</item>
</style>

42
app/src/main/res/values-v21/styles.xml
View File

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Opening Theme -->
<style name="Base.V21.OpeningTheme" parent="Base.V19.OpeningTheme">
<item name="android:navigationBarColor">@color/light_youtube_primary_color</item>
</style>
<style name="Base.OpeningTheme" parent="Base.V21.OpeningTheme" />
<!-- Base Theme -->
<style name="Base.V21" parent="Base.V19"/>
<style name="Base" parent="Base.V21"/>
<!-- Light Theme -->
<style name="Base.V21.LightTheme" parent="Base.V19.LightTheme" />
<style name="Base.LightTheme" parent="Base.V21.LightTheme" />
<!-- Dark Theme -->
<style name="Base.V21.DarkTheme" parent="Base.V19.DarkTheme" />
<style name="Base.DarkTheme" parent="Base.V21.DarkTheme" />
<!-- Black Theme -->
<style name="Base.V21.BlackTheme" parent="Base.V19.BlackTheme" />
<style name="Base.BlackTheme" parent="Base.V21.BlackTheme" />
<!-- Router Activity -->
<style name="Base.V21.RouterActivityThemeLight" parent="Base.RouterActivityThemeLight">
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="RouterActivityThemeLight" parent="Base.V21.RouterActivityThemeLight" />
<style name="Base.V21.RouterActivityThemeDark" parent="Base.RouterActivityThemeDark">
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="RouterActivityThemeDark" parent="Base.V21.RouterActivityThemeDark" />
</resources>

92
app/src/main/res/values-v21/styles_services.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- YouTube -->
<style name="LightTheme.YouTube" parent="LightTheme" tools:keep="@style/LightTheme_YouTube">
<item name="colorPrimaryDark">@color/light_youtube_statusbar_color</item>
</style>
<style name="DarkTheme.YouTube" parent="DarkTheme" tools:keep="@style/DarkTheme_YouTube">
<item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
</style>
<style name="BlackTheme.YouTube" parent="BlackTheme" tools:keep="@style/BlackTheme_YouTube">
<item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
</style>
<!-- SoundCloud -->
<style name="LightTheme.SoundCloud" parent="LightTheme" tools:keep="@style/LightTheme_SoundCloud">
<item name="colorPrimary">@color/light_soundcloud_primary_color</item>
<item name="colorPrimaryDark">@color/light_soundcloud_statusbar_color</item>
<item name="colorAccent">@color/light_soundcloud_accent_color</item>
</style>
<style name="DarkTheme.SoundCloud" parent="DarkTheme" tools:keep="@style/DarkTheme_SoundCloud">
<item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
<item name="colorPrimaryDark">@color/dark_soundcloud_statusbar_color</item>
<item name="colorAccent">@color/dark_soundcloud_accent_color</item>
</style>
<style name="BlackTheme.SoundCloud" parent="BlackTheme" tools:keep="@style/BlackTheme_SoundCloud">
<item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
<item name="colorPrimaryDark">@color/dark_soundcloud_statusbar_color</item>
<item name="colorAccent">@color/dark_soundcloud_accent_color</item>
</style>
<!-- PeerTube -->
<style name="LightTheme.PeerTube" parent="LightTheme" tools:keep="@style/LightTheme_PeerTube">
<item name="colorPrimary">@color/light_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/light_peertube_statusbar_color</item>
<item name="colorAccent">@color/light_peertube_accent_color</item>
</style>
<style name="DarkTheme.PeerTube" parent="DarkTheme" tools:keep="@style/DarkTheme_PeerTube">
<item name="colorPrimary">@color/dark_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_peertube_statusbar_color</item>
<item name="colorAccent">@color/dark_peertube_accent_color</item>
</style>
<style name="BlackTheme.PeerTube" parent="BlackTheme" tools:keep="@style/BlackTheme_PeerTube">
<item name="colorPrimary">@color/dark_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_peertube_statusbar_color</item>
<item name="colorAccent">@color/dark_peertube_accent_color</item>
</style>
<!-- media.ccc.de -->
<style name="LightTheme.media.ccc.de" parent="LightTheme" tools:keep="@style/LightTheme_media_ccc_de">
<item name="colorPrimary">@color/light_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/light_media_ccc_accent_color</item>
</style>
<style name="DarkTheme.media.ccc.de" parent="DarkTheme" tools:keep="@style/DarkTheme_media_ccc_de">
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item>
</style>
<style name="BlackTheme.media.ccc.de" parent="BlackTheme" tools:keep="@style/BlackTheme_media_ccc_de">
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item>
</style>
<!-- Bandcamp -->
<style name="LightTheme.Bandcamp" parent="LightTheme" tools:keep="@style/LightTheme_Bandcamp">
<item name="colorPrimary">@color/light_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/light_bandcamp_statusbar_color</item>
<item name="colorAccent">@color/light_bandcamp_accent_color</item>
</style>
<style name="DarkTheme.Bandcamp" parent="DarkTheme" tools:keep="@style/DarkTheme_Bandcamp">
<item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
<item name="colorAccent">@color/dark_bandcamp_accent_color</item>
</style>
<style name="BlackTheme.Bandcamp" parent="BlackTheme" tools:keep="@style/BlackTheme_Bandcamp">
<item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
<item name="colorAccent">@color/dark_bandcamp_accent_color</item>
</style>
</resources>

16
app/src/main/res/values/colors_services.xml
View File

@ -2,53 +2,37 @@
<resources>
<!-- YouTube -->
<color name="light_youtube_primary_color">#e53935</color>
<color name="light_youtube_dark_color">#992722</color>
<color name="light_youtube_accent_color">#000000</color>
<color name="light_youtube_statusbar_color">#e53935</color>
<color name="dark_youtube_primary_color">#992722</color>
<color name="dark_youtube_dark_color">#7a1717</color>
<color name="dark_youtube_accent_color">#FFFFFF</color>
<color name="dark_youtube_statusbar_color">#992722</color>
<!-- SoundCloud -->
<color name="light_soundcloud_primary_color">#f57c00</color>
<color name="light_soundcloud_dark_color">#995700</color>
<color name="light_soundcloud_accent_color">#000000</color>
<color name="light_soundcloud_statusbar_color">#f57c00</color>
<color name="dark_soundcloud_primary_color">#a35300</color>
<color name="dark_soundcloud_dark_color">#7d4000</color>
<color name="dark_soundcloud_accent_color">#FFFFFF</color>
<color name="dark_soundcloud_statusbar_color">#a35300</color>
<!-- PeerTube -->
<color name="light_peertube_primary_color">#ff6f00</color>
<color name="light_peertube_dark_color">#c43e00</color>
<color name="light_peertube_accent_color">#000000</color>
<color name="light_peertube_statusbar_color">#ff6f00</color>
<color name="dark_peertube_primary_color">#a34700</color>
<color name="dark_peertube_dark_color">#942f00</color>
<color name="dark_peertube_accent_color">#FFFFFF</color>
<color name="dark_peertube_statusbar_color">#a34700</color>
<!-- media.ccc.de -->
<color name="light_media_ccc_primary_color">#9e9e9e</color>
<color name="light_media_ccc_accent_color">#000000</color>
<color name="light_media_ccc_statusbar_color">#9e9e9e</color>
<color name="dark_media_ccc_primary_color">#878787</color>
<color name="dark_media_ccc_accent_color">#FFFFFF</color>
<color name="dark_media_ccc_statusbar_color">#878787</color>
<!-- Bandcamp -->
<color name="light_bandcamp_primary_color">#17a0c4</color>
<color name="light_bandcamp_accent_color">#000000</color>
<color name="light_bandcamp_statusbar_color">#17a0c4</color>
<color name="dark_bandcamp_primary_color">#1383a1</color>
<color name="dark_bandcamp_accent_color">#FFFFFF</color>
<color name="dark_bandcamp_statusbar_color">#1383a1</color>
</resources>

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

@ -1,27 +1,29 @@
<resources>
<!-- Opening Theme -->
<style name="Base.V19.OpeningTheme" parent="Theme.AppCompat.DayNight.NoActionBar"/>
<style name="Base.OpeningTheme" parent="Base.V19.OpeningTheme"/>
<style name="OpeningTheme" parent="Base.OpeningTheme">
<style name="Base.V21.OpeningTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@android:color/transparent</item>
<item name="colorPrimaryDark">@android:color/transparent</item>
<item name="colorAccent">@android:color/transparent</item>
<item name="android:windowBackground">@drawable/splash_background</item>
</style>
<style name="Base.OpeningTheme" parent="Base.V21.OpeningTheme">
<item name="android:navigationBarColor">@color/light_youtube_primary_color</item>
</style>
<style name="OpeningTheme" parent="Base.OpeningTheme" />
<!-- Base Theme -->
<style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar">
<style name="Base.V21" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="actionColor">@color/white</item>
<item name="floatingActionButtonStyle">@style/FloatingActionButtonTheme</item>
<item name="toolbarSearchColor">@color/white</item>
<item name="colorControlActivated">?attr/colorPrimary</item>
</style>
<style name="Base" parent="Base.V19"/>
<style name="Base" parent="Base.V21"/>
<!-- Light Theme -->
<style name="Base.V19.LightTheme" parent="Base">
<style name="Base.V21.LightTheme" parent="Base">
<item name="colorPrimary">@color/light_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
<item name="colorAccent">@color/light_youtube_accent_color</item>
@ -41,11 +43,11 @@
<item name="border_color">@color/light_border_color</item>
<item name="dashed_border">@drawable/dashed_border_light</item>
</style>
<style name="Base.LightTheme" parent="Base.V19.LightTheme" />
<style name="Base.LightTheme" parent="Base.V21.LightTheme" />
<style name="LightTheme" parent="Base.LightTheme"/>
<!-- Dark Theme -->
<style name="Base.V19.DarkTheme" parent="Base">
<style name="Base.V21.DarkTheme" parent="Base">
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
<item name="colorAccent">@color/dark_youtube_accent_color</item>
@ -65,11 +67,11 @@
<item name="border_color">@color/dark_border_color</item>
<item name="dashed_border">@drawable/dashed_border_dark</item>
</style>
<style name="Base.DarkTheme" parent="Base.V19.DarkTheme" />
<style name="Base.DarkTheme" parent="Base.V21.DarkTheme" />
<style name="DarkTheme" parent="Base.DarkTheme"/>
<!-- Black Theme -->
<style name="Base.V19.BlackTheme" parent="DarkTheme">
<style name="Base.V21.BlackTheme" parent="DarkTheme">
<item name="android:windowBackground">@color/black_background_color</item>
<item name="windowBackground">@color/black_background_color</item>
@ -81,7 +83,7 @@
<item name="border_color">@color/black_border_color</item>
<item name="dashed_border">@drawable/dashed_border_black</item>
</style>
<style name="Base.BlackTheme" parent="Base.V19.BlackTheme" />
<style name="Base.BlackTheme" parent="Base.V21.BlackTheme" />
<style name="BlackTheme" parent="Base.BlackTheme"/>
<!-- Dialogs -->
@ -137,6 +139,7 @@
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@null</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="RouterActivityThemeLight" parent="Base.RouterActivityThemeLight" />
@ -147,6 +150,7 @@
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@null</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="RouterActivityThemeDark" parent="Base.RouterActivityThemeDark" />

8
app/src/main/res/values/styles_misc.xml
View File

@ -12,7 +12,7 @@
<!--File picker styles-->
<style name="FilePickerThemeLight" parent="NNF_BaseTheme.Light">
<item name="colorPrimary">@color/light_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
<item name="colorAccent">@color/light_settings_accent_color</item>
<item name="actionColor">@color/white</item>
@ -26,7 +26,7 @@
<style name="FilePickerThemeDark" parent="NNF_BaseTheme">
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
<item name="colorAccent">@color/dark_settings_accent_color</item>
<item name="actionColor">@color/white</item>
@ -40,13 +40,13 @@
<style name="FilePickerAlertDialogThemeLight" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorPrimary">@color/light_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
<item name="colorAccent">@color/light_settings_accent_color</item>
</style>
<style name="FilePickerAlertDialogThemeDark" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
<item name="colorAccent">@color/dark_settings_accent_color</item>
</style>

36
app/src/main/res/values/styles_services.xml
View File

@ -1,16 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- YouTube -->
<style name="LightTheme.YouTube" parent="LightTheme" tools:keep="@style/LightTheme_YouTube" />
<style name="LightTheme.YouTube" parent="LightTheme" tools:keep="@style/LightTheme_YouTube">
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
</style>
<style name="DarkTheme.YouTube" parent="DarkTheme" tools:keep="@style/DarkTheme_YouTube" />
<style name="DarkTheme.YouTube" parent="DarkTheme" tools:keep="@style/DarkTheme_YouTube">
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
</style>
<style name="BlackTheme.YouTube" parent="BlackTheme" tools:keep="@style/BlackTheme_YouTube" />
<style name="BlackTheme.YouTube" parent="BlackTheme" tools:keep="@style/BlackTheme_YouTube">
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
</style>
<!-- SoundCloud -->
<style name="LightTheme.SoundCloud" parent="LightTheme" tools:keep="@style/LightTheme_SoundCloud">
<item name="colorPrimary">@color/light_soundcloud_primary_color</item>
<item name="colorPrimaryDark">@color/light_soundcloud_dark_color</item>
<item name="colorPrimaryDark">@color/light_soundcloud_primary_color</item>
<item name="colorAccent">@color/light_soundcloud_accent_color</item>
<item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_light
</item>
@ -18,7 +24,7 @@
<style name="DarkTheme.SoundCloud" parent="DarkTheme" tools:keep="@style/DarkTheme_SoundCloud">
<item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
<item name="colorPrimaryDark">@color/dark_soundcloud_dark_color</item>
<item name="colorPrimaryDark">@color/dark_soundcloud_primary_color</item>
<item name="colorAccent">@color/dark_soundcloud_accent_color</item>
<item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_dark
</item>
@ -26,7 +32,7 @@
<style name="BlackTheme.SoundCloud" parent="BlackTheme" tools:keep="@style/BlackTheme_SoundCloud">
<item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
<item name="colorPrimaryDark">@color/dark_soundcloud_dark_color</item>
<item name="colorPrimaryDark">@color/dark_soundcloud_primary_color</item>
<item name="colorAccent">@color/dark_soundcloud_accent_color</item>
<item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_dark
</item>
@ -35,57 +41,57 @@
<!-- PeerTube -->
<style name="LightTheme.PeerTube" parent="LightTheme" tools:keep="@style/LightTheme_PeerTube">
<item name="colorPrimary">@color/light_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/light_peertube_dark_color</item>
<item name="colorPrimaryDark">@color/light_peertube_primary_color</item>
<item name="colorAccent">@color/light_peertube_accent_color</item>
</style>
<style name="DarkTheme.PeerTube" parent="DarkTheme" tools:keep="@style/DarkTheme_PeerTube">
<item name="colorPrimary">@color/dark_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
<item name="colorPrimaryDark">@color/dark_peertube_primary_color</item>
<item name="colorAccent">@color/dark_peertube_accent_color</item>
</style>
<style name="BlackTheme.PeerTube" parent="BlackTheme" tools:keep="@style/BlackTheme_PeerTube">
<item name="colorPrimary">@color/dark_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
<item name="colorPrimaryDark">@color/dark_peertube_primary_color</item>
<item name="colorAccent">@color/dark_peertube_accent_color</item>
</style>
<!-- media.ccc.de -->
<style name="LightTheme.media.ccc.de" parent="LightTheme" tools:keep="@style/LightTheme_media_ccc_de">
<item name="colorPrimary">@color/light_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
<item name="colorPrimaryDark">@color/light_media_ccc_primary_color</item>
<item name="colorAccent">@color/light_media_ccc_accent_color</item>
</style>
<style name="DarkTheme.media.ccc.de" parent="DarkTheme" tools:keep="@style/DarkTheme_media_ccc_de">
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_primary_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item>
</style>
<style name="BlackTheme.media.ccc.de" parent="BlackTheme" tools:keep="@style/BlackTheme_media_ccc_de">
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_primary_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item>
</style>
<!-- Bandcamp -->
<style name="LightTheme.Bandcamp" parent="LightTheme" tools:keep="@style/LightTheme_Bandcamp">
<item name="colorPrimary">@color/light_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/light_bandcamp_statusbar_color</item>
<item name="colorPrimaryDark">@color/light_bandcamp_primary_color</item>
<item name="colorAccent">@color/light_bandcamp_accent_color</item>
</style>
<style name="DarkTheme.Bandcamp" parent="DarkTheme" tools:keep="@style/DarkTheme_Bandcamp">
<item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
<item name="colorPrimaryDark">@color/dark_bandcamp_primary_color</item>
<item name="colorAccent">@color/dark_bandcamp_accent_color</item>
</style>
<style name="BlackTheme.Bandcamp" parent="BlackTheme" tools:keep="@style/BlackTheme_Bandcamp">
<item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
<item name="colorPrimaryDark">@color/dark_bandcamp_primary_color</item>
<item name="colorAccent">@color/dark_bandcamp_accent_color</item>
</style>