From c74596de7b6b2c15643b94c1437e93e295cdd2a0 Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 16 Feb 2025 18:38:56 +0900 Subject: [PATCH 1/4] chore: add 1.1.0v Icons --- .../core/designsystem/icon/DobeDobeIcons.kt | 7 +++- .../src/main/res/drawable/ic_edit_24.xml | 6 ++-- .../src/main/res/drawable/ic_fire_24.xml | 10 ++++++ .../src/main/res/drawable/ic_flag_24.xml | 19 ++++++++++ .../src/main/res/drawable/ic_flag_fill_24.xml | 26 ++++++++++++++ .../src/main/res/drawable/ic_party_24.xml | 35 +++++++++++++++++++ .../src/main/res/drawable/ic_pin_24.xml | 18 ++++++++++ .../src/main/res/drawable/ic_pin_fill_24.xml | 22 ++++++++++++ .../src/main/res/drawable/ic_setting_24.xml | 2 +- .../src/main/res/drawable/ic_year_36.xml | 33 +++++++++++++++++ .../feature/goal/component/GoalRow.kt | 2 +- 11 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 core/designsystem/src/main/res/drawable/ic_fire_24.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_flag_24.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_flag_fill_24.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_party_24.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_pin_24.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_pin_fill_24.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_year_36.xml diff --git a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt index f51ee0a2..4d3c6ac6 100644 --- a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt +++ b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt @@ -5,7 +5,12 @@ import com.chipichpi.dobedobe.core.designsystem.R object DobeDobeIcons { val Add = R.drawable.ic_add_14 val ArrowBack = R.drawable.ic_arrow_back_24 - val Bookmark = R.drawable.ic_bookmark + val PinnedFilled = R.drawable.ic_pin_fill_24 + val PinnedOutLined = R.drawable.ic_pin_24 + val FlagFilled = R.drawable.ic_flag_fill_24 + val FlagOutLined = R.drawable.ic_flag_24 + val Party = R.drawable.ic_party_24 + val Fire = R.drawable.ic_fire_24 val Cancel = R.drawable.ic_cancel_circle_16 val Checked = R.drawable.ic_checked_24 val Unchecked = R.drawable.ic_unchecked_24 diff --git a/core/designsystem/src/main/res/drawable/ic_edit_24.xml b/core/designsystem/src/main/res/drawable/ic_edit_24.xml index c86659d5..3b377c41 100644 --- a/core/designsystem/src/main/res/drawable/ic_edit_24.xml +++ b/core/designsystem/src/main/res/drawable/ic_edit_24.xml @@ -10,14 +10,14 @@ android:pathData="M12.306,8.64L19.752,8.64A3,3 0,0 1,22.752 11.64L22.752,19.086A3,3 0,0 1,19.752 22.086L12.306,22.086A3,3 0,0 1,9.306 19.086L9.306,11.64A3,3 0,0 1,12.306 8.64z" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="#7A828C"/> + android:strokeColor="#333945"/> diff --git a/core/designsystem/src/main/res/drawable/ic_fire_24.xml b/core/designsystem/src/main/res/drawable/ic_fire_24.xml new file mode 100644 index 00000000..c939cd17 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_fire_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/designsystem/src/main/res/drawable/ic_flag_24.xml b/core/designsystem/src/main/res/drawable/ic_flag_24.xml new file mode 100644 index 00000000..2e898f7f --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_flag_24.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_flag_fill_24.xml b/core/designsystem/src/main/res/drawable/ic_flag_fill_24.xml new file mode 100644 index 00000000..db303d23 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_flag_fill_24.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_party_24.xml b/core/designsystem/src/main/res/drawable/ic_party_24.xml new file mode 100644 index 00000000..cc074c36 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_party_24.xml @@ -0,0 +1,35 @@ + + + + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_pin_24.xml b/core/designsystem/src/main/res/drawable/ic_pin_24.xml new file mode 100644 index 00000000..efb7c226 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_pin_24.xml @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_pin_fill_24.xml b/core/designsystem/src/main/res/drawable/ic_pin_fill_24.xml new file mode 100644 index 00000000..bdb35728 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_pin_fill_24.xml @@ -0,0 +1,22 @@ + + + + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_setting_24.xml b/core/designsystem/src/main/res/drawable/ic_setting_24.xml index d2190610..a0c0307b 100644 --- a/core/designsystem/src/main/res/drawable/ic_setting_24.xml +++ b/core/designsystem/src/main/res/drawable/ic_setting_24.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="#333945"/> diff --git a/core/designsystem/src/main/res/drawable/ic_year_36.xml b/core/designsystem/src/main/res/drawable/ic_year_36.xml new file mode 100644 index 00000000..d649d383 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_year_36.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/component/GoalRow.kt b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/component/GoalRow.kt index 0b0c3036..a798223d 100644 --- a/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/component/GoalRow.kt +++ b/feature/goal/src/main/kotlin/com/chipichipi/dobedobe/feature/goal/component/GoalRow.kt @@ -76,7 +76,7 @@ fun GoalRow( private fun RowScope.TrailingIcon(isPinned: Boolean) { if (isPinned) { Icon( - imageVector = ImageVector.vectorResource(DobeDobeIcons.Bookmark), + imageVector = ImageVector.vectorResource(DobeDobeIcons.PinnedFilled), modifier = Modifier .size(PinnedIconSize) .align(Alignment.Top), From 42c9b5e938fc2293c00b2dffb2cceb22cc7a5fa1 Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 16 Feb 2025 19:41:24 +0900 Subject: [PATCH 2/4] chore: rename Icon Name --- .../dobedobe/core/designsystem/icon/DobeDobeIcons.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt index 4d3c6ac6..aeec2ba3 100644 --- a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt +++ b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt @@ -6,9 +6,9 @@ object DobeDobeIcons { val Add = R.drawable.ic_add_14 val ArrowBack = R.drawable.ic_arrow_back_24 val PinnedFilled = R.drawable.ic_pin_fill_24 - val PinnedOutLined = R.drawable.ic_pin_24 + val PinnedOutLine = R.drawable.ic_pin_24 val FlagFilled = R.drawable.ic_flag_fill_24 - val FlagOutLined = R.drawable.ic_flag_24 + val FlagOutLine = R.drawable.ic_flag_24 val Party = R.drawable.ic_party_24 val Fire = R.drawable.ic_fire_24 val Cancel = R.drawable.ic_cancel_circle_16 From 2f85233f6e0b35b01bb27fccedb3e8882396d80e Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 16 Feb 2025 19:56:27 +0900 Subject: [PATCH 3/4] chore: add checkedIconRes, unCheckedIconRes params --- .../dobedobe/core/designsystem/component/CheckBox.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/CheckBox.kt b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/CheckBox.kt index a7c86ddc..35d3c7b5 100644 --- a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/CheckBox.kt +++ b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/CheckBox.kt @@ -17,9 +17,11 @@ import com.chipichipi.dobedobe.core.designsystem.theme.DobeDobeTheme @Composable fun DobeDobeCheckBox( checked: Boolean, - onCheckedChange: ((Boolean) -> Unit)? = null, modifier: Modifier = Modifier, + onCheckedChange: ((Boolean) -> Unit)? = null, enabled: Boolean = true, + @DrawableRes checkedIconRes: Int = DobeDobeIcons.Checked, + @DrawableRes uncheckedIconRes: Int = DobeDobeIcons.Unchecked, ) { IconButton( onClick = { onCheckedChange?.invoke(!checked) }, @@ -28,7 +30,7 @@ fun DobeDobeCheckBox( }, enabled = enabled, ) { - val iconRes = if (checked) DobeDobeIcons.Checked else DobeDobeIcons.Unchecked + val iconRes = if (checked) checkedIconRes else uncheckedIconRes Icon( imageVector = ImageVector.vectorResource(iconRes), contentDescription = "checked", From 863782609389c69caa6c0e1a2fccde52fb8f72ca Mon Sep 17 00:00:00 2001 From: murjune Date: Sun, 16 Feb 2025 19:56:47 +0900 Subject: [PATCH 4/4] chore: change checked, unchecked icon --- .../core/designsystem/component/CheckBox.kt | 11 +++-- .../core/designsystem/icon/DobeDobeIcons.kt | 4 +- .../src/main/res/drawable/ic_checked_24.xml | 16 -------- .../src/main/res/drawable/ic_checked_36.xml | 41 +++++++++++++++++++ .../src/main/res/drawable/ic_unchecked_24.xml | 20 --------- .../src/main/res/drawable/ic_unchecked_36.xml | 22 ++++++++++ 6 files changed, 73 insertions(+), 41 deletions(-) delete mode 100644 core/designsystem/src/main/res/drawable/ic_checked_24.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_checked_36.xml delete mode 100644 core/designsystem/src/main/res/drawable/ic_unchecked_24.xml create mode 100644 core/designsystem/src/main/res/drawable/ic_unchecked_36.xml diff --git a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/CheckBox.kt b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/CheckBox.kt index 35d3c7b5..94f37637 100644 --- a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/CheckBox.kt +++ b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/component/CheckBox.kt @@ -1,6 +1,8 @@ package com.chipichipi.dobedobe.core.designsystem.component +import androidx.annotation.DrawableRes import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.size import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.runtime.Composable @@ -11,6 +13,7 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.role import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.unit.dp import com.chipichipi.dobedobe.core.designsystem.icon.DobeDobeIcons import com.chipichipi.dobedobe.core.designsystem.theme.DobeDobeTheme @@ -25,9 +28,11 @@ fun DobeDobeCheckBox( ) { IconButton( onClick = { onCheckedChange?.invoke(!checked) }, - modifier = modifier.semantics { - role = Role.Checkbox - }, + modifier = modifier + .size(44.dp) + .semantics { + role = Role.Checkbox + }, enabled = enabled, ) { val iconRes = if (checked) checkedIconRes else uncheckedIconRes diff --git a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt index aeec2ba3..5c94c00c 100644 --- a/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt +++ b/core/designsystem/src/main/kotlin/com/chipichipi/dobedobe/core/designsystem/icon/DobeDobeIcons.kt @@ -12,8 +12,8 @@ object DobeDobeIcons { val Party = R.drawable.ic_party_24 val Fire = R.drawable.ic_fire_24 val Cancel = R.drawable.ic_cancel_circle_16 - val Checked = R.drawable.ic_checked_24 - val Unchecked = R.drawable.ic_unchecked_24 + val Checked = R.drawable.ic_checked_36 + val Unchecked = R.drawable.ic_unchecked_36 val Edit = R.drawable.ic_edit_24 val EditPlaceholder = R.drawable.ic_edit_placeholder_58 val Search = R.drawable.ic_search_24 diff --git a/core/designsystem/src/main/res/drawable/ic_checked_24.xml b/core/designsystem/src/main/res/drawable/ic_checked_24.xml deleted file mode 100644 index b3017cba..00000000 --- a/core/designsystem/src/main/res/drawable/ic_checked_24.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/core/designsystem/src/main/res/drawable/ic_checked_36.xml b/core/designsystem/src/main/res/drawable/ic_checked_36.xml new file mode 100644 index 00000000..1ae81307 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_checked_36.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_unchecked_24.xml b/core/designsystem/src/main/res/drawable/ic_unchecked_24.xml deleted file mode 100644 index 685c364f..00000000 --- a/core/designsystem/src/main/res/drawable/ic_unchecked_24.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/core/designsystem/src/main/res/drawable/ic_unchecked_36.xml b/core/designsystem/src/main/res/drawable/ic_unchecked_36.xml new file mode 100644 index 00000000..29d37728 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_unchecked_36.xml @@ -0,0 +1,22 @@ + + + + + + + +