Skip to content

Use Material3Expressive #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luna712 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Use Material3Expressive #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc94a51
Use Material3Expressive
Luna712 Dec 22, 2025
dffa03e
Fix
Luna712 Dec 22, 2025
667c917
Fix
Luna712 Dec 22, 2025
4013fd3
Fix
Luna712 Dec 22, 2025
73ee33a
Update
Luna712 Dec 22, 2025
96313ba
Fix
Luna712 Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_player.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/overlay_loading_skip_button"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_gravity="center"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/fragment_result.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,9 +601,9 @@
app:trackColor="@color/skipOpTransparent"
tools:progress="50" />
</FrameLayout>
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/result_resume_series_title"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/Widget.Material3Expressive.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
Expand All @@ -620,9 +620,9 @@
android:ellipsize="end"
android:clickable="false"
android:focusable="false" />
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/result_resume_series_progress_text"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/Widget.Material3Expressive.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/player_custom_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@
</FrameLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/player_speedup_button"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="center_horizontal"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/player_custom_layout_tv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@
</FrameLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/player_speedup_button"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="center_horizontal"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/trailer_custom_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@
</LinearLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/player_speedup_button"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3Expressive.Button.OutlinedButton"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="center_horizontal"
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. Material3 -->
<style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
<!-- Base application theme. Material3Expressive -->
<style name="AppTheme" parent="Theme.Material3Expressive.Dark.NoActionBar">
<item name="android:windowBackground">@drawable/splash_background</item>
<item name="android:colorEdgeEffect">?attr/textColor</item>

Expand Down Expand Up @@ -447,7 +447,7 @@
<item name="android:paddingStart">-10dp</item>
</style>

<style name="AppSearchViewStyle" parent="Theme.MaterialComponents.NoActionBar">
<style name="AppSearchViewStyle" parent="Theme.Material3Expressive.Dark.NoActionBar">
<item name="android:searchIcon">@drawable/search_icon</item>
<item name="android:queryHint">@string/search_hint</item>
<item name="android:background">@color/transparent</item>
Expand Down Expand Up @@ -476,7 +476,7 @@

<style name="PreferenceTheme" parent="@style/AppTheme" />

<style name="Theme.AlertDialog" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
<style name="Theme.AlertDialog" parent="ThemeOverlay.Material3Expressive.Dialog.Alert">
<item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
<item name="android:windowBackground">@drawable/dialog__window_background</item>
Expand Down Expand Up @@ -518,12 +518,12 @@
<item name="android:paddingEnd">5dp</item>-->
</style>

<style name="AppMaterialButtonStyle" parent="Widget.MaterialComponents.Button">
<style name="AppMaterialButtonStyle" parent="Widget.Material3Expressive.Button">
<item name="android:fontFamily">@font/google_sans</item>
</style>

<style name="Theme.Widget.Tabs" parent="Widget.MaterialComponents.TabLayout.Colored">
<!--<item name="tabGravity">center</item>
<style name="Theme.Widget.Tabs" parent="Widget.Material3.TabLayout">
<item name="tabGravity">center</item>
<item name="backgroundTint">@color/transparent</item>
<item name="tabIndicator">@drawable/tab_selector</item>
<item name="tabIndicatorColor">?attr/colorPrimary</item>
Expand All @@ -532,7 +532,7 @@
<item name="tabIndicatorHeight">3dp</item>
<item name="tabInlineLabel">true</item>
<item name="tabMinWidth">75dp</item>
<item name="tabMode">scrollable</item>-->
<item name="tabMode">scrollable</item>
</style>

<style name="DarkFragment" parent="AppTheme">
Expand Down Expand Up @@ -713,7 +713,7 @@
<item name="android:insetBottom">@dimen/dialog_buttons_inset</item>
</style>

<style name="BlackLabel" parent="@style/Widget.MaterialComponents.Tooltip">
<style name="BlackLabel" parent="@style/Widget.Material3.Tooltip">
<item name="backgroundTint">?attr/iconGrayBackground</item>
<item name="android:textColor">?attr/textColor</item>
</style>
Expand Down Expand Up @@ -888,7 +888,7 @@
<item name="strokeColor">@color/toggle_button_outline</item>
</style>

<style name="Tag" parent="Widget.MaterialComponents.Button.OutlinedButton">
<style name="Tag" parent="Widget.Material3Expressive.Button.OutlinedButton">
<item name="strokeColor">@color/tag_stroke_color</item>
</style>

Expand Down