feat: Refactor main navigation structure

This commit introduces a major refactor to the main navigation structure of the app, focusing on clarity and maintainability.

-   **PagerDestination:** Created a new `PagerDestination` class to encapsulate the different screens in the main pager view, including their titles, icons, and indices.
-   **MainPager:** Implemented the `MainPager` composable to handle the horizontal pager, replacing the previous `SystemTtsScreen`. It uses `PagerDestination` to manage the different pages (System TTS list, Log, Forwarder, Settings).
-   **NavRoutes:** Updated `NavRoutes` to use `MainPager` as the main destination, removing individual routes for each pager page.
-   **SettingsScreen:** Removed `drawerState` param.
-   **NavTopAppBar:** Removed `drawerState` and other parameters related to drawer navigation.
-   **Strings:** Renamed "System TTS forwarder" to "TTS forwarder" in all translations.
-   **MainActivity:** Simplified the `MainActivity` composable by using `MainPager` for the main navigation flow. Removed code for the navigation drawer.
- **BasicForwarderScreen**: Use Box to replace HorizontalPager.
- Remove `SystemTtsScreen`.

Author: jing332

app/src/main/java/com/github/jing332/tts_server_android/compose/MainActivity.kt

@@ -15,21 +15,17 @@ import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowCircleUp
@@ -41,7 +37,6 @@ import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.NavigationDrawerItem
 import androidx.compose.material3.NavigationDrawerItemDefaults
 import androidx.compose.material3.Text
@@ -85,10 +80,7 @@ import com.github.jing332.database.entities.systts.SystemTtsV2
 import com.github.jing332.tts_server_android.BuildConfig
 import com.github.jing332.tts_server_android.R
 import com.github.jing332.tts_server_android.ShortCuts
-import com.github.jing332.tts_server_android.compose.forwarder.systts.SystemTtsForwarderScreen
 import com.github.jing332.tts_server_android.compose.nav.NavRoutes
-import com.github.jing332.tts_server_android.compose.settings.SettingsScreen
-import com.github.jing332.tts_server_android.compose.systts.SystemTtsScreen
 import com.github.jing332.tts_server_android.compose.systts.list.ui.widgets.TtsEditContainerScreen
 import com.github.jing332.tts_server_android.compose.theme.AppTheme
 import com.github.jing332.tts_server_android.conf.AppConfig
@@ -188,10 +180,6 @@ private fun MainScreen(finish: () -> Unit) {
     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
     val entryState by navController.currentBackStackEntryAsState()
 
-    val gesturesEnabled = remember(entryState) {
-        NavRoutes.routes.find { it.id == entryState?.destination?.route } != null
-    }
-
     var lastBackDownTime by remember { mutableLongStateOf(0L) }
     BackHandler(enabled = drawerState.isClosed) {
         val duration = 2000
@@ -208,68 +196,45 @@ private fun MainScreen(finish: () -> Unit) {
         LocalNavController provides navController,
         LocalDrawerState provides drawerState,
     ) {
-        ModalNavigationDrawer(
-            drawerState = drawerState,
-            gesturesEnabled = gesturesEnabled,
-            drawerContent = {
-                NavDrawerContent(
-                    Modifier
-                        .fillMaxHeight()
-                        .width(300.dp)
-                        .clip(
-                            MaterialTheme.shapes.large.copy(
-                                topStart = CornerSize(0.dp),
-                                bottomStart = CornerSize(0.dp)
-                            )
-                        )
-                        .background(MaterialTheme.colorScheme.background)
-                        .padding(12.dp),
-                    navController,
-                    drawerState,
-                )
-            }) {
-
-            val sharedVM: SharedViewModel = viewModel()
-            NavHost(
-                navController = navController,
-                startDestination = NavRoutes.SystemTTS.id
-            ) {
-                composable(NavRoutes.SystemTTS.id) { SystemTtsScreen(sharedVM) }
-                composable(NavRoutes.SystemTtsForwarder.id) {
-                    SystemTtsForwarderScreen()
-                }
-                composable(NavRoutes.Settings.id) { SettingsScreen(drawerState) }
-
-                composable(NavRoutes.TtsEdit.id) {
-                    var stateSystemTts by rememberSaveable {
-                        mutableStateOf(
-                            checkNotNull(sharedVM.getOnce<SystemTtsV2>(NavRoutes.TtsEdit.DATA)) {
-                                "Not found systemTts from sharedVM"
-                            }
-                        )
-                    }
+        val sharedVM: SharedViewModel = viewModel()
+        NavHost(
+            navController = navController,
+            startDestination = NavRoutes.MainPager.id
+        ) {
+            composable(NavRoutes.MainPager.id) { MainPager(sharedVM) }
+//            composable(NavRoutes.SystemTtsForwarder.id) {
+//                SystemTtsForwarderScreen()
+//            }
+//                composable(NavRoutes.Settings.id) { SettingsScreen(drawerState) }
 
-                    TtsEditContainerScreen(
-                        modifier = Modifier
-                            .fillMaxSize(),
-                        systts = stateSystemTts,
-                        onSysttsChange = {
-                            stateSystemTts = it
-                            println("UpdateSystemTTS: $it")
-                        },
-                        onSave = {
-                            navController.popBackStack()
-                            dbm.systemTtsV2.insert(stateSystemTts)
-                            if (stateSystemTts.isEnabled) SystemTtsService.notifyUpdateConfig()
-                        },
-                        onCancel = {
-                            navController.popBackStack()
+            composable(NavRoutes.TtsEdit.id) {
+                var stateSystemTts by rememberSaveable {
+                    mutableStateOf(
+                        checkNotNull(sharedVM.getOnce<SystemTtsV2>(NavRoutes.TtsEdit.DATA)) {
+                            "Not found systemTts from sharedVM"
                         }
                     )
                 }
+
+                TtsEditContainerScreen(
+                    modifier = Modifier
+                        .fillMaxSize(),
+                    systts = stateSystemTts,
+                    onSysttsChange = {
+                        stateSystemTts = it
+                        println("UpdateSystemTTS: $it")
+                    },
+                    onSave = {
+                        navController.popBackStack()
+                        dbm.systemTtsV2.insert(stateSystemTts)
+                        if (stateSystemTts.isEnabled) SystemTtsService.notifyUpdateConfig()
+                    },
+                    onCancel = {
+                        navController.popBackStack()
+                    }
+                )
             }
         }
-
     }
 }
 

app/src/main/java/com/github/jing332/tts_server_android/compose/PagerDestination.kt

@@ -0,0 +1,57 @@
+package com.github.jing332.tts_server_android.compose
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.TextSnippet
+import androidx.compose.material.icons.filled.ArrowCircleUp
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.github.jing332.tts_server_android.R
+
+sealed class PagerDestination(
+    val index: Int,
+    @StringRes val strId: Int,
+    val icon: @Composable () -> Unit = {},
+) {
+    companion object {
+        val routes by lazy {
+            listOf(
+                SystemTts,
+                SystemTtsLog,
+                SystemTtsForwarder,
+                Settings
+            )
+        }
+    }
+
+    object SystemTts : PagerDestination(0, R.string.system_tts, {
+        Icon(
+            modifier = Modifier.size(24.dp),
+            painter = painterResource(id = R.drawable.ic_config),
+            contentDescription = null
+        )
+    })
+
+    object SystemTtsLog : PagerDestination(1, R.string.log, {
+        Icon(
+            Icons.AutoMirrored.Default.TextSnippet,
+            contentDescription = null
+        )
+    })
+
+    object SystemTtsForwarder: PagerDestination(2, R.string.forwarder_systts, {
+        Icon(
+            Icons.Default.ArrowCircleUp,
+            contentDescription = null
+        )
+    })
+
+    object Settings : PagerDestination(3, R.string.settings, {
+        Icon(Icons.Default.Settings, null)
+    })
+}

app/src/main/java/com/github/jing332/tts_server_android/compose/forwarder/BasicForwarderScreen.kt

@@ -1,31 +1,16 @@
 package com.github.jing332.tts_server_android.compose.forwarder
 
-import android.content.IntentFilter
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.TextSnippet
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.NavigationBar
-import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.compose.widgets.LocalBroadcastReceiver
-import com.github.jing332.tts_server_android.service.forwarder.system.SysTtsForwarderService
-import com.google.accompanist.web.rememberWebViewNavigator
-import com.google.accompanist.web.rememberWebViewState
-import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
 @Composable
@@ -40,29 +25,36 @@ internal fun BasicForwarderScreen(
     Scaffold(
         topBar = topBar,
         bottomBar = {
-            NavigationBar {
-                pages.forEachIndexed { index, strId ->
-                    val selected = state.currentPage == index
-                    NavigationBarItem(
-                        selected = selected,
-                        onClick = {
-                            scope.launch {
-                                state.animateScrollToPage(index)
-                            }
-                        },
-                        icon = {
-                            if (index == 0)
-                                Icon(Icons.Default.TextSnippet, null)
-                            else
-                                Icon(painter = painterResource(R.drawable.ic_web), null)
-                        },
-                        label = { Text(stringResource(id = strId)) }
-                    )
-                }
-            }
+//            NavigationBar {
+//                pages.forEachIndexed { index, strId ->
+//                    val selected = state.currentPage == index
+//                    NavigationBarItem(
+//                        selected = selected,
+//                        onClick = {
+//                            scope.launch {
+//                                state.animateScrollToPage(index)
+//                            }
+//                        },
+//                        icon = {
+//                            if (index == 0)
+//                                Icon(Icons.Default.TextSnippet, null)
+//                            else
+//                                Icon(painter = painterResource(R.drawable.ic_web), null)
+//                        },
+//                        label = { Text(stringResource(id = strId)) }
+//                    )
+//                }
+//            }
         }) { paddingValues ->
+        Box(Modifier.padding(paddingValues)) {
+            configScreen()
+        }
+
+        /*
         HorizontalPager(
-            modifier = Modifier.padding(paddingValues).fillMaxSize(),
+            modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxSize(),
             state = state,
             userScrollEnabled = false
         ) {
@@ -82,7 +74,7 @@ internal fun BasicForwarderScreen(
                     )
                 }
             }
-        }
+        }*/
     }
 
 }