Merge branch "refactor/tech-debt-erasure" into "dev"

app/src/main/java/com/dd3boh/outertune/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.dd3boh.outertune
 
+import android.Manifest
 import android.annotation.SuppressLint
 import android.content.ComponentName
 import android.content.Context
@@ -10,17 +11,33 @@ import android.graphics.drawable.BitmapDrawable
 import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
+import android.os.Looper
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
 import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.Crossfade
-import androidx.compose.animation.core.*
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.add
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
@@ -29,9 +46,29 @@ import androidx.compose.material.icons.rounded.Language
 import androidx.compose.material.icons.rounded.LibraryMusic
 import androidx.compose.material.icons.rounded.Search
 import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.contentColorFor
+import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -51,11 +88,6 @@ import androidx.compose.ui.util.fastFirstOrNull
 import androidx.compose.ui.util.fastForEach
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import android.Manifest
-import android.os.Looper
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.RequiresApi
 import androidx.core.net.toUri
 import androidx.core.util.Consumer
 import androidx.core.view.WindowCompat
@@ -71,22 +103,53 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import coil.imageLoader
 import coil.request.ImageRequest
-import com.valentinilk.shimmer.LocalShimmerTheme
-import com.zionhuang.innertube.YouTube
-import com.zionhuang.innertube.models.SongItem
-import com.dd3boh.outertune.constants.*
+import com.dd3boh.outertune.constants.AppBarHeight
+import com.dd3boh.outertune.constants.AutomaticScannerKey
+import com.dd3boh.outertune.constants.DarkModeKey
+import com.dd3boh.outertune.constants.DefaultOpenTabKey
+import com.dd3boh.outertune.constants.DefaultOpenTabNewKey
+import com.dd3boh.outertune.constants.DynamicThemeKey
+import com.dd3boh.outertune.constants.ExcludedScanPathsKey
+import com.dd3boh.outertune.constants.LibraryFilter
+import com.dd3boh.outertune.constants.LibraryFilterKey
+import com.dd3boh.outertune.constants.LookupYtmArtistsKey
+import com.dd3boh.outertune.constants.MiniPlayerHeight
+import com.dd3boh.outertune.constants.NavigationBarAnimationSpec
+import com.dd3boh.outertune.constants.NavigationBarHeight
+import com.dd3boh.outertune.constants.NewInterfaceKey
+import com.dd3boh.outertune.constants.PauseSearchHistoryKey
+import com.dd3boh.outertune.constants.PlayerBackgroundStyleKey
+import com.dd3boh.outertune.constants.PureBlackKey
+import com.dd3boh.outertune.constants.ScanPathsKey
+import com.dd3boh.outertune.constants.ScannerMatchCriteria
+import com.dd3boh.outertune.constants.ScannerSensitivityKey
+import com.dd3boh.outertune.constants.ScannerStrictExtKey
+import com.dd3boh.outertune.constants.SearchSource
+import com.dd3boh.outertune.constants.SearchSourceKey
 import com.dd3boh.outertune.db.MusicDatabase
 import com.dd3boh.outertune.db.entities.SearchHistory
-import com.dd3boh.outertune.extensions.*
+import com.dd3boh.outertune.extensions.toEnum
 import com.dd3boh.outertune.playback.DownloadUtil
 import com.dd3boh.outertune.playback.MusicService
 import com.dd3boh.outertune.playback.MusicService.MusicBinder
 import com.dd3boh.outertune.playback.PlayerConnection
-import com.dd3boh.outertune.ui.component.*
+import com.dd3boh.outertune.ui.component.BottomSheetMenu
+import com.dd3boh.outertune.ui.component.LocalMenuState
+import com.dd3boh.outertune.ui.component.SearchBar
+import com.dd3boh.outertune.ui.component.rememberBottomSheetState
 import com.dd3boh.outertune.ui.component.shimmer.ShimmerTheme
 import com.dd3boh.outertune.ui.menu.YouTubeSongMenu
 import com.dd3boh.outertune.ui.player.BottomSheetPlayer
-import com.dd3boh.outertune.ui.screens.*
+import com.dd3boh.outertune.ui.screens.AccountScreen
+import com.dd3boh.outertune.ui.screens.AlbumScreen
+import com.dd3boh.outertune.ui.screens.HistoryScreen
+import com.dd3boh.outertune.ui.screens.HomeScreen
+import com.dd3boh.outertune.ui.screens.LoginScreen
+import com.dd3boh.outertune.ui.screens.MoodAndGenresScreen
+import com.dd3boh.outertune.ui.screens.NewReleaseScreen
+import com.dd3boh.outertune.ui.screens.Screens
+import com.dd3boh.outertune.ui.screens.StatsScreen
+import com.dd3boh.outertune.ui.screens.YouTubeBrowseScreen
 import com.dd3boh.outertune.ui.screens.artist.ArtistItemsScreen
 import com.dd3boh.outertune.ui.screens.artist.ArtistScreen
 import com.dd3boh.outertune.ui.screens.artist.ArtistSongsScreen
@@ -102,12 +165,29 @@ import com.dd3boh.outertune.ui.screens.playlist.OnlinePlaylistScreen
 import com.dd3boh.outertune.ui.screens.search.LocalSearchScreen
 import com.dd3boh.outertune.ui.screens.search.OnlineSearchResult
 import com.dd3boh.outertune.ui.screens.search.OnlineSearchScreen
-import com.dd3boh.outertune.ui.screens.settings.*
-import com.dd3boh.outertune.ui.theme.*
+import com.dd3boh.outertune.ui.screens.settings.AboutScreen
+import com.dd3boh.outertune.ui.screens.settings.AppearanceSettings
+import com.dd3boh.outertune.ui.screens.settings.BackupAndRestore
+import com.dd3boh.outertune.ui.screens.settings.ContentSettings
+import com.dd3boh.outertune.ui.screens.settings.DarkMode
+import com.dd3boh.outertune.ui.screens.settings.ExperimentalSettings
+import com.dd3boh.outertune.ui.screens.settings.LocalPlayerSettings
+import com.dd3boh.outertune.ui.screens.settings.LyricsSettings
+import com.dd3boh.outertune.ui.screens.settings.NavigationTab
+import com.dd3boh.outertune.ui.screens.settings.NavigationTabNew
+import com.dd3boh.outertune.ui.screens.settings.PlayerBackgroundStyle
+import com.dd3boh.outertune.ui.screens.settings.PlayerSettings
+import com.dd3boh.outertune.ui.screens.settings.PrivacySettings
+import com.dd3boh.outertune.ui.screens.settings.SettingsScreen
+import com.dd3boh.outertune.ui.screens.settings.StorageSettings
+import com.dd3boh.outertune.ui.theme.ColorSaver
+import com.dd3boh.outertune.ui.theme.DefaultThemeColor
+import com.dd3boh.outertune.ui.theme.OuterTuneTheme
+import com.dd3boh.outertune.ui.theme.extractThemeColor
 import com.dd3boh.outertune.ui.utils.DEFAULT_SCAN_PATH
 import com.dd3boh.outertune.ui.utils.appBarScrollBehavior
-import com.dd3boh.outertune.ui.utils.getLocalThumbnail
 import com.dd3boh.outertune.ui.utils.cacheDirectoryTree
+import com.dd3boh.outertune.ui.utils.getLocalThumbnail
 import com.dd3boh.outertune.ui.utils.resetHeightOffset
 import com.dd3boh.outertune.utils.SyncUtils
 import com.dd3boh.outertune.utils.dataStore
@@ -119,13 +199,15 @@ import com.dd3boh.outertune.utils.reportException
 import com.dd3boh.outertune.utils.scanners.LocalMediaScanner
 import com.dd3boh.outertune.utils.scanners.LocalMediaScanner.Companion.unloadAdvancedScanner
 import com.dd3boh.outertune.utils.scanners.ScannerAbortException
+import com.valentinilk.shimmer.LocalShimmerTheme
+import com.zionhuang.innertube.YouTube
+import com.zionhuang.innertube.models.SongItem
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.net.URLDecoder
 import java.net.URLEncoder
 import javax.inject.Inject
 

app/src/main/java/com/dd3boh/outertune/db/DatabaseDao.kt

@@ -10,9 +10,6 @@ import androidx.room.Transaction
 import androidx.room.Update
 import androidx.room.Upsert
 import androidx.sqlite.db.SupportSQLiteQuery
-import com.zionhuang.innertube.models.SongItem
-import com.zionhuang.innertube.pages.AlbumPage
-import com.zionhuang.innertube.pages.ArtistPage
 import com.dd3boh.outertune.constants.AlbumSortType
 import com.dd3boh.outertune.constants.ArtistSongSortType
 import com.dd3boh.outertune.constants.ArtistSortType
@@ -48,12 +45,12 @@ import com.dd3boh.outertune.models.toMediaMetadata
 import com.dd3boh.outertune.ui.utils.resize
 import com.zionhuang.innertube.models.AlbumItem
 import com.zionhuang.innertube.models.PlaylistItem
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
+import com.zionhuang.innertube.models.SongItem
+import com.zionhuang.innertube.pages.AlbumPage
+import com.zionhuang.innertube.pages.ArtistPage
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import java.time.LocalDateTime
 import java.time.ZoneOffset

app/src/main/java/com/dd3boh/outertune/db/MusicDatabase.kt

@@ -1,19 +1,30 @@
 package com.dd3boh.outertune.db
 
 import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import androidx.core.content.contentValuesOf
-import androidx.room.*
-import androidx.room.migration.AutoMigrationSpec
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import androidx.sqlite.db.SupportSQLiteOpenHelper
-import com.dd3boh.outertune.db.entities.*
-import com.dd3boh.outertune.extensions.toSQLiteQuery
-import java.time.Instant
-import java.time.LocalDateTime
-import java.time.ZoneOffset
-import java.util.*
+import com.dd3boh.outertune.db.entities.AlbumArtistMap
+import com.dd3boh.outertune.db.entities.AlbumEntity
+import com.dd3boh.outertune.db.entities.ArtistEntity
+import com.dd3boh.outertune.db.entities.Event
+import com.dd3boh.outertune.db.entities.FormatEntity
+import com.dd3boh.outertune.db.entities.GenreEntity
+import com.dd3boh.outertune.db.entities.LyricsEntity
+import com.dd3boh.outertune.db.entities.PlayCountEntity
+import com.dd3boh.outertune.db.entities.PlaylistEntity
+import com.dd3boh.outertune.db.entities.PlaylistSongMap
+import com.dd3boh.outertune.db.entities.PlaylistSongMapPreview
+import com.dd3boh.outertune.db.entities.RelatedSongMap
+import com.dd3boh.outertune.db.entities.SearchHistory
+import com.dd3boh.outertune.db.entities.SongAlbumMap
+import com.dd3boh.outertune.db.entities.SongArtistMap
+import com.dd3boh.outertune.db.entities.SongEntity
+import com.dd3boh.outertune.db.entities.SongGenreMap
+import com.dd3boh.outertune.db.entities.SortedSongAlbumMap
+import com.dd3boh.outertune.db.entities.SortedSongArtistMap
 
 class MusicDatabase(
     private val delegate: InternalDatabase,

app/src/main/java/com/dd3boh/outertune/db/entities/AlbumEntity.kt

@@ -1,7 +1,6 @@
 package com.dd3boh.outertune.db.entities
 
 import androidx.compose.runtime.Immutable
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.zionhuang.innertube.YouTube

app/src/main/java/com/dd3boh/outertune/db/entities/ArtistEntity.kt

@@ -1,7 +1,6 @@
 package com.dd3boh.outertune.db.entities
 
 import androidx.compose.runtime.Immutable
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.zionhuang.innertube.YouTube

app/src/main/java/com/dd3boh/outertune/db/entities/PlaylistEntity.kt

@@ -1,11 +1,9 @@
 package com.dd3boh.outertune.db.entities
 
 import androidx.compose.runtime.Immutable
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.zionhuang.innertube.YouTube
-import com.zionhuang.innertube.models.WatchEndpoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel

app/src/main/java/com/dd3boh/outertune/db/entities/SongEntity.kt

@@ -1,7 +1,6 @@
 package com.dd3boh.outertune.db.entities
 
 import androidx.compose.runtime.Immutable
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey

app/src/main/java/com/dd3boh/outertune/playback/SleepTimer.kt

@@ -1,6 +1,7 @@
 package com.dd3boh.outertune.playback
 
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.media3.common.MediaItem
@@ -16,7 +17,7 @@ class SleepTimer(
     val player: Player,
 ) : Player.Listener {
     private var sleepTimerJob: Job? = null
-    var triggerTime by mutableStateOf(-1L)
+    var triggerTime by mutableLongStateOf(-1L)
         private set
     var pauseWhenSongEnd by mutableStateOf(false)
         private set

app/src/main/java/com/dd3boh/outertune/ui/component/BigSeekBar.kt

@@ -23,7 +23,7 @@ fun BigSeekBar(
     color: Color = MaterialTheme.colorScheme.primary,
 ) {
     var width by remember {
-        mutableStateOf(0f)
+        mutableFloatStateOf(0f)
     }
 
     Canvas(

app/src/main/java/com/dd3boh/outertune/ui/component/BottomSheet.kt

@@ -26,7 +26,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -310,7 +310,7 @@ fun rememberBottomSheetState(
     val coroutineScope = rememberCoroutineScope()
 
     var previousAnchor by rememberSaveable {
-        mutableStateOf(initialAnchor)
+        mutableIntStateOf(initialAnchor)
     }
     val animatable = remember {
         Animatable(0.dp, Dp.VectorConverter)

app/src/main/java/com/dd3boh/outertune/ui/component/ChipsRow.kt

@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
 import androidx.compose.material3.MaterialTheme
@@ -22,7 +21,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun <E> ChipsRow(
     chips: List<Pair<E, String>>,