[2.0.0 QA] todo + profile + 인터넷 연결 (#331)

* fix(NetworkErrorActivity): 라이팅 : 확인해주세요! -> 확인해 주세요!(띄어쓰기.) * fix(PersonalityTestStartFragment): 라이팅 변경 * fix(TodoLimitDialog): 라이팅 : 시도해주세요 -> 시도해 주세요(띄어쓰기!) * fix(to-do) : To-Do 라이팅 * feat(Todo) : 추가 제한, 삭제 다이얼로그 영역 밖 터치시 꺼지지 않게 * feat(Todo add) 알림받기 text 눌러도 click 적용 * style : ktFormat
Hous-Release · Mar 17, 2024 · 4476790 · 4476790
1 parent f891f33
commit 4476790
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/...c/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt b/...c/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt
@@ -12,7 +12,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -21,7 +20,6 @@ import hous.release.designsystem.component.HousTextField
 import hous.release.designsystem.component.HousTextFieldMode
 import hous.release.designsystem.theme.HousTheme
 import hous.release.domain.entity.rule.Rule
-import hous.release.feature.todo.R
 
 @Composable
 fun MainRuleContent(
@@ -65,7 +63,7 @@ fun MainRuleContent(
                 textFielddMode = HousTextFieldMode.SEARCH,
                 text = searchQuery,
                 onTextChange = onSearch,
-                hint = stringResource(R.string.todo_detail_textfield_hint),
+                hint = "Rules 검색하기",
                 keyboardOptions = KeyboardOptions(
                     imeAction = ImeAction.Done
                 ),

diff --git a/app/src/main/java/hous/release/android/util/component/ToDoUserScreen.kt b/app/src/main/java/hous/release/android/util/component/ToDoUserScreen.kt
@@ -181,13 +181,13 @@ private fun TodoNotificationCheckBox(
     isCheck: Boolean
 ) {
     Row(
+        modifier = Modifier.clickable {
+            changeNotification()
+        },
         horizontalArrangement = Arrangement.spacedBy(4.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Image(
-            modifier = Modifier.clickable {
-                changeNotification()
-            },
             painter = painterResource(id = if (isCheck) R.drawable.ic_check_on else R.drawable.ic_check_off),
             contentDescription = null
         )

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -243,7 +243,7 @@
     <string name="tutorial_4_body">생활 성향 테스트를 참여하면 나를 대신해\n나를 잘 설명해줄 호미 성향 카드를 받을 수 있어요.\n\n이제 Hous-와 함께 우리 집 호미들의 성향 카드를\n확인하며 즐거운 공동생활을 시작해볼까요?</string>
 
     <string name="to_do_limit_title">to-do 개수 초과</string>
-    <string name="to_do_limit_content">우리 집 to-do가 너무 많아요!\n필요하지 않은 to-do를 삭제하고\n다시 시도해주세요~</string>
+    <string name="to_do_limit_content">우리 집 to-do가 너무 많아요!\n필요하지 않은 to-do를 삭제하고\n다시 시도해 주세요~</string>
     <string name="todo_limit_confirm">알겠어요!</string>
     <string name="todo_main_empty_progress">아직 우리 집 to-do가 없어요!</string>
     <string name="to_do_my_empty">오늘은 쉬는 날! 내 담당 to-do가 없어요!</string>
@@ -336,7 +336,7 @@
     <string name="personality_result_good">찰떡궁합</string>
     <string name="personality_result_bad">맞춰가요</string>
     <string name="test_start_title">생활패턴 체크 시작!</string>
-    <string name="test_start_content">지금부터 15개의 질문에 답변해주세요 :)\n솔직한 답변은 서로를 배려할 수 있는\n좋은 기회가 될거에요!</string>
+    <string name="test_start_content">15개 질문을 통해 나의 생활 성향을 알아보아요!\n솔직한 답변은 서로를 배려할 수 있는\n좋은 기회가 될 거예요! :)</string>
     <string name="test_start">시작하기</string>
     <string name="test_loading_title">결과 나오는 중</string>
     <string name="test_loading_subtitle">조금만 기다려주세요!</string>
@@ -399,7 +399,7 @@
     <!-- NetworkError -->
     <string name="network_error_img_desc">네트워크 에러 이미지</string>
     <string name="network_error_title">인터넷에 연결되어 있지 않아요!</string>
-    <string name="network_error_desc">Hous-를 사용하려면 인터넷 연결이 필요해요.\nWi-Fi를 다시 한 번 확인해주세요!</string>
+    <string name="network_error_desc">Hous-를 사용하려면 인터넷 연결이 필요해요.\nWi-Fi를 다시 한 번 확인해 주세요!!</string>
     <string name="network_error_retry">다시 시도하기</string>
     <string name="network_error_toast">인터넷 연결 후 다시 시도해 주세요.</string>
 

diff --git a/feature/todo/src/main/java/hous/release/feature/todo/detail/TodoDetailScreen.kt b/feature/todo/src/main/java/hous/release/feature/todo/detail/TodoDetailScreen.kt
@@ -43,6 +43,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
@@ -110,14 +111,22 @@ fun TodoDetailScreen(
                     bottomSheetState.hide()
                 }
             },
-            onDismissRequest = { isDeleteTodo = false }
+            onDismissRequest = { isDeleteTodo = false },
+            properties = DialogProperties(
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false
+            )
         )
     }
     if (isLimitTodo) {
         HousLimitDialog(
             title = stringResource(R.string.todo_limit_title),
             content = stringResource(R.string.todo_limit_content),
-            onDismissRequest = { isLimitTodo = false }
+            onDismissRequest = { isLimitTodo = false },
+            properties = DialogProperties(
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false
+            )
         )
     }
 

diff --git a/feature/todo/src/main/res/values/strings.xml b/feature/todo/src/main/res/values/strings.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="filter_title">필터 설정</string>
+    <string name="filter_title">to-do 필터 설정</string>
     <string name="filter_day">요일</string>
     <string name="filter_homy">호미</string>
     <string name="filter_save">저장하기</string>
     <string name="todo_detail_title">우리 집 to-do</string>
     <string name="new_todo">new !</string>
-    <string name="todo_filter">필터</string>
+    <string name="todo_filter">to-do 필터</string>
     <string name="todo_filter_day_of_week">요일</string>
     <string name="todo_filter_homy">호미</string>
     <string name="filter_search_result">검색 결과</string>
     <string name="filter_search_result_postfix">개</string>
-    <string name="todo_detail_textfield_hint">Rules 검색하기</string>
+    <string name="todo_detail_textfield_hint">to-do 검색하기</string>
     <string name="todo_detail_empty">아직 우리집 to-do가 없어요!</string>
     <string name="todo_filter_empty">해당되는 to-do가 없어요!</string>
     <string name="todo_delete_title">안녕, to-do...</string>