UI improvements

jsixface · Mar 13, 2024 · f1798d5 · f1798d5
1 parent 2b23aee
commit f1798d5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 32 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,6 +13,7 @@ ij_continuation_indent_size = 4
 # ij_smart_tabs = false
 # ij_visual_guides = 
 # ij_wrap_on_typing = false
+ij_java_use_single_class_imports = true
 
 [*.yml]
 indent_size = 2
diff --git a/composeApp/src/commonMain/kotlin/ui/home/HomeScreen.kt b/composeApp/src/commonMain/kotlin/ui/home/HomeScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 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.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -53,7 +54,7 @@ object HomeScreen : Screen {
     private var selectedVideo by mutableStateOf<VideoFile?>(null)
     private var showFileDetails by mutableStateOf(false)
     private val bottomPad = Modifier.padding(0.dp, 0.dp, 0.dp, 8.dp)
-    private val sidePad = Modifier.padding(0.dp, 16.dp)
+    private val sidePad = Modifier.padding(8.dp, 0.dp, 0.dp, 0.dp)
 
     override val name: String
         get() = "Home"
@@ -158,16 +159,9 @@ object HomeScreen : Screen {
                     label = { Text("File name") },
                     leadingIcon = { Icon(Icons.Rounded.Search, contentDescription = "Search") })
                 val videoOptions = list.asSequence().flatMap { it.videos }.map { it.codec }.toSet().toList().sorted()
-                FilterOptions(
-                    "Video Codecs", videoOptions,
-                    filteredVideoCodec
-                ) { filteredVideoCodec = it }
+                FilterOptions("Video Codecs", videoOptions, filteredVideoCodec) { filteredVideoCodec = it }
                 val audioOptions = list.asSequence().flatMap { it.audios }.map { it.codec }.toSet().toList().sorted()
-                FilterOptions(
-                    "Audio Codecs", audioOptions,
-                    filteredAudioCodec
-                ) { filteredAudioCodec = it }
-
+                FilterOptions("Audio Codecs", audioOptions, filteredAudioCodec) { filteredAudioCodec = it }
                 IconButton(modifier = sidePad, onClick = onRefresh) {
                     Icon(Icons.Rounded.Refresh, contentDescription = "Refresh")
                 }
@@ -210,7 +204,7 @@ object HomeScreen : Screen {
         onSelect: (String) -> Unit
     ) {
         var expanded by remember { mutableStateOf(false) }
-        ExposedDropdownMenuBox(expanded, onExpandedChange = { expanded = it }, modifier = sidePad) {
+        ExposedDropdownMenuBox(expanded, onExpandedChange = { expanded = it }, modifier = sidePad.height(32.dp)) {
             TextField(
                 // The `menuAnchor` modifier must be passed to the text field for correctness.
                 modifier = sidePad.menuAnchor(),

diff --git a/composeApp/src/desktopMain/kotlin/Previews.kt b/composeApp/src/desktopMain/kotlin/Previews.kt
@@ -1,12 +1,19 @@
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.runtime.Composable
-import io.github.jsixface.common.*
-import ui.*
+import io.github.jsixface.common.ConversionJob
+import io.github.jsixface.common.JobStatus
+import io.github.jsixface.common.MediaTrack
+import io.github.jsixface.common.TrackType
+import io.github.jsixface.common.VideoFile
+import kotlin.random.Random
+import ui.BackendDialogContent
+import ui.BackupsScreen
+import ui.JobsScreen
+import ui.SettingsScreen
 import ui.home.FileDetails
 import ui.home.HomeScreen
 import ui.theme.AppTheme
-import kotlin.random.Random
 
 
 private val videos = listOf(
@@ -83,23 +90,6 @@ fun previewBackendDialog() {
     }
 }
 
-
-@Composable
-@Preview
-fun previewMainScreen() {
-    AppTheme {
-        MainScreen()
-    }
-}
-
-@Preview
-@Composable
-private fun seeHomeScreen() {
-    AppTheme {
-        HomeScreen.content()
-    }
-}
-
 @Preview
 @Composable
 private fun seeFileDetails() {

diff --git a/composeApp/src/wasmJsMain/resources/index.html b/composeApp/src/wasmJsMain/resources/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Compose App</title>
+    <title>Codecs Conversion</title>
     <script type="application/javascript" src="skiko.js"></script>
     <script type="application/javascript" src="composeApp.js"></script>
 </head>