ANDROID-13833 Omit compose customization

Telefonica · Nov 7, 2023 · 25c9e54 · 25c9e54
1 parent f7c3b2f
commit 25c9e54
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 487 deletions.
diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/CatalogMainActivity.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/CatalogMainActivity.kt
@@ -18,7 +18,6 @@ import com.telefonica.mistica.compose.theme.brand.BrandType.O2
 import com.telefonica.mistica.compose.theme.brand.BrandType.TELEFONICA
 import com.telefonica.mistica.compose.theme.brand.BrandType.VIVO
 import com.telefonica.mistica.compose.theme.brand.BrandType.VIVO_NEW
-import com.telefonica.mistica.compose.theme.brand.BrandType.VIVO_NEW_OVERRIDE
 import com.telefonica.mistica.compose.theme.brand.MovistarBrand
 import com.telefonica.mistica.input.DropDownInput
 import com.telefonica.mistica.list.ListRowView
@@ -49,7 +48,6 @@ class CatalogMainActivity : AppCompatActivity() {
             ComponentStyle("O2", R.style.MisticaTheme_O2, O2),
             ComponentStyle("Vivo", R.style.MisticaTheme_Vivo, VIVO),
             ComponentStyle("Vivo New", R.style.MisticaTheme_VivoNew, VIVO_NEW),
-            ComponentStyle("Vivo New Override", R.style.VivoNewOverride, VIVO_NEW_OVERRIDE),
             ComponentStyle("Telefonica", R.style.MisticaTheme_Telefonica, TELEFONICA),
             ComponentStyle("Blau", R.style.MisticaTheme_Blau, BLAU),
         )

diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/ComponentCatalogActivity.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/ComponentCatalogActivity.kt
@@ -71,13 +71,11 @@ import com.telefonica.mistica.compose.theme.brand.BrandType.O2
 import com.telefonica.mistica.compose.theme.brand.BrandType.TELEFONICA
 import com.telefonica.mistica.compose.theme.brand.BrandType.VIVO
 import com.telefonica.mistica.compose.theme.brand.BrandType.VIVO_NEW
-import com.telefonica.mistica.compose.theme.brand.BrandType.VIVO_NEW_OVERRIDE
 import com.telefonica.mistica.compose.theme.brand.MovistarBrand
 import com.telefonica.mistica.compose.theme.brand.O2Brand
 import com.telefonica.mistica.compose.theme.brand.TelefonicaBrand
 import com.telefonica.mistica.compose.theme.brand.VivoBrand
 import com.telefonica.mistica.compose.theme.brand.VivoNewBrand
-import com.telefonica.mistica.compose.theme.brand.VivoNewOverrideBrand
 
 class ComponentCatalogActivity : FragmentActivity() {
 
@@ -250,7 +248,6 @@ class ComponentCatalogActivity : FragmentActivity() {
             O2 -> O2Brand
             VIVO -> VivoBrand
             VIVO_NEW -> VivoNewBrand
-            VIVO_NEW_OVERRIDE -> VivoNewOverrideBrand
             TELEFONICA -> TelefonicaBrand
             BLAU -> BlauBrand
         }

diff --git a/...ry/src/main/java/com/telefonica/mistica/compose/composeview/AbstractMisticaComposeView.kt b/...ry/src/main/java/com/telefonica/mistica/compose/composeview/AbstractMisticaComposeView.kt
@@ -12,7 +12,6 @@ import com.telefonica.mistica.compose.composeview.AbstractMisticaComposeView.Com
 import com.telefonica.mistica.compose.composeview.AbstractMisticaComposeView.Companion.BRAND_VALUE_TELEFONICA
 import com.telefonica.mistica.compose.composeview.AbstractMisticaComposeView.Companion.BRAND_VALUE_VIVO
 import com.telefonica.mistica.compose.composeview.AbstractMisticaComposeView.Companion.BRAND_VALUE_VIVO_NEW
-import com.telefonica.mistica.compose.composeview.AbstractMisticaComposeView.Companion.BRAND_VALUE_VIVO_NEW_OVERRIDE
 import com.telefonica.mistica.compose.theme.MisticaTheme
 import com.telefonica.mistica.compose.theme.brand.BlauBrand
 import com.telefonica.mistica.compose.theme.brand.Brand
@@ -21,7 +20,6 @@ import com.telefonica.mistica.compose.theme.brand.O2Brand
 import com.telefonica.mistica.compose.theme.brand.TelefonicaBrand
 import com.telefonica.mistica.compose.theme.brand.VivoBrand
 import com.telefonica.mistica.compose.theme.brand.VivoNewBrand
-import com.telefonica.mistica.compose.theme.brand.VivoNewOverrideBrand
 
 abstract class AbstractMisticaComposeView @JvmOverloads constructor(
     context: Context,
@@ -71,7 +69,6 @@ abstract class AbstractMisticaComposeView @JvmOverloads constructor(
         const val BRAND_VALUE_TELEFONICA = 3
         const val BRAND_VALUE_BLAU = 4
         const val BRAND_VALUE_VIVO_NEW = 5
-        const val BRAND_VALUE_VIVO_NEW_OVERRIDE = 6
     }
 }
 
@@ -82,6 +79,5 @@ fun Int.mapToComposeBrand(): Brand = when (this) {
     BRAND_VALUE_TELEFONICA -> TelefonicaBrand
     BRAND_VALUE_BLAU -> BlauBrand
     BRAND_VALUE_VIVO_NEW -> VivoNewBrand
-    BRAND_VALUE_VIVO_NEW_OVERRIDE -> VivoNewOverrideBrand
     else -> TelefonicaBrand
 }
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/Brand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/Brand.kt
@@ -32,4 +32,4 @@ interface Brand {
     val radius: MisticaRadius
 }
 
-enum class BrandType { BLAU, MOVISTAR, O2, TELEFONICA, VIVO, VIVO_NEW, VIVO_NEW_OVERRIDE }
+enum class BrandType { BLAU, MOVISTAR, O2, TELEFONICA, VIVO, VIVO_NEW }
diff --git a/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewOverrideBrand.kt b/library/src/main/java/com/telefonica/mistica/compose/theme/brand/VivoNewOverrideBrand.kt