Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ui: clean up material3.1 changes

Browse source
This commit is contained in:
Alexander Capehart 2024-04-18 14:04:43 -06:00
parent c90b9e5827
commit 6c640909f7
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
7 changed files with 41 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/res/layout-h480dp/fragment_playback_panel.xml
View file

@ -78,8 +78,7 @@
android:id="@+id/playback_controls_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginHorizontal="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent">
@ -102,13 +101,11 @@
<org.oxycblt.auxio.ui.RippleFixMaterialButton
android:id="@+id/playback_skip_prev"
style="@style/Widget.Auxio.Button.Icon.Larger"
style="@style/Widget.Auxio.Button.Icon.Huge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/desc_skip_prev"
app:icon="@drawable/ic_skip_prev_40"
app:iconTint="?attr/colorOnSecondaryContainer"
app:backgroundTint="?attr/colorSecondaryContainer"
app:iconSize="40dp"
app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
@ -122,8 +119,6 @@
android:layout_height="wrap_content"
android:contentDescription="@string/desc_play_pause"
app:icon="@drawable/sel_playing_state_48"
app:backgroundTint="?attr/colorPrimaryContainer"
app:iconTint="?attr/colorOnPrimaryContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -132,13 +127,11 @@
<org.oxycblt.auxio.ui.RippleFixMaterialButton
android:id="@+id/playback_skip_next"
style="@style/Widget.Auxio.Button.Icon.Larger"
style="@style/Widget.Auxio.Button.Icon.Huge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/desc_skip_next"
app:icon="@drawable/ic_skip_next_40"
app:iconTint="?attr/colorOnSecondaryContainer"
app:backgroundTint="?attr/colorSecondaryContainer"
app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
app:layout_constraintStart_toEndOf="@+id/playback_play_pause"

6
app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
View file

@ -110,8 +110,6 @@
android:layout_marginEnd="@dimen/spacing_huge"
android:contentDescription="@string/desc_skip_prev"
app:icon="@drawable/ic_skip_prev_24"
app:iconTint="?attr/colorOnSecondaryContainer"
app:backgroundTint="?attr/colorSecondaryContainer"
app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
@ -122,8 +120,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/desc_play_pause"
app:backgroundTint="?attr/colorPrimaryContainer"
app:iconTint="?attr/colorOnPrimaryContainer"
app:icon="@drawable/sel_playing_state_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -139,8 +135,6 @@
android:layout_marginStart="@dimen/spacing_huge"
android:contentDescription="@string/desc_skip_next"
app:icon="@drawable/ic_skip_next_24"
app:iconTint="?attr/colorOnSecondaryContainer"
app:backgroundTint="?attr/colorSecondaryContainer"
app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />

10
app/src/main/res/layout/fragment_playback_panel.xml
View file

@ -105,13 +105,11 @@
<org.oxycblt.auxio.ui.RippleFixMaterialButton
android:id="@+id/playback_skip_prev"
style="@style/Widget.Auxio.Button.Icon.Larger"
style="@style/Widget.Auxio.Button.Icon.Huge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/desc_skip_prev"
app:icon="@drawable/ic_skip_prev_24"
app:iconTint="?attr/colorOnSecondaryContainer"
app:backgroundTint="?attr/colorSecondaryContainer"
app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
app:layout_constraintStart_toEndOf="@+id/playback_repeat"
@ -123,8 +121,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/desc_play_pause"
app:backgroundTint="?attr/colorPrimaryContainer"
app:iconTint="?attr/colorOnPrimaryContainer"
app:icon="@drawable/sel_playing_state_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -134,13 +130,11 @@
<org.oxycblt.auxio.ui.RippleFixMaterialButton
android:id="@+id/playback_skip_next"
style="@style/Widget.Auxio.Button.Icon.Larger"
style="@style/Widget.Auxio.Button.Icon.Huge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/desc_skip_next"
app:icon="@drawable/ic_skip_next_24"
app:iconTint="?attr/colorOnSecondaryContainer"
app:backgroundTint="?attr/colorSecondaryContainer"
app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
app:layout_constraintStart_toEndOf="@+id/playback_play_pause"

2
app/src/main/res/layout/view_seek_bar.xml
View file

@ -10,8 +10,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_medium"
app:trackHeight="4dp"
app:thumbHeight="24dp"
android:valueFrom="0"
android:valueTo="1" />

8
app/src/main/res/values-night/styles_ui.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ThemeOverlay.Auxio.IconButton.PlayPause" parent="">
<item name="colorContainer">?attr/colorPrimaryContainer</item>
<item name="colorOnContainer">?attr/colorOnPrimaryContainer</item>
</style>
</resources>

6
app/src/main/res/values/dimens.xml
View file

@ -21,10 +21,11 @@
<dimen name="size_corners_mid_large">24dp</dimen>
<dimen name="size_btn">48dp</dimen>
<dimen name="size_btn_larger">56dp</dimen>
<dimen name="size_accent_item">56dp</dimen>
<dimen name="size_bottom_sheet_bar">64dp</dimen>
<dimen name="size_copy_button">64dp</dimen>
<dimen name="size_play_pause_button">72dp</dimen>
<dimen name="size_play_pause_button">80dp</dimen>
<dimen name="size_icon_small">24dp</dimen>
<dimen name="size_icon_medium">32dp</dimen>
@ -35,6 +36,9 @@
<dimen name="text_size_track_number_max">22sp</dimen>
<dimen name="text_size_track_number_step">2sp</dimen>
<dimen name="slider_track_height">10dp</dimen>
<dimen name="slider_thumb_height">24dp</dimen>
<!-- Misc -->
<dimen name="elevation_normal">6dp</dimen>

36
app/src/main/res/values/styles_ui.xml
View file

@ -22,6 +22,8 @@
<item name="labelBehavior">gone</item>
<item name="tickVisible">false</item>
<item name="trackStopIndicatorSize">0dp</item>
<item name="trackHeight">@dimen/slider_track_height</item>
<item name="thumbHeight">@dimen/slider_thumb_height</item>
</style>
<style name="Widget.Auxio.LinearProgressIndicator" parent="Widget.Material3.LinearProgressIndicator">
@ -254,8 +256,8 @@
<item name="iconSize">@dimen/size_icon_medium</item>
<item name="android:minWidth">@dimen/size_btn</item>
<item name="android:minHeight">@dimen/size_btn</item>
<item name="android:insetTop">0dp</item>
<item name="android:insetBottom">0dp</item>
<item name="android:insetTop">@dimen/spacing_small</item>
<item name="android:insetBottom">@dimen/spacing_small</item>
<item name="android:insetLeft">0dp</item>
<item name="android:insetRight">0dp</item>
<item name="android:paddingStart">@dimen/spacing_small</item>
@ -265,20 +267,24 @@
<item name="iconTint">@color/m3_text_button_foreground_color_selector</item>
</style>
<style name="Widget.Auxio.Button.Icon.Larger" parent="Widget.Auxio.Button.Icon.Base">
<style name="Widget.Auxio.Button.Icon.Huge" parent="Widget.Material3.Button.IconButton">
<item name="iconSize">40dp</item>
<item name="android:minWidth">@dimen/size_btn</item>
<item name="android:minHeight">@dimen/size_btn</item>
<item name="android:minWidth">@dimen/size_btn_larger</item>
<item name="android:minHeight">@dimen/size_btn_larger</item>
<item name="android:insetTop">0dp</item>
<item name="android:insetBottom">0dp</item>
<item name="android:insetLeft">0dp</item>
<item name="android:insetRight">0dp</item>
<item name="android:paddingStart">10dp</item>
<item name="android:paddingEnd">10dp</item>
<item name="android:paddingTop">10dp</item>
<item name="android:paddingBottom">10dp</item>
<item name="iconTint">?attr/colorSecondaryContainer</item>
<item name="backgroundTint">?attr/colorOnSecondaryContainer</item>
<item name="android:paddingStart">@dimen/spacing_small</item>
<item name="android:paddingEnd">@dimen/spacing_small</item>
<item name="android:paddingTop">@dimen/spacing_small</item>
<item name="android:paddingBottom">@dimen/spacing_small</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.Auxio.IconButton.Huge</item>
</style>
<style name="ThemeOverlay.Auxio.IconButton.Huge" parent="">
<item name="colorContainer">?attr/colorSecondaryContainer</item>
<item name="colorOnContainer">?attr/colorOnSecondaryContainer</item>
</style>
<style name="Widget.Auxio.Button.PlayPause" parent="Widget.Material3.Button.IconButton.Filled.Tonal">
@ -296,8 +302,12 @@
<item name="shapeAppearanceOverlay">
@style/ShapeAppearanceOverlay.Material3.FloatingActionButton
</item>
<item name="iconTint">?attr/colorOnPrimaryContainer</item>
<item name="backgroundTint">?attr/colorPrimaryContainer</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.Auxio.IconButton.PlayPause</item>
</style>
<style name="ThemeOverlay.Auxio.IconButton.PlayPause" parent="">
<item name="colorContainer">?attr/colorPrimaryFixedDim</item>
<item name="colorOnContainer">?attr/colorOnPrimaryFixed</item>
</style>
<style name="Widget.Auxio.FloatingActionButton.Adaptive" parent="Widget.Material3.FloatingActionButton.Primary">