refactor: separation module for lib-compose

jing332 · Aug 12, 2024 · ee05aad · ee05aad
1 parent 4edc37c
commit ee05aad
Show file tree

Hide file tree

Showing 125 changed files with 768 additions and 864 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -215,23 +215,17 @@ dependencies {
 
     implementation libs.bundles.accompanist
 
-    implementation("io.github.dokar3:sheets-m3:0.5.4")
+
 
     implementation(libs.bundles.lifecycle)
-    implementation(libs.bundles.compose)
 
-    def composeBom = platform(libs.composeBom)
+    def composeBom = platform(libs.compose.bom)
 //    def composeBom = platform("dev.chrisbanes.compose:compose-bom:2024.01.00-alpha01")
     implementation composeBom
     androidTestImplementation composeBom
 
-    implementation("androidx.compose.material3:material3")
-    implementation("androidx.compose.foundation:foundation")
-    implementation("androidx.compose.ui:ui")
-
-    implementation("androidx.compose.material:material-icons-core")
-    implementation("androidx.compose.material:material-icons-extended")
-    implementation("androidx.compose.material3:material3-window-size-class")
+    implementation(libs.bundles.compose)
+    implementation(libs.bundles.compose.material3)
 
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'

diff --git a/app/src/androidTest/java/com/github/jing332/tts_server_android/HttpTtsUrlTest.kt b/app/src/androidTest/java/com/github/jing332/tts_server_android/HttpTtsUrlTest.kt
diff --git a/app/src/main/java/com/github/jing332/tts_server_android/CrashHandler.kt b/app/src/main/java/com/github/jing332/tts_server_android/CrashHandler.kt
@@ -3,7 +3,7 @@ package com.github.jing332.tts_server_android
 import android.content.Context
 import com.github.jing332.tts_server_android.constant.AppConst
 import com.github.jing332.lib_gojni.NativeUtils
-import com.github.jing332.tts_server_android.utils.ClipboardUtils
+import com.github.jing332.common.utils.ClipboardUtils
 import com.github.jing332.common.utils.longToast
 import com.github.jing332.common.utils.runOnUI
  import java.time.LocalDateTime

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/compose/AboutDialog.kt b/app/src/main/java/com/github/jing332/tts_server_android/compose/AboutDialog.kt
@@ -23,10 +23,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextAlign.Companion
 import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
+import com.github.jing332.compose.widgets.AppDialog
+import com.github.jing332.compose.widgets.AppLauncherIcon
 import com.github.jing332.tts_server_android.BuildConfig
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.AppDialog
-import com.github.jing332.tts_server_android.compose.widgets.AppLauncherIcon
 
 @Composable
 fun AboutDialog(onDismissRequest: () -> Unit) {
@@ -36,7 +36,7 @@ fun AboutDialog(onDismissRequest: () -> Unit) {
         onDismissRequest = onDismissRequest,
         title = {
             Row(verticalAlignment = Alignment.CenterVertically) {
-                AppLauncherIcon(modifier = Modifier.size(64.dp))
+                AppLauncherIcon(modifier = Modifier.size(64.dp), R.mipmap.ic_app_launcher_round)
                 Text(
                     stringResource(id = R.string.app_name),
                     modifier = Modifier

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/compose/AppUpdateDialog.kt b/app/src/main/java/com/github/jing332/tts_server_android/compose/AppUpdateDialog.kt
@@ -25,12 +25,11 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.github.jing332.common.DateFormatConst
+import com.github.jing332.common.utils.ClipboardUtils
+import com.github.jing332.compose.widgets.AppDialog
+import com.github.jing332.compose.widgets.Markdown
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.AppDialog
-import com.github.jing332.tts_server_android.compose.widgets.Markdown
-import com.github.jing332.tts_server_android.constant.AppConst
 import com.github.jing332.tts_server_android.model.updater.AppUpdateChecker
-import com.github.jing332.tts_server_android.utils.ClipboardUtils
 
 @Preview
 @Composable
@@ -101,8 +100,7 @@ fun AppUpdateDialog(
         ClipboardUtils.copyText("TTS Server", url)
         context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
     }
-
-    AppDialog(onDismissRequest = onDismissRequest,
+   AppDialog(onDismissRequest = onDismissRequest,
         title = {
             Text(
                 stringResource(id = R.string.check_update),

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/compose/MainActivity.kt b/app/src/main/java/com/github/jing332/tts_server_android/compose/MainActivity.kt
@@ -80,6 +80,11 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.github.jing332.common.DateFormatConst
+import com.github.jing332.common.utils.clone
+import com.github.jing332.common.utils.longToast
+import com.github.jing332.common.utils.performLongPress
+import com.github.jing332.common.utils.toast
+import com.github.jing332.compose.widgets.AppLauncherIcon
 import com.github.jing332.tts_server_android.BuildConfig
 import com.github.jing332.tts_server_android.R
 import com.github.jing332.tts_server_android.ShortCuts
@@ -90,7 +95,6 @@ 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.edit.TtsEditContainerScreen
 import com.github.jing332.tts_server_android.compose.theme.AppTheme
-import com.github.jing332.tts_server_android.compose.widgets.AppLauncherIcon
 import com.github.jing332.tts_server_android.conf.AppConfig
 import com.github.jing332.tts_server_android.constant.AppConst
 import com.github.jing332.tts_server_android.data.appDb
@@ -99,10 +103,6 @@ import com.github.jing332.tts_server_android.model.speech.tts.ITextToSpeechEngin
 import com.github.jing332.tts_server_android.service.systts.SystemTtsService
 import com.github.jing332.tts_server_android.ui.AppHelpDocumentActivity
 import com.github.jing332.tts_server_android.utils.MyTools.killBattery
-import com.github.jing332.tts_server_android.utils.clone
-import com.github.jing332.common.utils.longToast
-import com.github.jing332.tts_server_android.utils.performLongPress
-import com.github.jing332.common.utils.toast
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
@@ -362,7 +362,7 @@ fun NavDrawerContent(
                 }
             )) {
             Row(verticalAlignment = Alignment.CenterVertically) {
-                AppLauncherIcon(Modifier.size(64.dp))
+                AppLauncherIcon(Modifier.size(64.dp), R.mipmap.ic_app_launcher_round)
                 Column(
                     modifier = Modifier
                         .padding(start = 8.dp)

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/compose/backup/BackupDialog.kt b/app/src/main/java/com/github/jing332/tts_server_android/compose/backup/BackupDialog.kt
@@ -20,9 +20,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.github.jing332.compose.widgets.AppDialog
+import com.github.jing332.compose.widgets.TextCheckBox
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.AppDialog
-import com.github.jing332.tts_server_android.compose.widgets.TextCheckBox
 import com.github.jing332.tts_server_android.ui.AppActivityResultContracts
 import com.github.jing332.tts_server_android.ui.FilePickerActivity
 import com.github.jing332.tts_server_android.ui.view.AppDialogs.displayErrorDialog

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/compose/backup/RestoreDialog.kt b/app/src/main/java/com/github/jing332/tts_server_android/compose/backup/RestoreDialog.kt
@@ -19,12 +19,12 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.github.jing332.tts_server_android.R
 import com.github.jing332.tts_server_android.app
-import com.github.jing332.tts_server_android.compose.widgets.AppDialog
-import com.github.jing332.tts_server_android.compose.widgets.LoadingContent
 import com.github.jing332.tts_server_android.ui.AppActivityResultContracts
 import com.github.jing332.tts_server_android.ui.FilePickerActivity
 import com.github.jing332.tts_server_android.ui.view.AppDialogs.displayErrorDialog
 import com.github.jing332.common.utils.FileUtils.readBytes
+import com.github.jing332.compose.widgets.AppDialog
+import com.github.jing332.compose.widgets.LoadingContent
 import kotlinx.coroutines.launch
 
 @Composable

diff --git a/...rc/main/java/com/github/jing332/tts_server_android/compose/codeeditor/CodeEditorScreen.kt b/...rc/main/java/com/github/jing332/tts_server_android/compose/codeeditor/CodeEditorScreen.kt
@@ -12,10 +12,10 @@ import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.InsertDriveFile
 import androidx.compose.material.icons.automirrored.filled.WrapText
 import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.material.icons.filled.ColorLens
-import androidx.compose.material.icons.filled.InsertDriveFile
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Save
 import androidx.compose.material.icons.filled.SettingsRemote
@@ -43,14 +43,14 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.github.jing332.compose.ComposeExtensions.clickableRipple
+import com.github.jing332.compose.widgets.CheckedMenuItem
+import com.github.jing332.compose.widgets.LongClickIconButton
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.CheckedMenuItem
-import com.github.jing332.tts_server_android.compose.widgets.LongClickIconButton
 import com.github.jing332.tts_server_android.conf.CodeEditorConfig
 import com.github.jing332.tts_server_android.ui.AppActivityResultContracts
 import com.github.jing332.tts_server_android.ui.FilePickerActivity
 import com.github.jing332.tts_server_android.ui.view.AppDialogs.displayErrorDialog
-import com.github.jing332.tts_server_android.utils.clickableRipple
 import io.github.rosemoe.sora.widget.CodeEditor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -157,7 +157,7 @@ fun CodeEditorScreen(
                                             )
                                         }
                                     },
-                                    leadingIcon = { Icon(Icons.Default.InsertDriveFile, null) }
+                                    leadingIcon = { Icon(Icons.AutoMirrored.Filled.InsertDriveFile, null) }
                                 )
 
                             var syncEnabled by remember { CodeEditorConfig.isRemoteSyncEnabled }

diff --git a/...c/main/java/com/github/jing332/tts_server_android/compose/codeeditor/LoggerBottomSheet.kt b/...c/main/java/com/github/jing332/tts_server_android/compose/codeeditor/LoggerBottomSheet.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
-import com.github.jing332.tts_server_android.compose.widgets.AppBottomSheet
+import com.github.jing332.compose.widgets.AppBottomSheet
 import com.github.jing332.common.LogLevel
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/.../main/java/com/github/jing332/tts_server_android/compose/codeeditor/RemoteSyncSettings.kt b/.../main/java/com/github/jing332/tts_server_android/compose/codeeditor/RemoteSyncSettings.kt
@@ -17,8 +17,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.AppDialog
-import com.github.jing332.tts_server_android.compose.widgets.DenseOutlinedField
+import com.github.jing332.compose.widgets.AppDialog
+import com.github.jing332.compose.widgets.DenseOutlinedField
 import com.github.jing332.tts_server_android.conf.CodeEditorConfig
 
 @Composable

diff --git a/...main/java/com/github/jing332/tts_server_android/compose/codeeditor/ThemeSettingsDialog.kt b/...main/java/com/github/jing332/tts_server_android/compose/codeeditor/ThemeSettingsDialog.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.AppSelectionDialog
+import com.github.jing332.compose.widgets.AppSelectionDialog
 import com.github.jing332.tts_server_android.conf.CodeEditorConfig
 import com.github.jing332.tts_server_android.constant.CodeEditorTheme
 

diff --git a/...rc/main/java/com/github/jing332/tts_server_android/compose/forwarder/BasicConfigScreen.kt b/...rc/main/java/com/github/jing332/tts_server_android/compose/forwarder/BasicConfigScreen.kt
@@ -11,14 +11,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.github.jing332.common.LogLevel
+import com.github.jing332.compose.widgets.DenseOutlinedField
+import com.github.jing332.compose.widgets.LocalBroadcastReceiver
+import com.github.jing332.compose.widgets.SwitchFloatingButton
 import com.github.jing332.tts_server_android.R
 import com.github.jing332.tts_server_android.compose.systts.LogScreen
-import com.github.jing332.tts_server_android.compose.widgets.DenseOutlinedField
-import com.github.jing332.tts_server_android.compose.widgets.LocalBroadcastReceiver
-import com.github.jing332.tts_server_android.compose.widgets.SwitchFloatingButton
-import com.github.jing332.tts_server_android.constant.KeyConst
-import com.github.jing332.common.LogLevel
 import com.github.jing332.tts_server_android.constant.AppLog
+import com.github.jing332.tts_server_android.constant.KeyConst
 
 @Suppress("DEPRECATION")
 @Composable

diff --git a/...main/java/com/github/jing332/tts_server_android/compose/forwarder/BasicForwarderScreen.kt b/...main/java/com/github/jing332/tts_server_android/compose/forwarder/BasicForwarderScreen.kt
@@ -21,7 +21,7 @@ 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.tts_server_android.compose.widgets.LocalBroadcastReceiver
+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

diff --git a/...c/main/java/com/github/jing332/tts_server_android/compose/forwarder/ForwarderTopAppBar.kt b/...c/main/java/com/github/jing332/tts_server_android/compose/forwarder/ForwarderTopAppBar.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.core.net.toUri
 import com.github.jing332.tts_server_android.R
 import com.github.jing332.tts_server_android.compose.nav.NavTopAppBar
-import com.github.jing332.tts_server_android.compose.widgets.CheckedMenuItem
+import com.github.jing332.compose.widgets.CheckedMenuItem
 import com.github.jing332.common.utils.toast
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/...n/java/com/github/jing332/tts_server_android/compose/forwarder/ms/MsTtsForwarderScreen.kt b/...n/java/com/github/jing332/tts_server_android/compose/forwarder/ms/MsTtsForwarderScreen.kt
@@ -22,7 +22,7 @@ import com.github.jing332.tts_server_android.compose.forwarder.BasicConfigScreen
 import com.github.jing332.tts_server_android.compose.forwarder.BasicForwarderScreen
 import com.github.jing332.tts_server_android.compose.forwarder.ConfigViewModel
 import com.github.jing332.tts_server_android.compose.forwarder.ForwarderTopAppBar
-import com.github.jing332.tts_server_android.compose.widgets.TextFieldDialog
+import com.github.jing332.compose.widgets.TextFieldDialog
 import com.github.jing332.tts_server_android.conf.MsTtsForwarderConfig
 import com.github.jing332.tts_server_android.service.forwarder.ForwarderServiceManager.switchMsTtsForwarder
 import com.github.jing332.tts_server_android.service.forwarder.ms.MsTtsForwarderService

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/compose/nav/NavTopAppBar.kt b/app/src/main/java/com/github/jing332/tts_server_android/compose/nav/NavTopAppBar.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.github.jing332.tts_server_android.R
 import com.github.jing332.tts_server_android.compose.LocalDrawerState
-import com.github.jing332.tts_server_android.compose.widgets.AppTooltip
+import com.github.jing332.compose.widgets.AppTooltip
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/compose/settings/SettingsWidgets.kt b/app/src/main/java/com/github/jing332/tts_server_android/compose/settings/SettingsWidgets.kt
@@ -36,8 +36,8 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.AppDialog
-import com.github.jing332.tts_server_android.compose.widgets.LabelSlider
+import com.github.jing332.compose.widgets.AppDialog
+import com.github.jing332.compose.widgets.LabelSlider
 
 @Composable
 internal fun DropdownPreference(

diff --git a/app/src/main/java/com/github/jing332/tts_server_android/compose/systts/AuditionDialog.kt b/app/src/main/java/com/github/jing332/tts_server_android/compose/systts/AuditionDialog.kt
@@ -22,15 +22,15 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.drake.net.utils.withMain
+import com.github.jing332.common.utils.ClipboardUtils
+import com.github.jing332.common.utils.toast
+import com.github.jing332.compose.ComposeExtensions.clickableRipple
+import com.github.jing332.compose.widgets.AppDialog
+import com.github.jing332.compose.widgets.LoadingContent
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.AppDialog
-import com.github.jing332.tts_server_android.compose.widgets.LoadingContent
 import com.github.jing332.tts_server_android.conf.AppConfig
 import com.github.jing332.tts_server_android.data.entities.systts.SystemTts
-import com.github.jing332.tts_server_android.utils.ClipboardUtils
 import com.github.jing332.tts_server_android.utils.StringUtils.sizeToReadable
-import com.github.jing332.tts_server_android.utils.clickableRipple
-import com.github.jing332.common.utils.toast
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 

diff --git a/...main/java/com/github/jing332/tts_server_android/compose/systts/ConfigExportBottomSheet.kt b/...main/java/com/github/jing332/tts_server_android/compose/systts/ConfigExportBottomSheet.kt
@@ -26,11 +26,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import com.github.jing332.tts_server_android.R
 import com.github.jing332.tts_server_android.compose.systts.directlink.LinkUploadSelectionDialog
-import com.github.jing332.tts_server_android.compose.widgets.AppBottomSheet
+import com.github.jing332.compose.widgets.AppBottomSheet
 import com.github.jing332.tts_server_android.ui.AppActivityResultContracts
 import com.github.jing332.tts_server_android.ui.FilePickerActivity
 import com.github.jing332.tts_server_android.ui.view.BigTextView
-import com.github.jing332.tts_server_android.utils.ClipboardUtils
+import com.github.jing332.common.utils.ClipboardUtils
 import com.github.jing332.common.utils.toast
 
 

diff --git a/...main/java/com/github/jing332/tts_server_android/compose/systts/ConfigImportBottomSheet.kt b/...main/java/com/github/jing332/tts_server_android/compose/systts/ConfigImportBottomSheet.kt
@@ -46,13 +46,13 @@ import com.drake.net.Net
 import com.drake.net.okhttp.trustSSLCertificate
 import com.drake.net.utils.withMain
 import com.github.jing332.tts_server_android.R
-import com.github.jing332.tts_server_android.compose.widgets.AppBottomSheet
-import com.github.jing332.tts_server_android.compose.widgets.AppDialog
-import com.github.jing332.tts_server_android.compose.widgets.RowToggleButtonGroup
+import com.github.jing332.compose.widgets.AppBottomSheet
+import com.github.jing332.compose.widgets.AppDialog
+import com.github.jing332.compose.widgets.RowToggleButtonGroup
 import com.github.jing332.tts_server_android.ui.AppActivityResultContracts
 import com.github.jing332.tts_server_android.ui.FilePickerActivity
 import com.github.jing332.tts_server_android.ui.view.AppDialogs.displayErrorDialog
-import com.github.jing332.tts_server_android.utils.ClipboardUtils
+import com.github.jing332.common.utils.ClipboardUtils
 import com.github.jing332.common.utils.FileUtils.readAllText
 import com.github.jing332.common.utils.longToast
 import com.github.jing332.tts_server_android.utils.toJsonListString