From b12f8722c6354423531bc12dc3675432bb402188 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 6 Jul 2023 22:28:17 +0900 Subject: [PATCH 01/13] =?UTF-8?q?#21=20MainScreen=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EC=A0=80=EB=B8=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/droidknights/app2023/feature/main/MainActivity.kt | 5 ++++- .../com/droidknights/app2023/feature/main/MainScreen.kt | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt index b970b5db..32118209 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt @@ -3,6 +3,7 @@ package com.droidknights.app2023.feature.main import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.material3.MaterialTheme class MainActivity : ComponentActivity() { @@ -10,7 +11,9 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { - // TODO: MainScreen 구현 + MaterialTheme { + MainScreen() + } } } } diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt new file mode 100644 index 00000000..e4ee07d1 --- /dev/null +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -0,0 +1,8 @@ +package com.droidknights.app2023.feature.main + +import androidx.compose.runtime.Composable + +@Composable +fun MainScreen() { + +} From be5856dd6165d19c8c48b2a44013fd2ce875a1b6 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 6 Jul 2023 22:38:19 +0900 Subject: [PATCH 02/13] =?UTF-8?q?#21=20=ED=85=8C=EB=A7=88=EC=9D=98=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=86=8D=EC=84=B1=EC=9D=84=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 ++ {app => core/designsystem}/src/main/res/values/themes.xml | 5 +++++ 2 files changed, 7 insertions(+) rename {app => core/designsystem}/src/main/res/values/themes.xml (51%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 854891d1..ff822c49 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,4 +20,6 @@ android { dependencies { implementation(project(":feature:main")) + + implementation(project(":core:designsystem")) } diff --git a/app/src/main/res/values/themes.xml b/core/designsystem/src/main/res/values/themes.xml similarity index 51% rename from app/src/main/res/values/themes.xml rename to core/designsystem/src/main/res/values/themes.xml index de1ee565..714404b0 100644 --- a/app/src/main/res/values/themes.xml +++ b/core/designsystem/src/main/res/values/themes.xml @@ -2,4 +2,9 @@ + \ No newline at end of file From 8fc7df297090f601192f9c7df1693cbb9f47d8ba Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 6 Jul 2023 22:39:10 +0900 Subject: [PATCH 03/13] =?UTF-8?q?#21=20=EB=A9=94=EC=9D=B8=20=EC=95=A1?= =?UTF-8?q?=ED=8B=B0=EB=B9=84=ED=8B=B0=EB=A5=BC=20=ED=88=AC=EB=AA=85=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=B0=94=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/designsystem/src/main/res/values/themes.xml | 1 + feature/main/src/main/AndroidManifest.xml | 4 +++- .../com/droidknights/app2023/feature/main/MainActivity.kt | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/designsystem/src/main/res/values/themes.xml b/core/designsystem/src/main/res/values/themes.xml index 714404b0..9a94cb72 100644 --- a/core/designsystem/src/main/res/values/themes.xml +++ b/core/designsystem/src/main/res/values/themes.xml @@ -5,6 +5,7 @@ \ No newline at end of file diff --git a/feature/main/src/main/AndroidManifest.xml b/feature/main/src/main/AndroidManifest.xml index 499fc3c2..073570b9 100644 --- a/feature/main/src/main/AndroidManifest.xml +++ b/feature/main/src/main/AndroidManifest.xml @@ -5,7 +5,9 @@ + android:exported="true" + android:theme="@style/Theme.DroidKnights2023.NoStatusBar"> + diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt index 32118209..a6825b75 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainActivity.kt @@ -4,12 +4,15 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.material3.MaterialTheme +import androidx.core.view.WindowCompat class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + WindowCompat.setDecorFitsSystemWindows(window, false) + setContent { MaterialTheme { MainScreen() From 5bdfc5d97c0de1ddecd9394ba8cf9c122535b25d Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 6 Jul 2023 23:03:55 +0900 Subject: [PATCH 04/13] =?UTF-8?q?#21=20Scaffold=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app2023/feature/main/MainScreen.kt | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index e4ee07d1..fe1b3bfc 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -1,8 +1,30 @@ package com.droidknights.app2023.feature.main +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color @Composable fun MainScreen() { - + Scaffold( + content = { padding -> + // TODO: Background color using scheme + Box( + modifier = Modifier + .fillMaxSize() + .background(Color(0xFFF9F9F9)) + .padding(padding) + ) { + + } + }, + bottomBar = { + // TODO: Composable with Bottom Bar + }, + ) } From 3512ae6aa6386e64b1d1f9e0092ebcf0e8840f94 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 6 Jul 2023 23:26:06 +0900 Subject: [PATCH 05/13] =?UTF-8?q?#21=20BottomBar=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EC=A0=80=EB=B8=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app2023/feature/main/MainScreen.kt | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index fe1b3bfc..4ac0b58b 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -1,19 +1,25 @@ package com.droidknights.app2023.feature.main import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp @Composable fun MainScreen() { Scaffold( content = { padding -> - // TODO: Background color using scheme Box( modifier = Modifier .fillMaxSize() @@ -24,7 +30,26 @@ fun MainScreen() { } }, bottomBar = { - // TODO: Composable with Bottom Bar + MainBottomBar() }, ) } + +@Composable +private fun MainBottomBar(modifier: Modifier = Modifier) { + Row( + modifier = modifier + .navigationBarsPadding() + .padding(start = 8.dp, end = 8.dp, bottom = 28.dp) + .fillMaxWidth() + .height(56.dp) + .border( + width = 1.dp, + color = Color(0xFFDCDCDC), // lightgray + shape = RoundedCornerShape(size = 28.dp) + ) + .background(color = Color(0xFFFFFFFF), shape = RoundedCornerShape(28.dp)), + ) { + // TODO: BottomBar Item + } +} From fd1f93e4e856db14b02358b4d40cd12a74299799 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 6 Jul 2023 23:54:53 +0900 Subject: [PATCH 06/13] =?UTF-8?q?#21=20MainTab=20enum=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=20=EC=A2=85=EB=A5=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/droidknights/app2023/feature/main/MainTab.kt | 9 +++++++++ feature/main/src/main/res/drawable/ic_home.xml | 9 +++++++++ feature/main/src/main/res/drawable/ic_setting.xml | 9 +++++++++ feature/main/src/main/res/drawable/ic_temp.xml | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt create mode 100644 feature/main/src/main/res/drawable/ic_home.xml create mode 100644 feature/main/src/main/res/drawable/ic_setting.xml create mode 100644 feature/main/src/main/res/drawable/ic_temp.xml diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt new file mode 100644 index 00000000..f1ac34d7 --- /dev/null +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt @@ -0,0 +1,9 @@ +package com.droidknights.app2023.feature.main + +enum class MainTab( + val iconResId: Int, +) { + SETTING(R.drawable.ic_setting), + HOME(R.drawable.ic_home), + TEMP(R.drawable.ic_temp), +} diff --git a/feature/main/src/main/res/drawable/ic_home.xml b/feature/main/src/main/res/drawable/ic_home.xml new file mode 100644 index 00000000..04f2243b --- /dev/null +++ b/feature/main/src/main/res/drawable/ic_home.xml @@ -0,0 +1,9 @@ + + + diff --git a/feature/main/src/main/res/drawable/ic_setting.xml b/feature/main/src/main/res/drawable/ic_setting.xml new file mode 100644 index 00000000..3a0f909f --- /dev/null +++ b/feature/main/src/main/res/drawable/ic_setting.xml @@ -0,0 +1,9 @@ + + + diff --git a/feature/main/src/main/res/drawable/ic_temp.xml b/feature/main/src/main/res/drawable/ic_temp.xml new file mode 100644 index 00000000..20bf3e1d --- /dev/null +++ b/feature/main/src/main/res/drawable/ic_temp.xml @@ -0,0 +1,9 @@ + + + From 786a660dd8038e6b1df816d0f818c36f98d46ae7 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Thu, 6 Jul 2023 23:55:16 +0900 Subject: [PATCH 07/13] =?UTF-8?q?#21=20MainBottomBar=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EC=A0=80=EB=B8=94=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app2023/feature/main/MainScreen.kt | 69 +++++++++++++++++-- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index 4ac0b58b..549b0227 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -2,22 +2,35 @@ package com.droidknights.app2023.feature.main import androidx.compose.foundation.background import androidx.compose.foundation.border +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp @Composable fun MainScreen() { + var currentTab by remember { mutableStateOf(MainTab.HOME) } Scaffold( content = { padding -> Box( @@ -26,17 +39,26 @@ fun MainScreen() { .background(Color(0xFFF9F9F9)) .padding(padding) ) { - + // TODO: 컨텐츠 추가 } }, bottomBar = { - MainBottomBar() + MainBottomBar( + tabs = MainTab.values().toList(), + currentTab = currentTab, + onTabSelected = { currentTab = it } + ) }, ) } @Composable -private fun MainBottomBar(modifier: Modifier = Modifier) { +private fun MainBottomBar( + tabs: List, + currentTab: MainTab, + onTabSelected: (MainTab) -> Unit, + modifier: Modifier = Modifier, +) { Row( modifier = modifier .navigationBarsPadding() @@ -48,8 +70,45 @@ private fun MainBottomBar(modifier: Modifier = Modifier) { color = Color(0xFFDCDCDC), // lightgray shape = RoundedCornerShape(size = 28.dp) ) - .background(color = Color(0xFFFFFFFF), shape = RoundedCornerShape(28.dp)), + .background(color = Color(0xFFFFFFFF), shape = RoundedCornerShape(28.dp)) + .padding(horizontal = 28.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + tabs.forEach { tab -> + MainBottomBarItem( + selected = tab == currentTab, + onClick = { onTabSelected(tab) }, + resId = tab.iconResId, + ) + } + } +} + +@Composable +private fun RowScope.MainBottomBarItem( + selected: Boolean, + onClick: () -> Unit, + resId: Int, + modifier: Modifier = Modifier, +) { + Box( + modifier = modifier + .weight(1f) + .fillMaxHeight() + .selectable( + selected = selected, + indication = null, + role = null, + interactionSource = remember { MutableInteractionSource() }, + onClick = onClick, + ), + contentAlignment = Alignment.Center, ) { - // TODO: BottomBar Item + Icon( + painter = painterResource(id = resId), + contentDescription = null, + tint = if (selected) Color(0xFF49F300) else Color(0xFFDCDCDC) + ) } } From 06740e29bf821a0fd8c198a66d49a25de5b8bfaf Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Fri, 7 Jul 2023 09:09:20 +0900 Subject: [PATCH 08/13] =?UTF-8?q?#21=20EOF=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/designsystem/src/main/res/values/themes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/designsystem/src/main/res/values/themes.xml b/core/designsystem/src/main/res/values/themes.xml index 9a94cb72..11a1ba30 100644 --- a/core/designsystem/src/main/res/values/themes.xml +++ b/core/designsystem/src/main/res/values/themes.xml @@ -8,4 +8,4 @@ true - \ No newline at end of file + From e5dcf1f5e8bf570fefcf394c6e6deb93d77b4749 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Fri, 7 Jul 2023 09:09:46 +0900 Subject: [PATCH 09/13] =?UTF-8?q?#21=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=86=8D=EC=84=B1=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/droidknights/app2023/feature/main/MainScreen.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index 549b0227..a69ccd45 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -72,7 +72,6 @@ private fun MainBottomBar( ) .background(color = Color(0xFFFFFFFF), shape = RoundedCornerShape(28.dp)) .padding(horizontal = 28.dp), - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), ) { tabs.forEach { tab -> From 4fb619af6854f4c2fbc8bf57668530b206dbfc09 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Fri, 7 Jul 2023 09:10:28 +0900 Subject: [PATCH 10/13] =?UTF-8?q?#21=20=EC=95=84=EC=9D=B4=EC=BD=98?= =?UTF-8?q?=EC=9D=98=20=ED=81=AC=EA=B8=B0=EB=A5=BC=20=EB=AA=85=EC=8B=9C?= =?UTF-8?q?=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/droidknights/app2023/feature/main/MainScreen.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index a69ccd45..9d998a22 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon @@ -107,7 +108,8 @@ private fun RowScope.MainBottomBarItem( Icon( painter = painterResource(id = resId), contentDescription = null, - tint = if (selected) Color(0xFF49F300) else Color(0xFFDCDCDC) + tint = if (selected) Color(0xFF49F300) else Color(0xFFDCDCDC), + modifier = Modifier.size(34.dp), ) } } From 098c5cb48053f3ccbd2840bc1b41c71781dcf069 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Fri, 7 Jul 2023 23:48:59 +0900 Subject: [PATCH 11/13] =?UTF-8?q?#21=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20Modiifer=20=EC=A3=BC=EC=9E=85=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/droidknights/app2023/feature/main/MainScreen.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index 9d998a22..16cba7ca 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -58,10 +58,9 @@ private fun MainBottomBar( tabs: List, currentTab: MainTab, onTabSelected: (MainTab) -> Unit, - modifier: Modifier = Modifier, ) { Row( - modifier = modifier + modifier = Modifier .navigationBarsPadding() .padding(start = 8.dp, end = 8.dp, bottom = 28.dp) .fillMaxWidth() @@ -90,10 +89,9 @@ private fun RowScope.MainBottomBarItem( selected: Boolean, onClick: () -> Unit, resId: Int, - modifier: Modifier = Modifier, ) { Box( - modifier = modifier + modifier = Modifier .weight(1f) .fillMaxHeight() .selectable( From 1d024abf40b41ddb1bec957a03b32d03125c07f4 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Fri, 7 Jul 2023 23:51:54 +0900 Subject: [PATCH 12/13] =?UTF-8?q?#21=20width,=20height=20=EA=B0=9C?= =?UTF-8?q?=EB=85=90=EC=9D=84=20Modifier=EC=9D=98=20=EA=B0=80=EC=9E=A5=20?= =?UTF-8?q?=EC=95=9E=EC=97=90=20=EC=9C=84=EC=B9=98=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/droidknights/app2023/feature/main/MainScreen.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index 16cba7ca..655643b2 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -61,10 +61,10 @@ private fun MainBottomBar( ) { Row( modifier = Modifier - .navigationBarsPadding() - .padding(start = 8.dp, end = 8.dp, bottom = 28.dp) .fillMaxWidth() .height(56.dp) + .navigationBarsPadding() + .padding(start = 8.dp, end = 8.dp, bottom = 28.dp) .border( width = 1.dp, color = Color(0xFFDCDCDC), // lightgray From ba82fd5a040f880281cb1ab437bf4132b0837026 Mon Sep 17 00:00:00 2001 From: Youngjik Yoon Date: Fri, 7 Jul 2023 23:53:03 +0900 Subject: [PATCH 13/13] =?UTF-8?q?#21=20=EC=99=B8=EB=B6=80=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=EC=97=90=EC=84=9C=20=EC=A0=91=EA=B7=BC=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=97=86=EB=8F=84=EB=A1=9D=20internal=20=EC=A0=91?= =?UTF-8?q?=EA=B7=BC=EC=9E=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/droidknights/app2023/feature/main/MainScreen.kt | 2 +- .../main/java/com/droidknights/app2023/feature/main/MainTab.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt index 655643b2..a1d30c31 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainScreen.kt @@ -30,7 +30,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp @Composable -fun MainScreen() { +internal fun MainScreen() { var currentTab by remember { mutableStateOf(MainTab.HOME) } Scaffold( content = { padding -> diff --git a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt index f1ac34d7..9b530f11 100644 --- a/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt +++ b/feature/main/src/main/java/com/droidknights/app2023/feature/main/MainTab.kt @@ -1,6 +1,6 @@ package com.droidknights.app2023.feature.main -enum class MainTab( +internal enum class MainTab( val iconResId: Int, ) { SETTING(R.drawable.ic_setting),