diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
index 56c94fc15..8f65f143f 100644
--- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
@@ -102,6 +102,8 @@ class WidgetProvider : AppWidgetProvider() {
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) {
builder.transformations(
RoundedCornersTransformation(
diff --git a/app/src/main/res/font/inter_bold.ttf b/app/src/main/res/font/inter_bold.ttf
deleted file mode 100644
index e98b84ce8..000000000
Binary files a/app/src/main/res/font/inter_bold.ttf and /dev/null differ
diff --git a/app/src/main/res/layout-land/item_detail.xml b/app/src/main/res/layout-land/item_detail.xml
index ef06b8166..d7fc875b0 100644
--- a/app/src/main/res/layout-land/item_detail.xml
+++ b/app/src/main/res/layout-land/item_detail.xml
@@ -38,26 +38,28 @@
diff --git a/app/src/main/res/layout-large/item_detail.xml b/app/src/main/res/layout-large/item_detail.xml
index e9d2553e8..6f4d63930 100644
--- a/app/src/main/res/layout-large/item_detail.xml
+++ b/app/src/main/res/layout-large/item_detail.xml
@@ -36,26 +36,26 @@
diff --git a/app/src/main/res/layout/dialog_excluded.xml b/app/src/main/res/layout/dialog_excluded.xml
index f8d4995ca..e3383f47e 100644
--- a/app/src/main/res/layout/dialog_excluded.xml
+++ b/app/src/main/res/layout/dialog_excluded.xml
@@ -28,7 +28,7 @@
android:padding="@dimen/spacing_medium"
android:text="@string/lbl_no_dirs"
android:textAlignment="center"
- android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
android:textColor="?android:attr/textColorSecondary" />
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 55306cb66..53f5eb3d9 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -35,7 +35,6 @@
android:id="@+id/search_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@android:color/transparent"
android:hint="@string/hint_search_library"
android:padding="@dimen/spacing_medium"
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index eb2bfdfbe..81b61db5a 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -23,9 +23,8 @@
android:minWidth="@dimen/size_track_number"
android:text="@{String.valueOf(song.track)}"
android:textAlignment="center"
- android:textAppearance="?android:attr/textAppearanceListItem"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
android:textColor="@color/sel_accented_secondary"
- android:textSize="@dimen/text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml
index 391228763..1efd844b8 100644
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -24,7 +24,7 @@
16sp
18sp
20sp
- 26sp
+ 24sp
34sp
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index 7096e77f2..e4f55086a 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -13,7 +13,7 @@
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 57a5272d1..7f50a79eb 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -20,7 +20,7 @@
@@ -59,7 +59,6 @@
@@ -89,12 +88,12 @@
@@ -135,21 +134,21 @@
- @dimen/size_btn_small
- @dimen/text_size_medium
- center_vertical
- - ?android:attr/textColorPrimary
- @font/inter_semibold
+ - @style/TextAppearance.MaterialComponents.Headline6
+