Merge remote-tracking branch 'origin/master'

# Conflicts: # composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/AppBar.kt # composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/home/HomeLibraryModern.kt # composeApp/src/androidMain/kotlin/me/knighthat/GlobalVars.kt
fast4x · Oct 3, 2024 · 3ce3930 · 3ce3930
2 parents 056b4ba + 939f058
commit 3ce3930
Show file tree

Hide file tree

Showing 63 changed files with 228 additions and 298 deletions.
diff --git a/...seApp/src/androidAccrescent/kotlin/it/fast4x/rimusic/ui/screens/settings/OtherSettings.kt b/...seApp/src/androidAccrescent/kotlin/it/fast4x/rimusic/ui/screens/settings/OtherSettings.kt
@@ -92,7 +92,6 @@ import it.fast4x.rimusic.utils.showFoldersOnDeviceKey
 import it.fast4x.rimusic.utils.thumbnailRoundnessKey
 import kotlinx.coroutines.launch
 import me.knighthat.colorPalette
-import me.knighthat.navBarPos
 import me.knighthat.thumbnailShape
 import timber.log.Timber
 import java.io.File
@@ -172,10 +171,10 @@ fun OtherSettings() {
             //.fillMaxSize()
             .fillMaxHeight()
             .fillMaxWidth(
-                if( navBarPos() != NavigationBarPosition.Right )
-                    1f
-                else
+                if( NavigationBarPosition.Right.isCurrent() )
                     Dimensions.contentWidthRightBar
+                else
+                    1f
             )
             .verticalScroll(rememberScrollState())
             /*

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/enums/NavigationBarPosition.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/enums/NavigationBarPosition.kt
@@ -1,8 +1,21 @@
 package it.fast4x.rimusic.enums
 
+import androidx.compose.runtime.Composable
+import it.fast4x.rimusic.utils.navigationBarPositionKey
+import it.fast4x.rimusic.utils.rememberPreference
+
 enum class NavigationBarPosition {
     Left,
     Right,
     Top,
-    Bottom
+    Bottom;
+
+    companion object {
+
+        @Composable
+        fun current() = rememberPreference( navigationBarPositionKey, Bottom ).value
+    }
+
+    @Composable
+    fun isCurrent(): Boolean = current() == this
 }
diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/enums/NavigationBarType.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/enums/NavigationBarType.kt
@@ -1,7 +1,20 @@
 package it.fast4x.rimusic.enums
 
+import androidx.compose.runtime.Composable
+import it.fast4x.rimusic.utils.navigationBarTypeKey
+import it.fast4x.rimusic.utils.rememberPreference
+
 
 enum class NavigationBarType {
     IconAndText,
-    IconOnly
+    IconOnly;
+
+    companion object {
+
+        @Composable
+        fun current(): NavigationBarType = rememberPreference( navigationBarTypeKey, NavigationBarType.IconAndText ).value
+    }
+
+    @Composable
+    fun isCurrent(): Boolean = current() == this
 }
diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/enums/UiType.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/enums/UiType.kt
@@ -1,6 +1,22 @@
 package it.fast4x.rimusic.enums
 
+import androidx.compose.runtime.Composable
+import it.fast4x.rimusic.utils.UiTypeKey
+import it.fast4x.rimusic.utils.rememberPreference
+
 enum class UiType {
     RiMusic,
-    ViMusic
+    ViMusic;
+
+    companion object {
+
+        @Composable
+        fun current(): UiType = rememberPreference( UiTypeKey, RiMusic ).value
+    }
+
+    @Composable
+    fun isCurrent(): Boolean = current() == this
+
+    @Composable
+    fun isNotCurrent(): Boolean = !isCurrent()
 }
diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/NavigationRail.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/NavigationRail.kt
@@ -38,9 +38,7 @@ import it.fast4x.rimusic.ui.styling.favoritesIcon
 import it.fast4x.rimusic.utils.isLandscape
 import it.fast4x.rimusic.utils.semiBold
 import me.knighthat.colorPalette
-import me.knighthat.navBarType
 import me.knighthat.typography
-import me.knighthat.uiType
 
 @Composable
 inline fun NavigationRail(
@@ -76,7 +74,7 @@ inline fun NavigationRail(
                 contentAlignment = Alignment.TopCenter,
                 modifier = Modifier
                     .height(
-                        if( uiType() == UiType.ViMusic )
+                        if( UiType.ViMusic.isCurrent() )
                             if (showButton2)
                                 Dimensions.headerHeight
                             else
@@ -151,7 +149,7 @@ inline fun NavigationRail(
                     }
 
                     val textContent: @Composable () -> Unit = {
-                        if ( navBarType() == NavigationBarType.IconOnly ) {
+                        if ( NavigationBarType.IconOnly.isCurrent() ) {
                             /*
                             BasicText(
                                 text = "",
@@ -180,7 +178,7 @@ inline fun NavigationRail(
                     }
 
                     val iconContent: @Composable () -> Unit = {
-                        if ( navBarType() == NavigationBarType.IconOnly ) {
+                        if ( NavigationBarType.IconOnly.isCurrent() ) {
                             Image(
                                 painter = painterResource(icon),
                                 contentDescription = null,

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/NavigationRailTB.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/NavigationRailTB.kt
@@ -44,8 +44,6 @@ import it.fast4x.rimusic.ui.styling.Dimensions
 import it.fast4x.rimusic.ui.styling.favoritesIcon
 import it.fast4x.rimusic.utils.semiBold
 import me.knighthat.colorPalette
-import me.knighthat.navBarPos
-import me.knighthat.navBarType
 import me.knighthat.typography
 
 @OptIn(UnstableApi::class)
@@ -85,7 +83,7 @@ inline fun NavigationRailTB(
         if (localSheetState.isCollapsed) bottomDp + Dimensions.navigationBarHeight else bottomDp
     else 0.dp
      */
-    val bottomPadding = if ( navBarPos() == NavigationBarPosition.Bottom ) bottomDp else 5.dp
+    val bottomPadding = if ( NavigationBarPosition.Bottom.isCurrent() ) bottomDp else 5.dp
 
     //val topPadding = if (navigationBarPosition == NavigationBarPosition.Top) 30.dp else 0.dp
     val topPadding = 0.dp
@@ -131,7 +129,7 @@ inline fun NavigationRailTB(
                         Box(
                             modifier = contentModifier
                         ) {
-                            if ( navBarType() == NavigationBarType.IconOnly ) {
+                            if ( NavigationBarType.IconOnly.isCurrent() ) {
                                 Image(
                                     painter = painterResource(icon),
                                     contentDescription = null,
@@ -178,7 +176,7 @@ inline fun NavigationRailTB(
                    }
 
                 val scrollState = rememberScrollState()
-                val roundedCornerShape = if ( navBarPos() == NavigationBarPosition.Bottom )
+                val roundedCornerShape = if ( NavigationBarPosition.Bottom.isCurrent() )
                     RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)
                 else RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp)
                 Box(

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/Scaffold.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/Scaffold.kt
@@ -46,8 +46,6 @@ import it.fast4x.rimusic.utils.playerPositionKey
 import it.fast4x.rimusic.utils.rememberPreference
 import it.fast4x.rimusic.utils.transitionEffectKey
 import me.knighthat.colorPalette
-import me.knighthat.navBarPos
-import me.knighthat.uiType
 
 @OptIn(ExperimentalMaterial3Api::class)
 @ExperimentalAnimationApi
@@ -80,7 +78,7 @@ fun Scaffold(
     val transitionEffect by rememberPreference(transitionEffectKey, TransitionEffect.Scale)
     val playerPosition by rememberPreference(playerPositionKey, PlayerPosition.Bottom)
 
-    if ( navBarPos() == NavigationBarPosition.Top || navBarPos() == NavigationBarPosition.Bottom) {
+    if ( NavigationBarPosition.Top.isCurrent() || NavigationBarPosition.Bottom.isCurrent() ) {
             ScaffoldTB(
                 navController = navController,
                 playerEssential = playerEssential,
@@ -109,7 +107,7 @@ fun Scaffold(
         //val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
         val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
         val customModifier =
-            if( uiType() == UiType.RiMusic )
+            if( UiType.RiMusic.isCurrent() )
                 Modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
             else
                 Modifier
@@ -119,7 +117,7 @@ fun Scaffold(
             modifier = customModifier,
             containerColor = colorPalette().background0,
             topBar = {
-                if( uiType() == UiType.RiMusic ) {
+                if( UiType.RiMusic.isCurrent() ) {
                     AppBar(navController)
                 }
             },
@@ -177,10 +175,10 @@ fun Scaffold(
                         )
                     }
 
-                    if ( navBarPos() == NavigationBarPosition.Left )
+                    if ( NavigationBarPosition.Left.isCurrent() )
                         navigationRail()
 
-                    val topPadding = if ( uiType() == UiType.ViMusic ) 30.dp else 0.dp
+                    val topPadding = if ( UiType.ViMusic.isCurrent() ) 30.dp else 0.dp
 
                     AnimatedContent(
                         targetState = tabIndex,
@@ -242,7 +240,7 @@ fun Scaffold(
                             .padding(top = topPadding)
                     )
 
-                    if ( navBarPos() == NavigationBarPosition.Right )
+                    if ( NavigationBarPosition.Right.isCurrent() )
                         navigationRail()
 
                 }

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/ScaffoldTB.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/ScaffoldTB.kt
@@ -51,7 +51,6 @@ import it.fast4x.rimusic.utils.playerPositionKey
 import it.fast4x.rimusic.utils.rememberPreference
 import it.fast4x.rimusic.utils.transitionEffectKey
 import me.knighthat.colorPalette
-import me.knighthat.navBarPos
 
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -117,7 +116,7 @@ fun ScaffoldTB(
             ) {
                 AppBar(navController)
 
-                if ( navBarPos() == NavigationBarPosition.Top )
+                if ( NavigationBarPosition.Top.isCurrent() )
                     navigationRailTB()
 
                 /*
@@ -166,19 +165,15 @@ fun ScaffoldTB(
                     }
                      */
 
-                    if ( navBarPos() == NavigationBarPosition.Bottom )
+                    if ( NavigationBarPosition.Bottom.isCurrent() )
                             navigationRailTB()
 
                 //}
         }
 
     ) {
         val modifierBoxPadding =
-            if ( navBarPos() != NavigationBarPosition.Top )
-                Modifier
-                    .padding(it)
-                    .fillMaxSize()
-            else
+            if ( NavigationBarPosition.Top.isCurrent() )
                 Modifier
                     .padding(it)
                     .padding(
@@ -187,6 +182,10 @@ fun ScaffoldTB(
                             .asPaddingValues()
                     )
                     .fillMaxSize()
+            else
+                Modifier
+                    .padding(it)
+                    .fillMaxSize()
 
         Box(
             modifier = modifierBoxPadding

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/SimpleScaffold.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/SimpleScaffold.kt
@@ -17,8 +17,6 @@ import it.fast4x.rimusic.enums.UiType
 import it.fast4x.rimusic.ui.components.themed.AppBar
 import it.fast4x.rimusic.ui.styling.Dimensions
 import me.knighthat.colorPalette
-import me.knighthat.navBarPos
-import me.knighthat.uiType
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -27,7 +25,7 @@ fun SimpleScaffold(
     content: @Composable () -> Unit
 ) {
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
-    val customModifier = if( uiType() == UiType.RiMusic)
+    val customModifier = if( UiType.RiMusic.isCurrent())
         Modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
     else Modifier
 
@@ -36,7 +34,7 @@ fun SimpleScaffold(
         modifier = customModifier,
         containerColor = colorPalette().background0,
         topBar = {
-            if( uiType() == UiType.RiMusic) {
+            if( UiType.RiMusic.isCurrent()) {
                 AppBar(navController)
             }
         },
@@ -52,10 +50,10 @@ fun SimpleScaffold(
             Surface(
                 modifier = Modifier
                     .fillMaxWidth(
-                        if( navBarPos() != NavigationBarPosition.Right )
-                            1f
-                        else
+                        if( NavigationBarPosition.Right.isCurrent() )
                             Dimensions.contentWidthRightBar
+                        else
+                            1f
                     ),
                 content = content
             )

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/Snackbar.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/Snackbar.kt
@@ -49,7 +49,6 @@ import it.fast4x.rimusic.utils.rememberPreference
 import it.fast4x.rimusic.utils.thumbnailRoundnessKey
 import kotlinx.coroutines.launch
 import me.knighthat.colorPalette
-import me.knighthat.navBarPos
 import me.knighthat.typography
 
 @Composable
@@ -97,7 +96,7 @@ fun Popup(
     val windowsInsets = WindowInsets.systemBars
     val bottomDp = with(density) { windowsInsets.getBottom(density).toDp() }
     val additionalBottomPadding =
-        if ( navBarPos() == NavigationBarPosition.Bottom )
+        if ( NavigationBarPosition.Bottom.isCurrent() )
             Dimensions.additionalVerticalSpaceForFloatingAction
         else
             0.dp

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/AppBar.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/AppBar.kt
@@ -52,7 +52,6 @@ import it.fast4x.rimusic.utils.rememberPreference
 import it.fast4x.rimusic.utils.semiBold
 import me.knighthat.colorPalette
 import me.knighthat.typography
-import me.knighthat.uiType
 
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@@ -66,7 +65,7 @@ fun AppBar(
     var showGames by remember { mutableStateOf(false) }
     //val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
-    val customModifier = if( uiType() == UiType.RiMusic )
+    val customModifier = if( UiType.RiMusic.isCurrent() )
         Modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
     else Modifier
 

diff --git a/...src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/FloatingActionsContainer.kt b/...src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/FloatingActionsContainer.kt
@@ -45,7 +45,6 @@ import it.fast4x.rimusic.utils.rememberPreference
 import it.fast4x.rimusic.utils.scrollingInfo
 import it.fast4x.rimusic.utils.smoothScrollToTop
 import kotlinx.coroutines.launch
-import me.knighthat.navBarPos
 
 @ExperimentalMaterial3Api
 @UnstableApi
@@ -60,7 +59,7 @@ fun BoxScope.MultiFloatingActionsContainer(
     onClickSearch: (() -> Unit)? = null
 ) {
     val additionalBottomPadding =
-        if ( navBarPos() == NavigationBarPosition.Bottom )
+        if ( NavigationBarPosition.Bottom.isCurrent() )
             Dimensions.additionalVerticalSpaceForFloatingAction
         else
             0.dp
@@ -196,7 +195,7 @@ fun BoxScope.FloatingActions(
     onClick: (() -> Unit)? = null
 ) {
     val transition = updateTransition(transitionState, "")
-    val additionalBottomPadding = if ( navBarPos() == NavigationBarPosition.Bottom )
+    val additionalBottomPadding = if ( NavigationBarPosition.Bottom.isCurrent() )
         Dimensions.additionalVerticalSpaceForFloatingAction else 0.dp
     //val bottomPaddingValues = windowInsets.only(WindowInsetsSides.Bottom).asPaddingValues()
     val density = LocalDensity.current