diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a6a59f074..df783de16 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,24 +50,29 @@ - - - - + + + + + + + - logD("${artist.name} ${album.name}") fetchArt(context, album) } - logD("OK: ${artist.name}") - return createMosaic(context, results, size) } diff --git a/app/src/main/java/org/oxycblt/auxio/music/Models.kt b/app/src/main/java/org/oxycblt/auxio/music/Models.kt index 954032c43..2775adc75 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/Models.kt +++ b/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() /** diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt index 8f7fe8597..a741adafe 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt +++ b/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() diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt index 3c5f6ab51..307285400 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt +++ b/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 } diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt index dc98592ac..fdd373db6 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt +++ b/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 } diff --git a/app/src/main/res/font/inter.ttf b/app/src/main/res/font/inter.ttf new file mode 100644 index 000000000..96fd6a12d Binary files /dev/null and b/app/src/main/res/font/inter.ttf differ diff --git a/app/src/main/res/font/inter_semibold.ttf b/app/src/main/res/font/inter_semibold.ttf new file mode 100644 index 000000000..ddb279290 Binary files /dev/null and b/app/src/main/res/font/inter_semibold.ttf differ diff --git a/app/src/main/res/layout-sw600dp/item_detail.xml b/app/src/main/res/layout-sw600dp/item_detail.xml index ed00e99af..e798c2e6d 100644 --- a/app/src/main/res/layout-sw600dp/item_detail.xml +++ b/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" diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml index ac8cf7af7..09e219ba8 100644 --- a/app/src/main/res/layout/item_album_song.xml +++ b/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" diff --git a/app/src/main/res/layout/widget_default.xml b/app/src/main/res/layout/widget_default.xml index abf8a9794..f02d3bf98 100644 --- a/app/src/main/res/layout/widget_default.xml +++ b/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" /> diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml index 598557730..37275b1e6 100644 --- a/app/src/main/res/values/styles_android.xml +++ b/app/src/main/res/values/styles_android.xml @@ -16,7 +16,7 @@ @@ -39,7 +39,7 @@ diff --git a/app/src/main/res/values/typography.xml b/app/src/main/res/values/typography.xml index e76ae0924..0d240ad40 100644 --- a/app/src/main/res/values/typography.xml +++ b/app/src/main/res/values/typography.xml @@ -2,81 +2,98 @@ - + - + + + + + + + + + + - - \ No newline at end of file