From 66025471baaa02ccd732a8f988d140c79ee6201a Mon Sep 17 00:00:00 2001 From: uiel Date: Mon, 12 Aug 2024 16:25:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aliens/dms/android/core/designsystem/DmsIcon.kt | 2 +- .../src/main/res/drawable/ic_person.xml | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/DmsIcon.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/DmsIcon.kt index 9bbbb1690..0d2cacdf3 100644 --- a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/DmsIcon.kt +++ b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/DmsIcon.kt @@ -25,7 +25,7 @@ object DmsIcon { val Logo = R.drawable.ic_logo val Notification = R.drawable.ic_notification val Lunch = R.drawable.ic_lunch - val MyPage = R.drawable.ic_person + val Person = R.drawable.ic_person val Notice = R.drawable.ic_notice val Palette = R.drawable.ic_palette val PasswordInvisible = R.drawable.ic_password_invisible diff --git a/core/design-system/src/main/res/drawable/ic_person.xml b/core/design-system/src/main/res/drawable/ic_person.xml index edca5fdb9..32b3100a3 100644 --- a/core/design-system/src/main/res/drawable/ic_person.xml +++ b/core/design-system/src/main/res/drawable/ic_person.xml @@ -1,5 +1,9 @@ - - - - + + From 33c71f6277a465db698daaad6e0bbcb53c361227 Mon Sep 17 00:00:00 2001 From: uiel Date: Mon, 12 Aug 2024 16:25:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20::=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/aliens/dms/android/feature/main/Main.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/feature/src/main/java/team/aliens/dms/android/feature/main/Main.kt b/feature/src/main/java/team/aliens/dms/android/feature/main/Main.kt index fa20b2a52..16ead0a7a 100644 --- a/feature/src/main/java/team/aliens/dms/android/feature/main/Main.kt +++ b/feature/src/main/java/team/aliens/dms/android/feature/main/Main.kt @@ -37,9 +37,9 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootNavGraph -import team.aliens.dms.android.core.designsystem.Scaffold +import team.aliens.dms.android.core.designsystem.DmsIcon import team.aliens.dms.android.core.designsystem.DmsTheme -import team.aliens.dms.android.core.designsystem.R +import team.aliens.dms.android.core.designsystem.Scaffold import team.aliens.dms.android.core.designsystem.slideInFromEnd import team.aliens.dms.android.core.designsystem.slideInFromStart import team.aliens.dms.android.core.designsystem.slideOutFromEnd @@ -243,22 +243,22 @@ private enum class MainSections( ) { HOME( route = "home", - iconRes = R.drawable.ic_home, + iconRes = DmsIcon.Home, labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_home, ), APPLICATION( route = "application", - iconRes = R.drawable.ic_applicate, + iconRes = DmsIcon.Applicate, labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_application, ), ANNOUNCEMENT_LIST( route = "announcement_list", - iconRes = R.drawable.ic_notice, + iconRes = DmsIcon.Notice, labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_announcement_list, ), MY_PAGE( route = "my_page", - iconRes = R.drawable.ic_person, + iconRes = DmsIcon.Person, labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_my_page, ), ;