style: unify typography
Use Material typography everywhere instead of using a mix of AppCompat and Material styles. This is still based around MaterialComponents though, as I'm not fully sure how to wield the new Material3 text styles yet. This also completely phases out inter bold.
This commit is contained in:
parent
c5fcc45ee9
commit
63198f8677
11 changed files with 27 additions and 26 deletions
|
@ -102,6 +102,8 @@ class WidgetProvider : AppWidgetProvider() {
|
||||||
onSuccess = { onDone(it.toBitmap()) }
|
onSuccess = { onDone(it.toBitmap()) }
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// If we are on Android 12 or higher, round out the album cover so that the widget is
|
||||||
|
// cohesive. I really don't like this, but whatever.
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
builder.transformations(
|
builder.transformations(
|
||||||
RoundedCornersTransformation(
|
RoundedCornersTransformation(
|
||||||
|
|
Binary file not shown.
|
@ -38,26 +38,28 @@
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/detail_subhead"
|
android:id="@+id/detail_subhead"
|
||||||
|
style="@style/Widget.Auxio.TextView.Secondary"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_medium"
|
android:layout_marginStart="@dimen/spacing_medium"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
|
||||||
android:textColor="?android:attr/textColorSecondary"
|
android:textColor="?android:attr/textColorSecondary"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/detail_info"
|
app:layout_constraintBottom_toTopOf="@+id/detail_info"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/detail_cover"
|
app:layout_constraintStart_toEndOf="@+id/detail_cover"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/detail_name"
|
app:layout_constraintTop_toBottomOf="@+id/detail_name"
|
||||||
tools:text="Info A" />
|
tools:text="Info A" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/detail_info"
|
android:id="@+id/detail_info"
|
||||||
|
style="@style/Widget.Auxio.TextView.Secondary"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_medium"
|
android:layout_marginStart="@dimen/spacing_medium"
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
|
||||||
android:textColor="?android:attr/textColorSecondary"
|
android:textColor="?android:attr/textColorSecondary"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
|
app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/detail_cover"
|
app:layout_constraintStart_toEndOf="@+id/detail_cover"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
|
app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
|
||||||
tools:text="Info B" />
|
tools:text="Info B" />
|
||||||
|
|
|
@ -36,26 +36,26 @@
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/detail_subhead"
|
android:id="@+id/detail_subhead"
|
||||||
|
style="@style/Widget.Auxio.TextView.Secondary"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_medium"
|
android:layout_marginStart="@dimen/spacing_medium"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
|
||||||
android:textColor="?android:attr/textColorSecondary"
|
|
||||||
app:layout_constraintBottom_toTopOf="@+id/detail_info"
|
app:layout_constraintBottom_toTopOf="@+id/detail_info"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/detail_cover"
|
app:layout_constraintStart_toEndOf="@+id/detail_cover"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/detail_name"
|
app:layout_constraintTop_toBottomOf="@+id/detail_name"
|
||||||
tools:text="Info A" />
|
tools:text="Info A" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/detail_info"
|
android:id="@+id/detail_info"
|
||||||
|
style="@style/Widget.Auxio.TextView.Secondary"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_medium"
|
android:layout_marginStart="@dimen/spacing_medium"
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
|
||||||
android:textColor="?android:attr/textColorSecondary"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
|
app:layout_constraintBottom_toBottomOf="@+id/detail_cover"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/detail_cover"
|
app:layout_constraintStart_toEndOf="@+id/detail_cover"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
|
app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
|
||||||
tools:text="Info B" />
|
tools:text="Info B" />
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
android:padding="@dimen/spacing_medium"
|
android:padding="@dimen/spacing_medium"
|
||||||
android:text="@string/lbl_no_dirs"
|
android:text="@string/lbl_no_dirs"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
|
||||||
android:textColor="?android:attr/textColorSecondary" />
|
android:textColor="?android:attr/textColorSecondary" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
android:id="@+id/search_edit_text"
|
android:id="@+id/search_edit_text"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
android:hint="@string/hint_search_library"
|
android:hint="@string/hint_search_library"
|
||||||
android:padding="@dimen/spacing_medium"
|
android:padding="@dimen/spacing_medium"
|
||||||
|
|
|
@ -23,9 +23,8 @@
|
||||||
android:minWidth="@dimen/size_track_number"
|
android:minWidth="@dimen/size_track_number"
|
||||||
android:text="@{String.valueOf(song.track)}"
|
android:text="@{String.valueOf(song.track)}"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
|
||||||
android:textColor="@color/sel_accented_secondary"
|
android:textColor="@color/sel_accented_secondary"
|
||||||
android:textSize="@dimen/text_size_large"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/detail_name"
|
android:id="@+id/detail_name"
|
||||||
style="@style/Widget.Auxio.TextView.Detail"
|
style="@style/Widget.Auxio.TextView.Detail"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/spacing_medium"
|
android:layout_marginTop="@dimen/spacing_medium"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
@ -35,9 +35,9 @@
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/detail_subhead"
|
android:id="@+id/detail_subhead"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
style="@style/Widget.Auxio.TextView.Secondary"
|
||||||
android:textColor="?android:attr/textColorSecondary"
|
android:textColor="?android:attr/textColorSecondary"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/detail_name"
|
app:layout_constraintTop_toBottomOf="@+id/detail_name"
|
||||||
|
@ -45,9 +45,9 @@
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/detail_info"
|
android:id="@+id/detail_info"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
style="@style/Widget.Auxio.TextView.Secondary"
|
||||||
android:textColor="?android:attr/textColorSecondary"
|
android:textColor="?android:attr/textColorSecondary"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
|
app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<dimen name="text_size_small">16sp</dimen>
|
<dimen name="text_size_small">16sp</dimen>
|
||||||
<dimen name="text_size_medium">18sp</dimen>
|
<dimen name="text_size_medium">18sp</dimen>
|
||||||
<dimen name="text_size_large">20sp</dimen>
|
<dimen name="text_size_large">20sp</dimen>
|
||||||
<dimen name="text_size_huge">26sp</dimen>
|
<dimen name="text_size_huge">24sp</dimen>
|
||||||
<dimen name="text_size_insane">34sp</dimen>
|
<dimen name="text_size_insane">34sp</dimen>
|
||||||
|
|
||||||
<!-- Misc -->
|
<!-- Misc -->
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
<!-- Custom dialog title theme -->
|
<!-- Custom dialog title theme -->
|
||||||
<style name="Widget.Auxio.Dialog.TextView" parent="MaterialAlertDialog.Material3.Title.Text">
|
<style name="Widget.Auxio.Dialog.TextView" parent="MaterialAlertDialog.Material3.Title.Text">
|
||||||
<item name="android:fontFamily">@font/inter_bold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||||
<item name="android:textSize">@dimen/text_size_large</item>
|
<item name="android:textSize">@dimen/text_size_large</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextAppearance.ToolbarTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
|
<style name="TextAppearance.ToolbarTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
|
||||||
<item name="android:fontFamily">@font/inter_bold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
<item name="android:textSize">@dimen/text_size_large</item>
|
<item name="android:textSize">@dimen/text_size_large</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -59,7 +59,6 @@
|
||||||
|
|
||||||
<style name="TextAppearance.Auxio.TabLayout.Label" parent="TextAppearance.Material3.LabelLarge">
|
<style name="TextAppearance.Auxio.TabLayout.Label" 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:textSize">@dimen/text_size_small</item>
|
<item name="android:textSize">@dimen/text_size_small</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -89,12 +88,12 @@
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Item.Primary" parent="Widget.Auxio.TextView.Item.Base">
|
<style name="Widget.Auxio.TextView.Item.Primary" parent="Widget.Auxio.TextView.Item.Base">
|
||||||
<item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
|
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1</item>
|
||||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Item.Secondary" parent="Widget.Auxio.TextView.Item.Base">
|
<style name="Widget.Auxio.TextView.Item.Secondary" parent="Widget.Auxio.TextView.Item.Base">
|
||||||
<item name="android:textAppearance">?android:attr/textAppearanceListItemSecondary</item>
|
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle2</item>
|
||||||
<item name="android:textColor">?android:attr/textColorSecondary</item>
|
<item name="android:textColor">?android:attr/textColorSecondary</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -135,21 +134,21 @@
|
||||||
<item name="android:minHeight">@dimen/size_btn_small</item>
|
<item name="android:minHeight">@dimen/size_btn_small</item>
|
||||||
<item name="android:textSize">@dimen/text_size_medium</item>
|
<item name="android:textSize">@dimen/text_size_medium</item>
|
||||||
<item name="android:gravity">center_vertical</item>
|
<item name="android:gravity">center_vertical</item>
|
||||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
|
||||||
<item name="android:fontFamily">@font/inter_semibold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
|
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
|
||||||
|
</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Detail" parent="Widget.Auxio.TextView.Base">
|
<style name="Widget.Auxio.TextView.Detail" parent="Widget.Auxio.TextView.Base">
|
||||||
<item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
|
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline5</item>
|
||||||
<item name="android:textSize">@dimen/text_size_huge</item>
|
|
||||||
<item name="android:textAlignment">viewStart</item>
|
<item name="android:textAlignment">viewStart</item>
|
||||||
<item name="android:fontFamily">@font/inter_bold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Icon" parent="Widget.Auxio.TextView.Base">
|
<style name="Widget.Auxio.TextView.Icon" parent="Widget.Auxio.TextView.Base">
|
||||||
<item name="android:drawablePadding">@dimen/spacing_medium</item>
|
<item name="android:drawablePadding">@dimen/spacing_medium</item>
|
||||||
<item name="android:padding">@dimen/spacing_medium</item>
|
<item name="android:padding">@dimen/spacing_medium</item>
|
||||||
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Subhead</item>
|
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Icon.Clickable" parent="Widget.Auxio.TextView.Icon">
|
<style name="Widget.Auxio.TextView.Icon.Clickable" parent="Widget.Auxio.TextView.Icon">
|
||||||
|
|
Loading…
Reference in a new issue