diff --git a/.gitignore b/.gitignore index 3e319632..7ca2a899 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ fastlane/README.md .externalNativeBuild .cxx github_credentials.properties +github_credentials.properties.sample +github_credentials.properties.sample diff --git a/designsystem/src/main/res/font/helvetica_now_display_bd.ttf b/designsystem/src/main/res/font/helvetica_now_display_bd.ttf deleted file mode 100644 index cc0741da..00000000 Binary files a/designsystem/src/main/res/font/helvetica_now_display_bd.ttf and /dev/null differ diff --git a/designsystem/src/main/res/font/helvetica_now_display_md.ttf b/designsystem/src/main/res/font/helvetica_now_display_md.ttf deleted file mode 100644 index a02d519f..00000000 Binary files a/designsystem/src/main/res/font/helvetica_now_display_md.ttf and /dev/null differ diff --git a/designsystem/src/main/res/font/helvetica_now_display_regular.ttf b/designsystem/src/main/res/font/helvetica_now_display_regular.ttf deleted file mode 100644 index 4cd9e7f9..00000000 Binary files a/designsystem/src/main/res/font/helvetica_now_display_regular.ttf and /dev/null differ diff --git a/designsystem/src/main/res/values/theme_natura_dark_ssot.xml b/designsystem/src/main/res/values/theme_natura_dark_ssot.xml index 4f4165da..355816e6 100644 --- a/designsystem/src/main/res/values/theme_natura_dark_ssot.xml +++ b/designsystem/src/main/res/values/theme_natura_dark_ssot.xml @@ -446,10 +446,10 @@ @drawable/natura_b_official_dark @drawable/natura_a_custom @drawable/natura_b_custom - @font/helvetica_now_display_bd - @font/helvetica_now_display_md - @font/helvetica_now_display_regular - @font/helvetica_now_display_bd + @font/roboto_regular + @font/roboto_regular + @font/roboto_regular + @font/roboto_medium sans-serif-medium sans-serif sans-serif diff --git a/designsystem/src/main/res/values/theme_natura_v2_dark_ssot.xml b/designsystem/src/main/res/values/theme_natura_v2_dark_ssot.xml index eb4fc55d..ffcd53b2 100644 --- a/designsystem/src/main/res/values/theme_natura_v2_dark_ssot.xml +++ b/designsystem/src/main/res/values/theme_natura_v2_dark_ssot.xml @@ -450,10 +450,10 @@ @drawable/natura_b_official_dark @drawable/natura_a_custom @drawable/natura_b_custom - @font/helvetica_now_display_bd - @font/helvetica_now_display_md - @font/helvetica_now_display_regular - @font/helvetica_now_display_bd + @font/roboto_regular + @font/roboto_regular + @font/roboto_regular + @font/roboto_medium sans-serif-medium sans-serif sans-serif 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 007be88b..003f42eb 100644 --- a/sample/src/main/kotlin/com/natura/android/sample/BrandSelectorActivity.kt +++ b/sample/src/main/kotlin/com/natura/android/sample/BrandSelectorActivity.kt @@ -37,6 +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) else -> openSampleBy(TBS) } } @@ -47,6 +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) } private fun openSampleBy(brandTheme: String) { @@ -61,5 +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" } } 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 4755b578..5649666e 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,6 +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 else -> R.style.Theme_TheBodyShop_Light } } @@ -38,6 +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 else -> R.style.Theme_TheBodyShop_Dark } } @@ -48,6 +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 else -> R.style.Theme_TheBodyShop_Light_NoActionBar } } @@ -58,6 +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 else -> R.style.Theme_TheBodyShop_Dark_NoActionBar } } diff --git a/sample/src/main/res/layout/activity_brand_selector.xml b/sample/src/main/res/layout/activity_brand_selector.xml index 5590c1ba..f0dda15c 100644 --- a/sample/src/main/res/layout/activity_brand_selector.xml +++ b/sample/src/main/res/layout/activity_brand_selector.xml @@ -157,5 +157,43 @@ app:srcCompat="@drawable/consultoriadebeleza_b_official" app:tint="@color/black" /> + + + + + + + + + + diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml index 38195ade..6b720d95 100644 --- a/sample/src/main/res/values/strings.xml +++ b/sample/src/main/res/values/strings.xml @@ -461,6 +461,8 @@ NaturaeCo The Body Shop Consultoria de Beleza + Natura v2 + Avon v2 Alert Only Title Alert Success Alert Success Outlined