update search screen logic

apps/vbox/client/androidApp/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     alias(libs.plugins.convention.ktor.client)
 }
 
-val appVersion = "1.26.6"
+val appVersion = "1.26.7"
 
 android {
     buildFeatures { buildConfig = true }

apps/vbox/client/androidApp/src/main/kotlin/ru/shadowsparky/videobox/multiplatform/preview/SearchScreenPreview.kt

@@ -21,7 +21,8 @@ fun AppBarWithSearchPreview() {
     AppBarWithSearch(
         title = "TitleWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW",
         isDefault = false,
-        onBack = {}
+        onBack = {},
+        onEdit = {}
     )
 }
 
@@ -30,7 +31,8 @@ fun AppBarWithSearchPreview() {
 fun AppBarWithSearchWithBackPreview() {
     AppBarWithSearch(
         title = "TitleWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW",
-        onBack = {}
+        onBack = {},
+        onEdit = {}
     )
 }
 

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/list/VideoScreen.kt

@@ -69,7 +69,8 @@ fun VideoScreen(component: VideoScreenComponent) {
             AppBarWithSearch(
                 title,
                 isDefault = title == appName,
-                onBack = { component.doBack() }
+                onBack = { component.doBack() },
+                onEdit = { component.doEdit() }
             )
         }
     )

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/list/VideoScreenComponent.kt

@@ -26,7 +26,8 @@ class VideoScreenComponent(
     private val dispatcherProvider: DispatcherProvider,
     val search: String? = null,
     val showOverview: (Long) -> Unit,
-    val doBack: () -> Unit
+    val doBack: () -> Unit,
+    val doEdit: () -> Unit
 ) : ComponentContext by context {
     private val componentScope = createComponentScope()
     private val _items = MutableStateFlow<List<VideoItem>?>(null)
@@ -65,7 +66,8 @@ class VideosChildFactory(
             dispatcherProvider,
             route.request,
             showOverview = { root.nav(Route.Overview(it)) },
-            doBack = { root.onBack() }
+            doBack = { root.onBack() },
+            doEdit = { root.navReplace(Route.SearchVideos(route.request)) }
         )
         return Child.VideosChild(comp)
     }

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/nav/Route.kt

@@ -13,7 +13,10 @@ sealed class Route : ru.shadowsparky.ui.nav.Route() {
     ) : Route()
 
     @Serializable
-    data class SearchVideos(override val routeId: String = RouteIds.SEARCH) : Route()
+    data class SearchVideos(
+        val request: String? = null,
+        override val routeId: String = RouteIds.SEARCH
+    ) : Route()
 
     @Serializable
     data class Bookmark(override val routeId: String = RouteIds.BOOKMARK) : Route()

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/search/SearchScreen.kt

@@ -63,6 +63,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import ru.shadowsparky.ui.components.AppBarWithSearch
+import ru.shadowsparky.ui.components.BackButton
 import ru.shadowsparky.ui.components.ExpressiveLazyColumn
 import ru.shadowsparky.ui.components.IconButton
 import ru.shadowsparky.vbox.shared.presentation.MainScreenScaffold
@@ -77,7 +78,8 @@ fun SearchScreen(
 ) {
     val requester by remember { mutableStateOf(FocusRequester()) }
     var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
-        mutableStateOf(TextFieldValue())
+        val text = component.defaultRequest
+        mutableStateOf(TextFieldValue(text, TextRange(text.length)))
     }
     MainScreenScaffold(
         appBar = {
@@ -218,28 +220,28 @@ fun SearchAppBar(
     AppBarWithSearch(
         inputField = {
             TextField(
-                value = textFieldValue,
+                    value = textFieldValue,
-                onValueChange = { onValueChange(it) },
+                    onValueChange = { onValueChange(it) },
-                colors = getTextFieldsColors(),
+                    colors = getTextFieldsColors(),
-                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-                keyboardActions = KeyboardActions(onDone = { onDone() }),
+                    keyboardActions = KeyboardActions(onDone = { onDone() }),
-                modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth()
-                    .focusRequester(inputFocusRequester)
+                        .focusRequester(inputFocusRequester)
-                    .onFocusChanged {
+                        .onFocusChanged {
-                        if (it.isFocused) keyboardController?.show()
+                            if (it.isFocused) keyboardController?.show()
-                    }.requestFocusOnDownEvent(focusRequester),
+                        }.requestFocusOnDownEvent(focusRequester),
-                trailingIcon = {
+                    trailingIcon = {
-                    if (textFieldValue.text.isNotEmpty()) {
+                        if (textFieldValue.text.isNotEmpty()) {
-                        IconButton(onClick = {
+                            IconButton(onClick = {
-                            onValueChange(TextFieldValue(""))
+                                onValueChange(TextFieldValue(""))
-                        }) {
+                            }) {
-                            Icon(painterResource(Res.drawable.clear_text), null)
+                                Icon(painterResource(Res.drawable.clear_text), null)
+                            }
                         }
-                    }
+                    },
-                },
+                    singleLine = true,
-                singleLine = true,
+                    label = { Text(stringResource(Res.string.search)) }
-                label = { Text(stringResource(Res.string.search)) }
+                )
-            )
         }
     )
     LaunchedEffect("focus") {
@@ -272,7 +274,8 @@ fun AppBarWithSearch(
     title: String,
     isDefault: Boolean = false,
     actions: @Composable RowScope.() -> Unit = {},
-    onBack: (() -> Unit)
+    onBack: (() -> Unit),
+    onEdit: (() -> Unit)
 ) {
     AppBarWithSearch(
         actions = { actions(this) },
@@ -281,16 +284,12 @@ fun AppBarWithSearch(
             Surface(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .clickable(enabled = !isDefault) { onBack() },
+                    .clickable(enabled = !isDefault) { onEdit() },
                 shape = RoundedCornerShape(12.dp),
                 color = Color.Transparent
             ) {
-                Row(
+                Row(modifier = Modifier, verticalAlignment = Alignment.CenterVertically) {
-                    modifier = Modifier
+                    BackButton { onBack() }
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp, vertical = 14.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
                     Text(text = title, maxLines = 1)
                 }
             }

apps/vbox/client/shared/src/commonMain/kotlin/ru/shadowsparky/vbox/shared/presentation/search/SearchScreenComponent.kt

@@ -18,6 +18,7 @@ class SearchScreenComponent(
     val search: (String) -> Unit,
     val doBack: () -> Unit,
     private val searchRepository: SearchRepository,
+    val defaultRequest: String
 ) : ComponentContext by context {
     val info = searchRepository.search("").map { it.reversed() }
     private val componentScope = createComponentScope()
@@ -50,7 +51,8 @@ class SearchScreenFactory(
             child,
             search = { root.nav(Route.Videos(it)) },
             doBack = { root.onBack() },
-            searchRepository
+            searchRepository,
+            route.request.orEmpty()
         )
         return Child.SearchChild(comp)
     }