From 19f61dc4e354de266fab4361cb4e1fcfce098c5a Mon Sep 17 00:00:00 2001 From: hayna-foursys Date: Fri, 26 May 2023 05:29:50 -0300 Subject: [PATCH] finish fixes --- .../res/values-v23/theme_avon_v2_dark.xml | 185 +++++++++++++ .../res/values-v23/theme_avon_v2_light.xml | 188 +++++++++++++ .../res/values-v23/theme_natura_v2_dark.xml | 185 +++++++++++++ .../res/values-v23/theme_natura_v2_light.xml | 187 +++++++++++++ .../src/main/res/values/styles_avon_v2.xml | 252 ++++++++++++++++++ .../src/main/res/values/styles_natura_v2.xml | 252 ++++++++++++++++++ .../main/res/values/theme_avon_v2_dark.xml | 182 +++++++++++++ .../main/res/values/theme_avon_v2_light.xml | 187 +++++++++++++ .../main/res/values/theme_natura_v2_dark.xml | 184 +++++++++++++ .../main/res/values/theme_natura_v2_light.xml | 155 +++++++++++ .../android/sample/BrandSelectorActivity.kt | 12 +- .../android/sample/data/ThemeRepository.kt | 16 +- 12 files changed, 1971 insertions(+), 14 deletions(-) create mode 100644 designsystem/src/main/res/values-v23/theme_avon_v2_dark.xml create mode 100644 designsystem/src/main/res/values-v23/theme_avon_v2_light.xml create mode 100644 designsystem/src/main/res/values-v23/theme_natura_v2_dark.xml create mode 100644 designsystem/src/main/res/values-v23/theme_natura_v2_light.xml create mode 100644 designsystem/src/main/res/values/styles_avon_v2.xml create mode 100644 designsystem/src/main/res/values/styles_natura_v2.xml create mode 100644 designsystem/src/main/res/values/theme_avon_v2_dark.xml create mode 100644 designsystem/src/main/res/values/theme_avon_v2_light.xml create mode 100644 designsystem/src/main/res/values/theme_natura_v2_dark.xml create mode 100644 designsystem/src/main/res/values/theme_natura_v2_light.xml diff --git a/designsystem/src/main/res/values-v23/theme_avon_v2_dark.xml b/designsystem/src/main/res/values-v23/theme_avon_v2_dark.xml new file mode 100644 index 00000000..bb191ab1 --- /dev/null +++ b/designsystem/src/main/res/values-v23/theme_avon_v2_dark.xml @@ -0,0 +1,185 @@ + + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values-v23/theme_avon_v2_light.xml b/designsystem/src/main/res/values-v23/theme_avon_v2_light.xml new file mode 100644 index 00000000..939e03d4 --- /dev/null +++ b/designsystem/src/main/res/values-v23/theme_avon_v2_light.xml @@ -0,0 +1,188 @@ + + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values-v23/theme_natura_v2_dark.xml b/designsystem/src/main/res/values-v23/theme_natura_v2_dark.xml new file mode 100644 index 00000000..82efc59e --- /dev/null +++ b/designsystem/src/main/res/values-v23/theme_natura_v2_dark.xml @@ -0,0 +1,185 @@ + + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values-v23/theme_natura_v2_light.xml b/designsystem/src/main/res/values-v23/theme_natura_v2_light.xml new file mode 100644 index 00000000..4198ffd6 --- /dev/null +++ b/designsystem/src/main/res/values-v23/theme_natura_v2_light.xml @@ -0,0 +1,187 @@ + + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values/styles_avon_v2.xml b/designsystem/src/main/res/values/styles_avon_v2.xml new file mode 100644 index 00000000..d9b95799 --- /dev/null +++ b/designsystem/src/main/res/values/styles_avon_v2.xml @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values/styles_natura_v2.xml b/designsystem/src/main/res/values/styles_natura_v2.xml new file mode 100644 index 00000000..744f18c2 --- /dev/null +++ b/designsystem/src/main/res/values/styles_natura_v2.xml @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values/theme_avon_v2_dark.xml b/designsystem/src/main/res/values/theme_avon_v2_dark.xml new file mode 100644 index 00000000..0bcef462 --- /dev/null +++ b/designsystem/src/main/res/values/theme_avon_v2_dark.xml @@ -0,0 +1,182 @@ + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values/theme_avon_v2_light.xml b/designsystem/src/main/res/values/theme_avon_v2_light.xml new file mode 100644 index 00000000..7812bb57 --- /dev/null +++ b/designsystem/src/main/res/values/theme_avon_v2_light.xml @@ -0,0 +1,187 @@ + + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values/theme_natura_v2_dark.xml b/designsystem/src/main/res/values/theme_natura_v2_dark.xml new file mode 100644 index 00000000..318e1ede --- /dev/null +++ b/designsystem/src/main/res/values/theme_natura_v2_dark.xml @@ -0,0 +1,184 @@ + + + + + + + + \ No newline at end of file diff --git a/designsystem/src/main/res/values/theme_natura_v2_light.xml b/designsystem/src/main/res/values/theme_natura_v2_light.xml new file mode 100644 index 00000000..18bb8742 --- /dev/null +++ b/designsystem/src/main/res/values/theme_natura_v2_light.xml @@ -0,0 +1,155 @@ + + + + + + + \ No newline at end of file diff --git a/sample/src/main/kotlin/com/natura/android/sample/BrandSelectorActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/BrandSelectorActivity.kt index 003f42eb..7b158a5e 100644 --- a/sample/src/main/kotlin/com/natura/android/sample/BrandSelectorActivity.kt +++ b/sample/src/main/kotlin/com/natura/android/sample/BrandSelectorActivity.kt @@ -37,8 +37,8 @@ class BrandSelectorActivity : AppCompatActivity(), View.OnClickListener { binding.avonThemeButton.id -> openSampleBy(AVON) binding.aesopThemeButton.id -> openSampleBy(AESOP) binding.conBelezaThemeButton.id -> openSampleBy(CONSULTORIA) - binding.naturav2ThemeButton.id -> openSampleBy(NATURAV2) - binding.avonv2ThemeButton.id -> openSampleBy(AVONV2) + binding.naturaV2ThemeButton.id -> openSampleBy(NATURAV2) + binding.avonV2ThemeButton.id -> openSampleBy(AVONV2) else -> openSampleBy(TBS) } } @@ -49,8 +49,8 @@ class BrandSelectorActivity : AppCompatActivity(), View.OnClickListener { binding.tbsThemeButton.setOnClickListener(this) binding.aesopThemeButton.setOnClickListener(this) binding.conBelezaThemeButton.setOnClickListener(this) - binding.naturav2ThemeButton.setOnClickListener(this) - binding.avonv2ThemeButton.setOnClickListener(this) + binding.naturaV2ThemeButton.setOnClickListener(this) + binding.avonV2ThemeButton.setOnClickListener(this) } private fun openSampleBy(brandTheme: String) { @@ -65,7 +65,7 @@ class BrandSelectorActivity : AppCompatActivity(), View.OnClickListener { const val TBS = "bodyshop" const val AESOP = "aesop" const val CONSULTORIA = "consultoria" - const val NATURAV2 = "naturav2" - const val AVONV2 = "avonv2" + const val NATURAV2 = "natura_v2" + const val AVONV2 = "avon_v2" } } diff --git a/sample/src/main/kotlin/com/natura/android/sample/data/ThemeRepository.kt b/sample/src/main/kotlin/com/natura/android/sample/data/ThemeRepository.kt index 5649666e..ff44ac59 100644 --- a/sample/src/main/kotlin/com/natura/android/sample/data/ThemeRepository.kt +++ b/sample/src/main/kotlin/com/natura/android/sample/data/ThemeRepository.kt @@ -28,8 +28,8 @@ class ThemeRepository(context: Context) { "avon" -> R.style.Theme_Avon_Light "aesop" -> R.style.Theme_Aesop_Light "consultoria" -> R.style.Theme_ConsultoriaDeBeleza_Light - "naturav2" -> R.style.Theme_Natura_V2_Light - "avonv2" -> R.style.Theme_Avon_V2_Light + "natura_v2" -> R.style.Theme_Natura_v2_Light_SSOT + "avon_v2" -> R.style.Theme_Avon_v2_Light_SSOT else -> R.style.Theme_TheBodyShop_Light } } @@ -40,8 +40,8 @@ class ThemeRepository(context: Context) { "avon" -> R.style.Theme_Avon_Dark "aesop" -> R.style.Theme_Aesop_Dark "consultoria" -> R.style.Theme_ConsultoriaDeBeleza_Dark - "naturav2" -> R.style.Theme_Natura_V2_Dark - "avonv2" -> R.style.Theme_Avon_V2_Dark + "natura_v2" -> R.style.Theme_Natura_v2_Dark_SSOT + "avon_v2" -> R.style.Theme_Avon_v2_Dark_SSOT else -> R.style.Theme_TheBodyShop_Dark } } @@ -52,8 +52,8 @@ class ThemeRepository(context: Context) { "avon" -> R.style.Theme_Avon_Light_NoActionBar "aesop" -> R.style.Theme_Aesop_Light_NoActionBar "consultoria" -> R.style.Theme_ConsultoriaDeBeleza_Light_NoActionBar - "naturav2" -> R.style.Theme_Natura_V2_Light_NoActionBar - "avonv2" -> R.style.Theme_Avon_V2_Light_NoActionBar + "natura_v2" -> R.style.Theme_Natura_v2_Light_NoActionBar + "avon_v2" -> R.style.Theme_Avon_v2_Light_NoActionBar else -> R.style.Theme_TheBodyShop_Light_NoActionBar } } @@ -64,8 +64,8 @@ class ThemeRepository(context: Context) { "avon" -> R.style.Theme_Avon_Dark_NoActionBar "aesop" -> R.style.Theme_Aesop_Dark_NoActionBar "consultoria" -> R.style.Theme_ConsultoriaDeBeleza_Dark_NoActionBar - "naturav2" -> R.style.Theme_Natura_V2_Dark_NoActionBar - "avonv2" -> R.style.Theme_Avon_V2_Dark_NoActionBar + "natura_v2" -> R.style.Theme_Natura_v2_Dark_NoActionBar + "avon_v2" -> R.style.Theme_Avon_v2_Dark_NoActionBar else -> R.style.Theme_TheBodyShop_Dark_NoActionBar } }