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

style: implement m3 switches

Browse source 
Implement a facimile of the new Material 3/You switches in the settings
menu. There's no defined spec for this yet, so I just shamelessly ripped
the implementation from Doodle.
This commit is contained in:
OxygenCobalt 2022-01-23 10:53:39 -07:00
parent 50170f202e
commit c98d131316
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
7 changed files with 88 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/org/oxycblt/auxio/settings/pref/M3SwitchPreference.kt Normal file
View file

@ -0,0 +1,40 @@
package org.oxycblt.auxio.settings.pref
import android.content.Context
import android.os.Build
import android.util.AttributeSet
import androidx.appcompat.widget.SwitchCompat
import androidx.preference.PreferenceViewHolder
import androidx.preference.SwitchPreferenceCompat
import org.oxycblt.auxio.R
import org.oxycblt.auxio.util.resolveDrawable
import org.oxycblt.auxio.util.resolveStateList
class M3SwitchPreference @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = R.attr.switchPreferenceCompatStyle,
defStyleRes: Int = 0
) : SwitchPreferenceCompat(context, attrs, defStyleAttr, defStyleRes) {
// Lollipop cannot into ColorStateList, disable this feature on that version
private var needToUpdateSwitch = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
if (needToUpdateSwitch) {
val switch = holder.findViewById(androidx.preference.R.id.switchWidget)
if (switch is SwitchCompat) {
switch.apply {
trackDrawable = R.drawable.ui_m3_switch_track.resolveDrawable(context)
trackTintList = R.color.sel_m3_switch_track.resolveStateList(context)
thumbDrawable = R.drawable.ui_m3_switch_thumb.resolveDrawable(context)
thumbTintList = R.color.sel_m3_switch_thumb.resolveStateList(context)
}
needToUpdateSwitch = false
}
}
}
}

5
app/src/main/res/color/sel_m3_switch_thumb.xml Normal file
View file

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

5
app/src/main/res/color/sel_m3_switch_track.xml Normal file
View file

@ -0,0 +1,5 @@
<?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/colorOnSurfaceVariant" />
</selector>

15
app/src/main/res/drawable/ui_m3_switch_thumb.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="4dp"
android:left="4dp"
android:right="4dp"
android:top="4dp">
<shape android:shape="oval">
<solid android:color="#000000" />
<size
android:width="20dp"
android:height="20dp" />
</shape>
</item>
</layer-list>

12
app/src/main/res/drawable/ui_m3_switch_track.xml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="#000000" />
<corners android:radius="56dp" />
<size
android:width="64dp"
android:height="28dp" />
</shape>
</item>
</layer-list>

2
app/src/main/res/values/typography.xml
View file

@ -72,7 +72,7 @@
</style>
<style name="TextAppearance.Auxio.TitleSmallish" parent="TextAppearance.Material3.TitleSmall">
<item name="android:textSize">16sp</item>
<item name="android:textSize">18sp</item>
</style>
<style name="TextAppearance.Auxio.LabelLarger" parent="TextAppearance.Auxio.LabelLarge">

20
app/src/main/res/xml/prefs_main.xml
View file

@ -20,7 +20,7 @@
app:key="auxio_accent"
app:title="@string/set_accent" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:allowDividerBelow="false"
app:defaultValue="false"
app:iconSpaceReserved="false"
@ -40,14 +40,14 @@
app:summary="@string/set_lib_tabs_desc"
app:title="@string/set_lib_tabs" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:defaultValue="true"
app:iconSpaceReserved="false"
app:key="KEY_SHOW_COVERS"
app:summary="@string/set_show_covers_desc"
app:title="@string/set_show_covers" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:defaultValue="false"
app:dependency="KEY_SHOW_COVERS"
app:iconSpaceReserved="false"
@ -55,7 +55,7 @@
app:summary="@string/set_quality_covers_desc"
app:title="@string/set_quality_covers" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:defaultValue="false"
app:dependency="KEY_SHOW_COVERS"
app:iconSpaceReserved="false"
@ -63,7 +63,7 @@
app:summary="@string/set_round_covers_desc"
app:title="@string/set_round_covers" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:allowDividerBelow="false"
app:defaultValue="false"
app:iconSpaceReserved="false"
@ -78,14 +78,14 @@
app:layout="@layout/item_header"
app:title="@string/set_audio">
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:defaultValue="true"
app:iconSpaceReserved="false"
app:key="KEY_AUDIO_FOCUS"
app:summary="@string/set_focus_desc"
app:title="@string/set_focus" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:defaultValue="true"
app:iconSpaceReserved="false"
app:key="KEY_PLUG_MGT"
@ -116,14 +116,14 @@
app:title="@string/set_song_mode"
app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:defaultValue="true"
app:iconSpaceReserved="false"
app:key="KEY_KEEP_SHUFFLE"
app:summary="@string/set_keep_shuffle_desc"
app:title="@string/set_keep_shuffle" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:allowDividerBelow="false"
app:defaultValue="true"
app:iconSpaceReserved="false"
@ -131,7 +131,7 @@
app:summary="@string/set_rewind_prev_desc"
app:title="@string/set_rewind_prev" />
<SwitchPreferenceCompat
<org.oxycblt.auxio.settings.pref.M3SwitchPreference
app:allowDividerBelow="false"
app:defaultValue="false"
app:iconSpaceReserved="false"