Seil0/teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

migrate to material 3 #70

Merged
Seil0 merged 6 commits from feature/material-3 into develop 2023-04-15 23:51:08 +02:00
Conversation 0 Commits 6 Files Changed 43 +331 -254
32 changed files with 331 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5cf4527a92 - Show all commits

4
app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt
View File

@ -109,7 +109,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {
gravity = Gravity.CENTER_VERTICAL gravity = Gravity.CENTER_VERTICAL
text = if (locale == Locale.ROOT) context.getString(R.string.no_subtitles) else locale.displayLanguage text = if (locale == Locale.ROOT) context.getString(R.string.no_subtitles) else locale.displayLanguage
setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f) setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
setTextColor(context.resources.getColor(R.color.textSecondaryDark, context.theme)) setTextColor(context.resources.getColor(R.color.player_text, context.theme))
setPadding(75, 0, 0, 0) setPadding(75, 0, 0, 0)
setOnClickListener(onClick) setOnClickListener(onClick)
@ -131,7 +131,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {
languageLayout.children.forEach { child -> languageLayout.children.forEach { child ->
if (child is TextView) { if (child is TextView) {
child.apply { child.apply {
setTextColor(context.resources.getColor(R.color.textPrimaryDark, context.theme)) setTextColor(context.resources.getColor(R.color.player_text, context.theme))
setTypeface(null, Typeface.NORMAL) setTypeface(null, Typeface.NORMAL)
setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0) setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
setPadding(75, 0, 0, 0) setPadding(75, 0, 0, 0)

6
app/src/main/res/layout/item_episode_player.xml
View File

@ -44,7 +44,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="7dp" android:layout_marginTop="7dp"
android:text="@string/component_episode_title" android:text="@string/component_episode_title"
android:textColor="@color/textPrimaryDark" android:textColor="@color/player_text"
android:textSize="16sp" /> android:textSize="16sp" />
<View <View
@ -53,7 +53,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:background="@color/textSecondaryDark" /> android:background="@color/player_text_secondary" />
<TextView <TextView
android:id="@+id/text_episode_desc2" android:id="@+id/text_episode_desc2"
@ -62,6 +62,6 @@
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:maxLines="10" android:maxLines="10"
android:text="@string/text_overview_ex" android:text="@string/text_overview_ex"
android:textColor="@color/textPrimaryDark" /> android:textColor="@color/player_text" />
</LinearLayout> </LinearLayout>

8
app/src/main/res/layout/player_language_settings.xml
View File

@ -138,9 +138,9 @@
android:layout_marginEnd="7dp" android:layout_marginEnd="7dp"
android:text="@string/cancel" android:text="@string/cancel"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/player_white" android:textColor="@color/button_text_color_light"
android:textSize="16sp" android:textSize="16sp"
app:backgroundTint="@color/buttonBackgroundLight" app:backgroundTint="@color/button_background_light"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -151,9 +151,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/apply" android:text="@string/apply"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/themePrimaryDark" android:textColor="@color/button_text_color_dark"
android:textSize="16sp" android:textSize="16sp"
app:backgroundTint="@color/buttonBackgroundDark" app:backgroundTint="@color/button_background_dark"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"

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

@ -2,12 +2,12 @@
<resources> <resources>
<style name="Widget.App.Button" parent="Widget.Material3.Button"> <style name="Widget.App.Button" parent="Widget.Material3.Button">
<item name="backgroundTint">@color/buttonBackgroundDark</item> <item name="backgroundTint">@color/button_background_dark</item>
<item name="android:textColor">@color/buttonTextColorDark</item> <item name="android:textColor">@color/button_text_color_dark</item>
<item name="iconTint">@color/buttonTextColorDark</item> <item name="iconTint">@color/button_text_color_dark</item>
</style> </style>
<style name="AppThemeGenerated" parent="Theme.Material3.Dark.NoActionBar"> <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
<!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>--> <!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item> <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>

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

@ -1,46 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- base theme colors --> <!-- theme independent colors -->
<color name="colorPrimary">#66aa00</color>
<color name="colorOnPrimary">#FFFFFF</color>
<color name="colorSecondary">#607d8b</color>
<color name="colorTertiary">#899579</color>
<color name="colorPrimaryLight">#99dc45</color>
<color name="colorPrimaryDark">#317a00</color>
<color name="colorAccent">#607d8b</color> <color name="colorAccent">#607d8b</color>
<color name="imagePlaceholder">#c2c2c2</color> <color name="imagePlaceholder">#c2c2c2</color>
<!-- light theme colors --> <!-- light theme colors -->
<color name="themePrimaryLight">#ffffff</color> <color name="button_background_light">#000000</color>
<color name="themeSecondaryLight">#ffffff</color> <color name="button_text_color_light">#ffffff</color>
<color name="textPrimaryLight">#de000000</color>
<color name="textSecondaryLight">#99000000</color>
<color name="textBackgroundLight">#55000000</color>
<color name="iconColorLight">#99000000</color>
<color name="buttonBackgroundLight">#000000</color>
<color name="buttonTextColorLight">#ffffff</color>
<!-- dark theme colors --> <!-- dark theme colors -->
<color name="themePrimaryDark">#121212</color> <color name="button_background_dark">#ffffff</color>
<color name="themeSecondaryDark">#202020</color> <color name="button_text_color_dark">#000000</color>
<color name="textPrimaryDark">#deffffff</color>
<color name="textSecondaryDark">#99ffffff</color>
<color name="textBackgroundDark">#55ffffff</color>
<color name="iconColorDark">#99ffffff</color>
<color name="buttonBackgroundDark">#ffffff</color>
<color name="buttonTextColorDark">#000000</color>
<color name="controlHighlightDark">#11ffffff</color>
<!-- player colors -->
<color name="player_white">#ffffff</color>
<color name="ic_launcher_background">#ffffff</color>
<color name="ic_splash_background">#ffffff</color>
<!-- material3 colors --> <!-- material3 colors -->
<color name="seed">#66aa00</color> <color name="seed">#66aa00</color> <!-- base/primary color -->
<color name="md_theme_light_primary">#3E6A00</color> <color name="md_theme_light_primary">#3E6A00</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color> <color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#99d853</color> <color name="md_theme_light_primaryContainer">#99d853</color>
@ -101,4 +74,14 @@
<color name="md_theme_dark_surfaceTint">#92DA3E</color> <color name="md_theme_dark_surfaceTint">#92DA3E</color>
<color name="md_theme_dark_outlineVariant">#44483D</color> <color name="md_theme_dark_outlineVariant">#44483D</color>
<color name="md_theme_dark_scrim">#000000</color> <color name="md_theme_dark_scrim">#000000</color>
<!-- player colors -->
<color name="player_white">#ffffff</color>
<color name="player_text">#deffffff</color>
<color name="player_text_secondary">#99ffffff</color>
<!-- launcher/splash screen colors -->
<color name="ic_launcher_background">#ffffff</color>
<color name="ic_splash_background">#ffffff</color>
</resources> </resources>

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

@ -1,96 +1,33 @@
<resources> <resources>
<!-- application themes --> <!-- application themes -->
<style name="AppTheme.DayNight" parent="Theme.Material3.DayNight.NoActionBar"> <!-- <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">-->
<!-- <item name="colorPrimary">@color/colorPrimary</item> <!-- <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>-->
<item name="colorOnPrimary">@color/colorOnPrimary</item>
<item name="colorOutline">#ffffff</item>
<item name="colorSurfaceVariant">#c5c8ba</item>
<item name="colorOnPrimaryContainer">#2d5000</item>
<item name="colorPrimaryContainer">@color/colorSecondary</item>
<item name="colorSecondary">@color/colorSecondary</item>
<item name="colorTertiary">@color/colorTertiary</item>
<item name="materialButtonStyle">@style/Widget.App.Button.DayNight</item>
<item name="popupMenuStyle">@style/Widget.App.PopupMenu</item>
<item name="searchViewStyle">@style/SearchViewStyle</item>
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>-->
</style>
<style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar"> <!-- <item name="colorPrimary">@color/seed</item>-->
<!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>--> <!-- <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>-->
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item> <!-- <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>-->
<!-- <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>-->
<item name="colorPrimary">@color/seed</item> <!-- <item name="colorSecondary">@color/md_theme_light_secondary</item>-->
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item> <!-- <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>-->
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item> <!-- <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>-->
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item> <!-- <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>-->
<item name="colorSecondary">@color/md_theme_light_secondary</item> <!-- <item name="colorTertiary">@color/md_theme_light_tertiary</item>-->
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item> <!-- <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>-->
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item> <!-- <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>-->
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item> <!-- <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>-->
<item name="colorTertiary">@color/md_theme_light_tertiary</item> <!-- <item name="colorError">@color/md_theme_light_error</item>-->
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item> <!-- <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>-->
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item> <!-- <item name="colorOnError">@color/md_theme_light_onError</item>-->
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item> <!-- <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>-->
<item name="colorError">@color/md_theme_light_error</item> <!-- <item name="colorSurface">@color/md_theme_light_surface</item>-->
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item> <!-- <item name="colorOnSurface">@color/md_theme_light_onSurface</item>-->
<item name="colorOnError">@color/md_theme_light_onError</item> <!-- <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>-->
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item> <!-- <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>-->
<item name="colorSurface">@color/md_theme_light_surface</item> <!-- <item name="colorOutline">@color/md_theme_light_outline</item>-->
<item name="colorOnSurface">@color/md_theme_light_onSurface</item> <!-- <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>-->
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item> <!-- <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>-->
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item> <!-- <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>-->
<item name="colorOutline">@color/md_theme_light_outline</item> <!-- </style>-->
<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_inversePrimary</item>
</style>
<!-- <style name="AppTheme.Light" parent="AppTheme">
<item name="themePrimary">@color/themePrimaryLight</item>
<item name="themeSecondary">@color/themeSecondaryLight</item>
<item name="textPrimary">@color/textPrimaryLight</item>
<item name="textSecondary">@color/textSecondaryLight</item>
<item name="android:textColor">@color/textPrimaryLight</item>
<item name="android:textColorPrimary">@color/textPrimaryLight</item>
<item name="android:textColorHint">@color/textSecondaryLight</item>
<item name="shapeTextBackground">@color/textBackgroundLight</item>
<item name="iconColor">@color/iconColorLight</item>
<item name="buttonBackground">@color/buttonBackgroundLight</item>
</style>
<style name="AppTheme.Dark" parent="AppTheme">
<item name="themePrimary">@color/themePrimaryDark</item>
<item name="themeSecondary">@color/themeSecondaryDark</item>
<item name="textPrimary">@color/textPrimaryDark</item>
<item name="textSecondary">@color/textSecondaryDark</item>
<item name="android:textColor">@color/textPrimaryDark</item>
<item name="android:textColorPrimary">@color/textPrimaryDark</item>
<item name="android:textColorHint">@color/textSecondaryDark</item>
<item name="shapeTextBackground">@color/textBackgroundDark</item>
<item name="iconColor">@color/iconColorDark</item>
<item name="buttonBackground">@color/buttonBackgroundDark</item>
<item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Dark</item>
&lt;!&ndash; change on click indicator color for manually set components &ndash;&gt;
<item name="colorControlHighlight">@color/controlHighlightDark</item>
</style>-->
<style name="Widget.App.Button.DayNight" parent="Widget.App.Button">
<item name="shapeAppearance">@style/ShapeAppearance.Material3.SmallComponent</item>
</style>
<!-- dialog themes -->
<style name="ThemeOverlay.App.MaterialAlertDialog.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorSurface">@color/themeSecondaryDark</item>
<item name="colorOnSurface">@color/textPrimaryDark</item>
<item name="android:colorControlNormal">@color/textSecondaryDark</item> <!-- Radio button unchecked-->
<item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
</style>
<style name="MaterialAlertDialog.App.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
<item name="android:textColor">?textPrimary</item>
</style>
<!-- search view theme --> <!-- search view theme -->
<style name="SearchViewStyle" parent="Widget.AppCompat.SearchView.ActionBar"> <style name="SearchViewStyle" parent="Widget.AppCompat.SearchView.ActionBar">
@ -120,7 +57,7 @@
<item name="windowSplashScreenAnimationDuration">200</item> <item name="windowSplashScreenAnimationDuration">200</item>
<!-- Set the theme of the Activity that directly follows your splash screen. --> <!-- Set the theme of the Activity that directly follows your splash screen. -->
<item name="postSplashScreenTheme">@style/AppTheme</item> # Required. <item name="postSplashScreenTheme">@style/AppTheme</item> <!-- Required -->
</style> </style>
<!-- shapes --> <!-- shapes -->

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

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Widget.App.Button" parent="Widget.Material3.Button"> <style name="Widget.App.Button" parent="Widget.Material3.Button">
<item name="backgroundTint">@color/buttonBackgroundLight</item> <item name="backgroundTint">@color/button_background_light</item>
<item name="android:textColor">@color/buttonTextColorLight</item> <item name="android:textColor">@color/button_text_color_light</item>
<item name="iconTint">@color/buttonTextColorLight</item> <item name="iconTint">@color/button_text_color_light</item>
</style> </style>
<style name="AppThemeGenerated" parent="Theme.Material3.Light.NoActionBar"> <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>--> <!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item> <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>