Implement wide screen layout support for the Android

.editorconfig

@@ -1,2 +1,5 @@
 [*.{kt,kts}]
 ktlint_function_naming_ignore_when_annotated_with=Composable
+
+[lib/**]
+ktlint=disabled

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "lib/hotwire-native-android"]
+	path = lib/hotwire-native-android
+	url = https://github.com/aidewoode/hotwire-native-android.git
+	branch = feat/extend_navigtion_bar

androidApp/src/main/java/org/blackcandy/android/MainActivity.kt

@@ -19,12 +19,12 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
-import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.navigation.NavigationBarView
 import dev.hotwire.navigation.activities.HotwireActivity
 import dev.hotwire.navigation.navigator.NavigatorConfiguration
-import dev.hotwire.navigation.tabs.HotwireBottomNavigationController
-import dev.hotwire.navigation.tabs.HotwireBottomTab
+import dev.hotwire.navigation.tabs.HotwireNavigationController
+import dev.hotwire.navigation.tabs.HotwireTab
 import dev.hotwire.navigation.tabs.navigatorConfigurations
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
@@ -37,15 +37,15 @@ import org.blackcandy.shared.viewmodels.MusicServiceViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class MainActivity : HotwireActivity() {
-    private lateinit var bottomNavigationController: HotwireBottomNavigationController
+    private lateinit var navigationController: HotwireNavigationController
 
     private val viewModel: MainViewModel by viewModel()
 
     private val musicServiceViewModel: MusicServiceViewModel by viewModel()
 
     private lateinit var binding: ActivityMainBinding
     private lateinit var playerBottomSheetBehavior: BottomSheetBehavior<FrameLayout>
-    private lateinit var mainTabs: List<HotwireBottomTab>
+    private lateinit var mainTabs: List<HotwireTab>
 
     private val playerBottomSheetCallback by lazy {
         object : BottomSheetBehavior.BottomSheetCallback() {
@@ -242,11 +242,12 @@ class MainActivity : HotwireActivity() {
     }
 
     private fun setupBottomTabs() {
-        val bottomNavigationView = findViewById<BottomNavigationView>(R.id.bottom_nav)
+        val navigationView: NavigationBarView =
+            findViewById(R.id.bottom_nav) ?: findViewById(R.id.rail_nav)
 
-        bottomNavigationController = HotwireBottomNavigationController(this, bottomNavigationView)
-        bottomNavigationController.load(mainTabs, viewModel.selectedTabIndex)
-        bottomNavigationController.setOnTabSelectedListener { index, _ ->
+        navigationController = HotwireNavigationController(this, navigationView)
+        navigationController.load(mainTabs, viewModel.selectedTabIndex)
+        navigationController.setOnTabSelectedListener { index, _ ->
             viewModel.selectedTabIndex = index
         }
     }

androidApp/src/main/java/org/blackcandy/android/MainTabs.kt

@@ -1,11 +1,11 @@
 package org.blackcandy.android
 
 import dev.hotwire.navigation.navigator.NavigatorConfiguration
-import dev.hotwire.navigation.tabs.HotwireBottomTab
+import dev.hotwire.navigation.tabs.HotwireTab
 
-fun buildMainTabs(serverAddress: String): List<HotwireBottomTab> =
+fun buildMainTabs(serverAddress: String): List<HotwireTab> =
     listOf(
-        HotwireBottomTab(
+        HotwireTab(
             title = "Home",
             iconResId = R.drawable.baseline_home_24,
             configuration =
@@ -15,7 +15,7 @@ fun buildMainTabs(serverAddress: String): List<HotwireBottomTab> =
                     navigatorHostId = R.id.home_container,
                 ),
         ),
-        HotwireBottomTab(
+        HotwireTab(
             title = "Library",
             iconResId = R.drawable.baseline_library_music_24,
             configuration =

androidApp/src/main/java/org/blackcandy/android/compose/player/FullPlayer.kt

@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -22,6 +21,8 @@ import org.blackcandy.shared.models.Song
 fun FullPlayer(
     modifier: Modifier = Modifier,
     windowSizeClass: WindowSizeClass,
+    inWideLayout: Boolean = false,
+    inCompactHeight: Boolean = false,
     currentSong: Song?,
     isPlaying: Boolean,
     isLoading: Boolean,
@@ -34,12 +35,9 @@ fun FullPlayer(
     onSeek: (Double) -> Unit,
     onModeSwitchButtonClicked: () -> Unit,
     onFavoriteButtonClicked: () -> Unit,
-    onPlaylistButtonClicked: () -> Unit,
+    onPlaylistButtonClicked: (() -> Unit)? = null,
 ) {
-    if (
-        windowSizeClass.heightSizeClass == WindowHeightSizeClass.Compact &&
-        windowSizeClass.widthSizeClass != WindowWidthSizeClass.Compact
-    ) {
+    if (inCompactHeight) {
         PlayerHorizontalLayout(
             modifier = modifier,
             currentSong = currentSong,
@@ -59,6 +57,7 @@ fun FullPlayer(
     } else {
         PlayerVerticalLayout(
             modifier = modifier,
+            inWideLayout = inWideLayout,
             currentSong = currentSong,
             isPlaying = isPlaying,
             isLoading = isLoading,
@@ -92,7 +91,7 @@ fun PlayerHorizontalLayout(
     onSeek: (Double) -> Unit,
     onModeSwitchButtonClicked: () -> Unit,
     onFavoriteButtonClicked: () -> Unit,
-    onPlaylistButtonClicked: () -> Unit,
+    onPlaylistButtonClicked: (() -> Unit)? = null,
 ) {
     Row(
         modifier =
@@ -153,6 +152,7 @@ fun PlayerHorizontalLayout(
 @Composable
 fun PlayerVerticalLayout(
     modifier: Modifier,
+    inWideLayout: Boolean,
     currentSong: Song?,
     isPlaying: Boolean,
     isLoading: Boolean,
@@ -165,7 +165,7 @@ fun PlayerVerticalLayout(
     onSeek: (Double) -> Unit,
     onModeSwitchButtonClicked: () -> Unit,
     onFavoriteButtonClicked: () -> Unit,
-    onPlaylistButtonClicked: () -> Unit,
+    onPlaylistButtonClicked: (() -> Unit)? = null,
     isExpandedHeight: Boolean,
 ) {
     Column(
@@ -175,7 +175,9 @@ fun PlayerVerticalLayout(
                 .fillMaxWidth()
                 .padding(horizontal = dimensionResource(R.dimen.padding_small)),
     ) {
-        Spacer(modifier = Modifier.weight(1f))
+        if (!inWideLayout) {
+            Spacer(modifier = Modifier.weight(1f))
+        }
 
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
@@ -195,7 +197,7 @@ fun PlayerVerticalLayout(
                 modifier =
                     Modifier
                         .widthIn(max = dimensionResource(R.dimen.player_content_max_width))
-                        .padding(top = dimensionResource(R.dimen.padding_small)),
+                        .padding(vertical = dimensionResource(R.dimen.padding_small)),
                 isPlaying = isPlaying,
                 isLoading = isLoading,
                 largeIcon = true,
@@ -210,7 +212,9 @@ fun PlayerVerticalLayout(
             )
         }
 
-        Spacer(modifier = Modifier.weight(1f))
+        if (!inWideLayout) {
+            Spacer(modifier = Modifier.weight(1f))
+        }
 
         PlayerActions(
             modifier =

androidApp/src/main/java/org/blackcandy/android/compose/player/PlayerActions.kt

@@ -21,7 +21,7 @@ fun PlayerActions(
     isFavorited: Boolean,
     onModeSwitchButtonClicked: () -> Unit,
     onFavoriteButtonClicked: () -> Unit,
-    onPlaylistButtonClicked: () -> Unit,
+    onPlaylistButtonClicked: (() -> Unit)? = null,
 ) {
     Row(
         horizontalArrangement = Arrangement.SpaceBetween,
@@ -53,13 +53,15 @@ fun PlayerActions(
             }
         }
 
-        IconButton(
-            onClick = onPlaylistButtonClicked,
-        ) {
-            Icon(
-                painter = painterResource(R.drawable.baseline_format_list_bulleted_24),
-                contentDescription = stringResource(R.string.playlist),
-            )
+        if (onPlaylistButtonClicked != null) {
+            IconButton(
+                onClick = onPlaylistButtonClicked,
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.baseline_format_list_bulleted_24),
+                    contentDescription = stringResource(R.string.playlist),
+                )
+            }
         }
     }
 }