diff --git a/app/build.gradle b/app/build.gradle
index 75bd83da6..a3e59cc66 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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'
diff --git a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
index f9f69c31d..e84566a3f 100644
--- a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
@@ -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() {
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 0b35978c1..25f82464c 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
@@ -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()
}
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
deleted file mode 100644
index 5255c629e..000000000
--- a/app/src/main/res/drawable/ic_error.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index db43f6af4..6b68cb42c 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -16,18 +16,13 @@
android:gravity="center"
android:orientation="vertical">
-
-
+ android:padding="@dimen/spacing_huge" />
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index e87e97b89..05bd61745 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -15,7 +15,8 @@
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 892fa64dc..7e6626396 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -114,7 +114,6 @@
Suchanfrage löschen
Warteschlange entleeren
- Fehler
Auxio-Icon
Albumcover für %s
Künstlerbild für %s
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index b0906019b..cb66358b8 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -59,8 +59,6 @@
Εκκαθάριση ουράς αναπαραγωγής
- Εμφάνιση σφάλματος
-
Αναζήτηση στη βιβλιοθήκη…
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 187866eff..aa628bc4e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -118,7 +118,6 @@
Borrar historial de búsqueda
Eliminar directorio excluido
- Error
Auxio icon
Carátula de álbum para %s
Imagen de artista para %s
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2a4af6a8a..9f8031a15 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -68,7 +68,6 @@
Effacer la file d\'attente
- L’erreur
Recherche dans votre bibliothèque…
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 7d5f04490..3b7f19224 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -54,8 +54,6 @@
चलाएं/रोकें
- त्रुटी
-
संग्रह में खोजें
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e33a919fc..32d032edb 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -69,8 +69,6 @@
Lejátszási sor
- Hiba
-
Piros
Rózsaszínű
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 0e365a976..d830e414f 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -69,8 +69,6 @@
Kosongkan antrean
- Galat
-
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 09096f56a..a52d78df8 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -68,8 +68,6 @@
Svuota coda
- Errore
-
Cerca nella tua libreria…
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b7c7854b5..68c3a6fc9 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -65,8 +65,6 @@
재생 대기열 비우기
- 오류
-
저장소 검색…
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 16b931738..68c1b4232 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -116,7 +116,6 @@
Zoekopdracht wissen
Verwijder uitgesloten map
- Fout
Auxio pictogram
Artist Image voor %s
Artist Image voor %s
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1bda56a42..27b4bf85b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -66,8 +66,6 @@
Wyczyść kolejkę
- Błąd
-
Szukaj w bibliotece…
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ab1f28303..62189a915 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -67,8 +67,6 @@
Limpar fila
- Erro
-
Procurar na biblioteca…
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 0f6a7edba..a219220ff 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -68,8 +68,6 @@
Limpar fila
- Error
-
Procurar na biblioteca…
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 9c7311acb..a0ab9dbdc 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -70,8 +70,6 @@
Golește lista de redare
- Eroare
-
Roșu
Roz
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9c72d41e9..88f5de1fa 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -67,8 +67,6 @@
Очистить очередь
- Ошибка
-
Поиск в библиотеке…
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5a5f8dbb4..a7f69b30f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -68,8 +68,6 @@
Temizle Kuyruk
- Hata
-
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 759c46c0b..fffc7734c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -62,8 +62,6 @@
Очистити черга
- Помилка
-
Пісні завантажено: %d
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index dc44fff2b..5f5eda679 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -60,8 +60,6 @@
清空播放队列
- 错误
-
- %d 歌曲
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index bcd78fa81..2ab47e42f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -66,8 +66,6 @@
清空播放佇列
- 錯誤
-
搜尋音樂庫…
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 988ea6876..18afbc0e6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -21,8 +21,6 @@
20dp
- 48dp
-
18dp
24dp
@@ -40,13 +38,10 @@
50dp
- 1sp
- 10sp
- 20sp
- 26sp
16sp
- 18sp
- 20sp
+ 18sp
+ 20sp
+ 26sp
2dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b84b1961a..117616681 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
A simple, rational music player for android.
Music Playback
Now Playing
- View and control music playback
+ View and control playing music
Retry
@@ -124,7 +124,6 @@
Clear search query
Remove excluded directory
- Error
Auxio icon
Album cover
Album Cover for %s
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index 9ca6a2ab4..e8fd586c9 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -54,7 +54,7 @@
diff --git a/app/src/main/res/values/styles_component.xml b/app/src/main/res/values/styles_component.xml
index 736d583b2..37be39e0f 100644
--- a/app/src/main/res/values/styles_component.xml
+++ b/app/src/main/res/values/styles_component.xml
@@ -76,7 +76,4 @@
- @dimen/elevation_normal
-
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 0346be789..cfeca317e 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -70,7 +70,7 @@