From 1c2cdbe5731fee8b7b39348137d1a18ad9f18c05 Mon Sep 17 00:00:00 2001 From: Noelia Alcala Date: Thu, 16 Nov 2023 11:38:06 +0000 Subject: [PATCH] ADS: Section Header List Item update (#3842) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task/Issue URL: https://app.asana.com/0/488551667048375/1205910347984891/f ### Description New text color added to design system and applied to `SectionHeaderListItem` ### Steps to test this PR - Install from branch - Go to Settings - [ ] Check text color for all headers is updated to latests specs ### UI changes | Before | After | | ------ | ----- | Screenshot 2023-11-09 at 15 56 34|Screenshot 2023-11-09 at 15 44 43| Screenshot 2023-11-09 at 15 56 56|Screenshot 2023-11-09 at 15 44 31| --------- Co-authored-by: David González --- .../common/ui/view/listitem/SectionHeaderListItem.kt | 2 +- ...xt_color_selector.xml => tertiary_text_color_selector.xml} | 2 +- common/common-ui/src/main/res/values/design-system-colors.xml | 4 ++++ .../common-ui/src/main/res/values/design-system-theming.xml | 2 ++ .../java/com/duckduckgo/sync/impl/SyncAccountRepository.kt | 2 +- .../com/duckduckgo/sync/impl/AppSyncAccountRepositoryTest.kt | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) rename common/common-ui/src/main/res/color/{accent_blue_text_color_selector.xml => tertiary_text_color_selector.xml} (97%) diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/SectionHeaderListItem.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/SectionHeaderListItem.kt index fc1d8608f580..b4d1a5c07384 100644 --- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/SectionHeaderListItem.kt +++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/SectionHeaderListItem.kt @@ -51,7 +51,7 @@ class SectionHeaderListItem @JvmOverloads constructor( ).apply { primaryText = getString(R.styleable.SectionHeaderListItem_primaryText).orEmpty() binding.sectionHeaderText.text = primaryText - binding.sectionHeaderText.setTextColor(ContextCompat.getColorStateList(context, R.color.accent_blue_text_color_selector)) + binding.sectionHeaderText.setTextColor(ContextCompat.getColorStateList(context, R.color.tertiary_text_color_selector)) val showOverflowMenuIcon = getBoolean(R.styleable.SectionHeaderListItem_showOverflowMenu, false) if (showOverflowMenuIcon) { diff --git a/common/common-ui/src/main/res/color/accent_blue_text_color_selector.xml b/common/common-ui/src/main/res/color/tertiary_text_color_selector.xml similarity index 97% rename from common/common-ui/src/main/res/color/accent_blue_text_color_selector.xml rename to common/common-ui/src/main/res/color/tertiary_text_color_selector.xml index 538734814e7c..8f4db7e6e6eb 100644 --- a/common/common-ui/src/main/res/color/accent_blue_text_color_selector.xml +++ b/common/common-ui/src/main/res/color/tertiary_text_color_selector.xml @@ -17,5 +17,5 @@ - + \ No newline at end of file diff --git a/common/common-ui/src/main/res/values/design-system-colors.xml b/common/common-ui/src/main/res/values/design-system-colors.xml index 937064d42094..3b6f065a7256 100644 --- a/common/common-ui/src/main/res/values/design-system-colors.xml +++ b/common/common-ui/src/main/res/values/design-system-colors.xml @@ -40,6 +40,7 @@ daxColorAccentYellow daxColorContainerDisabled - Disabled color applied to background elements like buttons daxColorTextDisabled - Disabled color applied to text elements + daxColorTertiaryText - Tertiary text color --> @@ -50,6 +51,7 @@ + @@ -145,6 +147,7 @@ #D6000000 #99000000 + #7A000000 #66000000 #5C000000 #4D000000 @@ -158,6 +161,7 @@ #D6FFFFFF #99FFFFFF + #7AFFFFFF #66FFFFFF #5CFFFFFF #4DFFFFFF diff --git a/common/common-ui/src/main/res/values/design-system-theming.xml b/common/common-ui/src/main/res/values/design-system-theming.xml index 5047d1d7a8cc..cc6e59e04b68 100644 --- a/common/common-ui/src/main/res/values/design-system-theming.xml +++ b/common/common-ui/src/main/res/values/design-system-theming.xml @@ -153,6 +153,7 @@ @color/black84 @color/white60 @color/black60 + @color/white48 @color/white84 @color/alertRedOnDarkDefault @color/white40 @@ -225,6 +226,7 @@ @color/white84 @color/black60 @color/white60 + @color/black48 @color/black84 @color/black40 @color/alertRedOnLightDefault diff --git a/sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/SyncAccountRepository.kt b/sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/SyncAccountRepository.kt index 4075db08c3e9..c5773091ef4a 100644 --- a/sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/SyncAccountRepository.kt +++ b/sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/SyncAccountRepository.kt @@ -18,7 +18,7 @@ package com.duckduckgo.sync.impl import androidx.annotation.* import com.duckduckgo.app.di.AppCoroutineScope -import com.duckduckgo.app.global.DispatcherProvider +import com.duckduckgo.common.utils.DispatcherProvider import com.duckduckgo.di.scopes.* import com.duckduckgo.sync.api.engine.* import com.duckduckgo.sync.api.engine.SyncEngine.SyncTrigger.ACCOUNT_CREATION diff --git a/sync/sync-impl/src/test/java/com/duckduckgo/sync/impl/AppSyncAccountRepositoryTest.kt b/sync/sync-impl/src/test/java/com/duckduckgo/sync/impl/AppSyncAccountRepositoryTest.kt index 842720009885..6785b2374ecc 100644 --- a/sync/sync-impl/src/test/java/com/duckduckgo/sync/impl/AppSyncAccountRepositoryTest.kt +++ b/sync/sync-impl/src/test/java/com/duckduckgo/sync/impl/AppSyncAccountRepositoryTest.kt @@ -17,7 +17,7 @@ package com.duckduckgo.sync.impl import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.duckduckgo.app.global.DefaultDispatcherProvider +import com.duckduckgo.common.utils.DefaultDispatcherProvider import com.duckduckgo.sync.TestSyncFixtures.accountCreatedFailDupUser import com.duckduckgo.sync.TestSyncFixtures.accountCreatedSuccess import com.duckduckgo.sync.TestSyncFixtures.accountKeys