[FEAT/#41] 채팅방 뷰 구현 #49
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…PT-all/35-APPJAM-ANDROID-WITHSUHYEON into feat/#41-chat-view # Conflicts: # app/src/main/java/com/sopt/withsuhyeon/feature/chat/ChatScreen.kt
…ID-WITHSUHYEON into feat/#41-chat-view # Conflicts: # app/src/main/java/com/sopt/withsuhyeon/core/navigation/RouteModel.kt
…all/35-APPJAM-ANDROID-WITHSUHYEON into feat/#41-chat-view # Conflicts: # app/src/main/java/com/sopt/withsuhyeon/feature/main/MainScreen.kt
…/SOPT-all/35-APPJAM-ANDROID-WITHSUHYEON into feat/#41-chat-view # Conflicts: # app/src/main/java/com/sopt/withsuhyeon/core/navigation/RouteModel.kt # app/src/main/java/com/sopt/withsuhyeon/feature/main/MainNavigator.kt
sayyyho
approved these changes
Jan 21, 2025
Comment on lines
103
to
116
| LaunchedEffect(datePickerState.selectedItem, amPmPickerState.selectedItem, hourPickerState.selectedItem, minutePickerState.selectedItem) { | ||
| try { | ||
| val selectedDate = datePickerState.selectedItem.toDate() | ||
| val selectedTime = LocalTime( | ||
| hourPickerState.selectedItem.toTime(amPmPickerState.selectedItem), | ||
| minutePickerState.selectedItem.toInt() | ||
| ) | ||
| val selectedDateTime = LocalDateTime(selectedDate, selectedTime) | ||
| onDateTimeSelected(selectedDateTime) | ||
| } catch (e: Exception) { | ||
| println("Error parsing date: ${e.message}") | ||
| onDateTimeSelected(null) | ||
| } | ||
| } |
There was a problem hiding this comment.
좋네요! 이 코드 보고 웹에서 sideEffect 처리할 때랑 비슷함을 느꼈습니다!! 저도 Progress에 재적용하겠습니다!
| dividerColor = Transparent, | ||
| itemPadding = itemPadding, | ||
| fadingEdgeGradient = fadingEdgeGradient, | ||
| horizontalAlignment = horizontalAlignment, | ||
| itemTextAlignment = verticalAlignment, | ||
| isInfinity = true | ||
| isInfinity = false |
| shape = RoundedCornerShape(16.dp) | ||
| ) | ||
| .padding(horizontal = 12.dp, vertical = 8.dp) | ||
| .widthIn(max = 230.dp) |
Comment on lines
66
to
73
| textFieldBorderColor | ||
| ?: when { | ||
| value.isNotEmpty() && !isValid -> colors.Red01 | ||
| isMaxLengthExceeded -> colors.Red01 | ||
| isFocused -> colors.Purple300 | ||
| !isValid -> colors.Red01 | ||
| else -> colors.Grey100 | ||
| } |
Comment on lines
27
to
47
| fun String.toDate(): LocalDate { | ||
| val pattern = Regex("(\\d{1,2})월 (\\d{1,2})일.*") | ||
| val match = pattern.matchEntire(this) ?: throw IllegalArgumentException("Invalid date format") | ||
| val (month, day) = match.destructured | ||
| val currentYear = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).year | ||
| return LocalDate(currentYear, month.toInt(), day.toInt()) | ||
| } | ||
|
|
||
| fun String.toAllPostRequestDate(): String { | ||
| val currentYear = Calendar.getInstance().get(Calendar.YEAR) | ||
|
|
||
| val cleanedDate = this.replace(Regex("""\s*\([가-힣]+\)"""), "") | ||
|
|
||
| val inputFormat = SimpleDateFormat("M/dd, yyyy", Locale.KOREA) | ||
| val outputFormat = SimpleDateFormat("yyyy-MM-dd", Locale.KOREA) | ||
|
|
||
| val dateWithYear = "$cleanedDate, $currentYear" | ||
| val date = inputFormat.parse(dateWithYear) ?: throw IllegalArgumentException("Invalid date format") | ||
| return outputFormat.format(date) | ||
| } | ||
|
|
Comment on lines
+60
to
+66
| val lazyListState = rememberLazyListState() | ||
|
|
||
| LaunchedEffect(messages.size) { | ||
| if (messages.isNotEmpty()) { | ||
| lazyListState.animateScrollToItem(messages.size - 1) | ||
| } | ||
| } |
serioushyeon
approved these changes
Jan 21, 2025
app/src/main/AndroidManifest.xml
Outdated
| @@ -25,6 +25,7 @@ | |||
| android:name=".feature.main.MainActivity" | |||
| android:exported="true" | |||
| android:label="@string/app_name" | |||
| android:windowSoftInputMode="adjustResize" | |||
| shape = RoundedCornerShape(16.dp) | ||
| ) | ||
| .padding(horizontal = 12.dp, vertical = 8.dp) | ||
| .widthIn(max = 230.dp) |
| .fillMaxWidth() | ||
| .padding(horizontal = 16.dp, vertical = 8.dp), | ||
| verticalAlignment = Alignment.Bottom, | ||
| horizontalArrangement = if (isSentByOwner) Arrangement.End else Arrangement.Start |
| modifier: Modifier = Modifier | ||
| ) { | ||
| val isMessageTextFieldNotEmpty = text.isNotBlank() | ||
| // val focusRequester = remember { FocusRequester()} |
| ) { | ||
| val messages = remember { | ||
| mutableStateListOf( | ||
| Triple("안녕하세요", true, "오후 12:00"), |
| setInputText("") | ||
| } | ||
| }, | ||
| modifier = Modifier.fillMaxWidth().imePadding() |
There was a problem hiding this comment.
imePadding 고생했어요 ㅜㅜㅜ
…ID-WITHSUHYEON into feat/#41-chat-view # Conflicts: # app/src/main/java/com/sopt/withsuhyeon/core/navigation/RouteModel.kt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related issue 🛠
Work Description 📝
Screenshot 📸
ChatRoomScreen.mp4
Uncompleted Tasks 😅
To Reviewers 📢
채팅방 뷰 구현 완료하였습니다.
키보드 ime 문제 해결 때문에 PR이 늦어졌네요 ㅠㅠㅠㅠ 🥹
앞으로 남은 4일만 더 ! 화이팅