Skip to content

Commit 0594d4d

Browse files
authored
πŸ”€ :: (#714) λ§ˆμ΄νŽ˜μ΄μ§€ μ•„μ΄μ½˜ λ³€κ²½
πŸ”€ :: (#714) λ§ˆμ΄νŽ˜μ΄μ§€ μ•„μ΄μ½˜ λ³€κ²½
2 parents c6e968c + 33c71f6 commit 0594d4d

File tree

3 files changed

+15
-11
lines changed
  • core/design-system/src/main
  • feature/src/main/java/team/aliens/dms/android/feature/main

3 files changed

+15
-11
lines changed

β€Žcore/design-system/src/main/java/team/aliens/dms/android/core/designsystem/DmsIcon.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object DmsIcon {
2525
val Logo = R.drawable.ic_logo
2626
val Notification = R.drawable.ic_notification
2727
val Lunch = R.drawable.ic_lunch
28-
val MyPage = R.drawable.ic_person
28+
val Person = R.drawable.ic_person
2929
val Notice = R.drawable.ic_notice
3030
val Palette = R.drawable.ic_palette
3131
val PasswordInvisible = R.drawable.ic_password_invisible
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
2-
3-
<path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v1c0,0.55 0.45,1 1,1h14c0.55,0 1,-0.45 1,-1v-1c0,-2.66 -5.33,-4 -8,-4z"/>
4-
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M12,11.869C13.823,11.869 15.299,10.257 15.299,8.283C15.299,6.34 13.823,4.795 12,4.795C10.184,4.795 8.692,6.362 8.7,8.298C8.707,10.265 10.177,11.869 12,11.869ZM12,10.551C10.96,10.551 10.078,9.564 10.078,8.298C10.071,7.063 10.952,6.114 12,6.114C13.054,6.114 13.921,7.048 13.921,8.283C13.921,9.549 13.047,10.551 12,10.551ZM7.299,18.875H16.693C17.996,18.875 18.622,18.461 18.622,17.572C18.622,15.5 16.038,12.743 12,12.743C7.962,12.743 5.37,15.5 5.37,17.572C5.37,18.461 5.995,18.875 7.299,18.875ZM7.065,17.557C6.884,17.557 6.817,17.497 6.817,17.361C6.817,16.209 8.677,14.062 12,14.062C15.314,14.062 17.175,16.209 17.175,17.361C17.175,17.497 17.107,17.557 16.927,17.557H7.065Z"
8+
android:fillColor="#121212"/>
59
</vector>

β€Žfeature/src/main/java/team/aliens/dms/android/feature/main/Main.ktβ€Ž

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import androidx.navigation.compose.currentBackStackEntryAsState
3737
import androidx.navigation.compose.rememberNavController
3838
import com.ramcosta.composedestinations.annotation.Destination
3939
import com.ramcosta.composedestinations.annotation.RootNavGraph
40-
import team.aliens.dms.android.core.designsystem.Scaffold
40+
import team.aliens.dms.android.core.designsystem.DmsIcon
4141
import team.aliens.dms.android.core.designsystem.DmsTheme
42-
import team.aliens.dms.android.core.designsystem.R
42+
import team.aliens.dms.android.core.designsystem.Scaffold
4343
import team.aliens.dms.android.core.designsystem.slideInFromEnd
4444
import team.aliens.dms.android.core.designsystem.slideInFromStart
4545
import team.aliens.dms.android.core.designsystem.slideOutFromEnd
@@ -243,22 +243,22 @@ private enum class MainSections(
243243
) {
244244
HOME(
245245
route = "home",
246-
iconRes = R.drawable.ic_home,
246+
iconRes = DmsIcon.Home,
247247
labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_home,
248248
),
249249
APPLICATION(
250250
route = "application",
251-
iconRes = R.drawable.ic_applicate,
251+
iconRes = DmsIcon.Applicate,
252252
labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_application,
253253
),
254254
ANNOUNCEMENT_LIST(
255255
route = "announcement_list",
256-
iconRes = R.drawable.ic_notice,
256+
iconRes = DmsIcon.Notice,
257257
labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_announcement_list,
258258
),
259259
MY_PAGE(
260260
route = "my_page",
261-
iconRes = R.drawable.ic_person,
261+
iconRes = DmsIcon.Person,
262262
labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_my_page,
263263
),
264264
;

0 commit comments

Comments
Β (0)