From 3d6352f55300d91060edb996e0331b983a290796 Mon Sep 17 00:00:00 2001 From: sgsk88 Date: Sat, 12 Aug 2023 22:10:54 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[fix/select=5Fscreen]=20=EA=B8=B0=EC=A1=B4?= =?UTF-8?q?=20=ED=95=99=EA=B5=90=20=EC=84=A0=ED=83=9D=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=8D=94=EB=AF=B8=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20(#40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/signup/UnivSelectScreen.kt | 47 ++++++++++-------- .../everymeal/presentation/ui/theme/Color.kt | 1 + .../src/main/res/drawable/icon_school.png | Bin 0 -> 3244 bytes .../src/main/res/drawable/image_konkuk.png | Bin 3339 -> 0 bytes .../src/main/res/drawable/image_myongji.png | Bin 2869 -> 0 bytes .../main/res/drawable/image_seoulwoman.png | Bin 1607 -> 0 bytes .../src/main/res/drawable/image_sungsin.png | Bin 3136 -> 0 bytes 7 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 presentation/src/main/res/drawable/icon_school.png delete mode 100644 presentation/src/main/res/drawable/image_konkuk.png delete mode 100644 presentation/src/main/res/drawable/image_myongji.png delete mode 100644 presentation/src/main/res/drawable/image_seoulwoman.png delete mode 100644 presentation/src/main/res/drawable/image_sungsin.png diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt index e142423e..1facce5a 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt @@ -44,12 +44,13 @@ import com.everymeal.presentation.ui.theme.EveryMeal_AndroidTheme import com.everymeal.presentation.ui.theme.Gray100 import com.everymeal.presentation.ui.theme.Gray300 import com.everymeal.presentation.ui.theme.Gray500 +import com.everymeal.presentation.ui.theme.Gray600 import com.everymeal.presentation.ui.theme.Gray800 import com.everymeal.presentation.ui.theme.Paddings data class Item( - val Image: Int, - val name: String, + val univName: String, + val campusName: String? = null ) @Composable @@ -60,10 +61,11 @@ fun UnivSelectScreen( val viewState by viewModel.viewState.collectAsState() val items = listOf( - Item(Image = R.drawable.image_myongji, name = "명지대"), - Item(Image = R.drawable.image_sungsin, name = "성신여대"), - Item(Image = R.drawable.image_seoulwoman, name = "서울여대"), - Item(Image = R.drawable.image_konkuk, name = "건국대"), + Item(univName = "명지대", campusName = "자연캠퍼스"), + Item(univName = "명지대", campusName = "인문캠퍼스"), + Item(univName = "성신여대", campusName = "자연캠퍼스"), + Item(univName = "성신여대", campusName = "자연캠퍼스"), + Item(univName = "서울여대"), ) Box( @@ -86,17 +88,19 @@ fun UnivSelectScreen( ) Spacer(modifier = Modifier.padding(10.dp)) LazyVerticalGrid( - columns = GridCells.Fixed(3), + columns = GridCells.Fixed(2), modifier = Modifier.weight(1f), ) { items(items.size) { index -> val item = items[index] - val isSelected = viewState.selectedUniv == item.name + val isSelected = viewState.selectedUniv == "${item.univName}+${item.campusName}" UnivSelectItem( item = item, isSelected = isSelected, ) { - viewModel.setEvent(UnivSelectContract.UnivSelectEvent.SelectedUniv(item.name)) + viewModel.setEvent(UnivSelectContract.UnivSelectEvent.SelectedUniv( + "${item.univName}+${item.campusName}") + ) } } } @@ -161,7 +165,7 @@ fun UnivSelectItem(item: Item, isSelected: Boolean, onSelectClick: (Item) -> Uni indication = null, interactionSource = remember { MutableInteractionSource() } ) { onSelectClick(item) } - .padding(Paddings.medium) + .padding(bottom = Paddings.medium, end = Paddings.medium) .clip(RoundedCornerShape(Paddings.medium)) .background(if (isSelected) Gray500 else Gray100) .fillMaxSize(), @@ -169,16 +173,19 @@ fun UnivSelectItem(item: Item, isSelected: Boolean, onSelectClick: (Item) -> Uni verticalArrangement = Arrangement.Center ) { Spacer(modifier = Modifier.padding(bottom = 10.dp)) - Image( - painter = painterResource(item.Image), - contentDescription = item.name, - Modifier.size(36.dp) - ) Text( - text = item.name, - fontSize = 14.sp, - modifier = Modifier.padding(10.dp) + text = item.univName, + fontSize = 13.sp, + color = Gray800 ) + item.campusName?.let { + Text( + text = item.campusName, + fontSize = 13.sp, + color = Gray600, + modifier = Modifier.padding(10.dp) + ) + } } } @@ -197,8 +204,8 @@ fun UnivSelectScreenPreview() { fun UnivSelectScreenItemPreview() { EveryMeal_AndroidTheme { UnivSelectItem(item = Item( - Image = R.drawable.image_myongji, - name = "명지대학교" + univName = "명지대", + campusName = "용인캠퍼스" ), false ) { diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/theme/Color.kt b/presentation/src/main/java/com/everymeal/presentation/ui/theme/Color.kt index a8649d56..e54d2617 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/theme/Color.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/theme/Color.kt @@ -14,6 +14,7 @@ val Gray100 = Color(0xFFF9FAFB) val Gray200 = Color(0xFFE5E8EB) val Gray300 = Color(0xFFF2F4F6) val Gray500 = Color(0xFFB0B8C1) +val Gray600 = Color(0xFF8B95A1) var Gray800 = Color(0xFF4E5968) val Main100 = Color(0xFFFF4848) diff --git a/presentation/src/main/res/drawable/icon_school.png b/presentation/src/main/res/drawable/icon_school.png new file mode 100644 index 0000000000000000000000000000000000000000..36482d938dc5415b8d3c8bbbfba9fac134743e43 GIT binary patch literal 3244 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 V7g_jWs51Zn002ovPDHLkV1ji-bMF8E diff --git a/presentation/src/main/res/drawable/image_myongji.png b/presentation/src/main/res/drawable/image_myongji.png deleted file mode 100644 index 4c0d79abcd5535f28333f50fb95c7b66a4cbba64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2869 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 TfQRB&00000NkvXXu0mjfK#P1N diff --git a/presentation/src/main/res/drawable/image_seoulwoman.png b/presentation/src/main/res/drawable/image_seoulwoman.png deleted file mode 100644 index 1186786e653843bd7df513194b52d71df2c4af6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1607 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 agX8}ym@N0+%24P40000 Date: Sat, 12 Aug 2023 22:22:09 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[fix/select=5Fscreen]=20=ED=95=99=EA=B5=90?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=20=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20(#40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/signup/UnivSelectScreen.kt | 13 ++++++++++--- presentation/src/main/res/values/strings.xml | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt index 1facce5a..8da767ac 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt @@ -63,8 +63,8 @@ fun UnivSelectScreen( val items = listOf( Item(univName = "명지대", campusName = "자연캠퍼스"), Item(univName = "명지대", campusName = "인문캠퍼스"), - Item(univName = "성신여대", campusName = "자연캠퍼스"), - Item(univName = "성신여대", campusName = "자연캠퍼스"), + Item(univName = "성신여대", campusName = "수정캠퍼스"), + Item(univName = "성신여대", campusName = "운정캠퍼스"), Item(univName = "서울여대"), ) @@ -78,7 +78,13 @@ fun UnivSelectScreen( .fillMaxSize() .padding(horizontal = Paddings.extra) ) { - Spacer(modifier = Modifier.padding(58.dp)) + Spacer(modifier = Modifier.padding(40.dp)) + Image( + painter = painterResource(id = R.drawable.icon_school), + contentDescription = stringResource(R.string.icon_univ), + modifier = Modifier.size(64.dp) + ) + Spacer(modifier = Modifier.padding(10.dp)) Text( text = stringResource(R.string.univ_select_title), style = TextStyle( @@ -176,6 +182,7 @@ fun UnivSelectItem(item: Item, isSelected: Boolean, onSelectClick: (Item) -> Uni Text( text = item.univName, fontSize = 13.sp, + fontWeight = FontWeight.Bold, color = Gray800 ) item.campusName?.let { diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 5c55a71c..a97cf38b 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -12,6 +12,7 @@ 학교 신청하러가기 채팅아이콘 들어가기 + 학교 선택하기 아이콘 맛집 From e761d704f87905f086bb919d45de43e9a48f5752 Mon Sep 17 00:00:00 2001 From: sgsk88 Date: Sat, 12 Aug 2023 22:44:00 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[fix/select=5Fscreen]=20=ED=95=99=EA=B5=90?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=20=ED=99=94=EB=A9=B4=20GridView=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EB=B7=B0=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?(#40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/signup/UnivSelectScreen.kt | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt index 8da767ac..7fccc494 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt @@ -50,7 +50,7 @@ import com.everymeal.presentation.ui.theme.Paddings data class Item( val univName: String, - val campusName: String? = null + val campusName: String? ) @Composable @@ -65,7 +65,7 @@ fun UnivSelectScreen( Item(univName = "명지대", campusName = "인문캠퍼스"), Item(univName = "성신여대", campusName = "수정캠퍼스"), Item(univName = "성신여대", campusName = "운정캠퍼스"), - Item(univName = "서울여대"), + Item(univName = "서울여대", campusName = null), ) Box( @@ -178,21 +178,33 @@ fun UnivSelectItem(item: Item, isSelected: Boolean, onSelectClick: (Item) -> Uni horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { - Spacer(modifier = Modifier.padding(bottom = 10.dp)) + if(item.campusName == null) { + Spacer(modifier = Modifier.padding(16.dp)) + } else { + Spacer(modifier = Modifier.padding(10.dp)) + } + Text( text = item.univName, fontSize = 13.sp, fontWeight = FontWeight.Bold, color = Gray800 ) - item.campusName?.let { + + if(!item.campusName.isNullOrEmpty()) { + Spacer(modifier = Modifier.padding(4.dp)) Text( text = item.campusName, fontSize = 13.sp, color = Gray600, - modifier = Modifier.padding(10.dp) ) } + + if(item.campusName == null) { + Spacer(modifier = Modifier.padding(16.dp)) + } else { + Spacer(modifier = Modifier.padding(10.dp)) + } } } From 772ae067c841e029f8472723b593254240428528 Mon Sep 17 00:00:00 2001 From: sgsk88 Date: Sat, 12 Aug 2023 22:46:22 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[fix/select=5Fscreen]=20=ED=95=99=EA=B5=90?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=20=ED=99=94=EB=A9=B4=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=84=B0=EB=A7=81=20(#40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/signup/UnivSelectScreen.kt | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt index 7fccc494..cb77c687 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt @@ -178,33 +178,23 @@ fun UnivSelectItem(item: Item, isSelected: Boolean, onSelectClick: (Item) -> Uni horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { - if(item.campusName == null) { - Spacer(modifier = Modifier.padding(16.dp)) - } else { - Spacer(modifier = Modifier.padding(10.dp)) - } - + val spacerSize = if (item.campusName == null) 16.dp else 10.dp + Spacer(modifier = Modifier.padding(spacerSize)) Text( text = item.univName, fontSize = 13.sp, fontWeight = FontWeight.Bold, color = Gray800 ) - - if(!item.campusName.isNullOrEmpty()) { + item.campusName?.let { campusName -> Spacer(modifier = Modifier.padding(4.dp)) Text( - text = item.campusName, + text = campusName, fontSize = 13.sp, color = Gray600, ) } - - if(item.campusName == null) { - Spacer(modifier = Modifier.padding(16.dp)) - } else { - Spacer(modifier = Modifier.padding(10.dp)) - } + Spacer(modifier = Modifier.padding(spacerSize)) } } From b0c57610b39969d363290579c744a2adfe78cbed Mon Sep 17 00:00:00 2001 From: sgsk88 Date: Sat, 12 Aug 2023 22:48:53 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[fix/select=5Fscreen]=20=ED=95=99=EA=B5=90?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=20=ED=99=94=EB=A9=B4=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20nullable=20=EB=B3=80=EA=B2=BD=20(#40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/everymeal/presentation/ui/signup/UnivSelectScreen.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt index cb77c687..aae024b9 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt @@ -50,7 +50,7 @@ import com.everymeal.presentation.ui.theme.Paddings data class Item( val univName: String, - val campusName: String? + val campusName: String? = null ) @Composable @@ -65,7 +65,7 @@ fun UnivSelectScreen( Item(univName = "명지대", campusName = "인문캠퍼스"), Item(univName = "성신여대", campusName = "수정캠퍼스"), Item(univName = "성신여대", campusName = "운정캠퍼스"), - Item(univName = "서울여대", campusName = null), + Item(univName = "서울여대"), ) Box( From 9e1d06f9b62bde163de12c8e4f15159e9c70629e Mon Sep 17 00:00:00 2001 From: sgsk88 Date: Sun, 13 Aug 2023 05:03:24 +0900 Subject: [PATCH 6/6] =?UTF-8?q?[fix/select=5Fscreen]=20GridView=20?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EB=A7=88=EC=A7=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/signup/UnivSelectScreen.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt index aae024b9..e76779f8 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/signup/UnivSelectScreen.kt @@ -66,6 +66,7 @@ fun UnivSelectScreen( Item(univName = "성신여대", campusName = "수정캠퍼스"), Item(univName = "성신여대", campusName = "운정캠퍼스"), Item(univName = "서울여대"), + Item(univName = "연세대학교", campusName = "서울캠퍼스"), ) Box( @@ -103,6 +104,7 @@ fun UnivSelectScreen( UnivSelectItem( item = item, isSelected = isSelected, + index = index ) { viewModel.setEvent(UnivSelectContract.UnivSelectEvent.SelectedUniv( "${item.univName}+${item.campusName}") @@ -164,21 +166,21 @@ fun UnivSelectScreen( @SuppressLint("RememberReturnType") @Composable -fun UnivSelectItem(item: Item, isSelected: Boolean, onSelectClick: (Item) -> Unit) { +fun UnivSelectItem(item: Item, isSelected: Boolean, index: Int, onSelectClick: (Item) -> Unit) { Column( modifier = Modifier .clickable( indication = null, interactionSource = remember { MutableInteractionSource() } ) { onSelectClick(item) } - .padding(bottom = Paddings.medium, end = Paddings.medium) + .padding(bottom = Paddings.medium, end = if(index%2==0) Paddings.medium else 0.dp) .clip(RoundedCornerShape(Paddings.medium)) .background(if (isSelected) Gray500 else Gray100) .fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { - val spacerSize = if (item.campusName == null) 16.dp else 10.dp + val spacerSize = if (item.campusName == null) 17.dp else 10.dp Spacer(modifier = Modifier.padding(spacerSize)) Text( text = item.univName, @@ -216,7 +218,8 @@ fun UnivSelectScreenItemPreview() { univName = "명지대", campusName = "용인캠퍼스" ), - false + false, + index = 0 ) { }