From f73411b924689a49c84bc18c43a5087b3dfd2967 Mon Sep 17 00:00:00 2001
From: Tiger Oakes <toakes@mozilla.com>
Date: Mon, 20 Jul 2020 16:00:57 -0700
Subject: [PATCH] For #5499 - Unify CFR drawables and dimens (#12749)

---
 .../TrackingProtectionOverlay.kt              |  4 ++--
 app/src/main/res/drawable/ic_cfr_triangle.xml | 16 +++++++++++++++
 app/src/main/res/drawable/ic_pbm_triangle.xml | 20 -------------------
 app/src/main/res/drawable/ic_triangle.xml     | 20 -------------------
 .../main/res/layout/pbm_shortcut_popup.xml    |  9 +++++----
 app/src/main/res/layout/search_widget_cfr.xml | 12 ++++++-----
 .../tracking_protection_onboarding_popup.xml  | 20 ++++++++++---------
 app/src/main/res/values/dimens.xml            |  7 ++++---
 8 files changed, 45 insertions(+), 63 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_cfr_triangle.xml
 delete mode 100644 app/src/main/res/drawable/ic_pbm_triangle.xml
 delete mode 100644 app/src/main/res/drawable/ic_triangle.xml

diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
index e3839c5d3..0f0dae3dc 100644
--- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
+++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
@@ -81,8 +81,8 @@ class TrackingProtectionOverlay(
         }
 
         val res = context.resources
-        val triangleWidthPx = res.getDimension(R.dimen.tp_onboarding_triangle_height)
-        val triangleMarginStartPx = res.getDimension(R.dimen.tp_onboarding_triangle_margin_start)
+        val triangleWidthPx = res.getDimension(R.dimen.cfr_triangle_height)
+        val triangleMarginStartPx = res.getDimension(R.dimen.cfr_triangle_margin_edge)
 
         val toolbar = getToolbar()
         val trackingProtectionIcon: View =
diff --git a/app/src/main/res/drawable/ic_cfr_triangle.xml b/app/src/main/res/drawable/ic_cfr_triangle.xml
new file mode 100644
index 000000000..152e7c372
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfr_triangle.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="45"
+    android:pivotX="-40%"
+    android:pivotY="87%"
+    android:toDegrees="45">
+    <shape android:shape="rectangle">
+        <stroke
+            android:width="10dp"
+            android:color="#FFFFFF" />
+        <solid android:color="#FFFFFF" />
+    </shape>
+</rotate>
diff --git a/app/src/main/res/drawable/ic_pbm_triangle.xml b/app/src/main/res/drawable/ic_pbm_triangle.xml
deleted file mode 100644
index 025ce0cd9..000000000
--- a/app/src/main/res/drawable/ic_pbm_triangle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <rotate
-                android:fromDegrees="45"
-                android:pivotX="-40%"
-                android:pivotY="87%"
-                android:toDegrees="45">
-            <shape android:shape="rectangle">
-                <stroke
-                        android:width="10dp"
-                        android:color="#7542E5" />
-                <solid android:color="#7542E5" />
-            </shape>
-        </rotate>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_triangle.xml b/app/src/main/res/drawable/ic_triangle.xml
deleted file mode 100644
index d7fd2b45a..000000000
--- a/app/src/main/res/drawable/ic_triangle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <rotate
-            android:fromDegrees="45"
-            android:pivotX="-40%"
-            android:pivotY="87%"
-            android:toDegrees="45">
-            <shape android:shape="rectangle">
-                <stroke
-                    android:width="10dp"
-                    android:color="#0250BB" />
-                <solid android:color="#0250BB" />
-            </shape>
-        </rotate>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/layout/pbm_shortcut_popup.xml b/app/src/main/res/layout/pbm_shortcut_popup.xml
index 53246eece..f365d3681 100644
--- a/app/src/main/res/layout/pbm_shortcut_popup.xml
+++ b/app/src/main/res/layout/pbm_shortcut_popup.xml
@@ -9,12 +9,13 @@
     android:orientation="vertical">
 
     <ImageView
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="@dimen/cfr_triangle_width"
+        android:layout_height="@dimen/cfr_triangle_height"
         android:layout_gravity="end"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="@dimen/cfr_triangle_margin_edge"
         android:importantForAccessibility="no"
-        app:srcCompat="@drawable/ic_pbm_triangle" />
+        app:srcCompat="@drawable/ic_cfr_triangle"
+        app:tint="#7542E5" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/search_widget_cfr.xml b/app/src/main/res/layout/search_widget_cfr.xml
index e5f6be05b..9a4ffea21 100644
--- a/app/src/main/res/layout/search_widget_cfr.xml
+++ b/app/src/main/res/layout/search_widget_cfr.xml
@@ -13,11 +13,12 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:visibility="gone"
         android:id="@+id/drop_down_triangle"
-        android:layout_width="@dimen/tp_onboarding_triangle_width"
-        android:layout_height="@dimen/tp_onboarding_triangle_height"
+        android:layout_width="@dimen/cfr_triangle_width"
+        android:layout_height="@dimen/cfr_triangle_height"
         android:importantForAccessibility="no"
         android:rotation="0"
-        app:srcCompat="@drawable/ic_pbm_triangle"
+        app:srcCompat="@drawable/ic_cfr_triangle"
+        app:tint="#7542E5"
         android:layout_gravity="center" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -92,9 +93,10 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/pop_up_triangle"
         android:layout_width="16dp"
-        android:layout_height="@dimen/tp_onboarding_triangle_height"
+        android:layout_height="@dimen/cfr_triangle_height"
         android:importantForAccessibility="no"
         android:rotation="180"
-        app:srcCompat="@drawable/ic_pbm_triangle"
+        app:srcCompat="@drawable/ic_cfr_triangle"
+        app:tint="#7542E5"
         android:layout_gravity="center" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/tracking_protection_onboarding_popup.xml b/app/src/main/res/layout/tracking_protection_onboarding_popup.xml
index 06767c384..6ed17f725 100644
--- a/app/src/main/res/layout/tracking_protection_onboarding_popup.xml
+++ b/app/src/main/res/layout/tracking_protection_onboarding_popup.xml
@@ -11,12 +11,13 @@
     <ImageView
         android:visibility="gone"
         android:id="@+id/drop_down_triangle"
-        android:layout_width="@dimen/tp_onboarding_triangle_width"
-        android:layout_height="@dimen/tp_onboarding_triangle_height"
-        android:layout_marginStart="@dimen/tp_onboarding_triangle_margin_start"
+        android:layout_width="@dimen/cfr_triangle_width"
+        android:layout_height="@dimen/cfr_triangle_height"
+        android:layout_marginStart="@dimen/cfr_triangle_margin_edge"
         android:importantForAccessibility="no"
         android:rotation="0"
-        app:srcCompat="@drawable/ic_triangle"
+        app:srcCompat="@drawable/ic_cfr_triangle"
+        app:tint="#0250BB"
         android:layout_gravity="start" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -36,7 +37,7 @@
             android:focusable="true"
             android:contentDescription="@string/onboarding_close"
             app:srcCompat="@drawable/ic_close"
-            android:tint="@color/primary_text_dark_theme"
+            app:tint="@color/primary_text_dark_theme"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -60,11 +61,12 @@
 
     <ImageView
         android:id="@+id/pop_up_triangle"
-        android:layout_width="16dp"
-        android:layout_height="@dimen/tp_onboarding_triangle_height"
-        android:layout_marginStart="16dp"
+        android:layout_width="@dimen/cfr_triangle_width"
+        android:layout_height="@dimen/cfr_triangle_height"
+        android:layout_marginStart="@dimen/cfr_triangle_margin_edge"
         android:importantForAccessibility="no"
         android:rotation="180"
-        app:srcCompat="@drawable/ic_triangle"
+        app:srcCompat="@drawable/ic_cfr_triangle"
+        app:tint="#0250BB"
         android:layout_gravity="start" />
 </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 290b57d36..aa8b61113 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -42,9 +42,10 @@
     <dimen name="context_menu_height">48dp</dimen>
     <dimen name="context_menu_x_offset">8dp</dimen>
     <dimen name="tp_onboarding_width">256dp</dimen>
-    <dimen name="tp_onboarding_triangle_height">16dp</dimen>
-    <dimen name="tp_onboarding_triangle_width">16dp</dimen>
-    <dimen name="tp_onboarding_triangle_margin_start">16dp</dimen>
+    <!-- Dimensions for the CFR (Contextual Feature Recommendation) tooltip triangle. -->
+    <dimen name="cfr_triangle_height">16dp</dimen>
+    <dimen name="cfr_triangle_width">16dp</dimen>
+    <dimen name="cfr_triangle_margin_edge">16dp</dimen>
 
     <dimen name="tab_counter_box_width_height">24dp</dimen>