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 +358 -286
43 changed files with 358 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a6a23c8560 - Show all commits

5
app/src/main/res/color/bottom_nav_item_tint.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorPrimary" android:state_checked="true"/>
<item android:color="?attr/iconColor"/>
</selector>

2
app/src/main/res/drawable/dot_default.xml
View File

@ -6,7 +6,7 @@
android:shape="ring" android:shape="ring"
android:thickness="4dp" android:thickness="4dp"
android:useLevel="false"> android:useLevel="false">
<solid android:color="?iconColor"/> <solid android:color="?colorOutline"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

2
app/src/main/res/drawable/dot_selected.xml
View File

@ -6,7 +6,7 @@
android:shape="ring" android:shape="ring"
android:thickness="4dp" android:thickness="4dp"
android:useLevel="false"> android:useLevel="false">
<solid android:color="@color/colorAccent" /> <solid android:color="?colorSecondary" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

2
app/src/main/res/drawable/ic_baseline_search_24.xml
View File

@ -3,7 +3,7 @@
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24"
android:tint="?attr/iconColor"> android:tint="?attr/colorControlNormal">
<path <path
android:fillColor="@android:color/white" android:fillColor="@android:color/white"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>

2
app/src/main/res/drawable/placeholder_image.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?shapeTextBackground"/> <solid android:color="?colorSurfaceVariant"/>
<size <size
android:width="1920px" android:width="1920px"
android:height="1080px"/> android:height="1080px"/>

2
app/src/main/res/drawable/shape_rounded_corner.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?attr/shapeTextBackground"/> <solid android:color="?colorSurfaceVariant"/>
<corners android:radius="3dp"/> <corners android:radius="3dp"/>
</shape> </shape>

1
app/src/main/res/layout/fragment_on_login.xml
View File

@ -10,6 +10,7 @@
android:layout_height="128dp" android:layout_height="128dp"
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tint="?colorTeapodIcon"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

1
app/src/main/res/layout/fragment_on_welcome.xml
View File

@ -15,6 +15,7 @@
android:layout_height="128dp" android:layout_height="128dp"
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tint="?colorTeapodIcon"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

4
app/src/main/res/layout/item_episode.xml
View File

@ -24,8 +24,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:contentDescription="@string/component_poster_desc" android:contentDescription="@string/component_poster_desc"
app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" android:src="@drawable/placeholder_image"
app:srcCompat="@color/imagePlaceholder" /> app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />
<ImageView <ImageView
android:id="@+id/image_episode_play" android:id="@+id/image_episode_play"

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

@ -15,8 +15,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:contentDescription="@string/component_poster_desc" android:contentDescription="@string/component_poster_desc"
app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" android:src="@drawable/placeholder_image"
app:srcCompat="@color/imagePlaceholder" /> app:shapeAppearance="@style/ShapeAppearance.Teapod.RoundedPoster" />
<ImageView <ImageView
android:id="@+id/image_episode_play" android:id="@+id/image_episode_play"

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

@ -9,6 +9,7 @@
<style name="AppTheme" 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="searchViewStyle">@style/SearchViewStyle</item>
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item> <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
<item name="colorPrimary">@color/seed</item> <item name="colorPrimary">@color/seed</item>
@ -37,6 +38,7 @@
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item> <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item> <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item> <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
<item name="colorTeapodIcon">@color/button_background_dark</item>
</style> </style>
</resources> </resources>

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

@ -1,10 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<attr format="color" name="themePrimary"/> <attr format="color" name="colorTeapodIcon"/>
<attr format="color" name="themeSecondary"/>
<attr format="color" name="textPrimary"/>
<attr format="color" name="textSecondary"/>
<attr format="color" name="iconColor"/>
<attr format="color" name="buttonBackground"/>
<attr format="color" name="shapeTextBackground"/>
</resources> </resources>

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

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- theme independent colors -->
<color name="colorAccent">#607d8b</color>
<color name="imagePlaceholder">#c2c2c2</color>
<!-- light theme colors --> <!-- light theme colors -->
<color name="button_background_light">#000000</color> <color name="button_background_light">#000000</color>
<color name="button_text_color_light">#ffffff</color> <color name="button_text_color_light">#ffffff</color>

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

@ -8,6 +8,7 @@
<style name="AppTheme" 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="searchViewStyle">@style/SearchViewStyle</item>
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item> <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
<item name="colorPrimary">@color/seed</item> <item name="colorPrimary">@color/seed</item>
@ -36,5 +37,6 @@
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item> <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item> <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item> <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
<item name="colorTeapodIcon">@color/button_background_light</item>
</style> </style>
</resources> </resources>