[feat] 동행 모집 화면 UI 구성 및 화면 구현

core/common/build.gradle.kts

@@ -16,6 +16,8 @@ dependencies {
     implementations(
         projects.core.domain,
 
+        libs.kotlinx.datetime,
+
         libs.androidx.hilt.navigation.compose,
 
         libs.timber,

core/common/src/main/kotlin/com/tripmate/android/core/common/extension/LocalDate.kt

@@ -0,0 +1,14 @@
+package com.tripmate.android.core.common.extension
+
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
+fun LocalDate.formatToDate(): String {
+    val formatter = DateTimeFormatter.ofPattern("yyyy년 MM월 dd일", Locale.KOREAN)
+    return this.format(formatter)
+}
+
+// fun LocalDate.formatToDate(): String {
+//     return "${year}년 ${monthNumber.toString().padStart(2, '0')}월 ${dayOfMonth.toString().padStart(2, '0')}일"
+// }

core/common/src/main/kotlin/com/tripmate/android/core/common/extension/LocalTime.kt

@@ -0,0 +1,22 @@
+package com.tripmate.android.core.common.extension
+
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
+fun LocalTime.formatToTime(): String {
+    val formatter = DateTimeFormatter.ofPattern("a h시 mm분", Locale.KOREAN)
+    return this.format(formatter)
+        .replace("AM", "오전")
+        .replace("PM", "오후")
+}
+
+// fun LocalTime.formatToTime(): String {
+//     val period = if (hour < 12) "오전" else "오후"
+//     val adjustedHour = when {
+//         hour == 0 -> 12
+//         hour > 12 -> hour - 12
+//         else -> hour
+//     }
+//     return "$period ${adjustedHour}시 ${minute.toString().padStart(2, '0')}분"
+// }

core/common/src/main/kotlin/com/tripmate/android/core/common/extension/String.kt

@@ -0,0 +1,54 @@
+package com.tripmate.android.core.common.extension
+
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
+fun String.parseToLocalDate(): LocalDate {
+    val formatter = DateTimeFormatter.ofPattern("yyyy년 MM월 dd일", Locale.KOREAN)
+    return LocalDate.parse(this, formatter)
+}
+
+fun String.parseToLocalTime(): LocalTime {
+    val formattedString = this.replace("오전", "AM").replace("오후", "PM")
+    val formatter = DateTimeFormatter.ofPattern("a h시 mm분", Locale.ENGLISH)
+    return LocalTime.parse(formattedString, formatter)
+}
+
+// fun String.parseToLocalDate(): LocalDate {
+//     if (this.isBlank()) {
+//         return Clock.System.now().toLocalDateTime(TimeZone.of("Asia/Seoul")).date
+//     }
+//
+//     require(this.matches(Regex("^\\d{4}년\\s*\\d{1,2}월\\s*\\d{1,2}일$"))) { "잘못된 날짜 형식: $this" }
+//
+//     val (year, month, day) = this.split("년", "월", "일")
+//         .filter { it.isNotBlank() }
+//         .map { it.trim().toInt() }
+//     return LocalDate(year, month, day)
+// }
+//
+// fun String.parseToLocalTime(): LocalTime {
+//     if (this.isBlank()) {
+//         // 빈 문자열인 경우 현재 시간 반환
+//         return Clock.System.now().toLocalDateTime(TimeZone.of("Asia/Seoul")).time
+//     }
+//
+//     require(this.matches(Regex("^(오전|오후)\\s*\\d{1,2}시\\s*\\d{1,2}분$"))) { "잘못된 시간 형식: $this" }
+//
+//     val (period, time) = this.split(" ", limit = 2)
+//     val (hour, minute) = time.split("시 ", "분")
+//         .filter { it.isNotBlank() }
+//         .map { it.trim().toInt() }
+//
+//     require(hour in 1..12 && minute in 0..59) { "유효하지 않은 시간 또는 분: $this" }
+//
+//     val adjustedHour = when {
+//         period == "오후" && hour != 12 -> hour + 12
+//         period == "오전" && hour == 12 -> 0
+//         else -> hour
+//     }
+//
+//     return LocalTime(adjustedHour, minute)
+// }

core/data/src/main/kotlin/com/tripmate/android/core/data/di/RepositoryModule.kt

@@ -2,10 +2,12 @@ package com.tripmate.android.core.data.di
 
 import com.tripmate.android.core.data.repository.NotificationRepositoryImpl
 import com.tripmate.android.core.data.repository.MapRepositoryImpl
+import com.tripmate.android.core.data.repository.MateRepositoryImpl
 import com.tripmate.android.domain.repository.PersonalizationRepository
 import com.tripmate.android.core.data.repository.PersonalizationRepositoryImpl
 import com.tripmate.android.domain.repository.NotificationRepository
 import com.tripmate.android.domain.repository.MapRepository
+import com.tripmate.android.domain.repository.MateRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -27,4 +29,8 @@ internal abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindNotificationRepository(notificationRepositoryImpl: NotificationRepositoryImpl): NotificationRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindMateRepository(mateRepositoryImpl: MateRepositoryImpl): MateRepository
 }

core/data/src/main/kotlin/com/tripmate/android/core/data/repository/MateRepositoryImpl.kt

@@ -0,0 +1,17 @@
+package com.tripmate.android.core.data.repository
+
+import com.tripmate.android.core.datastore.PersonalizationDataSource
+import com.tripmate.android.domain.repository.MateRepository
+import javax.inject.Inject
+
+internal class MateRepositoryImpl @Inject constructor(
+    private val personalizationDataSource: PersonalizationDataSource,
+) : MateRepository {
+    override suspend fun checkPersonalizationCompletion(): Boolean {
+        return personalizationDataSource.checkPersonalizationCompletion()
+    }
+
+    override suspend fun completePersonalization(flag: Boolean) {
+        personalizationDataSource.completePersonalization(flag)
+    }
+}

core/designsystem/src/main/kotlin/com/tripmate/android/core/designsystem/component/Dialog.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
-import com.tripmate.android.core.designsystem.ComponentPreview
 import com.tripmate.android.core.designsystem.R
 import com.tripmate.android.core.designsystem.theme.Background02
 import com.tripmate.android.core.designsystem.theme.Gray001
@@ -143,6 +142,7 @@ fun ServerErrorDialog(
             cancelTextResId = null,
             onCancelClick = {},
             onConfirmClick = onRetryClick,
+            modifier = Modifier.padding(16.dp),
         )
     }
 }
@@ -162,24 +162,6 @@ fun NetworkErrorDialog(
             cancelTextResId = null,
             onCancelClick = {},
             onConfirmClick = onRetryClick,
-        )
-    }
-}
-
-@ComponentPreview
-@Composable
-fun TripMateDialogPreview() {
-    TripmateTheme {
-        TripmateDialog(
-            onDismissRequest = {},
-            titleResId = R.string.under_age_title,
-            iconResId = null,
-            iconDescription = "",
-            descriptionResId = R.string.under_age_description,
-            cancelTextResId = null,
-            confirmTextResId = R.string.under_age_confirm,
-            onCancelClick = {},
-            onConfirmClick = {},
             modifier = Modifier.padding(16.dp),
         )
     }

core/designsystem/src/main/kotlin/com/tripmate/android/core/designsystem/component/TextField.kt

@@ -5,12 +5,14 @@ import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
@@ -24,67 +26,72 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import com.tripmate.android.core.designsystem.ComponentPreview
 import com.tripmate.android.core.designsystem.R
 import com.tripmate.android.core.designsystem.theme.Error
 import com.tripmate.android.core.designsystem.theme.Gray001
 import com.tripmate.android.core.designsystem.theme.Gray006
 import com.tripmate.android.core.designsystem.theme.Gray008
 import com.tripmate.android.core.designsystem.theme.Small14_Reg
+import com.tripmate.android.core.designsystem.theme.TripmateTheme
 import com.tripmate.android.core.designsystem.theme.XSmall12_Reg
 
 @Composable
 fun TripmateTextField(
     text: String,
     onTextChange: (String) -> Unit,
     @StringRes searchTextHintRes: Int,
-    clearText: () -> Unit,
     modifier: Modifier = Modifier,
+    keyboardOptions: KeyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+    clearText: () -> Unit = {},
     errorText: String? = null,
     backgroundColor: Color = Color.White,
     textColor: Color = Gray001,
     cornerShape: RoundedCornerShape = RoundedCornerShape(6.dp),
     borderStroke: BorderStroke = BorderStroke(width = 1.dp, color = if (errorText != null) Error else Gray008),
+    multiline: Boolean = false,
     maxLength: Int? = null,
+    isClearIconVisible: Boolean = false,
 ) {
-    Column(modifier = modifier) {
+    Column {
         BasicTextField(
             value = text,
-            onValueChange = onTextChange,
-            modifier = Modifier.height(52.dp),
-            keyboardOptions = KeyboardOptions(
-                keyboardType = KeyboardType.Number,
-                imeAction = ImeAction.Done,
-            ),
+            onValueChange = { text ->
+                if (maxLength == null || text.length <= maxLength) {
+                    onTextChange(text)
+                }
+            },
+            keyboardOptions = keyboardOptions,
             textStyle = Small14_Reg.copy(color = textColor),
-            singleLine = true,
+            singleLine = !multiline,
             decorationBox = { innerTextField ->
                 Row(
-                    modifier = Modifier
+                    modifier = modifier
                         .background(
                             color = backgroundColor,
                             shape = cornerShape,
                         )
                         .border(
                             border = borderStroke,
                             shape = cornerShape,
-                        ),
-                    verticalAlignment = Alignment.CenterVertically,
+                        )
+                        .padding(vertical = if (multiline) 12.dp else 0.dp, horizontal = 12.dp),
+                    verticalAlignment = if (multiline) Alignment.Top else Alignment.CenterVertically,
                 ) {
-                    Spacer(modifier = Modifier.width(20.dp))
-                    Box(modifier = Modifier.weight(1f)) {
+                    Box {
                         if (text.isEmpty()) {
                             Text(
                                 text = stringResource(id = searchTextHintRes),
                                 color = Gray006,
+                                maxLines = 1,
                                 style = Small14_Reg,
                             )
                         }
                         innerTextField()
                     }
                     Spacer(modifier = Modifier.weight(1f))
-                    if (text.isNotEmpty()) {
+                    if (text.isNotEmpty() && isClearIconVisible) {
                         Icon(
                             imageVector = ImageVector.vectorResource(R.drawable.ic_clear_text),
                             contentDescription = "clear icon",
@@ -95,12 +102,15 @@ fun TripmateTextField(
                                 },
                         )
                     }
-                    Spacer(modifier = Modifier.width(20.dp))
                 }
             },
         )
         Spacer(modifier = Modifier.height(4.dp))
-        Row {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
             if (errorText != null) {
                 Spacer(modifier = Modifier.height(4.dp))
                 Text(
@@ -120,3 +130,15 @@ fun TripmateTextField(
         }
     }
 }
+
+@ComponentPreview
+@Composable
+fun TripmateTextFieldPreview() {
+    TripmateTheme {
+        TripmateTextField(
+            text = "트립메이트",
+            onTextChange = {},
+            searchTextHintRes = R.string.app_name,
+        )
+    }
+}