revert "style: migrate to roboto"

I want to hold off with this migration actually. I feel like it's too
jarring of a change to be included as of right now.
This reverts commit 50170f202e.

app/src/main/AndroidManifest.xml

@@ -50,24 +50,29 @@
             </intent-filter>
         </activity>
 
-        <service
-            android:name=".playback.system.PlaybackService"
-            android:foregroundServiceType="mediaPlayback"
-            android:icon="@mipmap/ic_launcher"
-            android:roundIcon="@mipmap/ic_launcher" />
-
-        <!--
-        Workaround to get apps that search for media apps by checking for a BroadcastReceiver
-        to detect Auxio, as we let the media APIs handle this.
-        -->
-        <receiver android:name="androidx.media.session.MediaButtonReceiver"
-            android:label="Auxio"
+        <receiver
+            android:name="androidx.media.session.MediaButtonReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
         </receiver>
 
+        <service
+            android:name=".playback.system.PlaybackService"
+            android:foregroundServiceType="mediaPlayback"
+            android:icon="@mipmap/ic_launcher"
+            android:exported="true"
+            android:roundIcon="@mipmap/ic_launcher">
+            <!--
+            Workaround to get apps that search for media apps by checking for a BroadcastReceiver
+            to detect Auxio, as we let the media APIs handle this.
+            -->
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </service>
+
         <receiver
             android:name=".widgets.WidgetProvider"
             android:exported="false"

app/src/main/java/org/oxycblt/auxio/coil/Fetchers.kt

@@ -34,7 +34,6 @@ import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.ui.Sort
-import org.oxycblt.auxio.util.logD
 import kotlin.math.min
 
 /**
@@ -82,12 +81,9 @@ class ArtistImageFetcher private constructor(
             .sortAlbums(artist.albums)
 
         val results = albums.mapAtMost(4) { album ->
-            logD("${artist.name} ${album.name}")
             fetchArt(context, album)
         }
 
-        logD("OK: ${artist.name}")
-
         return createMosaic(context, results, size)
     }
 

app/src/main/java/org/oxycblt/auxio/music/Models.kt

@@ -204,7 +204,7 @@ data class Genre(
  */
 data class Header(
     override val id: Long,
-    @StringRes val string: Int
+    @StringRes val string: Int,
 ) : BaseModel()
 
 /**

app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt

@@ -214,6 +214,7 @@ class PlaybackViewModel : ViewModel(), PlaybackStateManager.Callback {
      */
     fun removeQueueDataItem(adapterIndex: Int, apply: () -> Unit) {
         val adjusted = adapterIndex + (playbackManager.queue.size - mNextUp.value!!.size)
+        logD("$adjusted")
 
         if (adjusted in playbackManager.queue.indices) {
             apply()

app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt

@@ -284,6 +284,7 @@ class PlaybackStateManager private constructor() {
 
         if (index > mQueue.size || index < 0) {
             logE("Index is out of bounds, did not remove queue item.")
+
             return false
         }
 
@@ -300,6 +301,7 @@ class PlaybackStateManager private constructor() {
     fun moveQueueItems(from: Int, to: Int): Boolean {
         if (from > mQueue.size || from < 0 || to > mQueue.size || to < 0) {
             logE("Indices were out of bounds, did not move queue item")
+
             return false
         }
 

app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt

@@ -30,6 +30,7 @@ import android.media.AudioManager
 import android.os.Build
 import android.os.IBinder
 import android.support.v4.media.session.MediaSessionCompat
+import androidx.media.session.MediaButtonReceiver
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
@@ -102,8 +103,9 @@ class PlaybackService : Service(), Player.Listener, PlaybackStateManager.Callbac
     // --- SERVICE OVERRIDES ---
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        logD("Service is active.")
-
+        // Since this service exposes a media button intent, pass it off to the
+        // MediaSession if the intent really is an instance of one.
+        MediaButtonReceiver.handleIntent(mediaSession, intent)
         return START_NOT_STICKY
     }
 

app/src/main/res/layout-sw600dp/item_detail.xml

@@ -24,6 +24,7 @@
             style="@style/Widget.Auxio.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:fontFamily="@font/inter_semibold"
             android:layout_marginStart="@dimen/spacing_medium"
             android:ellipsize="end"
             android:maxLines="1"

app/src/main/res/layout/item_album_song.xml

@@ -24,7 +24,7 @@
             android:text="@{String.valueOf(song.track)}"
             android:textAlignment="center"
             android:textAppearance="@style/TextAppearance.Auxio.TitleMidLarge"
-            android:fontFamily="sans-serif"
+            android:fontFamily="@font/inter"
             android:textColor="@color/sel_accented_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/widget_default.xml

@@ -25,6 +25,7 @@
         android:padding="@dimen/spacing_medium"
         android:text="@string/def_playback"
         android:textAppearance="@style/TextAppearance.Auxio.TitleMidLarge"
-        android:textColor="?android:attr/textColorPrimary" />
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold" />
 
 </FrameLayout>

app/src/main/res/values/styles_android.xml

@@ -16,7 +16,7 @@
 
     <!-- Custom dialog title theme -->
     <style name="Widget.Auxio.Dialog.TextView" parent="MaterialAlertDialog.Material3.Title.Text">
-        <item name="android:textAppearance">@style/TextAppearance.Auxio.TitleLarge</item>
+        <item name="android:textAppearance">@style/TextAppearance.Auxio.TitleMidLarge</item>
     </style>
 
     <!-- The style for the checked text view in the custom dialog -->
@@ -39,7 +39,7 @@
 
     <!-- Widget TextView that mimics the main Auxio Primary TextView -->
     <style name="Widget.Auxio.TextView.Primary.AppWidget" parent="Widget.Auxio.TextView.AppWidget">
-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">bold</item>
         <item name="android:textAppearance">@style/TextAppearance.Auxio.TitleMidLarge</item>
     </style>
 

app/src/main/res/values/typography.xml

@@ -2,81 +2,98 @@
 <resources>
     <!-- Basic Material3 typography -->
     <style name="TextAppearance.Auxio.DisplayLarge" parent="TextAppearance.Material3.DisplayLarge">
-        <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
     </style>
 
     <style name="TextAppearance.Auxio.DisplayMedium" parent="TextAppearance.Material3.DisplayMedium">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Auxio.DisplaySmall" parent="TextAppearance.Material3.DisplaySmall">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
     </style>
-
+    
     <style name="TextAppearance.Auxio.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
-        <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
     </style>
 
     <style name="TextAppearance.Auxio.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Auxio.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Auxio.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
-        <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
     </style>
 
     <style name="TextAppearance.Auxio.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
     </style>
 
     <style name="TextAppearance.Auxio.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
     </style>
 
-    <style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge" />
-    <style name="TextAppearance.Auxio.LabelMedium" parent="TextAppearance.Material3.LabelMedium" />
-    <style name="TextAppearance.Auxio.LabelSmall" parent="TextAppearance.Material3.LabelSmall" />
-    <style name="TextAppearance.Auxio.BodyLarge" parent="TextAppearance.Material3.BodyLarge" />
-    <style name="TextAppearance.Auxio.BodyMedium" parent="TextAppearance.Material3.BodyMedium" />
-    <style name="TextAppearance.Auxio.BodySmall" parent="TextAppearance.Material3.BodySmall" />
+    <style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
+    </style>
+
+    <style name="TextAppearance.Auxio.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
+    </style>
+
+    <style name="TextAppearance.Auxio.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
+    </style>
+
+    <style name="TextAppearance.Auxio.BodyLarge" parent="TextAppearance.Material3.BodyLarge">
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
+    </style>
+
+    <style name="TextAppearance.Auxio.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
+    </style>
+
+    <style name="TextAppearance.Auxio.BodySmall" parent="TextAppearance.Material3.BodySmall">
+        <item name="fontFamily">@font/inter</item>
+        <item name="android:fontFamily">@font/inter</item>
+    </style>
 
     <!--
     Text extensions
     Material3 TextAppearances are really inflexible, so these add some extra categories that
     allow for better UX.
     -->
-    <style name="TextAppearance.Auxio.TitleMidLarge" parent="TextAppearance.Material3.TitleMedium">
+    <style name="TextAppearance.Auxio.TitleMidLarge" parent="TextAppearance.Auxio.TitleMedium">
         <item name="android:textSize">20sp</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
     </style>
 
-    <style name="TextAppearance.Auxio.TitleSmallish" parent="TextAppearance.Material3.TitleSmall">
+    <style name="TextAppearance.Auxio.TitleSmallish" parent="TextAppearance.Auxio.TitleSmall">
         <item name="android:textSize">18sp</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:fontFamily">@font/inter_semibold</item>
     </style>
 
     <style name="TextAppearance.Auxio.LabelLarger" parent="TextAppearance.Auxio.LabelLarge">
         <item name="android:textSize">16sp</item>
-        <item name="android:letterSpacing">0.03125</item>
     </style>
 </resources>