Merge pull request #23 from Telefonica/apps/icon-colors-renaming

Small renaming in app icon attributes
Telefonica · Oct 14, 2020 · 5ef8d56 · 5ef8d56
2 parents 6e6afe9 + 63aa6b3
commit 5ef8d56
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/library/src/main/java/com/telefonica/mistica/header/HeaderView.kt b/library/src/main/java/com/telefonica/mistica/header/HeaderView.kt
@@ -61,7 +61,7 @@ import com.telefonica.mistica.util.getThemeColor
     ),
     BindingMethod(
         type = HeaderView::class,
-        attribute = "headerNumeralHasDangerColor",
+        attribute = "headerNumeralHasErrorColor",
         method = "setNumeralHasDangerColor"
     ),
     BindingMethod(
@@ -163,7 +163,7 @@ class HeaderView @JvmOverloads constructor(
 
             numeralTextView.setTextAndVisibility(styledAttrs.getText(R.styleable.HeaderView_headerNumeral))
             numeralHasDangerColor =
-                styledAttrs.getBoolean(R.styleable.HeaderView_headerNumeralHasDangerColor, false)
+                styledAttrs.getBoolean(R.styleable.HeaderView_headerNumeralHasErrorColor, false)
 
             actionButton.setTextAndVisibility(styledAttrs.getText(R.styleable.HeaderView_headerActionButtonText))
             secondaryActionButton.setTextAndVisibility(styledAttrs.getText(R.styleable.HeaderView_headerSecondaryActionButtonText))

diff --git a/library/src/main/java/com/telefonica/mistica/header/README.md b/library/src/main/java/com/telefonica/mistica/header/README.md
@@ -17,7 +17,7 @@ Implemented as a custom view, `com.telefonica.mistica.header.HeaderView` can be
     <attr name="headerSecondPretitle" format="string"/>
     <attr name="headerSecondPretitleHasSecondaryColor" format="boolean"/>
     <attr name="headerNumeral" format="string"/>
-    <attr name="headerNumeralHasDangerColor" format="boolean"/>
+    <attr name="headerNumeralHasErrorColor" format="boolean"/>
     <attr name="headerActionButtonText" format="string"/>
     <attr name="headerSecondaryActionButtonText" format="string"/>
     <attr name="headerActionButtonOnClick" format="string"/>

diff --git a/library/src/main/res/values/attrs_colors.xml b/library/src/main/res/values/attrs_colors.xml
@@ -312,12 +312,12 @@
         <attr name="colorIconPrimary" format="color|reference" />
         <attr name="colorIconPrimaryDark" format="color|reference" />
         <attr name="colorIconBrand" format="color|reference" />
-        <attr name="colorIconAccent" format="color|reference" />
+        <attr name="colorIconSuccess" format="color|reference" />
         <attr name="colorIconDisabled" format="color|reference" />
         <attr name="colorIconInverse" format="color|reference" />
         <attr name="colorIconSecondary" format="color|reference" />
         <attr name="colorIconWarning" format="color|reference" />
-        <attr name="colorIconDanger" format="color|reference" />
+        <attr name="colorIconError" format="color|reference" />
         <attr name="colorIconCustomPurple" format="color|reference" />
         <attr name="colorIconCustomMagenta" format="color|reference" />
 

diff --git a/library/src/main/res/values/attrs_components.xml b/library/src/main/res/values/attrs_components.xml
@@ -70,7 +70,7 @@
         <attr name="headerSecondPretitle" format="string" />
         <attr name="headerSecondPretitleHasSecondaryColor" format="boolean" />
         <attr name="headerNumeral" format="string" />
-        <attr name="headerNumeralHasDangerColor" format="boolean" />
+        <attr name="headerNumeralHasErrorColor" format="boolean" />
         <attr name="headerActionButtonText" format="string" />
         <attr name="headerSecondaryActionButtonText" format="string" />
         <attr name="headerActionButtonOnClick" format="string" />

diff --git a/library/src/main/res/values/themes.xml b/library/src/main/res/values/themes.xml
@@ -36,9 +36,9 @@
         <item name="colorIconPrimary">?colorPrimary</item>
         <item name="colorIconPrimaryDark">?colorPrimaryDark</item>
         <item name="colorIconBrand">?colorPrimary</item>
-        <item name="colorIconAccent">?colorAccent</item>
+        <item name="colorIconSuccess">?colorAccent</item>
         <item name="colorIconWarning">?colorPrimary</item>
-        <item name="colorIconDanger">?colorPrimary</item>
+        <item name="colorIconError">?colorPrimary</item>
         <item name="colorIconCustomPurple">?colorPrimary</item>
         <item name="colorIconCustomMagenta">?colorPrimary</item>
     </style>

diff --git a/library/src/main/res/values/themes_movistar.xml b/library/src/main/res/values/themes_movistar.xml
@@ -362,7 +362,7 @@
         <item name="colorIconDisabled">@color/movistar_color_grey_3</item>
         <item name="colorIconSecondary">@color/movistar_color_grey_2</item>
         <item name="colorIconWarning">@color/movistar_color_egg</item>
-        <item name="colorIconDanger">@color/movistar_color_pepper</item>
+        <item name="colorIconError">@color/movistar_color_pepper</item>
         <item name="colorIconCustomPurple">@color/movistar_color_purple</item>
         <item name="colorIconCustomMagenta">@color/movistar_color_pink</item>