From bf2824af795fd6b2f0528e5f46c76cb0704c00a0 Mon Sep 17 00:00:00 2001
From: Rafael Chagas <chagas@gmail.com>
Date: Sun, 1 Mar 2020 20:36:07 +0100
Subject: [PATCH] Give unique names to some styles

Signed-off-by: Rafael Chagas <chagas@gmail.com>
---
 .../src/main/res/layout/activity_place_picker.xml    |  6 +++---
 .../places_autocomplete_impl_fragment_overlay.xml    |  4 ++--
 library/src/main/res/values/styles.xml               | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/library/src/main/res/layout/activity_place_picker.xml b/library/src/main/res/layout/activity_place_picker.xml
index 0a6e68d..f3a8d05 100644
--- a/library/src/main/res/layout/activity_place_picker.xml
+++ b/library/src/main/res/layout/activity_place_picker.xml
@@ -85,7 +85,7 @@
 
                 <ImageView
                     android:id="@+id/ivMarkerSelect"
-                    style="@style/Icon.Secondary"
+                    style="@style/PingIcon.Secondary"
                     android:layout_marginStart="@dimen/guide_start_margin"
                     android:layout_marginBottom="@dimen/selector_margin"
                     android:contentDescription="@string/picker_select_this"
@@ -121,7 +121,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/ToolbarStyle"
+                style="@style/PingToolbarStyle"
                 android:theme="@style/PingTheme.AppBarOverlay"
                 app:layout_collapseMode="pin"
                 app:title="@string/picker_title" />
@@ -139,7 +139,7 @@
                 app:rippleColor="@android:color/transparent">
 
                 <ImageView
-                    style="@style/Icon.OnSurface"
+                    style="@style/PingIcon.OnSurface"
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="@dimen/card_search_content_start_margin"
                     android:contentDescription="@android:string/search_go"
diff --git a/library/src/main/res/layout/places_autocomplete_impl_fragment_overlay.xml b/library/src/main/res/layout/places_autocomplete_impl_fragment_overlay.xml
index 3a067dc..bc61e64 100644
--- a/library/src/main/res/layout/places_autocomplete_impl_fragment_overlay.xml
+++ b/library/src/main/res/layout/places_autocomplete_impl_fragment_overlay.xml
@@ -27,7 +27,7 @@
 
                 <ImageButton
                     android:id="@+id/places_autocomplete_back_button"
-                    style="@style/Icon.OnSurface"
+                    style="@style/PingIcon.OnSurface"
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="@dimen/card_search_content_start_margin"
                     android:layout_marginEnd="20dp"
@@ -52,7 +52,7 @@
 
                 <ImageButton
                     android:id="@+id/places_autocomplete_clear_button"
-                    style="@style/Icon.OnSurface"
+                    style="@style/PingIcon.OnSurface"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="16dp"
                     android:background="?attr/selectableItemBackgroundBorderless"
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index d8185e2..3e3c084 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -41,7 +41,7 @@
         <item name="android:windowTranslucentStatus">true</item>
     </style>
 
-    <style name="ToolbarStyle" parent="Widget.MaterialComponents.Toolbar.Surface">
+    <style name="PingToolbarStyle" parent="Widget.MaterialComponents.Toolbar.Surface">
         <!-- Toolbar should always be within an AppBarLayout which provides the background. -->
         <item name="android:background">@null</item>
         <item name="android:layout_width">match_parent</item>
@@ -49,25 +49,25 @@
         <item name="titleTextColor">?attr/colorOnPrimarySurface</item>
     </style>
 
-    <style name="Icon">
+    <style name="PingIcon">
         <item name="android:layout_width">@dimen/icon_size_small</item>
         <item name="android:layout_height">@dimen/icon_size_small</item>
         <item name="android:alpha">0.54</item>
     </style>
 
-    <style name="Icon.OnPrimary">
+    <style name="PingIcon.OnPrimary">
         <item name="android:tint">?attr/colorOnPrimary</item>
     </style>
 
-    <style name="Icon.OnSurface">
+    <style name="PingIcon.OnSurface">
         <item name="android:tint">?attr/colorOnSurface</item>
     </style>
 
-    <style name="Icon.OnPrimarySurface">
+    <style name="PingIcon.OnPrimarySurface">
         <item name="android:tint">?attr/colorOnPrimarySurface</item>
     </style>
 
-    <style name="Icon.Secondary">
+    <style name="PingIcon.Secondary">
         <item name="android:alpha">1</item>
         <item name="android:tint">?attr/colorSecondary</item>
     </style>