style: update inter
Update the inter font to v3.19.
This commit is contained in:
parent
b121b6428d
commit
20245db261
8 changed files with 18 additions and 5 deletions
|
@ -106,7 +106,7 @@ dependencies {
|
||||||
implementation 'io.coil-kt:coil:2.0.0-alpha06'
|
implementation 'io.coil-kt:coil:2.0.0-alpha06'
|
||||||
|
|
||||||
// Material
|
// Material
|
||||||
implementation 'com.google.android.material:material:1.5.0'
|
implementation 'com.google.android.material:material:1.6.0-alpha02'
|
||||||
|
|
||||||
// --- DEBUG ---
|
// --- DEBUG ---
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,10 @@ import android.util.AttributeSet
|
||||||
import com.google.android.material.floatingactionbutton.FloatingActionButton
|
import com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
import com.google.android.material.R as MaterialR
|
import com.google.android.material.R as MaterialR
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A FloatingActionButton that automatically switches to a normal or large FAB depending on the
|
||||||
|
* screen size.
|
||||||
|
*/
|
||||||
@Suppress("PrivateResource")
|
@Suppress("PrivateResource")
|
||||||
class AdaptiveFloatingActionButton @JvmOverloads constructor(
|
class AdaptiveFloatingActionButton @JvmOverloads constructor(
|
||||||
context: Context,
|
context: Context,
|
||||||
|
|
|
@ -4,6 +4,12 @@ import android.content.Context
|
||||||
import com.google.android.material.tabs.TabLayout
|
import com.google.android.material.tabs.TabLayout
|
||||||
import com.google.android.material.tabs.TabLayoutMediator
|
import com.google.android.material.tabs.TabLayoutMediator
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A tag configuration strategy that automatically adapts the tab layout to the screen size.
|
||||||
|
* - On small screens, use only an icon
|
||||||
|
* - On medium screens, use only text
|
||||||
|
* - On large screens, use text and an icon
|
||||||
|
*/
|
||||||
class AdaptiveTabStrategy(
|
class AdaptiveTabStrategy(
|
||||||
context: Context,
|
context: Context,
|
||||||
private val homeModel: HomeViewModel
|
private val homeModel: HomeViewModel
|
||||||
|
|
|
@ -10,6 +10,10 @@ import org.oxycblt.auxio.R
|
||||||
import org.oxycblt.auxio.util.resolveDrawable
|
import org.oxycblt.auxio.util.resolveDrawable
|
||||||
import org.oxycblt.auxio.util.resolveStateList
|
import org.oxycblt.auxio.util.resolveStateList
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A [SwitchPreferenceCompat] that emulates the M3 switches until the design team
|
||||||
|
* actually bothers to add them to MDC.
|
||||||
|
*/
|
||||||
class M3SwitchPreference @JvmOverloads constructor(
|
class M3SwitchPreference @JvmOverloads constructor(
|
||||||
context: Context,
|
context: Context,
|
||||||
attrs: AttributeSet? = null,
|
attrs: AttributeSet? = null,
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -6,7 +6,6 @@
|
||||||
<style name="Widget.Auxio.Toolbar" parent="">
|
<style name="Widget.Auxio.Toolbar" parent="">
|
||||||
<item name="android:layout_width">match_parent</item>
|
<item name="android:layout_width">match_parent</item>
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
<item name="android:theme">@style/ThemeOverlay.Material3.ActionBar</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<!-- Toolbar sub-style with a nav icon -->
|
<!-- Toolbar sub-style with a nav icon -->
|
||||||
|
|
|
@ -55,20 +55,20 @@
|
||||||
<item name="android:textStyle">normal</item>
|
<item name="android:textStyle">normal</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
|
<style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
|
||||||
<item name="fontFamily">@font/inter_semibold</item>
|
<item name="fontFamily">@font/inter_semibold</item>
|
||||||
<item name="android:fontFamily">@font/inter_semibold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
<item name="android:textStyle">bold</item>
|
<item name="android:textStyle">bold</item>
|
||||||
<item name="android:letterSpacing">0.01</item>
|
<item name="android:letterSpacing">0.01</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextAppearance.Auxio.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
|
<style name="TextAppearance.Auxio.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
|
||||||
<item name="fontFamily">@font/inter_semibold</item>
|
<item name="fontFamily">@font/inter_semibold</item>
|
||||||
<item name="android:fontFamily">@font/inter_semibold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
<item name="android:textStyle">bold</item>
|
<item name="android:textStyle">bold</item>
|
||||||
<item name="android:letterSpacing">0.01</item>
|
<item name="android:letterSpacing">0.01</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextAppearance.Auxio.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
|
<style name="TextAppearance.Auxio.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
|
||||||
<item name="fontFamily">@font/inter_semibold</item>
|
<item name="fontFamily">@font/inter_semibold</item>
|
||||||
<item name="android:fontFamily">@font/inter_semibold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
|
|
Loading…
Reference in a new issue