From 2254944f495cf7c55574fa848b286399f5041408 Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 03:26:23 +0900 Subject: [PATCH 01/11] =?UTF-8?q?fix=20:=20Max=20text=EB=A1=9C=20=EC=9E=90?= =?UTF-8?q?=EA=B8=B0=20=EC=86=8C=EA=B0=9C=EB=A5=BC=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=ED=95=A0=20=EA=B2=BD=EC=9A=B0,=20=EA=B5=AC=EB=B6=84=EC=84=A0?= =?UTF-8?q?=20=EC=B9=A8=EB=B2=94=20=EC=9D=B4=EC=8A=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_homie_profile.xml | 4 ++-- app/src/main/res/layout/fragment_profile.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_homie_profile.xml b/app/src/main/res/layout/activity_homie_profile.xml index 842ab134..bf0dd33d 100644 --- a/app/src/main/res/layout/activity_homie_profile.xml +++ b/app/src/main/res/layout/activity_homie_profile.xml @@ -206,9 +206,9 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginHorizontal="16dp" - android:layout_marginTop="48dp" + android:layout_marginTop="28dp" android:background="@color/hous_g_0" - app:layout_constraintTop_toBottomOf="@id/iv_homie_profile_representation_image_empty" /> + app:layout_constraintTop_toBottomOf="@id/tv_homie_profile_introduction" /> From e3d14f9f8354d745ebd02dada236e00a9fba5ebc Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 03:29:25 +0900 Subject: [PATCH 02/11] =?UTF-8?q?fix=20:=20=EC=9A=B0=EB=A6=AC=20=EC=A7=91?= =?UTF-8?q?=20=EB=B3=84=EB=AA=85=20=EC=88=98=EC=A0=95=20-=20=EB=A9=A4?= =?UTF-8?q?=EB=B2=84=EB=93=A4=EC=9D=B4=20->=20=EB=8B=A4=EB=A5=B8=20?= =?UTF-8?q?=ED=98=B8=EB=AF=B8=EB=93=A4=EC=9D=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a1f8abea..ba248673 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -188,7 +188,7 @@ back button 저장 우리 집 별명 바꾸기 - 멤버들이 확인할 수 있도록 방 이름을 설정해주세요. + 다른 호미들이 확인할 수 있도록 방 이름을 설정해주세요. %d/8 From 7a6fd3be482ef22b63a96c452e76556af20ecf88 Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 21:44:11 +0900 Subject: [PATCH 03/11] =?UTF-8?q?fix(Rules=20Main):=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20->=20Ruels=20=EA=B2=80=EC=83=89=ED=95=98?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/todo/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/todo/src/main/res/values/strings.xml b/feature/todo/src/main/res/values/strings.xml index fcf0b432..d185b83c 100644 --- a/feature/todo/src/main/res/values/strings.xml +++ b/feature/todo/src/main/res/values/strings.xml @@ -11,7 +11,7 @@ 호미 검색 결과 개 - 검색하기 + Rules 검색하기 아직 우리집 to-do가 없어요! 해당되는 to-do가 없어요! 안녕, to-do... From 7c0efb2a2942eabada4a790bf616b8573b1676ca Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 21:55:12 +0900 Subject: [PATCH 04/11] =?UTF-8?q?feat(Rules=20Main):=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=20=EC=97=86=EC=9D=84=20=EB=95=8C=20empty=20=EB=B7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../our_rules/component/RuleEmptyContent.kt | 7 ++- .../component/main/MainRuleContent.kt | 8 ++-- .../our_rules/component/main/MainRuleList.kt | 45 +++++++++++++------ .../our_rules/graph/RuleNavGraph.kt | 3 +- .../our_rules/screen/MainRuleScreen.kt | 8 ++-- app/src/main/res/values/strings.xml | 1 + 6 files changed, 50 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/component/RuleEmptyContent.kt b/app/src/main/java/hous/release/android/presentation/our_rules/component/RuleEmptyContent.kt index 5acc2f71..d8e0e832 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/component/RuleEmptyContent.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/component/RuleEmptyContent.kt @@ -16,14 +16,17 @@ import hous.release.designsystem.theme.HousTheme @Composable fun RuleEmptyContent( - modifier: Modifier = Modifier.fillMaxWidth().padding(top = 88.dp) + text: String = stringResource(id = R.string.hous_empty_our_rules), + modifier: Modifier = Modifier + .fillMaxWidth() + .padding(top = 88.dp) ) { Column( modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally ) { Text( - text = stringResource(id = R.string.hous_empty_our_rules), + text = text, color = HousG5, style = HousTheme.typography.b2 ) diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt index 46ddad77..4247a70b 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt @@ -25,7 +25,8 @@ import hous.release.feature.todo.R @Composable fun MainRuleContent( - mainRules: List = emptyList(), + filteredRules: List = emptyList(), + originRules: List = emptyList(), searchQuery: String = "", onSearch: (String) -> Unit = {}, onOpenDetailRule: (Int) -> Unit = {}, @@ -75,7 +76,8 @@ fun MainRuleContent( ) ) MainRuleList( - mainRules = mainRules, + originRules = originRules, + filteredRules = filteredRules, onNavigateToDetailRule = onOpenDetailRule ) } @@ -87,7 +89,7 @@ fun MainRuleContent( private fun MainRuleScreenPreView2() { HousTheme { MainRuleContent( - mainRules = listOf( + filteredRules = listOf( Rule().copy(id = 1, name = "test1", isNew = true), Rule().copy(id = 2, name = "test2", isNew = false), Rule().copy(id = 3, name = "test3", isNew = true), diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleList.kt b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleList.kt index f18cfc32..bb1f6f05 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleList.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleList.kt @@ -12,8 +12,10 @@ import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import hous.release.android.R import hous.release.android.presentation.our_rules.component.RuleEmptyContent import hous.release.designsystem.component.HousDot import hous.release.designsystem.component.HousDotType @@ -25,18 +27,25 @@ import hous.release.domain.entity.rule.Rule @Composable fun MainRuleList( onNavigateToDetailRule: (Int) -> Unit = {}, - mainRules: List = emptyList() + originRules: List = emptyList(), + filteredRules: List = emptyList() ) { - if (mainRules.isEmpty()) { - RuleEmptyContent() - } else { - Spacer(modifier = Modifier.height(16.dp)) - LazyColumn { - itemsIndexed(mainRules, key = { _, rule -> rule.id }) { _, rule -> - MainRuleItem( - onClick = { onNavigateToDetailRule(rule.id) }, - mainRule = rule - ) + when { + originRules.isEmpty() -> { + RuleEmptyContent(text = stringResource(id = R.string.hous_empty_our_rules)) + } + filteredRules.isEmpty() -> { + RuleEmptyContent(text = stringResource(id = R.string.hous_filterd_empty_our_rules)) + } + else -> { + Spacer(modifier = Modifier.height(16.dp)) + LazyColumn { + itemsIndexed(filteredRules, key = { _, rule -> rule.id }) { _, rule -> + MainRuleItem( + onClick = { onNavigateToDetailRule(rule.id) }, + mainRule = rule + ) + } } } } @@ -72,7 +81,7 @@ private fun MainRuleItem( ) } -@Preview(name = "empty content", showBackground = true) +@Preview(name = "empty origin rules content", showBackground = true) @Composable private fun EmptyContentPreview() { HousTheme { @@ -82,12 +91,22 @@ private fun EmptyContentPreview() { } } +@Preview(name = "empty filtered Rules", showBackground = true) +@Composable +private fun EmptyContentPreview2() { + HousTheme { + Surface { + MainRuleList(originRules = listOf(Rule().copy(id = 1, name = "test1"))) + } + } +} + @Preview(name = "MainRuleContent", showBackground = true) @Composable private fun MainRuleContentPreview() { HousTheme { MainRuleList( - mainRules = listOf( + filteredRules = listOf( Rule().copy(id = 1, name = "test1", isNew = true), Rule().copy(id = 2, name = "test2", isNew = false), Rule().copy(id = 3, name = "test3", isNew = true), diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/graph/RuleNavGraph.kt b/app/src/main/java/hous/release/android/presentation/our_rules/graph/RuleNavGraph.kt index 64648cc6..c63875e8 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/graph/RuleNavGraph.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/graph/RuleNavGraph.kt @@ -97,7 +97,8 @@ private fun NavGraphBuilder.mainRuleScreen( MainRuleScreen( detailRule = uiState.value.detailRule, - mainRules = uiState.value.filteredRules, + filteredRules = uiState.value.filteredRules, + originRules = uiState.value.originRules, searchQuery = uiState.value.searchQuery, fetchDetailRuleById = viewModel::fetchDetailRule, onSearch = viewModel::searchRule, diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/screen/MainRuleScreen.kt b/app/src/main/java/hous/release/android/presentation/our_rules/screen/MainRuleScreen.kt index 03636d41..7ed996f2 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/screen/MainRuleScreen.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/screen/MainRuleScreen.kt @@ -32,7 +32,8 @@ import kotlinx.coroutines.launch @Composable fun MainRuleScreen( detailRule: DetailRuleUiModel = DetailRuleUiModel(), - mainRules: List = emptyList(), + filteredRules: List = emptyList(), + originRules: List = emptyList(), searchQuery: String = "", fetchDetailRuleById: (Int) -> Unit = {}, deleteRule: () -> Unit = {}, @@ -107,7 +108,8 @@ fun MainRuleScreen( sheetBackgroundColor = HousWhite ) { MainRuleContent( - mainRules = mainRules, + filteredRules = filteredRules, + originRules = originRules, searchQuery = searchQuery, onSearch = onSearch, onOpenDetailRule = { id -> @@ -135,7 +137,7 @@ fun MainRuleScreen( private fun MainRuleScreenPreView2() { HousTheme { MainRuleScreen( - mainRules = listOf( + filteredRules = listOf( Rule().copy(id = 1, name = "test1", isNew = true), Rule().copy(id = 2, name = "test2", isNew = false), Rule().copy(id = 3, name = "test3", isNew = true), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba248673..64c58d2c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -111,6 +111,7 @@ Our Rules btn_of_our_rules 아직 우리 집 Rules가 없어요! + 해당되는 Rules가 없어요! 다른 Rule도 추가해보세요! 똑같은 이름의 Rule이 있어요! 사진은 5개 까지만 추가할 수 있어요! From 5f9ea497e39789b1f3c641283b209b6d18b870fb Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 21:58:31 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat(Rules=20Detail)=20:=EA=B7=9C?= =?UTF-8?q?=EC=B9=99=20=EC=84=A4=EB=AA=85=EC=9D=B4=20=EB=B9=84=EC=96=B4?= =?UTF-8?q?=EC=9E=88=EB=8A=94=20=EA=B2=BD=EC=9A=B0,=20'=EC=84=A4=EB=AA=85?= =?UTF-8?q?=20=EC=97=86=EC=9D=8C'=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../our_rules/component/main/DetailRuleBottomSheetContent.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/DetailRuleBottomSheetContent.kt b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/DetailRuleBottomSheetContent.kt index a5c2936d..bebc76e1 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/DetailRuleBottomSheetContent.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/DetailRuleBottomSheetContent.kt @@ -54,7 +54,7 @@ fun DetailRuleBottomSheetContent( Spacer(modifier = Modifier.height(7.dp)) if (detailRule.description.isEmpty()) { Text( - text = detailRule.description, + text = "설명 없음", style = HousTheme.typography.b2, color = HousG4 ) From 90213aed9709318431ffb6d77499d7195e3cf051 Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 22:01:46 +0900 Subject: [PATCH 06/11] =?UTF-8?q?fix=20:=20Rules=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EA=B0=9C=EC=88=98=20=EC=A0=9C=ED=95=9C=20Dialog=20-=20writing?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64c58d2c..13fc3b76 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -117,7 +117,7 @@ 사진은 5개 까지만 추가할 수 있어요! 대표 rule 은 3개 까지만 추가할 수 있어요! Rules 개수 초과 - 우리 집 rule이 너무 많아요!\n필요하지 않은 rule을 삭제하고\n다시 시도해주세요~ + 우리 집 Rules가 너무 많아요!\n필요하지 않은 rule을 삭제하고\n다시 시도해 주세요~ 아직 우리 집 Rules가 없어요! Rules 추가 Rules 수정 From e728ccd8e5843212e6cb0da2b45eef0c0bb98120 Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 22:05:20 +0900 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20Rules=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EA=B0=9C=EC=88=98=20=EC=A0=9C=ED=95=9C=20Dialog=20-=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EC=99=B8=20=EC=98=81=EC=97=AD=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=20=EC=8B=9C,=20=EB=92=A4=EB=A1=9C=20=EA=B0=80?= =?UTF-8?q?=EA=B8=B0=20=EC=8B=9C=20=EB=8B=AB=ED=9E=98=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../our_rules/component/dialog/AddRuleLimitedDialog.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/component/dialog/AddRuleLimitedDialog.kt b/app/src/main/java/hous/release/android/presentation/our_rules/component/dialog/AddRuleLimitedDialog.kt index 05be8f1f..74896723 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/component/dialog/AddRuleLimitedDialog.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/component/dialog/AddRuleLimitedDialog.kt @@ -2,6 +2,7 @@ package hous.release.android.presentation.our_rules.component.dialog import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource +import androidx.compose.ui.window.DialogProperties import hous.release.android.R import hous.release.designsystem.component.HousLimitDialog @@ -12,6 +13,10 @@ fun AddRuleLimitedDialog( HousLimitDialog( title = stringResource(R.string.our_rule_limit_title), content = stringResource(R.string.our_rule_limit_content), - onDismissRequest = onDismissRequest + onDismissRequest = onDismissRequest, + properties = DialogProperties( + dismissOnBackPress = false, + dismissOnClickOutside = false + ) ) } From 4f8d827a20f5e77d215e82eaf5bd424b75e99c7d Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 22:12:11 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix=20:=20=EB=A3=B0=EC=8A=A4=20=EA=B3=A0?= =?UTF-8?q?=EC=A0=95=ED=95=98=EA=B8=B0"Page=20:=20N"=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../our_rules/component/main/RuleGuideBottomSheetContent.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/RuleGuideBottomSheetContent.kt b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/RuleGuideBottomSheetContent.kt index 95314eac..4dbe9e3d 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/RuleGuideBottomSheetContent.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/RuleGuideBottomSheetContent.kt @@ -61,10 +61,6 @@ fun RuleGuideBottomSheetContent() { style = HousTheme.typography.b1 ) Spacer(Modifier.height(13.dp)) - Text( - text = "Page: $page", - textAlign = TextAlign.Center - ) RuleGuideLottie(idx = page) Spacer(Modifier.height(20.dp)) From f35649acbb31b562ee0c808bea02cd641d674c2d Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 22:43:36 +0900 Subject: [PATCH 09/11] =?UTF-8?q?feat:=20rules=20guide=20=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=ED=8C=85=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/main/RuleGuideBottomSheetContent.kt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/RuleGuideBottomSheetContent.kt b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/RuleGuideBottomSheetContent.kt index 4dbe9e3d..46dd50af 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/component/main/RuleGuideBottomSheetContent.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/component/main/RuleGuideBottomSheetContent.kt @@ -35,6 +35,17 @@ import kotlinx.coroutines.launch // https://github.com/android/snippets/blob/5ae1f7852164d98d055b3cc6b463705989cff231/compose/snippets/src/main/java/com/example/compose/snippets/layouts/PagerSnippets.kt#L93-L103 +private val titleList = listOf( + "우리집 Rules란?", + "대표 Rules 선택하기", + "대표 Rules 선택 시 주의!" +) + +private val descriptionList = listOf( + "Rules는 우리 호미들이 꼭 지켜야 하는 규칙이에요!", + "우리 집 대표 Rules를 선택하면 홈에서 바로 확인할 수 있어요!", + "대표 Rules는 딱 3개까지만 고정할 수 있어요!" +) @OptIn(ExperimentalFoundationApi::class) @Composable fun RuleGuideBottomSheetContent() { @@ -55,7 +66,7 @@ fun RuleGuideBottomSheetContent() { horizontalAlignment = Alignment.CenterHorizontally ) { Text( - text = "룰스 고정하기", + text = titleList[page], color = HousBlack, textAlign = TextAlign.Center, style = HousTheme.typography.b1 @@ -65,7 +76,7 @@ fun RuleGuideBottomSheetContent() { Spacer(Modifier.height(20.dp)) Text( - text = "룰스 고정 어쩌구 저쩌구", + text = descriptionList[page], color = HousG6, textAlign = TextAlign.Center, style = HousTheme.typography.description From f91670a6d021beab4c361276dc94a659f56c4a5c Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 22:49:09 +0900 Subject: [PATCH 10/11] =?UTF-8?q?fix=20:=20Rule=20=EC=A0=9C=EB=AA=A9=20?= =?UTF-8?q?=EA=B8=80=EC=9E=90=EC=88=98=EB=8F=84=2020=EC=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../our_rules/component/update/BasicUpdateRuleScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/component/update/BasicUpdateRuleScreen.kt b/app/src/main/java/hous/release/android/presentation/our_rules/component/update/BasicUpdateRuleScreen.kt index 6efbeedf..e90ba844 100644 --- a/app/src/main/java/hous/release/android/presentation/our_rules/component/update/BasicUpdateRuleScreen.kt +++ b/app/src/main/java/hous/release/android/presentation/our_rules/component/update/BasicUpdateRuleScreen.kt @@ -85,7 +85,7 @@ fun BasicUpdateRuleScreen( textFielddMode = HousTextFieldMode.RIGHT_LIMITED, text = ruleName, onTextChange = changeName, - limitTextCount = 10, + limitTextCount = 20, keyboardOptions = KeyboardOptions.Default.copy( imeAction = ImeAction.Next ), From 8fdef5dd78d9dfc3f9529f1ad5034766c3f3d1ca Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 17 Mar 2024 23:55:57 +0900 Subject: [PATCH 11/11] =?UTF-8?q?fix=20:=20homie=20profile=20=EA=B5=AC?= =?UTF-8?q?=EB=B6=84=EC=84=A0=20=EB=A7=88=EC=A7=84=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_homie_profile.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_homie_profile.xml b/app/src/main/res/layout/activity_homie_profile.xml index bf0dd33d..f1ee75da 100644 --- a/app/src/main/res/layout/activity_homie_profile.xml +++ b/app/src/main/res/layout/activity_homie_profile.xml @@ -206,9 +206,9 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginHorizontal="16dp" - android:layout_marginTop="28dp" + android:layout_marginTop="20dp" android:background="@color/hous_g_0" - app:layout_constraintTop_toBottomOf="@id/tv_homie_profile_introduction" /> + app:layout_constraintTop_toBottomOf="@id/tv_homie_profile_representation" />