From 818f9372594c96e032fd86f5ee178bd807239927 Mon Sep 17 00:00:00 2001 From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:54:12 +0100 Subject: [PATCH] DROID-2125 Relations | Design | Date picker fixes (#975) --- .../anytypeio/anytype/ui/library/views/list/items/Items.kt | 2 +- .../anytypeio/anytype/core_ui/relations/DatePickerContent.kt | 4 ++-- core-ui/src/main/res/values-night/colors.xml | 2 ++ core-ui/src/main/res/values/colors.xml | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/anytypeio/anytype/ui/library/views/list/items/Items.kt b/app/src/main/java/com/anytypeio/anytype/ui/library/views/list/items/Items.kt index 74d8ee35c5..0cb6ed2eaa 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/library/views/list/items/Items.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/library/views/list/items/Items.kt @@ -274,7 +274,7 @@ fun Icon(icon: ObjectIcon?) { factory = { ctx -> ObjectIconWidget(ctx) }, - modifier = Modifier.size(24.dp), + modifier = Modifier.size(20.dp), update = { it.setIcon(icon) } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/relations/DatePickerContent.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/relations/DatePickerContent.kt index dacfd2b95e..8715aa099e 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/relations/DatePickerContent.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/relations/DatePickerContent.kt @@ -95,10 +95,10 @@ fun DatePickerContent( weekdayContentColor = colorResource(id = R.color.text_tertiary), todayContentColor = todayContentColor, todayDateBorderColor = Color.Transparent, - selectedDayContainerColor = colorResource(id = R.color.palette_very_light_orange), + selectedDayContainerColor = colorResource(id = R.color.date_selected_container_color), selectedDayContentColor = colorResource(id = R.color.glyph_accent), disabledDayContentColor = colorResource(id = R.color.text_primary), - disabledSelectedDayContentColor = colorResource(id = R.color.glyph_inactive), + disabledSelectedDayContentColor = colorResource(id = R.color.text_primary), disabledSelectedDayContainerColor = colorResource(id = R.color.date_selected_inactive_color), navigationContentColor = navigationContentColor ) diff --git a/core-ui/src/main/res/values-night/colors.xml b/core-ui/src/main/res/values-night/colors.xml index 170b88274b..4f0e4cbf6a 100644 --- a/core-ui/src/main/res/values-night/colors.xml +++ b/core-ui/src/main/res/values-night/colors.xml @@ -101,4 +101,6 @@ #302F2B + #483308 + diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml index 38df947259..91e83ef526 100644 --- a/core-ui/src/main/res/values/colors.xml +++ b/core-ui/src/main/res/values/colors.xml @@ -219,6 +219,7 @@ #FFFFFF #30DCDCDC + @color/palette_very_light_orange @color/palette_system_amber_50 @color/shape_primary