From 7034ad4be6e7e3e1b7ace07fbffb6bfc26235fc1 Mon Sep 17 00:00:00 2001
From: daphliu <daphne.liu97@gmail.com>
Date: Thu, 2 Jan 2020 13:11:36 -0800
Subject: [PATCH] Modified onboarding card colors according to design

---
 .../ic_onboarding_avatar_anonymous.xml        | 37 ++-----------------
 .../layout/onboarding_automatic_signin.xml    |  2 +-
 app/src/main/res/values/colors.xml            |  5 ++-
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
index 5d4bd8248..75d271ab5 100644
--- a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
+++ b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
@@ -3,43 +3,14 @@
    - 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/. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M17.6655,14.2092C16.1843,12.4998 14.1333,14.8 11.9997,14.8C9.8675,14.8 7.8151,12.4998 6.3339,14.2092C5.9139,14.6936 5.8803,15.3992 6.2401,15.9284C7.4959,17.7764 9.5959,19 11.9997,19C14.4035,19 16.5035,17.7764 17.7593,15.9284C18.1205,15.3992 18.0855,14.6936 17.6655,14.2092M16.25,9.25C16.25,6.9026 14.3474,5 12,5C9.6526,5 7.75,6.9026 7.75,9.25C7.75,11.5974 9.6526,13.5 12,13.5C14.3474,13.5 16.25,11.5974 16.25,9.25Z">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startY="21.265238"
-          android:startX="10.078417"
-          android:endY="-6.155523"
-          android:endX="18.457676"
-          android:type="linear">
-        <item android:offset="0" android:color="#00B3F4"/>
-        <item android:offset="0.16" android:color="#07B8ED"/>
-        <item android:offset="0.41" android:color="#1AC6D8"/>
-        <item android:offset="0.7" android:color="#39DCB7"/>
-        <item android:offset="0.76" android:color="#3FE1B0"/>
-      </gradient>
-    </aapt:attr>
-  </path>
+      android:fillColor="@android:color/white"
+      android:pathData="M17.6655,14.2092C16.1843,12.4998 14.1333,14.8 11.9997,14.8C9.8675,14.8 7.8151,12.4998 6.3339,14.2092C5.9139,14.6936 5.8803,15.3992 6.2401,15.9284C7.4959,17.7764 9.5959,19 11.9997,19C14.4035,19 16.5035,17.7764 17.7593,15.9284C18.1205,15.3992 18.0855,14.6936 17.6655,14.2092M16.25,9.25C16.25,6.9026 14.3474,5 12,5C9.6526,5 7.75,6.9026 7.75,9.25C7.75,11.5974 9.6526,13.5 12,13.5C14.3474,13.5 16.25,11.5974 16.25,9.25Z" />
   <path
-      android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4Z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:startY="25.236055"
-          android:startX="7.735972"
-          android:endY="-13.936461"
-          android:endX="26.325832"
-          android:type="linear">
-        <item android:offset="0" android:color="#00B3F4"/>
-        <item android:offset="0.16" android:color="#07B8ED"/>
-        <item android:offset="0.41" android:color="#1AC6D8"/>
-        <item android:offset="0.7" android:color="#39DCB7"/>
-        <item android:offset="0.76" android:color="#3FE1B0"/>
-      </gradient>
-    </aapt:attr>
-  </path>
+      android:fillColor="@android:color/white"
+      android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4Z" />
 </vector>
diff --git a/app/src/main/res/layout/onboarding_automatic_signin.xml b/app/src/main/res/layout/onboarding_automatic_signin.xml
index 50c9081bd..d96855dcc 100644
--- a/app/src/main/res/layout/onboarding_automatic_signin.xml
+++ b/app/src/main/res/layout/onboarding_automatic_signin.xml
@@ -33,7 +33,7 @@
         android:padding="10dp"
         android:text="@string/onboarding_firefox_account_auto_signin_confirm"
         android:textAllCaps="false"
-        android:textColor="?neutral"
+        android:textColor="@color/onboarding_card_button_text_dark"
         android:textSize="14sp"
         android:textStyle="bold"
         app:backgroundTint="@color/onboarding_card_button_background_dark" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9e55c5de3..6dd0f485e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -209,8 +209,9 @@
 
     <!-- Onboarding colors -->
     <color name="onboarding_card_background_dark">#20123A</color>
-    <color name="onboarding_card_primary_text_dark">#3FE1B0</color>
-    <color name="onboarding_card_button_background_dark">#312A65</color>
+    <color name="onboarding_card_primary_text_dark">#FFFFFF</color>
+    <color name="onboarding_card_button_background_dark">#F9F9FB</color>
+    <color name="onboarding_card_button_text_dark">#312A65</color>
 
     <!-- Share UI -->
     <color name="default_share_background">#E3E2E3</color>