Issue/update color scheme

RELEASE-NOTES.txt

@@ -1,5 +1,6 @@
 12.2
 -----
+* Updated color scheme to Classic Bright
 * Adds support for .blog subdomains for the new site creation flow
 
 12.1

WordPress/src/main/assets/login_anims/jetpack.json

@@ -1 +1 @@
-{"v":"4.10.1","fr":30,"ip":0,"op":95,"w":310,"h":464,"nm":"Jetpack","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Jetpack Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.344],"y":[1]},"o":{"x":[0.655],"y":[0]},"n":["0p344_1_0p655_0"],"t":20,"s":[0],"e":[1800]},{"t":50}],"ix":10},"p":{"a":0,"k":[155,291,0],"ix":2},"a":{"a":0,"k":[68,68,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-14.126,-27.274],[-14.126,37.664],[19.293,-27.274]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[85.523,84.065],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[14.124,27.282],[14.124,-37.658],[-19.296,27.282]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[50.476,51.935],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[37.556,0],[0,-37.556],[-37.556,0],[0,37.556]],"o":[[-37.556,0],[0,37.556],[37.556,0],[0,-37.556]],"v":[[0,-68],[-68,0],[0,68],[68,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.783999992819,0.842999985639,0.882000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[68,68],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,305,0],"ix":2},"a":{"a":0,"k":[153,303,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.663000009574,0.870999983245,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.310000011968,0.517999985639,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0}]}
+{"v":"5.3.4","fr":30,"ip":0,"op":95,"w":310,"h":464,"nm":"Jetpack","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Jetpack Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.344],"y":[1]},"o":{"x":[0.655],"y":[0]},"n":["0p344_1_0p655_0"],"t":20,"s":[0],"e":[1800]},{"t":50}],"ix":10},"p":{"a":0,"k":[155,291,0],"ix":2},"a":{"a":0,"k":[68,68,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-14.126,-27.274],[-14.126,37.664],[19.293,-27.274]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[85.523,84.065],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[14.124,27.282],[14.124,-37.658],[-19.296,27.282]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[50.476,51.935],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[37.556,0],[0,-37.556],[-37.556,0],[0,37.556]],"o":[[-37.556,0],[0,37.556],[37.556,0],[0,-37.556]],"v":[[0,-68],[-68,0],[0,68],[68,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.807843137255,0.81568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[68,68],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,305,0],"ix":2},"a":{"a":0,"k":[153,303,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.003921568627,0.376470588235,0.529411764706,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254901961,0.207843137255,0.294117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0}],"markers":[]}

WordPress/src/main/java/org/wordpress/android/push/GCMMessageService.java

@@ -656,7 +656,7 @@ private NotificationCompat.Builder getNotificationBuilder(Context context, Strin
             return new NotificationCompat.Builder(context,
                     context.getString(R.string.notification_channel_normal_id))
                     .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
-                    .setColor(context.getResources().getColor(R.color.blue_wordpress))
+                    .setColor(context.getResources().getColor(R.color.primary_500))
                     .setContentTitle(title)
                     .setContentText(message)
                     .setTicker(message)
@@ -711,7 +711,7 @@ private void showGroupNotificationForBuilder(Context context, NotificationCompat
                         context.getString(R.string.notification_channel_normal_id))
                         .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
                         .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
-                        .setColor(context.getResources().getColor(R.color.blue_wordpress))
+                        .setColor(context.getResources().getColor(R.color.primary_500))
                         .setGroup(NOTIFICATION_GROUP_KEY)
                         .setGroupSummary(true)
                         .setAutoCancel(true)
@@ -987,7 +987,7 @@ private void handlePushAuth(Context context, Bundle data) {
             NotificationCompat.Builder builder = new NotificationCompat.Builder(context,
                     context.getString(R.string.notification_channel_important_id))
                     .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
-                    .setColor(context.getResources().getColor(R.color.blue_wordpress))
+                    .setColor(context.getResources().getColor(R.color.primary_500))
                     .setContentTitle(title)
                     .setContentText(message)
                     .setAutoCancel(true)

WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java

@@ -40,7 +40,7 @@ public static void showMessageToUserWithBuilder(NotificationCompat.Builder build
     public static NotificationCompat.Builder getBuilder(Context context, String channelId) {
         return new NotificationCompat.Builder(context, channelId)
                 .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
-                .setColor(context.getResources().getColor(R.color.blue_wordpress))
+                .setColor(context.getResources().getColor(R.color.primary_500))
                 .setContentTitle(context.getString(R.string.app_name))
                 .setAutoCancel(true);
     }

WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java

@@ -218,7 +218,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                     StringEscapeUtils.unescapeHtml4(blogNames[position]));
             blogUsername.setText(
                     StringEscapeUtils.unescapeHtml4(username));
-            blavatar.setErrorImageResId(R.drawable.bg_rectangle_grey_lighten_20_globe_32dp);
+            blavatar.setErrorImageResId(R.drawable.bg_rectangle_neutral_100_globe_32dp);
             blavatar.setImageUrl(blavatars[position], mImageLoader);
 
             return view;

WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java

@@ -410,7 +410,7 @@ public static class Builder {
         String mSubtitle = "";
         String mTitle = "";
         boolean mHideActivityBar = false;
-        int mToolbarColor = R.color.color_primary;
+        int mToolbarColor = R.color.primary;
 
         /**
          * Builder to construct {@link FullScreenDialogFragment}.

WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java

@@ -23,12 +23,12 @@
 import org.wordpress.android.ui.main.WPMainActivity;
 import org.wordpress.android.ui.media.MediaBrowserActivity;
 import org.wordpress.android.ui.media.MediaBrowserType;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.FluxCUtils;
 import org.wordpress.android.util.LocaleManager;
 import org.wordpress.android.util.PermissionUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.WPPermissionUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -85,7 +85,7 @@ protected void onResume() {
         super.onResume();
         // keep setBackground in the onResume, otherwise the transition between activities is visible to the user when
         // sharing text with an account with one visible site
-        findViewById(R.id.main_view).setBackgroundResource(R.color.login_background_color);
+        findViewById(R.id.main_view).setBackgroundResource(R.color.background_default);
     }
 
     private void refreshContent() {

WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java

@@ -169,15 +169,15 @@ public void run() {
 
                                 if (mRecyclerView.computeVerticalScrollRange() > mRecyclerView.getHeight()) {
                                     mBottomButtonsShadow.setVisibility(View.VISIBLE);
-                                    mBottomButtonsContainer.setBackgroundResource(R.color.white);
-                                    mShareMediaBtn.setTextColor(getResources().getColor(R.color.blue_wordpress));
+                                    mBottomButtonsContainer.setBackgroundResource(android.R.color.white);
+                                    mShareMediaBtn.setTextColor(getResources().getColor(R.color.primary_500));
                                     ViewUtils.setButtonBackgroundColor(getContext(), mShareMediaBtn,
                                                                        R.style.WordPress_Button_Grey,
                                                                        R.attr.colorButtonNormal);
                                 } else {
                                     mBottomButtonsShadow.setVisibility(View.GONE);
                                     mBottomButtonsContainer.setBackground(null);
-                                    mShareMediaBtn.setTextColor(getResources().getColor(R.color.grey_dark));
+                                    mShareMediaBtn.setTextColor(getResources().getColor(R.color.neutral_700));
                                     ViewUtils.setButtonBackgroundColor(getContext(), mShareMediaBtn,
                                                                        R.style.WordPress_Button,
                                                                        R.attr.colorButtonNormal);

WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java

@@ -89,7 +89,7 @@ protected void onDraw(Canvas canvas) {
         Paint paint = mInputView.getPaint();
         paint.setTextAlign(Paint.Align.CENTER);
         //noinspection deprecation
-        paint.setColor(getResources().getColor(R.color.blue_wordpress));
+        paint.setColor(getResources().getColor(R.color.primary_500));
         int alpha = isEnabled() ? 255 : 96;
         paint.setAlpha(alpha);
         mPaint.setAlpha(alpha);

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java

@@ -21,10 +21,10 @@
 import org.wordpress.android.login.LoginBaseFormFragment;
 import org.wordpress.android.ui.main.SitePickerAdapter;
 import org.wordpress.android.ui.main.SitePickerAdapter.SiteList;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ViewUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.image.ImageManager;
 
 import java.util.ArrayList;
@@ -169,7 +169,7 @@ public void run() {
 
                                 if (mSitesList.computeVerticalScrollRange() > mSitesList.getHeight()) {
                                     mBottomShadow.setVisibility(View.VISIBLE);
-                                    mBottomButtonsContainer.setBackgroundResource(R.color.white);
+                                    mBottomButtonsContainer.setBackgroundResource(android.R.color.white);
                                     ViewUtils.setButtonBackgroundColor(getContext(), mConnectMore,
                                                                        R.style.WordPress_Button_Grey,
                                                                        R.attr.colorButtonNormal);

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java

@@ -44,15 +44,13 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
-            savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.login_intro_template_view, container, false);
-        rootView.setBackgroundColor(
-                getResources().getColor(mLightBackground ? R.color.blue_light : R.color.blue_medium));
+        rootView.setBackgroundColor(getResources().getColor(R.color.primary));
 
         TextView promoText = (TextView) rootView.findViewById(R.id.promo_text);
         promoText.setText(mPromoText);
-        promoText.setTextColor(getResources().getColor(mLightBackground ? R.color.blue_dark : R.color.white));
+        promoText.setTextColor(getResources().getColor(android.R.color.white));
 
         mLottieAnimationView = (LottieAnimationView) rootView.findViewById(R.id.animation_view);
         mLottieAnimationView.setAnimation(mAnimationFilename, LottieAnimationView.CacheStrategy.Weak);

WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java

@@ -642,8 +642,8 @@ protected void startCropActivity(Uri uri) {
         if (context != null) {
             UCrop.Options options = new UCrop.Options();
             options.setShowCropGrid(false);
-            options.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar_tint));
-            options.setToolbarColor(ContextCompat.getColor(context, R.color.color_primary));
+            options.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar));
+            options.setToolbarColor(ContextCompat.getColor(context, R.color.primary));
             options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE);
             options.setHideBottomControls(true);