all: minor improvements
Add some minor UI tweaks that accumulated over this week.
This commit is contained in:
parent
a5f65d39a5
commit
fed6902c21
31 changed files with 23 additions and 89 deletions
|
@ -5,7 +5,7 @@ apply plugin: "androidx.navigation.safeargs.kotlin"
|
|||
|
||||
android {
|
||||
compileSdkVersion 31
|
||||
buildToolsVersion "30.0.3"
|
||||
buildToolsVersion "31.0.0"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "org.oxycblt.auxio"
|
||||
|
@ -13,7 +13,7 @@ android {
|
|||
versionCode 7
|
||||
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 30 // Note: Do not increment until platform stability
|
||||
targetSdkVersion 31
|
||||
|
||||
buildFeatures {
|
||||
dataBinding true
|
||||
|
@ -91,7 +91,7 @@ dependencies {
|
|||
// --- THIRD PARTY ---
|
||||
|
||||
// ExoPlayer
|
||||
implementation "com.google.android.exoplayer:exoplayer-core:2.14.2"
|
||||
implementation "com.google.android.exoplayer:exoplayer-core:2.15.0"
|
||||
|
||||
// Image loading
|
||||
implementation 'io.coil-kt:coil:1.3.2'
|
||||
|
|
|
@ -37,6 +37,9 @@ import org.oxycblt.auxio.ui.isLandscape
|
|||
|
||||
/**
|
||||
* Fragment that handles what to display during the loading process.
|
||||
* TODO: Figure out how to phase out the loading screen since
|
||||
* Android 12 is annoyingly stubborn about having one splash
|
||||
* screen and one splash screen only.
|
||||
* @author OxygenCobalt
|
||||
*/
|
||||
class LoadingFragment : Fragment() {
|
||||
|
|
|
@ -32,8 +32,8 @@ import android.os.IBinder
|
|||
import android.os.PowerManager
|
||||
import android.support.v4.media.session.MediaSessionCompat
|
||||
import com.google.android.exoplayer2.C
|
||||
import com.google.android.exoplayer2.ExoPlaybackException
|
||||
import com.google.android.exoplayer2.MediaItem
|
||||
import com.google.android.exoplayer2.PlaybackException
|
||||
import com.google.android.exoplayer2.Player
|
||||
import com.google.android.exoplayer2.RenderersFactory
|
||||
import com.google.android.exoplayer2.SimpleExoPlayer
|
||||
|
@ -242,7 +242,7 @@ class PlaybackService : Service(), Player.Listener, PlaybackStateManager.Callbac
|
|||
acquireWakeLock()
|
||||
}
|
||||
|
||||
override fun onPlayerError(error: ExoPlaybackException) {
|
||||
override fun onPlayerError(error: PlaybackException) {
|
||||
// If there's any issue, just go to the next song.
|
||||
playbackManager.next()
|
||||
}
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="?attr/colorAccent"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M11 15h2v2h-2zm0-8h2v6h-2zm0.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />
|
||||
</vector>
|
|
@ -16,18 +16,13 @@
|
|||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
<!--
|
||||
TODO: Get this to line up with Android 12's splash screen when I can figure
|
||||
out what they do
|
||||
-->
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/loading_splash"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:src="@drawable/ic_launcher_foreground"
|
||||
android:contentDescription="@string/desc_auxio_icon"
|
||||
android:padding="@dimen/spacing_huge"
|
||||
android:src="@drawable/ic_launcher_foreground" />
|
||||
android:padding="@dimen/spacing_huge" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/loading_panel"
|
||||
|
@ -54,7 +49,7 @@
|
|||
android:fontFamily="@font/inter_semibold"
|
||||
android:textAlignment="center"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:textSize="@dimen/text_size_mid_large"
|
||||
android:textSize="@dimen/text_size_medium"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintBottom_toTopOf="@+id/loading_action_button"
|
||||
tools:text="No Music Found" />
|
||||
|
|
|
@ -15,7 +15,8 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/song_track"
|
||||
android:layout_width="@dimen/width_track_number"
|
||||
android:layout_width="wrap_content"
|
||||
android:minWidth="@dimen/width_track_number"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@{@string/desc_track_number(song.track)}"
|
||||
android:gravity="center"
|
||||
|
@ -24,11 +25,7 @@
|
|||
android:textAlignment="center"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
android:textColor="?android:attr/textColorTertiary"
|
||||
android:textSize="@dimen/text_size_track_max"
|
||||
app:autoSizeMaxTextSize="@dimen/text_size_detail_header_max"
|
||||
app:autoSizeMinTextSize="@dimen/text_size_min"
|
||||
app:autoSizeStepGranularity="@dimen/text_size_increment"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textSize="@dimen/text_size_large"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
android:fontFamily="@font/inter_semibold"
|
||||
android:gravity="center"
|
||||
android:textColor="?android:attr/windowBackground"
|
||||
android:textSize="@dimen/text_size_mid_large"
|
||||
android:textSize="@dimen/text_size_medium"
|
||||
tools:text="A" />
|
||||
|
||||
</FrameLayout>
|
||||
|
|
|
@ -114,7 +114,6 @@
|
|||
<string name="desc_clear_search">Suchanfrage löschen</string>
|
||||
<string name="desc_clear_user_queue">Warteschlange entleeren</string>
|
||||
|
||||
<string name="desc_error">Fehler</string>
|
||||
<string name="desc_auxio_icon">Auxio-Icon</string>
|
||||
<string name="desc_album_cover">Albumcover für %s</string>
|
||||
<string name="desc_artist_image">Künstlerbild für %s</string>
|
||||
|
|
|
@ -59,8 +59,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Εκκαθάριση ουράς αναπαραγωγής</string>
|
||||
|
||||
<string name="desc_error">Εμφάνιση σφάλματος</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">Αναζήτηση στη βιβλιοθήκη…</string>
|
||||
|
||||
|
|
|
@ -118,7 +118,6 @@
|
|||
<string name="desc_clear_search">Borrar historial de búsqueda</string>
|
||||
<string name="desc_blacklist_delete">Eliminar directorio excluido</string>
|
||||
|
||||
<string name="desc_error">Error</string>
|
||||
<string name="desc_auxio_icon">Auxio icon</string>
|
||||
<string name="desc_album_cover">Carátula de álbum para %s</string>
|
||||
<string name="desc_artist_image">Imagen de artista para %s</string>
|
||||
|
|
|
@ -68,7 +68,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Effacer la file d\'attente</string>
|
||||
|
||||
<string name="desc_error">L’erreur</string>
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">Recherche dans votre bibliothèque…</string>
|
||||
|
||||
|
|
|
@ -54,8 +54,6 @@
|
|||
<!-- Description Namespace | Accessibility Strings -->
|
||||
<string name="desc_play_pause">चलाएं/रोकें</string>
|
||||
|
||||
<string name="desc_error">त्रुटी</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">संग्रह में खोजें</string>
|
||||
|
||||
|
|
|
@ -69,8 +69,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Lejátszási sor</string>
|
||||
|
||||
<string name="desc_error">Hiba</string>
|
||||
|
||||
<!-- Color Label namespace | Accent names -->
|
||||
<string name="clr_red">Piros</string>
|
||||
<string name="clr_pink">Rózsaszínű</string>
|
||||
|
|
|
@ -69,8 +69,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Kosongkan antrean</string>
|
||||
|
||||
<string name="desc_error">Galat</string>
|
||||
|
||||
<!-- Format Namespace | Value formatting/plurals -->
|
||||
|
||||
<plurals name="fmt_song_count">
|
||||
|
|
|
@ -68,8 +68,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Svuota coda</string>
|
||||
|
||||
<string name="desc_error">Errore</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">Cerca nella tua libreria…</string>
|
||||
|
||||
|
|
|
@ -65,8 +65,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">재생 대기열 비우기</string>
|
||||
|
||||
<string name="desc_error">오류</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">저장소 검색…</string>
|
||||
|
||||
|
|
|
@ -116,7 +116,6 @@
|
|||
<string name="desc_clear_search">Zoekopdracht wissen</string>
|
||||
<string name="desc_blacklist_delete">Verwijder uitgesloten map</string>
|
||||
|
||||
<string name="desc_error">Fout</string>
|
||||
<string name="desc_auxio_icon">Auxio pictogram</string>
|
||||
<string name="desc_album_cover">Artist Image voor %s</string>
|
||||
<string name="desc_artist_image">Artist Image voor %s</string>
|
||||
|
|
|
@ -66,8 +66,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Wyczyść kolejkę</string>
|
||||
|
||||
<string name="desc_error">Błąd</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">Szukaj w bibliotece…</string>
|
||||
|
||||
|
|
|
@ -67,8 +67,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Limpar fila</string>
|
||||
|
||||
<string name="desc_error">Erro</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">Procurar na biblioteca…</string>
|
||||
|
||||
|
|
|
@ -68,8 +68,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Limpar fila</string>
|
||||
|
||||
<string name="desc_error">Error</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">Procurar na biblioteca…</string>
|
||||
|
||||
|
|
|
@ -70,8 +70,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Golește lista de redare</string>
|
||||
|
||||
<string name="desc_error">Eroare</string>
|
||||
|
||||
<!-- Color Label namespace | Accent names -->
|
||||
<string name="clr_red">Roșu</string>
|
||||
<string name="clr_pink">Roz</string>
|
||||
|
|
|
@ -67,8 +67,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Очистить очередь</string>
|
||||
|
||||
<string name="desc_error">Ошибка</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">Поиск в библиотеке…</string>
|
||||
|
||||
|
|
|
@ -68,8 +68,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Temizle Kuyruk</string>
|
||||
|
||||
<string name="desc_error">Hata</string>
|
||||
|
||||
<!-- Format Namespace | Value formatting/plurals -->
|
||||
|
||||
<plurals name="fmt_song_count">
|
||||
|
|
|
@ -62,8 +62,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">Очистити черга</string>
|
||||
|
||||
<string name="desc_error">Помилка</string>
|
||||
|
||||
<!-- Format Namespace | Value formatting/plurals -->
|
||||
<string name="fmt_songs_loaded">Пісні завантажено: %d</string>
|
||||
|
||||
|
|
|
@ -60,8 +60,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">清空播放队列</string>
|
||||
|
||||
<string name="desc_error">错误</string>
|
||||
|
||||
<!-- Format Namespace | Value formatting/plurals -->
|
||||
<plurals name="fmt_song_count">
|
||||
<item quantity="other">%d 歌曲</item>
|
||||
|
|
|
@ -66,8 +66,6 @@
|
|||
|
||||
<string name="desc_clear_user_queue">清空播放佇列</string>
|
||||
|
||||
<string name="desc_error">錯誤</string>
|
||||
|
||||
<!-- Hint Namespace | EditText Hints -->
|
||||
<string name="hint_search_library">搜尋音樂庫…</string>
|
||||
|
||||
|
|
|
@ -21,8 +21,6 @@
|
|||
<dimen name="width_fast_scroll">20dp</dimen>
|
||||
|
||||
<!-- Size Namespace | Width & Heights for UI elements -->
|
||||
<dimen name="size_error_icon">48dp</dimen>
|
||||
|
||||
<dimen name="size_small_unb_ripple">18dp</dimen>
|
||||
<dimen name="size_unb_ripple">24dp</dimen>
|
||||
|
||||
|
@ -40,13 +38,10 @@
|
|||
<dimen name="size_app_icon">50dp</dimen>
|
||||
|
||||
<!-- Text Size Namespace | Text Sizes -->
|
||||
<dimen name="text_size_increment">1sp</dimen>
|
||||
<dimen name="text_size_min">10sp</dimen>
|
||||
<dimen name="text_size_track_max">20sp</dimen>
|
||||
<dimen name="text_size_detail_header_max">26sp</dimen>
|
||||
<dimen name="text_size_small">16sp</dimen>
|
||||
<dimen name="text_size_mid_large">18sp</dimen>
|
||||
<dimen name="text_size_toolbar">20sp</dimen>
|
||||
<dimen name="text_size_medium">18sp</dimen>
|
||||
<dimen name="text_size_large">20sp</dimen>
|
||||
<dimen name="text_size_huge">26sp</dimen>
|
||||
|
||||
<!-- Misc -->
|
||||
<dimen name="elevation_small">2dp</dimen>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<string name="info_app_desc">A simple, rational music player for android.</string>
|
||||
<string name="info_channel_name">Music Playback</string>
|
||||
<string name="info_widget_name">Now Playing</string>
|
||||
<string name="info_widget_desc">View and control music playback</string>
|
||||
<string name="info_widget_desc">View and control playing music</string>
|
||||
|
||||
<!-- Label Namespace | Static Labels -->
|
||||
<string name="lbl_retry">Retry</string>
|
||||
|
@ -124,7 +124,6 @@
|
|||
<string name="desc_clear_search">Clear search query</string>
|
||||
<string name="desc_blacklist_delete">Remove excluded directory</string>
|
||||
|
||||
<string name="desc_error">Error</string>
|
||||
<string name="desc_auxio_icon">Auxio icon</string>
|
||||
<string name="desc_no_cover">Album cover</string>
|
||||
<string name="desc_album_cover">Album Cover for %s</string>
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
<style name="Widget.TextView.Dialog.Title" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
|
||||
<item name="android:fontFamily">@font/inter_bold</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textSize">@dimen/text_size_toolbar</item>
|
||||
<item name="android:textSize">@dimen/text_size_large</item>
|
||||
</style>
|
||||
|
||||
<!-- The style for the checked text view in the custom dialog -->
|
||||
|
|
|
@ -76,7 +76,4 @@
|
|||
<item name="android:elevation">@dimen/elevation_normal</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Component.Loading.ImageView.Icon" parent="">
|
||||
<item name="android:src">@drawable/ic_launcher_foreground</item>
|
||||
</style>
|
||||
</resources>
|
|
@ -70,7 +70,7 @@
|
|||
|
||||
<style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
|
||||
<item name="android:fontFamily">@font/inter_bold</item>
|
||||
<item name="android:textSize">@dimen/text_size_toolbar</item>
|
||||
<item name="android:textSize">@dimen/text_size_large</item>
|
||||
</style>
|
||||
|
||||
<style name="ItemLayout">
|
||||
|
@ -146,7 +146,7 @@
|
|||
<item name="android:paddingTop">@dimen/spacing_small</item>
|
||||
<item name="android:paddingBottom">@dimen/spacing_small</item>
|
||||
<item name="android:paddingEnd">@dimen/spacing_medium</item>
|
||||
<item name="android:textSize">@dimen/text_size_mid_large</item>
|
||||
<item name="android:textSize">@dimen/text_size_medium</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||
<item name="android:background">@drawable/ui_header_dividers</item>
|
||||
|
@ -155,18 +155,11 @@
|
|||
|
||||
<style name="Widget.TextView.Detail" parent="@style/Widget.AppCompat.TextView">
|
||||
<item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
|
||||
<item name="android:textSize">@dimen/text_size_detail_header_max</item>
|
||||
<item name="android:maxLines">1</item>
|
||||
<item name="android:ellipsize">end</item>
|
||||
<item name="android:textSize">@dimen/text_size_huge</item>
|
||||
<item name="android:textAlignment">viewStart</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:fontFamily">@font/inter_bold</item>
|
||||
<item name="android:textColor">?attr/colorAccent</item>
|
||||
|
||||
<item name="autoSizeMaxTextSize">@dimen/text_size_detail_header_max</item>
|
||||
<item name="autoSizeMinTextSize">@dimen/text_size_min</item>
|
||||
<item name="autoSizeStepGranularity">@dimen/text_size_increment</item>
|
||||
<item name="autoSizeTextType">uniform</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.TextView.Icon" parent="Widget.AppCompat.TextView">
|
||||
|
|
Loading…
Reference in a new issue