Various fixes

reocat · Jan 31, 2025 · 209b614 · 209b614
1 parent 58df9ed
commit 209b614
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 40 deletions.
diff --git a/app/src/main/java/com/dd3boh/outertune/playback/PlayerConnection.kt b/app/src/main/java/com/dd3boh/outertune/playback/PlayerConnection.kt
@@ -46,7 +46,6 @@ class PlayerConnection(
     }.stateIn(scope, SharingStarted.Lazily, player.playWhenReady && player.playbackState != STATE_ENDED)
     val waitingForNetworkConnection: StateFlow<Boolean> = service.waitingForNetworkConnection.asStateFlow()
     val mediaMetadata = MutableStateFlow(player.currentMetadata)
-    val waitingForNetworkConnection: StateFlow<Boolean> = service.waitingForNetworkConnection.asStateFlow()
     val currentSong = mediaMetadata.flatMapLatest {
         database.song(it?.id)
     }

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/menu/PlayerMenu.kt b/app/src/main/java/com/dd3boh/outertune/ui/menu/PlayerMenu.kt
@@ -1,7 +1,6 @@
 package com.dd3boh.outertune.ui.menu
 
 import android.content.Intent
-import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -25,11 +24,9 @@ import androidx.compose.material.icons.rounded.AddCircleOutline
 import androidx.compose.material.icons.rounded.Info
 import androidx.compose.material.icons.rounded.LibraryAdd
 import androidx.compose.material.icons.rounded.LibraryAddCheck
-import androidx.compose.material.icons.rounded.Pause
 import androidx.compose.material.icons.rounded.Radio
 import androidx.compose.material.icons.rounded.RemoveCircleOutline
 import androidx.compose.material.icons.rounded.Share
-import androidx.compose.material.icons.rounded.SkipNext
 import androidx.compose.material.icons.rounded.SlowMotionVideo
 import androidx.compose.material.icons.rounded.Timer
 import androidx.compose.material.icons.rounded.Tune
@@ -75,8 +72,6 @@ import com.dd3boh.outertune.LocalDownloadUtil
 import com.dd3boh.outertune.LocalPlayerConnection
 import com.dd3boh.outertune.R
 import com.dd3boh.outertune.constants.ListItemHeight
-import com.dd3boh.outertune.constants.PlayerOnError
-import com.dd3boh.outertune.constants.PlayerOnErrorActionKey
 import com.dd3boh.outertune.models.MediaMetadata
 import com.dd3boh.outertune.playback.ExoDownloadService
 import com.dd3boh.outertune.playback.PlayerConnection.Companion.queueBoard
@@ -89,7 +84,6 @@ import com.dd3boh.outertune.ui.component.GridMenu
 import com.dd3boh.outertune.ui.component.GridMenuItem
 import com.dd3boh.outertune.ui.component.ListDialog
 import com.dd3boh.outertune.ui.component.SleepTimerGridMenu
-import com.dd3boh.outertune.utils.rememberEnumPreference
 import com.zionhuang.innertube.YouTube
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -453,28 +447,6 @@ fun PlayerMenu(
         ) {
             showPitchTempoDialog = true
         }
-
-        GridMenuItem(
-            icon = when (playerOnErrorAction) {
-                PlayerOnError.PAUSE -> Icons.Rounded.Pause
-                PlayerOnError.SKIP -> Icons.Rounded.SkipNext
-            },
-            title = R.string.on_error
-        ) {
-            val nextState = when (playerOnErrorAction) {
-                PlayerOnError.PAUSE -> PlayerOnError.SKIP
-                PlayerOnError.SKIP -> PlayerOnError.PAUSE
-            }
-
-            toast?.cancel()
-            toast = when (nextState) {
-                PlayerOnError.PAUSE -> Toast.makeText(context, R.string.pause, Toast.LENGTH_SHORT)
-                PlayerOnError.SKIP -> Toast.makeText(context, R.string.play_next, Toast.LENGTH_SHORT)
-            }
-            toast?.show()
-
-            onPlayerOnErrorAction(nextState)
-        }
     }
 }
 

diff --git a/app/src/main/res/values-it/strings-ot.xml b/app/src/main/res/values-it/strings-ot.xml
@@ -121,18 +121,13 @@
     <string name="dev_settings_title">Abilita impostazioni sviluppatore</string>
     <string name="dev_settings_description">Rivela impostazioni avanzate aggiuntive destinate all\'uso in fase di sviluppo</string>
     <string name="oobe_welcome_message">Benvenuto in OuterTune</string>
-    <string name="oobe_ytm_content_description">YouTube Music a portata di mano</string>
-    <string name="oobe_ytm_sync_description">Sincronizzazione dell\'account</string>
-    <string name="oobe_local_playback_description">Riproduzione di musica locale</string>
     <string name="info">Informazione</string>
     <string name="oobe_use_backup">Ho un backup</string>
     <string name="action_back">Indietro</string>
     <string name="action_next">Successivo</string>
     <string name="action_skip">Salta</string>
-    <string name="oobe_ad_free_description">Riproduzione senza pubblicità</string>
     <string name="experimental_settings_title">Sperimentale</string>
     <string name="pause_remote_listen_history">Condividi la cronologia degli ascolti con YouTube Music</string>
-    <string name="oobe_local_scan_tooltip">Clicca qui per cercare i brani</string>
     <string name="m3u_import_song_failed">Impossibile importare:</string>
     <string name="wait_to_reconnect">Attendi per riconnetterti</string>"&gt;
 

diff --git a/app/src/main/res/values-uk/strings-ot.xml b/app/src/main/res/values-uk/strings-ot.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="recent_activity">Нещодавна активність</string>
-    <string name="oobe_ad_free_description">Безплатне відтворення без реклами</string>
     <string name="sort_by_like_date">Коли сподобалося</string>
     <string name="attrib_zhuang">Zion Huang за InnerTune</string>
     <string name="auto_scanner_description">Автоматичний пошук пісень під час відкриття застосунку. Це не перезавантажує метадані наявних пісень.</string>

diff --git a/app/src/main/res/values/strings-ot.xml b/app/src/main/res/values/strings-ot.xml
@@ -29,7 +29,7 @@
     <string name="like_all">Like all</string>
     <string name="delete_lyric_confirm">Do you really want to delete the stored lyrics for \"%s\"?</string>
 
-<!-- Player -->
+    <!-- Player -->
     <string name="err_play_next_on_error">Error occurred. Playing next</string>
     <string name="err_stop_on_error">Error occurred. Playback stopped</string>
     <string name="err_stop_on_too_many_errors">Too many errors. Playback stopped</string>
@@ -107,8 +107,6 @@
     <string name="swipe2Queue_description">Swipe on a song to add it to "enqueue next" directly after currently playing song</string>
     <string name="on_error">On error</string>
     <string name="pause">Pause</string>
-    <string name="wait_to_reconnect">Wait to reconnect</string>">
-
 
     <!--Lyrics settings -->
     <string name="lyrics_settings_title">Lyrics</string>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,11 +6,11 @@ kotlin = "2.1.20-Beta2"
 compose = "1.8.0-beta01"
 lifecycle = "2.8.7"
 material3 = "1.4.0-alpha07"
-media3 = "1.6.0-alpha01"
+media3 = "1.6.0-alpha02"
 room = "2.7.0-alpha13"
 hilt = "2.55"
 ktor = "3.0.3"
-ksp = "2.1.20-Beta1-1.0.29"
+ksp = "2.1.20-Beta2-1.0.29"
 multidex = "2.0.1"
 newpipe = "00cf7dad9e49933c7faaa382c9c7b1e7afb28a7d"
 taglib = "1.0.0-alpha25"