Skip to content

Commit a088ac7

Browse files
committed
[refactor]: pr리뷰 반영 (#83)
1 parent 320f40e commit a088ac7

4 files changed

Lines changed: 14 additions & 5 deletions

File tree

‎app/src/main/java/com/texthip/thip/ui/group/makeroom/component/GroupBookSearchBottomSheet.kt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fun GroupBookSearchBottomSheet(
7171
SearchBookTextField(
7272
hint = stringResource(R.string.group_book_search_hint),
7373
text = searchText,
74-
onValueChange = {
74+
onValueChange = {
7575
searchText = it
7676
onSearch(it)
7777
},
@@ -97,10 +97,16 @@ fun GroupBookSearchBottomSheet(
9797

9898
when {
9999
isLoading -> {
100-
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
100+
Box(
101+
modifier = Modifier
102+
.fillMaxWidth()
103+
.align(Alignment.CenterHorizontally),
104+
contentAlignment = Alignment.Center
105+
) {
101106
CircularProgressIndicator()
102107
}
103108
}
109+
104110
else -> {
105111
Column(Modifier.padding(horizontal = 20.dp)) {
106112
GroupBookListWithScrollbar(

‎app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomRecruitScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fun GroupRoomRecruitScreen(
102102
// 비밀방이면 비밀번호 화면으로, 공개방이면 바로 참여
103103
val detail = uiState.roomDetail
104104
if (detail != null && !detail.isPublic) {
105-
onNavigateToPasswordScreen(roomId)
105+
onNavigateToPasswordScreen(detail.roomId)
106106
} else {
107107
viewModel.onParticipationClick()
108108
}

‎app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomUnlockScreen.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fun GroupRoomUnlockScreen(
5353

5454
LaunchedEffect(password.toList()) {
5555
val fullPassword = password.joinToString("")
56-
if (fullPassword.length == 4 && password.all { it.length == 1 }) {
56+
if (!uiState.isLoading && fullPassword.length == 4 && password.all { it.length == 1 }) {
5757
viewModel.checkPassword(roomId, fullPassword)
5858
}
5959
}
@@ -62,6 +62,8 @@ fun GroupRoomUnlockScreen(
6262
when (uiState.passwordMatched) {
6363
true -> {
6464
// 비밀번호 일치: 성공 콜백 호출하여 네비게이션 처리
65+
keyboardController?.hide()
66+
viewModel.resetPasswordState()
6567
onSuccessNavigation()
6668
}
6769
false -> {

‎app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@
394394
<string name="error_room_close_failed">모집 마감 중 오류가 발생했습니다.</string>
395395
<string name="error_room_info_not_found">방 정보를 찾을 수 없습니다.</string>
396396

397-
<!-- SearchBookGroupViewModel -->\n <string name="error_recruiting_rooms_not_found">모집중인 방 정보를 찾을 수 없습니다.</string>
397+
<!-- SearchBookGroupViewModel -->
398+
<string name="error_recruiting_rooms_not_found">모집중인 방 정보를 찾을 수 없습니다.</string>
398399
<string name="error_recruiting_rooms_load_failed">모집중인 방을 불러오는데 실패했습니다.</string>
399400

400401
<!-- BookDetailViewModel -->

0 commit comments

Comments
 (0)