kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-13 13:50:30 +05:30
Code Issues Projects Releases Wiki Activity

Colors cleaned

Browse Source
This commit is contained in:
Bnyro 2022-05-19 14:14:18 +02:00
parent 9cc27346ae
commit 4f813f8e9c
6 changed files with 61 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/MainActivity.kt
View File

@ -50,6 +50,7 @@ class MainActivity : AppCompatActivity() {
SponsorBlockSettings.outroEnabled = sharedPreferences.getBoolean("outro_category_key", false)
DynamicColors.applyToActivitiesIfAvailable(application)
val languageName = sharedPreferences.getString("language", "sys")
if (languageName != "") {
var locale = if (languageName != "sys" && "$languageName".length < 3 ){
@ -72,6 +73,7 @@ class MainActivity : AppCompatActivity() {
"L" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
"D" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
}
//setTheme(R.style.YellowTheme)
val connectivityManager = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val networkInfo=connectivityManager.activeNetworkInfo

2
app/src/main/res/layout/channel_search_row.xml
View File

@ -50,7 +50,7 @@
android:layout_marginStart="24dp"
android:background="@android:color/transparent"
android:text="@string/subscribe"
android:textColor="@color/colorPrimary"
android:textColor="?attr/colorPrimary"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/search_channel_image" />

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

@ -1,36 +1,26 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.LibreTube" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorPrimary">@color/md_theme_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_dark_background</item>
<item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
<item name="colorPrimary">@color/red_dark_accentLight</item>
<item name="colorOnPrimary">@color/red_dark_accentLight</item>
<item name="colorPrimaryContainer">@color/red_dark_accentLight</item>
<item name="colorOnPrimaryContainer">@color/red_dark_accentLight</item>
<item name="colorSecondary">@color/red_dark_accentLight</item>
<item name="colorOnSecondary">@color/red_dark_accentLight</item>
<item name="colorSecondaryContainer">@color/red_dark_accentLight</item>
<item name="colorOnSecondaryContainer">@color/red_dark_accentLight</item>
<item name="colorTertiary">@color/red_dark_accentLight</item>
<item name="colorOnTertiary">@color/red_dark_accentLight</item>
<item name="colorTertiaryContainer">@color/red_dark_accentLight</item>
<item name="colorOnTertiaryContainer">@color/red_dark_accentLight</item>
<item name="android:colorBackground">@color/red_dark_background</item>
<item name="colorOnBackground">@color/red_dark_accentLight</item>
<item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
</resources>

41
app/src/main/res/values-v23/themes.xml
View File

@ -2,32 +2,21 @@
<resources>
<style name="Theme.LibreTube" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
<item name="colorPrimary">@color/red_light_accentLight</item>
<item name="colorOnPrimary">@color/red_light_accentLight</item>
<item name="colorPrimaryContainer">@color/red_light_accentLight</item>
<item name="colorOnPrimaryContainer">@color/red_light_accentLight</item>
<item name="colorSecondary">@color/red_light_accentDark</item>
<item name="colorOnSecondary">@color/red_light_accentDark</item>
<item name="colorSecondaryContainer">@color/red_light_accentLight</item>
<item name="colorOnSecondaryContainer">@color/red_light_accentLight</item>
<item name="colorTertiary">@color/red_light_accentLight</item>
<item name="colorOnTertiary">@color/red_light_accentLight</item>
<item name="colorTertiaryContainer">@color/red_light_accentLight</item>
<item name="colorOnTertiaryContainer">@color/red_light_accentLight</item>
<item name="android:colorBackground">@color/red_light_background</item>
<item name="colorOnBackground">@color/red_light_accentLight</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">true</item>

67
app/src/main/res/values/colors.xml
View File

@ -6,59 +6,16 @@
<color name="duration_background_color">#AA000000</color>
<color name="duration_text_color">#EEFFFFFF</color>
<color name="colorPrimary">#B81B3B</color>
<color name="md_theme_light_primary">#B81B3B</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#FFDADC</color>
<color name="md_theme_light_onPrimaryContainer">#40000B</color>
<color name="md_theme_light_secondary">#9C4145</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#FFD9DA</color>
<color name="md_theme_light_onSecondaryContainer">#400008</color>
<color name="md_theme_light_tertiary">#98470F</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#FFDBC8</color>
<color name="md_theme_light_onTertiaryContainer">#341100</color>
<color name="md_theme_light_error">#BA1B1B</color>
<color name="md_theme_light_errorContainer">#FFDAD4</color>
<color name="md_theme_light_onError">#FFFFFF</color>
<color name="md_theme_light_onErrorContainer">#410001</color>
<color name="md_theme_light_background">#FCFCFC</color>
<color name="md_theme_light_onBackground">#201A1A</color>
<color name="md_theme_light_surface">#FCFCFC</color>
<color name="md_theme_light_onSurface">#201A1A</color>
<color name="md_theme_light_surfaceVariant">#F4DDDD</color>
<color name="md_theme_light_onSurfaceVariant">#524343</color>
<color name="md_theme_light_outline">#847373</color>
<color name="md_theme_light_inverseOnSurface">#FBEDED</color>
<color name="md_theme_light_inverseSurface">#362F2F</color>
<color name="md_theme_light_primaryInverse">#FFB3B8</color>
<color name="md_theme_dark_primary">#FFB3B8</color>
<color name="md_theme_dark_onPrimary">#680018</color>
<color name="md_theme_dark_primaryContainer">#920026</color>
<color name="md_theme_dark_onPrimaryContainer">#FFDADC</color>
<color name="md_theme_dark_secondary">#FFB2B3</color>
<color name="md_theme_dark_onSecondary">#60131B</color>
<color name="md_theme_dark_secondaryContainer">#7D2A2F</color>
<color name="md_theme_dark_onSecondaryContainer">#FFD9DA</color>
<color name="md_theme_dark_tertiary">#FFB68C</color>
<color name="md_theme_dark_onTertiary">#552100</color>
<color name="md_theme_dark_tertiaryContainer">#783200</color>
<color name="md_theme_dark_onTertiaryContainer">#FFDBC8</color>
<color name="md_theme_dark_error">#FFB4A9</color>
<color name="md_theme_dark_errorContainer">#930006</color>
<color name="md_theme_dark_onError">#680003</color>
<color name="md_theme_dark_onErrorContainer">#FFDAD4</color>
<color name="md_theme_dark_background">#201A1A</color>
<color name="md_theme_dark_onBackground">#ECDFDF</color>
<color name="md_theme_dark_surface">#201A1A</color>
<color name="md_theme_dark_onSurface">#ECDFDF</color>
<color name="md_theme_dark_surfaceVariant">#524343</color>
<color name="md_theme_dark_onSurfaceVariant">#D7C2C2</color>
<color name="md_theme_dark_outline">#9F8C8C</color>
<color name="md_theme_dark_inverseOnSurface">#201A1A</color>
<color name="md_theme_dark_inverseSurface">#ECDFDF</color>
<color name="md_theme_dark_primaryInverse">#B81B3B</color>
<color name="seed">#BD1F3E</color>
<color name="error">#BA1B1B</color>
<color name="red_light_accentLight">#F1395E</color>
<color name="red_light_accentDark">#B81B3B</color>
<color name="red_light_container">#A5030B</color>
<color name="red_light_background">#FFFFFF</color>
<color name="red_light_text">#FFFFFF</color>
<color name="red_dark_accentLight">#F1395E</color>
<color name="red_dark_accentDark">#B81B3B</color>
<color name="red_dark_container">#A5030B</color>
<color name="red_dark_background">#40000B</color>
<color name="red_dark_text">#FFFFFF</color>
</resources>

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

@ -1,32 +1,21 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.LibreTube" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
<item name="colorPrimary">@color/red_light_accentLight</item>
<item name="colorOnPrimary">@color/red_light_accentLight</item>
<item name="colorPrimaryContainer">@color/red_light_accentLight</item>
<item name="colorOnPrimaryContainer">@color/red_light_accentLight</item>
<item name="colorSecondary">@color/red_light_accentDark</item>
<item name="colorOnSecondary">@color/red_light_accentDark</item>
<item name="colorSecondaryContainer">@color/red_light_accentLight</item>
<item name="colorOnSecondaryContainer">@color/red_light_accentLight</item>
<item name="colorTertiary">@color/red_light_accentLight</item>
<item name="colorOnTertiary">@color/red_light_accentLight</item>
<item name="colorTertiaryContainer">@color/red_light_accentLight</item>
<item name="colorOnTertiaryContainer">@color/red_light_accentLight</item>
<item name="android:colorBackground">@color/red_light_background</item>
<item name="colorOnBackground">@color/red_light_accentLight</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>