diff --git a/core/base/src/debug/res/values/colors.xml b/core/base/src/debug/res/values/colors.xml new file mode 100644 index 00000000..17663ced --- /dev/null +++ b/core/base/src/debug/res/values/colors.xml @@ -0,0 +1,21 @@ + + + + #FF5722 + diff --git a/core/base/src/main/res/drawable/ic_body_mass_foreground.xml b/core/base/src/main/res/drawable/ic_body_mass_foreground.xml index 4ca2169c..6f659fb7 100644 --- a/core/base/src/main/res/drawable/ic_body_mass_foreground.xml +++ b/core/base/src/main/res/drawable/ic_body_mass_foreground.xml @@ -23,9 +23,9 @@ android:viewportHeight="24"> + android:pathData="M0.922,-0.002h24v24h-24z"/> + android:pathData="M12.922,5.998C12.372,5.998 11.901,5.802 11.509,5.41C11.118,5.019 10.922,4.548 10.922,3.998C10.922,3.448 11.118,2.977 11.509,2.585C11.901,2.194 12.372,1.998 12.922,1.998C13.472,1.998 13.943,2.194 14.334,2.585C14.726,2.977 14.922,3.448 14.922,3.998C14.922,4.548 14.726,5.019 14.334,5.41C13.943,5.802 13.472,5.998 12.922,5.998ZM9.922,21.998V8.998C8.922,8.914 7.905,8.789 6.872,8.623C5.839,8.456 4.855,8.248 3.922,7.998L4.422,5.998C5.722,6.348 7.105,6.602 8.572,6.76C10.038,6.919 11.488,6.998 12.922,6.998C14.355,6.998 15.805,6.919 17.272,6.76C18.739,6.602 20.122,6.348 21.422,5.998L21.922,7.998C20.989,8.248 20.005,8.456 18.972,8.623C17.938,8.789 16.922,8.914 15.922,8.998V21.998H13.922V15.998H11.922V21.998H9.922Z" + android:fillColor="#378648"/> diff --git a/core/base/src/main/res/drawable/ic_launcher_icon_foreground.xml b/core/base/src/main/res/drawable/ic_launcher_icon_foreground.xml index eb88ca56..a2074231 100644 --- a/core/base/src/main/res/drawable/ic_launcher_icon_foreground.xml +++ b/core/base/src/main/res/drawable/ic_launcher_icon_foreground.xml @@ -27,39 +27,39 @@ android:translateY="116.608"> + android:fillColor="@color/unitto_primary"/> + android:fillColor="@color/ic_launcher_icon_background"/> + android:fillColor="@color/ic_launcher_icon_background"/> + android:fillColor="@color/ic_launcher_icon_background"/> + android:fillColor="@color/unitto_primary"/> + android:fillColor="@color/ic_launcher_icon_background"/> + android:fillColor="@color/ic_launcher_icon_background"/> + android:fillColor="@color/unitto_primary"/> + android:fillColor="@color/ic_launcher_icon_background"/> + android:fillColor="@color/unitto_primary"/> + android:fillColor="@color/ic_launcher_icon_background"/> + android:fillColor="@color/ic_launcher_icon_background"/> diff --git a/core/base/src/main/res/drawable/ic_launcher_icon_monochrome.xml b/core/base/src/main/res/drawable/ic_launcher_icon_monochrome.xml index 28d64969..8c5e002c 100644 --- a/core/base/src/main/res/drawable/ic_launcher_icon_monochrome.xml +++ b/core/base/src/main/res/drawable/ic_launcher_icon_monochrome.xml @@ -30,7 +30,7 @@ android:pathData="M357,269L357,269A88,88 0,0 1,445 357L445,357A88,88 0,0 1,357 445L357,445A88,88 0,0 1,269 357L269,357A88,88 0,0 1,357 269z"/> @@ -38,7 +38,7 @@ android:pathData="M155,269L155,269A88,88 0,0 1,243 357L243,357A88,88 0,0 1,155 445L155,445A88,88 0,0 1,67 357L67,357A88,88 0,0 1,155 269z"/> @@ -46,7 +46,7 @@ android:pathData="M357,67L357,67A88,88 0,0 1,445 155L445,155A88,88 0,0 1,357 243L357,243A88,88 0,0 1,269 155L269,155A88,88 0,0 1,357 67z"/> @@ -54,7 +54,7 @@ android:pathData="M155,67L155,67A88,88 0,0 1,243 155L243,155A88,88 0,0 1,155 243L155,243A88,88 0,0 1,67 155L67,155A88,88 0,0 1,155 67z"/> diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt index 89d75fe9..5dfca5ab 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt @@ -21,12 +21,14 @@ package com.sadellie.unitto.core.ui.model import android.os.Build import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Accessibility +import androidx.compose.material.icons.filled.AccessibilityNew import androidx.compose.material.icons.filled.Calculate import androidx.compose.material.icons.filled.Event import androidx.compose.material.icons.filled.Schedule import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.SwapHoriz import androidx.compose.material.icons.outlined.Accessibility +import androidx.compose.material.icons.outlined.AccessibilityNew import androidx.compose.material.icons.outlined.Calculate import androidx.compose.material.icons.outlined.Event import androidx.compose.material.icons.outlined.Schedule @@ -66,8 +68,8 @@ sealed class DrawerItems( data object BodyMass : DrawerItems( destination = TopLevelDestinations.BodyMass, - selectedIcon = Icons.Filled.Accessibility, // temporary - defaultIcon = Icons.Outlined.Accessibility // temporary + selectedIcon = Icons.Filled.AccessibilityNew, + defaultIcon = Icons.Outlined.AccessibilityNew ) data object Settings : DrawerItems(