🔀 :: (#416) - update expocreatescreen location input

app/src/main/java/com/school_of_company/expo_android/navigation/ExpoNavHost.kt

@@ -6,11 +6,13 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.compose.NavHost
 import com.school_of_company.common.exception.*
 import com.school_of_company.design_system.R
+import com.school_of_company.expo.navigation.expoAddressSearchScreen
 import com.school_of_company.expo.navigation.expoCreateScreen
 import com.school_of_company.expo.navigation.expoCreatedScreen
 import com.school_of_company.expo.navigation.expoDetailScreen
 import com.school_of_company.expo.navigation.expoModifyScreen
 import com.school_of_company.expo.navigation.expoScreen
+import com.school_of_company.expo.navigation.navigateToExpoAddressSearch
 import com.school_of_company.expo.navigation.navigateToExpoDetail
 import com.school_of_company.expo.navigation.navigateToExpoModify
 import com.school_of_company.expo.navigation.navigateToHome
@@ -139,18 +141,25 @@ fun ExpoNavHost(
         )
 
         expoModifyScreen(
+            navigateToExpoAddressSearch = navController::navigateToExpoAddressSearch,
             onErrorToast = makeErrorToast,
             onBackClick = navController::popBackStack,
         )
 
         expoCreateScreen(
+            navigateToExpoAddressSearch = navController::navigateToExpoAddressSearch,
             onErrorToast = makeErrorToast
         )
 
         expoCreatedScreen(
             onErrorToast = makeErrorToast
         )
 
+        expoAddressSearchScreen(
+            popUpBackStack = navController::popBackStack,
+            onErrorToast = makeErrorToast
+        )
+
         qrScannerScreen(
             onBackClick = navController::popBackStack,
             onPermissionBlock = navController::popBackStack,

core/design-system/src/main/java/com/school_of_company/design_system/component/textfield/ExpoTextField.kt

@@ -43,6 +43,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.school_of_company.design_system.icon.LocationIcon
+import com.school_of_company.design_system.icon.SearchIcon
 import com.school_of_company.design_system.theme.ExpoAndroidTheme
 
 @Composable
@@ -440,6 +441,62 @@ fun ExpoLocationIconTextField(
 }
 
 
+@Composable
+fun ExpoSearchIconTextField(
+    modifier: Modifier = Modifier,
+    value: String,
+    onValueChange: (String) -> Unit,
+    placeholder: String,
+    isDisabled: Boolean,
+    onButtonClicked: () -> Unit,
+) {
+    ExpoAndroidTheme { colors, typography ->
+        Box {
+            OutlinedTextField(
+                placeholder = {
+                    Text(
+                        text = placeholder,
+                        style = typography.captionRegular1,
+                        color = colors.gray300
+                    )
+                },
+                value = value,
+                onValueChange = { newState ->
+                    onValueChange(newState)
+                },
+                modifier = modifier
+                    .height(50.dp)
+                    .border(
+                        width = 1.dp,
+                        shape = RoundedCornerShape(6.dp),
+                        color = colors.gray100
+                    )
+                    .background(color = Color.Transparent)
+                    .fillMaxWidth(),
+                textStyle = typography.captionRegular1.copy(color = colors.black),
+                colors = OutlinedTextFieldDefaults.colors(
+                    focusedTextColor = colors.black,
+                    unfocusedTextColor = colors.black,
+                    cursorColor = colors.main,
+                    focusedBorderColor = Color.Transparent,
+                    unfocusedBorderColor = Color.Transparent,
+                ),
+                enabled = !isDisabled,
+                maxLines = 1,
+                singleLine = true,
+                trailingIcon = {
+                    IconButton(onClick = onButtonClicked) {
+                        SearchIcon(
+                            tint = colors.gray500,
+                            modifier = Modifier.size(24.dp)
+                        )
+                    }
+                }
+            )
+        }
+    }
+}
+
 @Preview
 @Composable
 fun ExpoOutlinedTextFieldPreview() {

feature/expo/src/main/java/com/school_of_company/expo/navigation/ExpoNavigation.kt

@@ -4,6 +4,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
+import com.school_of_company.expo.view.ExpoAddressSearchRoute
 import com.school_of_company.expo.view.ExpoCreateRoute
 import com.school_of_company.expo.view.ExpoCreatedRoute
 import com.school_of_company.expo.view.ExpoDetailRoute
@@ -15,6 +16,7 @@ const val expoDetailRoute = "expo_detail_route"
 const val expoModifyRoute = "expo_modify_route"
 const val expoCreateRoute = "expo_create_route"
 const val expoCreatedRoute = "expo_created_route"
+const val expoAddressSearchRoute = "expo_address_search_route"
 
 fun NavController.navigateToHome(navOptions: NavOptions? = null) {
     this.navigate(homeRoute, navOptions)
@@ -48,6 +50,10 @@ fun NavController.navigateToExpoCreated(navOptions: NavOptions? = null) {
     this.navigate(expoCreatedRoute, navOptions)
 }
 
+fun NavController.navigateToExpoAddressSearch(navOptions: NavOptions? = null) {
+    this.navigate(expoAddressSearchRoute, navOptions)
+}
+
 fun NavGraphBuilder.expoScreen(
     navigationToDetail: (String) -> Unit
 ) {
@@ -82,23 +88,27 @@ fun NavGraphBuilder.expoDetailScreen(
 
 fun NavGraphBuilder.expoModifyScreen(
     onBackClick: () -> Unit,
+    navigateToExpoAddressSearch: () -> Unit,
     onErrorToast: (throwable: Throwable?, message: Int?) -> Unit
 ) {
     composable(route = "$expoModifyRoute/{id}") { backStackEntry ->
         val id = backStackEntry.arguments?.getString("id") ?: ""
         ExpoModifyRoute(
             id = id,
+            navigateToExpoAddressSearch = navigateToExpoAddressSearch,
             onBackClick = onBackClick,
             onErrorToast = onErrorToast
         )
     }
 }
 
 fun NavGraphBuilder.expoCreateScreen(
-    onErrorToast: (throwable: Throwable?, message: Int?) -> Unit
+    navigateToExpoAddressSearch: () -> Unit,
+    onErrorToast: (throwable: Throwable?, message: Int?) -> Unit,
 ) {
     composable(route = expoCreateRoute) {
         ExpoCreateRoute(
+            navigateToExpoAddressSearch = navigateToExpoAddressSearch,
             onErrorToast = onErrorToast
         )
     }
@@ -111,3 +121,17 @@ fun NavGraphBuilder.expoCreatedScreen(
         ExpoCreatedRoute(onErrorToast = onErrorToast)
     }
 }
+
+fun NavGraphBuilder.expoAddressSearchScreen(
+    popUpBackStack: () -> Unit,
+    onErrorToast: (throwable: Throwable?, message: Int?) -> Unit
+) {
+    composable(route = expoAddressSearchRoute) {
+        ExpoAddressSearchRoute(
+            popUpBackStack = popUpBackStack,
+            onErrorToast = onErrorToast,
+        )
+    }
+}
+
+