From cd28713a535e6854c836062be423dcbac9fc1949 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Tue, 5 Mar 2019 12:28:26 -0700 Subject: [PATCH 001/167] Add studio colors --- WordPress/src/main/res/values/colors.xml | 176 +++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 58ccdc2ced8b..93c40c490eed 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -212,6 +212,182 @@ @color/blue_wordpress #1A0087BE + + #f3f5f6 + #bbc9d5 + #95adc1 + #6f93ad + #46799a + #d8dee4 + #016087 + #204a69 + #23354b + #1d232f + #111215 + #f3f6f5 + #bad1cb + #93bab0 + #6da296 + #438c7d + #d8e3e0 + #007565 + #195d52 + #20473f + #20312d + #1d1d1d + #f6f6f6 + #ccced0 + #b0b5b8 + #969ca1 + #7c848b + #e1e2e2 + #636d75 + #50575d + #3d4145 + #2b2d2f + #1a1a1a + #f3f6f1 + #bcd3b5 + #97bc8d + #73a567 + #4d8e41 + #d8e4d4 + #1d7819 + #1e611e + #1e4a1e + #1d341d + #192019 + #f5f9ff + #c1d7ff + #93b6ff + #6795fe + #3574f8 + #dbe8ff + #005fb7 + #144b9b + #183780 + #162566 + #10144d + #f2fdee + #c5e6b9 + #9dcf8d + #73b961 + #44a234 + #daf2d1 + #008a00 + #08720b + #0d5a10 + #0f4410 + #0f2e0e + #fff9eb + #fce1b5 + #fbca8a + #fcb161 + #fd953b + #feedcf + #f67c00 + #d9650c + #bb4f10 + #9d3a10 + #7e280e + #fff4fc + #ffcaea + #ffa2d4 + #ff76b8 + #ff3997 + #ffdff3 + #d52c82 + #b7266a + #992053 + #7c1b40 + #60162e + #fff6ff + #f0ccf6 + #dea7ef + #c683ea + #aa5fe6 + #f8e1fb + #8051b4 + #673d99 + #4f2a7e + #381865 + #21064c + #fff5ed + #ffcfac + #ffab78 + #ff8248 + #ff4b1c + #ffe2cd + #eb0001 + #cb0c07 + #ac120b + #8e140c + #70150c + #fffdeb + #fcf1bd + #fbe697 + #fbda70 + #fbcd45 + #fef7d2 + #f6c200 + #daaa12 + #bd9219 + #a17b1c + #86661e + #fef7f2 + #fad2b6 + #f5ba8f + #eda268 + #e38a40 + #fce4d5 + #d7730f + #b95e1b + #994b1f + #79391f + #592a1b + #fbf4f7 + #ebc6d5 + #e1a7bf + #d688aa + #c96895 + #f2dee6 #bc4681 + #9b3c69 + #7b3252 + #5d283d + #3f1f2a + #f7f5f8 + #d4c8de + #beabce + #a88ebe + #9273af + #e5deea + #7c589f + #634581 + #4b3264 + #342148 + #1f112e + #fdf3f1 + #f8bfb4 + #f19d8d + #e77a68 + #da5544 + #fadad3 + #ca2622 + #a82620 + #87241d + #68211a + #491d17 + #fdfaf4 + #f7e5c0 + #f1d79d + #e9ca7a + #e0bd56 + #faf0db + #d6b02c + #ba9830 + #9e8132 + #826b32 + #675631 From e35d6b0f7df27504a8244c6cf94f76728819544f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Fri, 8 Mar 2019 12:29:43 -0700 Subject: [PATCH 002/167] Add semnatic colors --- WordPress/src/main/res/values/colors.xml | 87 ++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 93c40c490eed..5499ee3c04b1 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -212,6 +212,93 @@ @color/blue_wordpress #1A0087BE + + @color/pink_500 + @color/pink_0 + @color/pink_100 + @color/pink_200 + @color/pink_300 + @color/pink_400 + @color/pink_50 + @color/pink_500 + @color/pink_600 + @color/pink_700 + @color/pink_800 + @color/pink_900 + @color/pink_700 + @color/pink_300 + @color/gray_50 + @color/hot_red_500 + @color/hot_red_0 + @color/hot_red_100 + @color/hot_red_200 + @color/hot_red_300 + @color/hot_red_400 + @color/hot_red_50 + @color/hot_red_500 + @color/hot_red_600 + @color/hot_red_700 + @color/hot_red_800 + @color/hot_red_900 + @color/hot_red_700 + @color/hot_red_300 + @color/gray_500 + @color/gray_0 + @color/gray_100 + @color/gray_200 + @color/gray_300 + @color/gray_400 + @color/gray_50 + @color/gray_500 + @color/gray_600 + @color/gray_700 + @color/gray_800 + @color/gray_900 + @color/blue_500 + @color/blue_0 + @color/blue_100 + @color/blue_200 + @color/blue_300 + @color/blue_400 + @color/blue_50 + @color/blue_500 + @color/blue_600 + @color/blue_700 + @color/blue_800 + @color/blue_900 + @color/blue_700 + @color/blue_300 + @color/hot_green_500 + @color/hot_green_0 + @color/hot_green_100 + @color/hot_green_200 + @color/hot_green_300 + @color/hot_green_400 + @color/hot_green_50 + @color/hot_green_500 + @color/hot_green_600 + @color/hot_green_700 + @color/hot_green_800 + @color/hot_green_900 + @color/hot_green_700 + @color/hot_green_300 + @color/gray_800 + @color/gray_500 + @color/hot_yellow_500 + @color/hot_yellow_0 + @color/hot_yellow_100 + @color/hot_yellow_200 + @color/hot_yellow_300 + @color/hot_yellow_400 + @color/hot_yellow_50 + @color/hot_yellow_500 + @color/hot_yellow_600 + @color/hot_yellow_700 + @color/hot_yellow_800 + @color/hot_yellow_900 + @color/hot_yellow_700 + @color/hot_yellow_300 + #f3f5f6 #bbc9d5 From a5f9a830e6d18b1e5ac3699d8bec63234593051a Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Wed, 20 Mar 2019 08:20:31 -0700 Subject: [PATCH 003/167] Update accent colors --- WordPress/src/main/res/values/colors.xml | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 5499ee3c04b1..0a47f7692f4d 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -213,20 +213,20 @@ #1A0087BE - @color/pink_500 - @color/pink_0 - @color/pink_100 - @color/pink_200 - @color/pink_300 - @color/pink_400 - @color/pink_50 - @color/pink_500 - @color/pink_600 - @color/pink_700 - @color/pink_800 - @color/pink_900 - @color/pink_700 - @color/pink_300 + @color/hot_pink_500 + @color/hot_pink_0 + @color/hot_pink_100 + @color/hot_pink_200 + @color/hot_pink_300 + @color/hot_pink_400 + @color/hot_pink_50 + @color/hot_pink_500 + @color/hot_pink_600 + @color/hot_pink_700 + @color/hot_pink_800 + @color/hot_pink_900 + @color/hot_pink_700 + @color/hot_pink_300 @color/gray_50 @color/hot_red_500 @color/hot_red_0 From 9d8374857528903bf95762fb85ac3eb09c2fc158 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Fri, 22 Mar 2019 16:10:23 -0700 Subject: [PATCH 004/167] Update color resources with semantic references --- WordPress/src/main/res/values/colors.xml | 224 ++++++++++------------- 1 file changed, 101 insertions(+), 123 deletions(-) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 0a47f7692f4d..84e65ef5b2a5 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -1,16 +1,10 @@ + - - - @color/blue_wordpress + + @color/primary @color/status_bar_tint @color/orange_jazzy @color/white @@ -26,191 +20,175 @@ @color/grey_lighten_30 @color/grey_lighten_20 #FFFFFF - #F1F1F1 - #000000 @color/grey_lighten_30 - - - - #0087be - #78dcfa - #00aadc - #005082 + @color/primary_500 + @color/primary_300 + @color/primary_400 + @color/primary_700 - #87a6bc - #f3f6f8 - #2e4453 - @color/grey_darken_10 + @color/neutral_300 + @color/neutral_0 + @color/neutral_700 + @color/neutral_400 - #e9eff3 - #c8d7e1 - #a8bece - #668eaa - #4f748e - #3d596d + @color/neutral_0 + @color/neutral_100 + @color/neutral_200 + @color/neutral_400 + @color/neutral_500 + @color/neutral_600 - #537994 + @color/neutral #333333 - #cccccc + @color/neutral_50 - #f0821e - #d54e21 - #f58335 - #c55b12 + @color/accent_500 + @color/accent_600 + @color/accent_400 + @color/accent_700 - #f0b849 - #d89511 - #d94f4f - #4ab866 + @color/warning_500 + @color/warning_700 + @color/error_500 + @color/success_500 #66000000 #80000000 - #cc78dcfa - #802e4453 - #b32e4453 - #80888888 - #80a8bece - #80c8d7e1 - #80e9eff3 + @color/primary_50 + @color/black_translucent_50 + @color/black_translucent_50 + @color/black_translucent_40 + @color/gray_50 + #80e9eff3 #66ffffff - #99ffffff #a6ffffff - - - - #fffafafa - #fff5f5f5 - #ffeeeeee - #ffe0e0e0 - #ffbdbdbd - #ff9e9e9e - #ff757575 - #ff616161 - #ff424242 - #ff212121 + @color/gray_100 + @color/gray_200 + @color/gray_400 + @color/gray_500 + @color/gray_600 + @color/gray_800 + @color/gray_900 - - #006b98 - #ff517188 + @color/primary_600 + @color/neutral - @color/grey_darken_30 - @color/grey_dark - @color/grey_lighten_30 + @color/neutral_600 + @color/neutral_700 + @color/neutral_50 - @color/grey_dark + @color/neutral_800 @color/white - @color/orange_jazzy - @color/grey_dark + @color/accent + @color/neutral_800 - @color/color_primary - @color/blue_light + @color/primary + @color/primary_50 @color/white @color/white - @color/grey_dark - @color/blue_wordpress - @color/grey_text_min - @color/grey_darken_20 - @color/blue_wordpress - @color/orange_jazzy - #1Af0821e - @color/blue_dark - @color/grey_lighten_30_translucent_50 - #260087be - #91e2fb - #00bef6 - #0083a9 + @color/neutral_800 + @color/accent + @color/neutral + @color/neutral + @color/primary + @color/accent + @color/accent_100 + @color/primary_dark + @color/neutral_0 + @color/primary_50 + @color/primary_light + @color/primary + @color/primary_dark - @color/grey_lighten_30 - @color/blue_medium - @color/alert_green - @color/blue_medium - @color/alert_green - @color/grey_dark - #f8f8f8 - @color/material_deep_teal_200 + @color/divider + @color/primary + @color/success + @color/primary + @color/success + @color/neutral_800 + @color/neutral_0 + @color/accent - @color/orange_jazzy - @color/alert_red + @color/accent + @color/error - @color/alert_yellow - #eeac31 - #fef8ee + @color/warning + @color/warning_600 + @color/warning_0 - @color/grey_lighten_20 - @color/grey_dark - @color/blue_wordpress - @color/white_dotorg_back - @color/grey_lighten_20 - @color/grey_lighten_10 + @color/neutral_100 + @color/neutral_800 + @color/primary + @color/neutral_100 + @color/neutral_200 - @color/grey_lighten_20 + @color/neutral_100 - #323232 + @color/neutral_800 - @color/blue_light_translucent_80 - @color/grey_lighten_30 - @color/blue_medium + @color/primary_50 + @color/neutral_0 + @color/primary_400 - #D8E3EA + @color/divider - #d0d5d9 + @color/divider - #dce1e6 + @color/divider - #4FB769 - #A9E9FC + @color/success + @color/primary_50 - #D8E3EA + @color/divider - @color/grey_light + @color/neutral_0 - @color/blue_wordpress - #7e0087be + @color/primary + @color/primary_100 - @color/blue_medium + @color/primary_400 #00be28 - #fbf4e7 + @color/warning_0 - @color/alert_red - #1Ad94f4f - @color/blue_wordpress - #1A0087BE + @color/error + @color/error_0 + @color/primary + @color/primary_0 @color/hot_pink_500 From 4cccaf4e6ceecb72f0d0a748abe26562ab6985b8 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Fri, 22 Mar 2019 16:12:42 -0700 Subject: [PATCH 005/167] Update color references from color primary to primary --- .../org/wordpress/android/ui/FullScreenDialogFragment.java | 2 +- .../android/ui/accounts/signup/SignupEpilogueFragment.java | 2 +- .../main/java/org/wordpress/android/ui/main/MeFragment.java | 2 +- .../java/org/wordpress/android/ui/main/MySiteFragment.java | 2 +- .../wordpress/android/ui/reader/ReaderPostListFragment.java | 2 +- .../org/wordpress/android/util/WPSwipeToRefreshHelper.java | 2 +- WordPress/src/main/res/layout/learn_more_pref.xml | 2 +- .../src/main/res/layout/notifications_fragment_notes_list.xml | 4 ++-- WordPress/src/main/res/layout/pages_fragment.xml | 2 +- WordPress/src/main/res/layout/person_detail_fragment.xml | 2 +- WordPress/src/main/res/layout/stats_fragment.xml | 2 +- WordPress/src/main/res/layout/toolbar_main.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles.xml | 4 ++-- WordPress/src/main/res/values/styles_calypso.xml | 4 ++-- 15 files changed, 17 insertions(+), 18 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java index da626ba324a0..e88528d149cf 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java +++ b/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}. diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java index 45e9c66c22cc..dff5b2cf269a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java @@ -643,7 +643,7 @@ protected void startCropActivity(Uri uri) { 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.setToolbarColor(ContextCompat.getColor(context, R.color.primary)); options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE); options.setHideBottomControls(true); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java index 4b4b101cfd3a..4c2eac7612a1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java @@ -473,7 +473,7 @@ private void startCropActivity(Uri uri) { 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.setToolbarColor(ContextCompat.getColor(context, R.color.primary)); options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE); options.setHideBottomControls(true); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java index ad944b67a821..bb27b7954d2e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java @@ -852,7 +852,7 @@ private void startCropActivity(Uri uri) { 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.setToolbarColor(ContextCompat.getColor(context, R.color.primary)); options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE); options.setHideBottomControls(true); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java index 218cec0b7946..a8a4eb30862d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java @@ -704,7 +704,7 @@ public void onShowCustomEmptyView(EmptyViewMessageType emptyViewMsgType) { mRecyclerView.addItemDecoration(new RecyclerItemDecoration(spacingHorizontal, spacingVertical, false)); // the following will change the look and feel of the toolbar to match the current design - mRecyclerView.setToolbarBackgroundColor(ContextCompat.getColor(context, R.color.color_primary)); + mRecyclerView.setToolbarBackgroundColor(ContextCompat.getColor(context, R.color.primary)); mRecyclerView.setToolbarSpinnerTextColor(ContextCompat.getColor(context, R.color.white)); mRecyclerView.setToolbarSpinnerDrawable(R.drawable.ic_dropdown_blue_light_24dp); mRecyclerView.setToolbarLeftAndRightPadding( diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java b/WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java index 9f9caa248dd1..e29c067e70c4 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java @@ -17,6 +17,6 @@ public class WPSwipeToRefreshHelper { */ public static SwipeToRefreshHelper buildSwipeToRefreshHelper(CustomSwipeRefreshLayout swipeRefreshLayout, RefreshListener listener) { - return new SwipeToRefreshHelper(swipeRefreshLayout, listener, R.color.color_primary, R.color.color_accent); + return new SwipeToRefreshHelper(swipeRefreshLayout, listener, R.color.primary, R.color.color_accent); } } diff --git a/WordPress/src/main/res/layout/learn_more_pref.xml b/WordPress/src/main/res/layout/learn_more_pref.xml index 8c0d61634233..8eded9da0d8d 100644 --- a/WordPress/src/main/res/layout/learn_more_pref.xml +++ b/WordPress/src/main/res/layout/learn_more_pref.xml @@ -48,7 +48,7 @@ android:layout_marginBottom="@dimen/margin_extra_small" android:layout_marginTop="@dimen/margin_extra_small" android:layout_width="wrap_content" - android:textColor="@color/color_primary" + android:textColor="@color/primary" android:visibility="gone" tools:text="@string/learn_more" tools:visibility="visible" diff --git a/WordPress/src/main/res/layout/notifications_fragment_notes_list.xml b/WordPress/src/main/res/layout/notifications_fragment_notes_list.xml index be18eecc8b58..a3bc687cf02b 100644 --- a/WordPress/src/main/res/layout/notifications_fragment_notes_list.xml +++ b/WordPress/src/main/res/layout/notifications_fragment_notes_list.xml @@ -74,7 +74,7 @@ diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 84e65ef5b2a5..5c43b3703585 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> - @color/primary @color/status_bar_tint @color/orange_jazzy @color/white diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 9547f57df533..be0d6b3aaf11 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -3,7 +3,7 @@ diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml index 9d54224c79db..2765ca52c19d 100644 --- a/WordPress/src/main/res/values/styles_calypso.xml +++ b/WordPress/src/main/res/values/styles_calypso.xml @@ -54,7 +54,7 @@ @@ -143,7 +143,7 @@ diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index ea389d5fa82b..f568672fa200 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -165,7 +165,7 @@ @color/grey_darken_10 @color/grey_text_min - @color/blue_wordpress + @color/primary_500 viewStart start @dimen/text_sz_medium @@ -210,13 +210,13 @@ @@ -548,7 +548,7 @@ @@ -787,7 +787,7 @@ From f08ac480e50a1557668e82cde702e5b595c8df99 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Fri, 22 Mar 2019 22:16:10 -0700 Subject: [PATCH 017/167] Update color references from blue light to primary 300 --- .../ui/accounts/login/LoginPrologueAnimationFragment.java | 2 +- .../org/wordpress/android/ui/media/MediaBrowserActivity.java | 2 +- .../org/wordpress/android/ui/reader/ReaderSubsActivity.java | 2 +- .../src/main/java/org/wordpress/android/util/QuickStartUtils.kt | 2 +- WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml | 2 +- .../src/main/res/drawable/img_illustration_site_about_182dp.xml | 2 +- .../src/main/res/drawable/img_illustration_site_about_280dp.xml | 2 +- .../src/main/res/drawable/reader_gap_marker_background.xml | 2 +- WordPress/src/main/res/layout/reader_search_tabs.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles.xml | 2 +- 11 files changed, 10 insertions(+), 11 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java index 022989540dd4..e87fd7c309dc 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java @@ -48,7 +48,7 @@ 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)); + getResources().getColor(mLightBackground ? R.color.primary_300 : R.color.blue_medium)); TextView promoText = (TextView) rootView.findViewById(R.id.promo_text); promoText.setText(mPromoText); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java index 9dd914047ca6..061ceeced12b 100755 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java @@ -281,7 +281,7 @@ private void enableTabs(boolean enable) { private void setupTabs() { if (shouldShowTabs()) { - int normalColor = ContextCompat.getColor(this, R.color.blue_light); + int normalColor = ContextCompat.getColor(this, R.color.primary_300); int selectedColor = ContextCompat.getColor(this, android.R.color.white); mTabLayout.setTabTextColors(normalColor, selectedColor); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java index c3004a02c3c5..b749456dd2c9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java @@ -95,7 +95,7 @@ protected void onCreate(Bundle savedInstanceState) { TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout); tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); - int normalColor = ContextCompat.getColor(this, R.color.blue_light); + int normalColor = ContextCompat.getColor(this, R.color.primary_300); int selectedColor = ContextCompat.getColor(this, android.R.color.white); tabLayout.setTabTextColors(normalColor, selectedColor); tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); diff --git a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt index 986baabc5f7e..39383455946c 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt @@ -73,7 +73,7 @@ class QuickStartUtils { Html.fromHtml(formattedMessage) } - val highlightColor = ContextCompat.getColor(context, R.color.blue_light) + val highlightColor = ContextCompat.getColor(context, R.color.primary_300) val mutableSpannedMessage = SpannableStringBuilder(spannedMessage) val foregroundColorSpan = mutableSpannedMessage diff --git a/WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml b/WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml index 28325ede8500..a5c72545691c 100644 --- a/WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml index a3aabdbcc2b0..9dd5a538b410 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml @@ -246,7 +246,7 @@ diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml index 1dde1b972e31..252d42fb4728 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml @@ -251,7 +251,7 @@ diff --git a/WordPress/src/main/res/drawable/reader_gap_marker_background.xml b/WordPress/src/main/res/drawable/reader_gap_marker_background.xml index e8852d8932f3..2f4300f398d2 100644 --- a/WordPress/src/main/res/drawable/reader_gap_marker_background.xml +++ b/WordPress/src/main/res/drawable/reader_gap_marker_background.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/layout/reader_search_tabs.xml b/WordPress/src/main/res/layout/reader_search_tabs.xml index f80d8797b88c..b4d043688ad8 100644 --- a/WordPress/src/main/res/layout/reader_search_tabs.xml +++ b/WordPress/src/main/res/layout/reader_search_tabs.xml @@ -9,7 +9,7 @@ app:tabMaxWidth="0dp" app:tabMode="fixed" app:tabSelectedTextColor="@android:color/white" - app:tabTextColor="@color/blue_light"> + app:tabTextColor="@color/primary_300"> @color/neutral_0 - @color/primary_300 @color/primary_400 @color/primary_700 diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index f568672fa200..cef662a6089e 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -525,7 +525,7 @@ @@ -92,8 +92,8 @@ diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index cef662a6089e..21db40687c02 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -134,7 +134,7 @@ @@ -205,7 +205,7 @@ @@ -704,13 +704,13 @@ @dimen/margin_extra_large ?android:attr/selectableItemBackground true - @color/blue_medium + @color/primary_400 @dimen/text_sz_medium bold diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml index 3f9ab441de62..60b03cb6eb6c 100644 --- a/WordPress/src/main/res/values/styles_calypso.xml +++ b/WordPress/src/main/res/values/styles_calypso.xml @@ -30,7 +30,7 @@ @color/grey_lighten_30 @style/Calypso.Dialog.Alert @style/Calypso.Dialog.Alert - @color/blue_medium + @color/primary_400 @color/grey_lighten_20 @color/orange_jazzy @drawable/preferences_divider @@ -56,7 +56,7 @@ From 9d4b74e6ad62485c5b80f1bffc95ad2f84c59990 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 13:10:59 -0700 Subject: [PATCH 022/167] Update color references from grey dark to neutral 700 --- WordPress/lint-baseline.xml | 4 +-- .../ui/ShareIntentReceiverFragment.java | 2 +- .../android/ui/main/SitePickerAdapter.java | 2 +- .../blocks/CommentUserNoteBlock.java | 2 +- .../blocks/NoteBlockClickableSpan.java | 4 +-- .../ui/people/PeopleInviteFragment.java | 5 ++-- .../ui/plugins/PluginDetailActivity.java | 2 +- .../ui/prefs/DetailListPreference.java | 2 +- .../android/ui/prefs/WPPreference.java | 2 +- .../android/ui/prefs/WPSwitchPreference.java | 2 +- .../reader/adapters/ReaderCommentAdapter.java | 2 +- .../ui/reader/adapters/ReaderMenuAdapter.java | 4 +-- .../ui/reader/adapters/ReaderPostAdapter.java | 2 +- .../views/ReaderPostDetailHeaderView.java | 2 +- ...tatsInsightsLatestPostSummaryFragment.java | 2 +- .../ui/stats/StatsInsightsTodayFragment.java | 2 +- .../stats/StatsVisitorsAndViewsFragment.java | 2 +- .../ui/stats/StatsWidgetConfigureAdapter.java | 2 +- .../viewholders/BlockListItemViewHolder.kt | 2 +- .../sections/viewholders/DayViewHolder.kt | 2 +- .../viewholders/ListItemWithIconViewHolder.kt | 2 +- .../wordpress/android/util/WPPrefUtils.java | 10 +++---- .../src/main/res/color/calypso_title_text.xml | 2 +- .../grey_dark_grey_lighten_10_selector.xml | 2 +- .../res/color/quick_start_icon_selector.xml | 2 +- .../res/color/quick_start_title_selector.xml | 2 +- .../res/color/related_posts_list_header.xml | 2 +- .../src/main/res/color/stats_block_column.xml | 4 +-- .../ic_add_outline_grey_dark_24dp.xml | 2 +- .../drawable/ic_bookmark_grey_dark_18dp.xml | 2 +- .../ic_info_outline_grey_dark_18dp.xml | 2 +- .../theme_grid_cardview_header.xml | 12 ++++---- .../stats_insights_all_time_item.xml | 6 ++-- .../res/layout/activity_log_item_detail.xml | 10 +++---- .../layout/activity_log_list_event_item.xml | 2 +- .../activity_log_list_progress_item.xml | 2 +- .../src/main/res/layout/add_category.xml | 4 +-- .../src/main/res/layout/categories_row.xml | 2 +- .../res/layout/comment_detail_fragment.xml | 2 +- .../src/main/res/layout/comment_listitem.xml | 2 +- .../res/layout/detail_list_preference.xml | 2 +- .../main/res/layout/followed_sites_dialog.xml | 12 ++++---- .../src/main/res/layout/help_activity.xml | 2 +- .../history_detail_container_fragment.xml | 2 +- .../res/layout/history_detail_fragment.xml | 4 +-- .../src/main/res/layout/history_list_item.xml | 2 +- .../res/layout/invite_username_button.xml | 2 +- WordPress/src/main/res/layout/me_fragment.xml | 2 +- .../src/main/res/layout/media_grid_item.xml | 6 ++-- .../res/layout/media_settings_activity.xml | 2 +- .../src/main/res/layout/my_profile_dialog.xml | 2 +- .../src/main/res/layout/my_site_fragment.xml | 6 ++-- ...e_creation_verticals_search_input_item.xml | 2 +- .../src/main/res/layout/note_block_basic.xml | 4 +-- .../res/layout/note_block_comment_user.xml | 4 +-- .../src/main/res/layout/note_block_header.xml | 2 +- .../src/main/res/layout/note_block_user.xml | 2 +- .../res/layout/notifications_list_item.xml | 2 +- .../res/layout/people_invite_fragment.xml | 10 +++---- .../src/main/res/layout/people_list_row.xml | 2 +- .../res/layout/person_detail_fragment.xml | 2 +- .../main/res/layout/plan_details_fragment.xml | 2 +- .../src/main/res/layout/plan_feature_item.xml | 2 +- .../src/main/res/layout/plans_list_item.xml | 2 +- .../main/res/layout/plugin_browser_row.xml | 2 +- .../res/layout/plugin_detail_activity.xml | 4 +-- .../src/main/res/layout/plugin_info_row.xml | 4 +-- .../src/main/res/layout/plugin_list_row.xml | 2 +- .../layout/publicize_connection_list_item.xml | 2 +- .../res/layout/publicize_list_fragment.xml | 2 +- .../layout/publicize_listitem_connection.xml | 2 +- .../res/layout/publicize_listitem_service.xml | 2 +- .../layout/reader_activity_video_player.xml | 2 +- .../main/res/layout/reader_cardview_post.xml | 2 +- .../reader_comments_post_header_view.xml | 4 +-- .../main/res/layout/reader_listitem_blog.xml | 2 +- .../res/layout/reader_listitem_comment.xml | 4 +-- .../res/layout/reader_listitem_suggestion.xml | 2 +- .../main/res/layout/reader_listitem_tag.xml | 2 +- .../main/res/layout/reader_listitem_user.xml | 2 +- .../res/layout/reader_simple_post_view.xml | 4 +-- .../res/layout/reader_site_header_view.xml | 4 +-- .../res/layout/reader_site_search_result.xml | 2 +- .../res/layout/reader_tag_header_view.xml | 4 +-- .../main/res/layout/related_posts_dialog.xml | 14 +++++----- .../src/main/res/layout/role_list_row.xml | 2 +- .../single_choice_recycler_view_item.xml | 2 +- .../res/layout/site_creation_domain_item.xml | 2 +- .../main/res/layout/site_picker_listitem.xml | 2 +- .../res/layout/site_settings_tag_list_row.xml | 2 +- .../stats_activity_single_post_details.xml | 2 +- .../res/layout/stats_block_activity_item.xml | 2 +- .../layout/stats_insights_all_time_item.xml | 6 ++-- .../stats_insights_generic_fragment.xml | 2 +- .../stats_insights_latest_post_item.xml | 2 +- .../res/layout/stats_list_item_fragment.xml | 2 +- .../layout/stats_visitors_and_views_tab.xml | 2 +- .../main/res/layout/stats_widget_layout.xml | 16 +++++------ .../main/res/layout/suggestion_list_row.xml | 2 +- .../layout/support_email_and_name_dialog.xml | 4 +-- .../src/main/res/layout/tags_list_row.xml | 2 +- .../res/layout/theme_grid_cardview_header.xml | 12 ++++---- .../layout/toolbar_spinner_dropdown_item.xml | 2 +- WordPress/src/main/res/layout/wppref_view.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - .../src/main/res/values/reader_styles.xml | 6 ++-- .../src/main/res/values/stats_styles.xml | 22 +++++++-------- WordPress/src/main/res/values/styles.xml | 28 +++++++++---------- .../src/main/res/values/styles_calypso.xml | 4 +-- WordPress/src/main/res/xml/site_settings.xml | 2 +- 110 files changed, 201 insertions(+), 201 deletions(-) diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml index e5b7b3ca88bd..ad197de075c9 100644 --- a/WordPress/lint-baseline.xml +++ b/WordPress/lint-baseline.xml @@ -3370,12 +3370,12 @@ { - this.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(this.context, R.color.grey_dark)) + this.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(this.context, R.color.neutral_700)) this.visibility = View.VISIBLE imageManager.load(this, item.icon) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt index 66fe143e7b1e..99092de2a895 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt @@ -28,7 +28,7 @@ class DayViewHolder(parent: ViewGroup) : ViewHolder( LOW -> R.color.stats_low_activity MEDIUM -> R.color.stats_medium_activity HIGH -> R.color.stats_high_activity - VERY_HIGH -> R.color.grey_dark + VERY_HIGH -> R.color.neutral_700 } itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, color)) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ListItemWithIconViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ListItemWithIconViewHolder.kt index 9548b75a8737..393d6697a30f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ListItemWithIconViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ListItemWithIconViewHolder.kt @@ -27,7 +27,7 @@ class ListItemWithIconViewHolder(parent: ViewGroup, val imageManager: ImageManag iconContainer.setIconOrAvatar(item, imageManager) text.setTextOrHide(item.textResource, item.text) val textColor = when (item.textStyle) { - TextStyle.NORMAL -> R.color.grey_dark + TextStyle.NORMAL -> R.color.neutral_700 LIGHT -> R.color.grey_darken_20 } text.setTextColor(ContextCompat.getColor(text.context, textColor)) diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java index d0534eafd78d..39b3325647ea 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java @@ -68,14 +68,14 @@ public static void layoutAsLightTitle(TextView view) { */ public static void layoutAsDarkTitle(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_extra_large); - setTextViewAttributes(view, size, R.color.grey_dark); + setTextViewAttributes(view, size, R.color.neutral_700); } /** * Styles a {@link TextView} to display medium sized text as a header with sub-elements. */ public static void layoutAsSubhead(TextView view) { - int color = view.isEnabled() ? R.color.grey_dark : R.color.grey_lighten_10; + int color = view.isEnabled() ? R.color.neutral_700 : R.color.grey_lighten_10; int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large); setTextViewAttributes(view, size, color); } @@ -126,9 +126,9 @@ public static void layoutAsRaisedButton(TextView view) { */ public static void layoutAsInput(EditText view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large); - setTextViewAttributes(view, size, R.color.grey_dark); + setTextViewAttributes(view, size, R.color.neutral_700); view.setHintTextColor(view.getResources().getColor(R.color.grey_lighten_10)); - view.setTextColor(view.getResources().getColor(R.color.grey_dark)); + view.setTextColor(view.getResources().getColor(R.color.neutral_700)); view.setSingleLine(true); } @@ -145,7 +145,7 @@ public static void layoutAsNumberPickerSelected(TextView view) { */ public static void layoutAsNumberPickerPeek(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large); - setTextViewAttributes(view, size, R.color.grey_dark); + setTextViewAttributes(view, size, R.color.neutral_700); } /** diff --git a/WordPress/src/main/res/color/calypso_title_text.xml b/WordPress/src/main/res/color/calypso_title_text.xml index ad850970ea5e..1dffd7173157 100644 --- a/WordPress/src/main/res/color/calypso_title_text.xml +++ b/WordPress/src/main/res/color/calypso_title_text.xml @@ -7,6 +7,6 @@ android:color="@color/grey_lighten_10" android:state_enabled="false" /> - + diff --git a/WordPress/src/main/res/color/grey_dark_grey_lighten_10_selector.xml b/WordPress/src/main/res/color/grey_dark_grey_lighten_10_selector.xml index 2e06b0224456..3694e2d80755 100644 --- a/WordPress/src/main/res/color/grey_dark_grey_lighten_10_selector.xml +++ b/WordPress/src/main/res/color/grey_dark_grey_lighten_10_selector.xml @@ -4,6 +4,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" > - + diff --git a/WordPress/src/main/res/color/quick_start_icon_selector.xml b/WordPress/src/main/res/color/quick_start_icon_selector.xml index 2e06b0224456..3694e2d80755 100644 --- a/WordPress/src/main/res/color/quick_start_icon_selector.xml +++ b/WordPress/src/main/res/color/quick_start_icon_selector.xml @@ -4,6 +4,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" > - + diff --git a/WordPress/src/main/res/color/quick_start_title_selector.xml b/WordPress/src/main/res/color/quick_start_title_selector.xml index bafda1a37c92..3119a105a3b0 100644 --- a/WordPress/src/main/res/color/quick_start_title_selector.xml +++ b/WordPress/src/main/res/color/quick_start_title_selector.xml @@ -4,6 +4,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" > - + diff --git a/WordPress/src/main/res/color/related_posts_list_header.xml b/WordPress/src/main/res/color/related_posts_list_header.xml index 3c2cbb36e167..965b96f7d2bf 100644 --- a/WordPress/src/main/res/color/related_posts_list_header.xml +++ b/WordPress/src/main/res/color/related_posts_list_header.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/WordPress/src/main/res/drawable/ic_add_outline_grey_dark_24dp.xml b/WordPress/src/main/res/drawable/ic_add_outline_grey_dark_24dp.xml index 57fb6702b164..63c024f46e72 100644 --- a/WordPress/src/main/res/drawable/ic_add_outline_grey_dark_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_add_outline_grey_dark_24dp.xml @@ -4,7 +4,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_18dp.xml b/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_18dp.xml index c70e0dd374f4..8826aca369f2 100644 --- a/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_18dp.xml +++ b/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_18dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="18.0" > diff --git a/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml b/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml index 582898f4b68f..73eaca85782b 100644 --- a/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml +++ b/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml @@ -69,13 +69,13 @@ android:adjustViewBounds="true" android:contentDescription="@string/customize" android:src="@drawable/ic_customize_white_24dp" - android:tint="@color/grey_dark" /> + android:tint="@color/neutral_700" /> @@ -99,13 +99,13 @@ android:adjustViewBounds="true" android:contentDescription="@string/details" android:src="@drawable/ic_info_outline_white_24dp" - android:tint="@color/grey_dark" /> + android:tint="@color/neutral_700" /> @@ -129,13 +129,13 @@ android:adjustViewBounds="true" android:contentDescription="@string/support" android:src="@drawable/ic_help_outline_white_24dp" - android:tint="@color/grey_dark" /> + android:tint="@color/neutral_700" /> diff --git a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml index 3e761091cfb4..5fec0777d58c 100644 --- a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml +++ b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml @@ -29,7 +29,7 @@ android:layout_marginEnd="3dp" android:contentDescription="@null" android:src="@drawable/ic_posts_white_24dp" - android:tint="@color/grey_dark" /> + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> @@ -68,7 +68,7 @@ android:ellipsize="end" android:lines="1" android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="Administrator"/> @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:ignore="RelativeOverlap" tools:text="January 8, 2018"/> @@ -94,7 +94,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:ignore="RelativeOverlap" tools:text="11:32 PM"/> @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:linksClickable="true" tools:text="Jetpack by WordPress.com autoupdated to 5.6" android:focusable="true"/> diff --git a/WordPress/src/main/res/layout/activity_log_list_event_item.xml b/WordPress/src/main/res/layout/activity_log_list_event_item.xml index 0cbec5bcb81d..2701871ee333 100644 --- a/WordPress/src/main/res/layout/activity_log_list_event_item.xml +++ b/WordPress/src/main/res/layout/activity_log_list_event_item.xml @@ -63,7 +63,7 @@ android:singleLine="true" android:textAlignment="viewStart" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="Comment by oguzkocer on Android Studio 3.1 Configuration Issue: I think the bigger problem for me was the lack of make option, so hopefully at least that'll work." > diff --git a/WordPress/src/main/res/layout/activity_log_list_progress_item.xml b/WordPress/src/main/res/layout/activity_log_list_progress_item.xml index 988e42385511..0e89832c94d0 100644 --- a/WordPress/src/main/res/layout/activity_log_list_progress_item.xml +++ b/WordPress/src/main/res/layout/activity_log_list_progress_item.xml @@ -48,7 +48,7 @@ android:singleLine="true" android:textAlignment="viewStart" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="Rewinding to June 1 2018 12:22PM" > diff --git a/WordPress/src/main/res/layout/add_category.xml b/WordPress/src/main/res/layout/add_category.xml index aff4d14bb8dc..ba1f3df3c38f 100644 --- a/WordPress/src/main/res/layout/add_category.xml +++ b/WordPress/src/main/res/layout/add_category.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/category_name" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textStyle="bold" android:labelFor="@+id/category_name" android:textSize="@dimen/text_sz_large" @@ -43,7 +43,7 @@ android:layout_below="@id/category_name" android:layout_marginTop="20dp" android:text="@string/category_parent" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textStyle="bold" android:labelFor="@+id/parent_category" android:textSize="@dimen/text_sz_large" diff --git a/WordPress/src/main/res/layout/categories_row.xml b/WordPress/src/main/res/layout/categories_row.xml index 57c46632570d..d241d43614c2 100644 --- a/WordPress/src/main/res/layout/categories_row.xml +++ b/WordPress/src/main/res/layout/categories_row.xml @@ -16,7 +16,7 @@ android:checkMarkTint="@color/grey_text_min" android:gravity="center_vertical" android:orientation="vertical" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="Pony Category" /> diff --git a/WordPress/src/main/res/layout/comment_detail_fragment.xml b/WordPress/src/main/res/layout/comment_detail_fragment.xml index 4b0d233ff2aa..08fa080b1f4d 100644 --- a/WordPress/src/main/res/layout/comment_detail_fragment.xml +++ b/WordPress/src/main/res/layout/comment_detail_fragment.xml @@ -113,7 +113,7 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/margin_large" android:paddingBottom="@dimen/margin_large" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textColorLink="@color/reader_hyperlink" android:background="@android:color/white" android:textIsSelectable="false" diff --git a/WordPress/src/main/res/layout/comment_listitem.xml b/WordPress/src/main/res/layout/comment_listitem.xml index 047a482ede6b..fd6ff7487b1a 100644 --- a/WordPress/src/main/res/layout/comment_listitem.xml +++ b/WordPress/src/main/res/layout/comment_listitem.xml @@ -78,7 +78,7 @@ android:ellipsize="end" android:lines="2" android:maxLines="2" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="title" android:textAlignment="viewStart" diff --git a/WordPress/src/main/res/layout/detail_list_preference.xml b/WordPress/src/main/res/layout/detail_list_preference.xml index 59430d7fe99f..925af78a74cc 100644 --- a/WordPress/src/main/res/layout/detail_list_preference.xml +++ b/WordPress/src/main/res/layout/detail_list_preference.xml @@ -40,7 +40,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="@dimen/text_sz_large" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:gravity="start" android:textAlignment="viewStart" tools:text="Main Text" /> diff --git a/WordPress/src/main/res/layout/followed_sites_dialog.xml b/WordPress/src/main/res/layout/followed_sites_dialog.xml index 679134a480b9..f15d75a01a91 100644 --- a/WordPress/src/main/res/layout/followed_sites_dialog.xml +++ b/WordPress/src/main/res/layout/followed_sites_dialog.xml @@ -30,7 +30,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_notification_posts_switch" android:textAlignment="viewStart" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:theme="@style/SwitchBlueMedium" tools:checked="true" @@ -66,7 +66,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_posts_switch" android:textAlignment="viewStart" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:theme="@style/SwitchBlueMedium" tools:checked="true" @@ -92,7 +92,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_posts_instantly" android:textAlignment="viewEnd" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:checked="true" style="@style/TextAppearance.AppCompat.Body2" > @@ -108,7 +108,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_posts_daily" android:textAlignment="viewEnd" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" style="@style/TextAppearance.AppCompat.Body2" > @@ -123,7 +123,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_posts_weekly" android:textAlignment="viewEnd" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" style="@style/TextAppearance.AppCompat.Body2" > @@ -148,7 +148,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_comments" android:textAlignment="viewStart" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:theme="@style/SwitchBlueMedium" style="@style/TextAppearance.AppCompat.Body2" > diff --git a/WordPress/src/main/res/layout/help_activity.xml b/WordPress/src/main/res/layout/help_activity.xml index 8d6883a6622c..0c768c65cee1 100644 --- a/WordPress/src/main/res/layout/help_activity.xml +++ b/WordPress/src/main/res/layout/help_activity.xml @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/support_contact_email" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large"/> diff --git a/WordPress/src/main/res/layout/history_detail_fragment.xml b/WordPress/src/main/res/layout/history_detail_fragment.xml index 40c1c93d5389..5673167afa33 100644 --- a/WordPress/src/main/res/layout/history_detail_fragment.xml +++ b/WordPress/src/main/res/layout/history_detail_fragment.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:lineSpacingExtra="@dimen/spacing_extra_title" android:padding="@dimen/margin_extra_large" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textIsSelectable="true" android:textSize="@dimen/aztec_title_size" android:textStyle="bold" > @@ -57,7 +57,7 @@ android:paddingStart="@dimen/margin_extra_large" android:paddingTop="@dimen/margin_extra_large" android:scrollbars="vertical" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textIsSelectable="true" android:textSize="@dimen/text_sz_post_content" > diff --git a/WordPress/src/main/res/layout/history_list_item.xml b/WordPress/src/main/res/layout/history_list_item.xml index 822ea7dcd6ac..8bcf6e827fa8 100644 --- a/WordPress/src/main/res/layout/history_list_item.xml +++ b/WordPress/src/main/res/layout/history_list_item.xml @@ -87,7 +87,7 @@ android:singleLine="true" android:textAlignment="viewStart" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="1d ago" > diff --git a/WordPress/src/main/res/layout/invite_username_button.xml b/WordPress/src/main/res/layout/invite_username_button.xml index 7f781482556c..dcb718bb47d0 100644 --- a/WordPress/src/main/res/layout/invite_username_button.xml +++ b/WordPress/src/main/res/layout/invite_username_button.xml @@ -14,7 +14,7 @@ android:layout_weight="1" android:layout_gravity="center_vertical" android:gravity="center_vertical" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" android:layout_marginEnd="5dp"/> diff --git a/WordPress/src/main/res/layout/me_fragment.xml b/WordPress/src/main/res/layout/me_fragment.xml index 7d5b69f80991..71b75540a7e0 100644 --- a/WordPress/src/main/res/layout/me_fragment.xml +++ b/WordPress/src/main/res/layout/me_fragment.xml @@ -95,7 +95,7 @@ android:ellipsize="end" android:fontFamily="sans-serif-light" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:textStyle="bold" tools:text="Full Name" /> diff --git a/WordPress/src/main/res/layout/media_grid_item.xml b/WordPress/src/main/res/layout/media_grid_item.xml index 507e58dcc35e..985e4026d26c 100644 --- a/WordPress/src/main/res/layout/media_grid_item.xml +++ b/WordPress/src/main/res/layout/media_grid_item.xml @@ -34,7 +34,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center_horizontal" - android:tint="@color/grey_dark" + android:tint="@color/neutral_700" tools:src="@drawable/ic_pages_white_24dp" android:contentDescription="@null" /> @@ -46,7 +46,7 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/margin_medium" android:textAllCaps="true" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_small" android:textStyle="bold" tools:text="PDF" /> @@ -59,7 +59,7 @@ android:ellipsize="end" android:gravity="center_horizontal" android:singleLine="true" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_extra_small" tools:text="filename" /> diff --git a/WordPress/src/main/res/layout/media_settings_activity.xml b/WordPress/src/main/res/layout/media_settings_activity.xml index 769b3d960dd4..06bcd44c464c 100644 --- a/WordPress/src/main/res/layout/media_settings_activity.xml +++ b/WordPress/src/main/res/layout/media_settings_activity.xml @@ -391,7 +391,7 @@ android:paddingTop="@dimen/margin_small" android:text="@string/copy" android:textAllCaps="true" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" android:paddingEnd="@dimen/margin_extra_large" android:paddingStart="@dimen/margin_extra_large"/> diff --git a/WordPress/src/main/res/layout/my_profile_dialog.xml b/WordPress/src/main/res/layout/my_profile_dialog.xml index 7c440c8364eb..7b08fcacb8cc 100644 --- a/WordPress/src/main/res/layout/my_profile_dialog.xml +++ b/WordPress/src/main/res/layout/my_profile_dialog.xml @@ -12,7 +12,7 @@ android:layout_marginBottom="@dimen/margin_large" android:layout_marginStart="@dimen/margin_small" android:fontFamily="sans-serif-light" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:labelFor="@+id/my_profile_dialog_input" android:textSize="@dimen/text_sz_extra_large" android:textStyle="bold"/> diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml index 5507d4db7738..72c1bfa3856c 100644 --- a/WordPress/src/main/res/layout/my_site_fragment.xml +++ b/WordPress/src/main/res/layout/my_site_fragment.xml @@ -86,7 +86,7 @@ android:fontFamily="sans-serif-light" android:gravity="center_vertical" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:textStyle="bold" tools:text="Example" /> @@ -130,7 +130,7 @@ android:layout_width="wrap_content" android:text="@string/my_site_btn_switch_site" android:textAllCaps="true" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_small" style="@style/MySiteListRowTextView" > @@ -177,7 +177,7 @@ android:layout_width="wrap_content" android:maxLines="1" android:text="@string/quick_start_sites" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:textStyle="bold" > diff --git a/WordPress/src/main/res/layout/new_site_creation_verticals_search_input_item.xml b/WordPress/src/main/res/layout/new_site_creation_verticals_search_input_item.xml index 1aab14b27079..982e12ad01e0 100644 --- a/WordPress/src/main/res/layout/new_site_creation_verticals_search_input_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_verticals_search_input_item.xml @@ -24,7 +24,7 @@ android:paddingTop="@dimen/margin_large" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textColorHint="@color/neutral_300" tools:hint="@string/site_creation_domain_keywords_hint" tools:ignore="RtlSymmetry" diff --git a/WordPress/src/main/res/layout/note_block_basic.xml b/WordPress/src/main/res/layout/note_block_basic.xml index 7581356ffd89..869f81595cea 100644 --- a/WordPress/src/main/res/layout/note_block_basic.xml +++ b/WordPress/src/main/res/layout/note_block_basic.xml @@ -20,8 +20,8 @@ android:id="@+id/note_text" android:layout_width="wrap_content" android:layout_height="match_parent" - android:textColor="@color/grey_dark" - android:textColorLink="@color/grey_dark" + android:textColor="@color/neutral_700" + android:textColorLink="@color/neutral_700" android:textSize="@dimen/text_sz_large" app:fixWidowWords="true"/> diff --git a/WordPress/src/main/res/layout/note_block_comment_user.xml b/WordPress/src/main/res/layout/note_block_comment_user.xml index 030a24a08f5e..8868cbfbe535 100644 --- a/WordPress/src/main/res/layout/note_block_comment_user.xml +++ b/WordPress/src/main/res/layout/note_block_comment_user.xml @@ -35,7 +35,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:textAlignment="viewStart" android:gravity="start" @@ -101,7 +101,7 @@ android:layout_marginTop="@dimen/margin_medium" android:background="?android:selectableItemBackground" android:paddingBottom="@dimen/margin_medium" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:fontFamily="serif" tools:text="Thanks for stopping by my blog! I hope to see you again. " /> diff --git a/WordPress/src/main/res/layout/note_block_header.xml b/WordPress/src/main/res/layout/note_block_header.xml index f0332c73ece9..28f9ff0f2c22 100644 --- a/WordPress/src/main/res/layout/note_block_header.xml +++ b/WordPress/src/main/res/layout/note_block_header.xml @@ -43,7 +43,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="Bob Ross" /> diff --git a/WordPress/src/main/res/layout/note_block_user.xml b/WordPress/src/main/res/layout/note_block_user.xml index 25d93db810f2..228b34e13b54 100644 --- a/WordPress/src/main/res/layout/note_block_user.xml +++ b/WordPress/src/main/res/layout/note_block_user.xml @@ -46,7 +46,7 @@ android:singleLine="true" android:textSize="@dimen/text_sz_medium" android:textStyle="bold" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="Bob Ross" /> diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml index 28d53d46a79e..2745a165ef15 100644 --- a/WordPress/src/main/res/layout/people_invite_fragment.xml +++ b/WordPress/src/main/res/layout/people_invite_fragment.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_large" android:text="@string/invite_names_title" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:labelFor="@+id/invite_usernames" android:textSize="@dimen/text_sz_large" /> @@ -59,7 +59,7 @@ android:paddingBottom="0dp" android:paddingTop="@dimen/margin_large" android:singleLine="true" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textColorHint="#AAAAAA" android:textSize="@dimen/text_sz_medium" tools:text="sdfwefef" @@ -106,7 +106,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:text="@string/role" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:labelFor="@+id/role" android:textSize="@dimen/text_sz_large" tools:text="@string/role" /> @@ -117,7 +117,7 @@ android:layout_height="wrap_content" android:contentDescription="@string/people_invite_role_info_desc" android:src="@drawable/ic_info_outline_white_24dp" - android:tint="@color/grey_dark" + android:tint="@color/neutral_700" android:paddingEnd="@dimen/margin_small" android:paddingStart="@dimen/margin_small"/> @@ -145,7 +145,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_medium" android:text="@string/invite_message_title" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:labelFor="@+id/message" android:textSize="@dimen/text_sz_large" /> diff --git a/WordPress/src/main/res/layout/people_list_row.xml b/WordPress/src/main/res/layout/people_list_row.xml index 972cb06a07b8..88adfdda57b4 100644 --- a/WordPress/src/main/res/layout/people_list_row.xml +++ b/WordPress/src/main/res/layout/people_list_row.xml @@ -43,7 +43,7 @@ android:layout_toStartOf="@id/person_role" android:gravity="start" android:textAlignment="viewStart" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="display_name"/> diff --git a/WordPress/src/main/res/layout/person_detail_fragment.xml b/WordPress/src/main/res/layout/person_detail_fragment.xml index 148de0d06e69..ebe2bce8833e 100644 --- a/WordPress/src/main/res/layout/person_detail_fragment.xml +++ b/WordPress/src/main/res/layout/person_detail_fragment.xml @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:text="@string/role" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="@string/role"/> diff --git a/WordPress/src/main/res/layout/plan_details_fragment.xml b/WordPress/src/main/res/layout/plan_details_fragment.xml index 40f6db44261a..0bd5bf7b2be7 100644 --- a/WordPress/src/main/res/layout/plan_details_fragment.xml +++ b/WordPress/src/main/res/layout/plan_details_fragment.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/margin_medium" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_extra_large" tools:text="Personal Plan"/> diff --git a/WordPress/src/main/res/layout/plan_feature_item.xml b/WordPress/src/main/res/layout/plan_feature_item.xml index e87240fc5708..05eb7af499e2 100644 --- a/WordPress/src/main/res/layout/plan_feature_item.xml +++ b/WordPress/src/main/res/layout/plan_feature_item.xml @@ -17,7 +17,7 @@ android:gravity="start" android:textAlignment="viewStart" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="Feature Name"> diff --git a/WordPress/src/main/res/layout/plans_list_item.xml b/WordPress/src/main/res/layout/plans_list_item.xml index 904f0c3d63f6..f9e0be3d565f 100644 --- a/WordPress/src/main/res/layout/plans_list_item.xml +++ b/WordPress/src/main/res/layout/plans_list_item.xml @@ -44,7 +44,7 @@ android:singleLine="true" android:textAlignment="viewStart" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="Free Plan"/> @@ -25,7 +25,7 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:gravity="end" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:textStyle="bold" tools:text="text2" /> diff --git a/WordPress/src/main/res/layout/plugin_list_row.xml b/WordPress/src/main/res/layout/plugin_list_row.xml index 1fe44fb48952..cf1775480232 100644 --- a/WordPress/src/main/res/layout/plugin_list_row.xml +++ b/WordPress/src/main/res/layout/plugin_list_row.xml @@ -34,7 +34,7 @@ android:id="@+id/plugin_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" tools:text="plugin_name" /> diff --git a/WordPress/src/main/res/layout/publicize_connection_list_item.xml b/WordPress/src/main/res/layout/publicize_connection_list_item.xml index 64e50789daf7..ff47aa0c390e 100644 --- a/WordPress/src/main/res/layout/publicize_connection_list_item.xml +++ b/WordPress/src/main/res/layout/publicize_connection_list_item.xml @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/publicize_name_size" android:layout_marginStart="@dimen/publicize_name_margin"/> diff --git a/WordPress/src/main/res/layout/publicize_list_fragment.xml b/WordPress/src/main/res/layout/publicize_list_fragment.xml index ddf29ce3a231..a597244415e0 100644 --- a/WordPress/src/main/res/layout/publicize_list_fragment.xml +++ b/WordPress/src/main/res/layout/publicize_list_fragment.xml @@ -126,7 +126,7 @@ android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/margin_extra_large" android:text="@string/manage" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large"/> diff --git a/WordPress/src/main/res/layout/publicize_listitem_connection.xml b/WordPress/src/main/res/layout/publicize_listitem_connection.xml index 9f0b20d7199c..9ef3fecd0ca2 100644 --- a/WordPress/src/main/res/layout/publicize_listitem_connection.xml +++ b/WordPress/src/main/res/layout/publicize_listitem_connection.xml @@ -30,7 +30,7 @@ android:layout_marginBottom="20dp" android:layout_marginTop="20dp" android:ellipsize="end" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="text_user" android:layout_marginEnd="@dimen/margin_large" diff --git a/WordPress/src/main/res/layout/publicize_listitem_service.xml b/WordPress/src/main/res/layout/publicize_listitem_service.xml index b925a0839ee1..1a67c3573ac6 100644 --- a/WordPress/src/main/res/layout/publicize_listitem_service.xml +++ b/WordPress/src/main/res/layout/publicize_listitem_service.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:textAlignment="viewStart" android:layout_gravity="start" diff --git a/WordPress/src/main/res/layout/reader_activity_video_player.xml b/WordPress/src/main/res/layout/reader_activity_video_player.xml index 01353ac97870..173404af97d1 100644 --- a/WordPress/src/main/res/layout/reader_activity_video_player.xml +++ b/WordPress/src/main/res/layout/reader_activity_video_player.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey_dark"> + android:background="@color/neutral_700"> @@ -66,7 +66,7 @@ android:maxLines="2" android:paddingBottom="@dimen/margin_small" android:paddingTop="@dimen/margin_medium" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:fontFamily="serif" tools:text="text_post_title" /> diff --git a/WordPress/src/main/res/layout/reader_listitem_blog.xml b/WordPress/src/main/res/layout/reader_listitem_blog.xml index 56a77f09672f..b0ea8d01a2d6 100644 --- a/WordPress/src/main/res/layout/reader_listitem_blog.xml +++ b/WordPress/src/main/res/layout/reader_listitem_blog.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" tools:text="text_title" android:layout_marginEnd="@dimen/margin_medium"/> diff --git a/WordPress/src/main/res/layout/reader_listitem_comment.xml b/WordPress/src/main/res/layout/reader_listitem_comment.xml index f1442261b630..a7d0f8102512 100644 --- a/WordPress/src/main/res/layout/reader_listitem_comment.xml +++ b/WordPress/src/main/res/layout/reader_listitem_comment.xml @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:background="?android:selectableItemBackground" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" android:textStyle="bold" tools:text="text_comment_author" @@ -65,7 +65,7 @@ android:focusable="false" android:focusableInTouchMode="false" android:lineSpacingMultiplier="1.1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" android:fontFamily="serif" tools:text="text_comment_text" /> diff --git a/WordPress/src/main/res/layout/reader_listitem_suggestion.xml b/WordPress/src/main/res/layout/reader_listitem_suggestion.xml index fa62a9b20fc2..e78940717fa6 100644 --- a/WordPress/src/main/res/layout/reader_listitem_suggestion.xml +++ b/WordPress/src/main/res/layout/reader_listitem_suggestion.xml @@ -17,7 +17,7 @@ android:lines="1" android:minHeight="?android:attr/listPreferredItemHeightSmall" android:textAppearance="?android:attr/textAppearanceListItemSmall" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="Suggestion" android:layout_toStartOf="@+id/image_delete"/> diff --git a/WordPress/src/main/res/layout/reader_listitem_tag.xml b/WordPress/src/main/res/layout/reader_listitem_tag.xml index 647b993036a8..7b529026c6c7 100644 --- a/WordPress/src/main/res/layout/reader_listitem_tag.xml +++ b/WordPress/src/main/res/layout/reader_listitem_tag.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="text_topic" /> diff --git a/WordPress/src/main/res/layout/reader_listitem_user.xml b/WordPress/src/main/res/layout/reader_listitem_user.xml index 471dfe01f831..4b909d5d8e78 100644 --- a/WordPress/src/main/res/layout/reader_listitem_user.xml +++ b/WordPress/src/main/res/layout/reader_listitem_user.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" tools:text="text_name" /> diff --git a/WordPress/src/main/res/layout/reader_simple_post_view.xml b/WordPress/src/main/res/layout/reader_simple_post_view.xml index 38de0d740a6c..c0c522088ef3 100644 --- a/WordPress/src/main/res/layout/reader_simple_post_view.xml +++ b/WordPress/src/main/res/layout/reader_simple_post_view.xml @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_small" tools:text="text_author_name" /> @@ -88,7 +88,7 @@ android:layout_below="@+id/layout_simple_post_site_header" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" android:textStyle="bold" android:fontFamily="serif" diff --git a/WordPress/src/main/res/layout/reader_site_header_view.xml b/WordPress/src/main/res/layout/reader_site_header_view.xml index 8cbe2b4457fe..5672e3f57c71 100644 --- a/WordPress/src/main/res/layout/reader_site_header_view.xml +++ b/WordPress/src/main/res/layout/reader_site_header_view.xml @@ -33,7 +33,7 @@ android:id="@+id/text_blog_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="Loading..." android:layout_toStartOf="@+id/follow_button" @@ -79,7 +79,7 @@ android:ellipsize="end" android:gravity="center" android:maxLines="3" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" android:fontFamily="serif" tools:text="text_description" diff --git a/WordPress/src/main/res/layout/reader_site_search_result.xml b/WordPress/src/main/res/layout/reader_site_search_result.xml index 3404385bc184..274a408d5022 100644 --- a/WordPress/src/main/res/layout/reader_site_search_result.xml +++ b/WordPress/src/main/res/layout/reader_site_search_result.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" tools:text="text_title"/> diff --git a/WordPress/src/main/res/layout/reader_tag_header_view.xml b/WordPress/src/main/res/layout/reader_tag_header_view.xml index dc262756f98a..4b247612a8a5 100644 --- a/WordPress/src/main/res/layout/reader_tag_header_view.xml +++ b/WordPress/src/main/res/layout/reader_tag_header_view.xml @@ -27,7 +27,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:shadowColor="@color/grey_dark" + android:shadowColor="@color/neutral_700" android:shadowDx="@dimen/reader_photo_title_shadow_offset" android:shadowDy="@dimen/reader_photo_title_shadow_offset" android:shadowRadius="@dimen/reader_photo_title_shadow_radius" @@ -45,7 +45,7 @@ android:background="?android:selectableItemBackground" android:ellipsize="end" android:maxLines="1" - android:shadowColor="@color/grey_dark" + android:shadowColor="@color/neutral_700" android:shadowDx="@dimen/reader_photo_title_shadow_offset" android:shadowDy="@dimen/reader_photo_title_shadow_offset" android:shadowRadius="@dimen/reader_photo_title_shadow_radius" diff --git a/WordPress/src/main/res/layout/related_posts_dialog.xml b/WordPress/src/main/res/layout/related_posts_dialog.xml index 429a8f634c28..5ee7060fa0ac 100644 --- a/WordPress/src/main/res/layout/related_posts_dialog.xml +++ b/WordPress/src/main/res/layout/related_posts_dialog.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/site_settings_rp_switch_title" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:textAlignment="viewStart" android:theme="@style/SwitchBlueMedium" @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:textStyle="bold" android:textSize="@dimen/text_sz_medium" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:text="@string/site_settings_rp_preview1_title" android:fontFamily="sans-serif-light" /> @@ -120,7 +120,7 @@ android:layout_marginBottom="8dp" android:textStyle="italic" android:textSize="@dimen/text_sz_related_post_small" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:text="@string/site_settings_rp_preview1_site" /> @@ -148,7 +148,7 @@ android:layout_marginBottom="8dp" android:textStyle="italic" android:textSize="@dimen/text_sz_related_post_small" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:text="@string/site_settings_rp_preview2_site" /> @@ -176,7 +176,7 @@ android:layout_marginBottom="8dp" android:textStyle="italic" android:textSize="@dimen/text_sz_related_post_small" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:text="@string/site_settings_rp_preview3_site"/> diff --git a/WordPress/src/main/res/layout/role_list_row.xml b/WordPress/src/main/res/layout/role_list_row.xml index e4f646d57246..05f825281b26 100644 --- a/WordPress/src/main/res/layout/role_list_row.xml +++ b/WordPress/src/main/res/layout/role_list_row.xml @@ -28,7 +28,7 @@ android:layout_marginEnd="@dimen/dlp_text_margin_end" android:layout_marginStart="@dimen/dlp_text_margin_start" android:layout_toEndOf="@id/radio" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="Main Text"/> diff --git a/WordPress/src/main/res/layout/single_choice_recycler_view_item.xml b/WordPress/src/main/res/layout/single_choice_recycler_view_item.xml index c68c8da0ec9c..1c5e3419f2ef 100644 --- a/WordPress/src/main/res/layout/single_choice_recycler_view_item.xml +++ b/WordPress/src/main/res/layout/single_choice_recycler_view_item.xml @@ -35,7 +35,7 @@ android:layout_marginEnd="@dimen/margin_extra_large" android:layout_toEndOf="@id/radio" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="Text" > diff --git a/WordPress/src/main/res/layout/site_creation_domain_item.xml b/WordPress/src/main/res/layout/site_creation_domain_item.xml index 538a5bbade95..128ba1eb9ec0 100644 --- a/WordPress/src/main/res/layout/site_creation_domain_item.xml +++ b/WordPress/src/main/res/layout/site_creation_domain_item.xml @@ -12,5 +12,5 @@ android:paddingEnd="@dimen/margin_extra_large" android:maxLines="2" tools:text="yourname.wordpress.com" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:ignore="UnusedAttribute"/> diff --git a/WordPress/src/main/res/layout/site_picker_listitem.xml b/WordPress/src/main/res/layout/site_picker_listitem.xml index ebd5fcb86a13..3fb1255d31cc 100644 --- a/WordPress/src/main/res/layout/site_picker_listitem.xml +++ b/WordPress/src/main/res/layout/site_picker_listitem.xml @@ -42,7 +42,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="text_title"/> diff --git a/WordPress/src/main/res/layout/site_settings_tag_list_row.xml b/WordPress/src/main/res/layout/site_settings_tag_list_row.xml index 28af3b87a871..1a2ee4f42927 100644 --- a/WordPress/src/main/res/layout/site_settings_tag_list_row.xml +++ b/WordPress/src/main/res/layout/site_settings_tag_list_row.xml @@ -14,7 +14,7 @@ android:maxLines="1" android:minHeight="@dimen/min_touch_target_sz" android:padding="@dimen/margin_extra_large" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="text_tag" android:textAlignment="viewStart" diff --git a/WordPress/src/main/res/layout/stats_activity_single_post_details.xml b/WordPress/src/main/res/layout/stats_activity_single_post_details.xml index e36b3d440408..71b39176d153 100644 --- a/WordPress/src/main/res/layout/stats_activity_single_post_details.xml +++ b/WordPress/src/main/res/layout/stats_activity_single_post_details.xml @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stats_default_number_zero" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:layout_alignParentStart="true"/> + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> diff --git a/WordPress/src/main/res/layout/stats_insights_latest_post_item.xml b/WordPress/src/main/res/layout/stats_insights_latest_post_item.xml index e43cab74118b..0d442441eb54 100644 --- a/WordPress/src/main/res/layout/stats_insights_latest_post_item.xml +++ b/WordPress/src/main/res/layout/stats_insights_latest_post_item.xml @@ -18,7 +18,7 @@ android:id="@+id/stats_post_trend_label" android:background="?android:selectableItemBackground" android:textAppearance="?android:attr/textAppearance" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_small" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/WordPress/src/main/res/layout/stats_list_item_fragment.xml b/WordPress/src/main/res/layout/stats_list_item_fragment.xml index 2f2452cb4bee..b851546e511e 100644 --- a/WordPress/src/main/res/layout/stats_list_item_fragment.xml +++ b/WordPress/src/main/res/layout/stats_list_item_fragment.xml @@ -48,7 +48,7 @@ + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> diff --git a/WordPress/src/main/res/layout/support_email_and_name_dialog.xml b/WordPress/src/main/res/layout/support_email_and_name_dialog.xml index 4cf5b903129f..b5bc7631a877 100644 --- a/WordPress/src/main/res/layout/support_email_and_name_dialog.xml +++ b/WordPress/src/main/res/layout/support_email_and_name_dialog.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/margin_large" android:layout_width="match_parent" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" > @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:maxLength="@integer/max_length_support_name" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" > diff --git a/WordPress/src/main/res/layout/tags_list_row.xml b/WordPress/src/main/res/layout/tags_list_row.xml index 423285bb4e50..79fde7c60c27 100644 --- a/WordPress/src/main/res/layout/tags_list_row.xml +++ b/WordPress/src/main/res/layout/tags_list_row.xml @@ -14,7 +14,7 @@ android:ellipsize="end" android:maxLines="1" android:padding="@dimen/margin_medium" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium"/> + android:tint="@color/neutral_700" /> @@ -103,13 +103,13 @@ android:adjustViewBounds="true" android:contentDescription="@null" android:src="@drawable/ic_info_outline_white_24dp" - android:tint="@color/grey_dark" /> + android:tint="@color/neutral_700" /> @@ -135,13 +135,13 @@ android:adjustViewBounds="true" android:contentDescription="@null" android:src="@drawable/ic_help_outline_white_24dp" - android:tint="@color/grey_dark" /> + android:tint="@color/neutral_700" /> diff --git a/WordPress/src/main/res/layout/toolbar_spinner_dropdown_item.xml b/WordPress/src/main/res/layout/toolbar_spinner_dropdown_item.xml index cbc3fb52214b..80576232aefb 100644 --- a/WordPress/src/main/res/layout/toolbar_spinner_dropdown_item.xml +++ b/WordPress/src/main/res/layout/toolbar_spinner_dropdown_item.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="@dimen/margin_large" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:textAlignment="viewStart" android:gravity="start" diff --git a/WordPress/src/main/res/layout/wppref_view.xml b/WordPress/src/main/res/layout/wppref_view.xml index b3d54913b51d..3053bda20d14 100644 --- a/WordPress/src/main/res/layout/wppref_view.xml +++ b/WordPress/src/main/res/layout/wppref_view.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/margin_small" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="text_title" android:textAlignment="viewStart" diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 603e1ca238d9..2ce554fdad8f 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -16,7 +16,6 @@ - @color/neutral_700 @color/neutral_400 diff --git a/WordPress/src/main/res/values/reader_styles.xml b/WordPress/src/main/res/values/reader_styles.xml index 7cd144fd0570..b98cb4ebea3b 100644 --- a/WordPress/src/main/res/values/reader_styles.xml +++ b/WordPress/src/main/res/values/reader_styles.xml @@ -25,7 +25,7 @@ match_parent wrap_content @dimen/text_sz_large - @color/grey_dark + @color/neutral_700 bold 3 serif @@ -38,7 +38,7 @@ match_parent wrap_content @dimen/text_sz_medium - @color/grey_dark + @color/neutral_700 1.1 3 end @@ -56,7 +56,7 @@ wrap_content @dimen/text_sz_large center - @color/grey_dark + @color/neutral_700 diff --git a/WordPress/src/main/res/values/stats_styles.xml b/WordPress/src/main/res/values/stats_styles.xml index 380004c54f20..e3acd9a13da9 100644 --- a/WordPress/src/main/res/values/stats_styles.xml +++ b/WordPress/src/main/res/values/stats_styles.xml @@ -19,7 +19,7 @@ @@ -67,7 +67,7 @@ @@ -87,7 +87,7 @@ all false false - @color/grey_dark + @color/neutral_700 @dimen/text_sz_medium @@ -112,12 +112,12 @@ @@ -163,23 +163,23 @@ diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index f1df267405f8..08ba7cc74f90 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -53,7 +53,7 @@ @@ -568,7 +568,7 @@ @@ -591,7 +591,7 @@ center_vertical wrap_content wrap_content - @color/grey_dark + @color/neutral_700 @dimen/text_sz_large bold @@ -642,7 +642,7 @@ wrap_content wrap_content center_vertical - @color/grey_dark + @color/neutral_700 @dimen/text_sz_large @@ -678,7 +678,7 @@ wrap_content @dimen/margin_extra_large @dimen/margin_extra_large - @color/grey_dark + @color/neutral_700 @dimen/text_sz_large end true @@ -741,7 +741,7 @@ match_parent wrap_content @dimen/margin_extra_large - @color/grey_dark + @color/neutral_700 @dimen/text_sz_large @@ -763,7 +763,7 @@ @@ -780,7 +780,7 @@ @@ -100,6 +100,6 @@ diff --git a/WordPress/src/main/res/xml/site_settings.xml b/WordPress/src/main/res/xml/site_settings.xml index d274464dca5a..441972db8b85 100644 --- a/WordPress/src/main/res/xml/site_settings.xml +++ b/WordPress/src/main/res/xml/site_settings.xml @@ -446,7 +446,7 @@ android:title="@string/let_us_help" app:buttonText="@string/contact_support" app:buttonTextAllCaps="true" - app:buttonTextColor="@color/grey_dark" + app:buttonTextColor="@color/neutral_700" app:longClickHint="@string/site_settings_start_over_hint" app:preficon="@drawable/ic_history_white_24dp"/> From 0f755cce2d3025c4314e6be630f47adff4bc7b9f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 13:17:03 -0700 Subject: [PATCH 023/167] Update color references from grey disabled to neutral 400 --- .../android/ui/reader/views/ReaderIconCountView.java | 4 ++-- WordPress/src/main/res/color/dialog_button_selector.xml | 2 +- ...tor.xml => grey_min_orange_jazzy_neutral_400_selector.xml} | 4 ++-- ...ctor.xml => grey_min_primary_400_neutral_400_selector.xml} | 2 +- WordPress/src/main/res/color/reader_count_text.xml | 2 +- WordPress/src/main/res/layout/reader_bookmark_button.xml | 4 ++-- WordPress/src/main/res/layout/reader_cardview_post.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 8 files changed, 10 insertions(+), 11 deletions(-) rename WordPress/src/main/res/color/{grey_min_orange_jazzy_grey_disabled_selector.xml => grey_min_orange_jazzy_neutral_400_selector.xml} (56%) rename WordPress/src/main/res/color/{grey_min_blue_medium_grey_disabled_selector.xml => grey_min_primary_400_neutral_400_selector.xml} (76%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java index 9f7a0e47e77e..b4ce33da4c2a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java @@ -55,13 +55,13 @@ private void initView(Context context, AttributeSet attrs) { mImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.reader_button_like)); mImageView.setImageTintList(getResources().getColorStateList( - R.color.grey_min_orange_jazzy_grey_disabled_selector)); + R.color.grey_min_orange_jazzy_neutral_400_selector)); break; case ICON_COMMENT: mImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_comment_white_24dp)); mImageView.setImageTintList(getResources().getColorStateList( - R.color.grey_min_blue_medium_grey_disabled_selector)); + R.color.grey_min_primary_400_neutral_400_selector)); break; } } finally { diff --git a/WordPress/src/main/res/color/dialog_button_selector.xml b/WordPress/src/main/res/color/dialog_button_selector.xml index 1d6ac3d43c99..8791bdc27f93 100644 --- a/WordPress/src/main/res/color/dialog_button_selector.xml +++ b/WordPress/src/main/res/color/dialog_button_selector.xml @@ -3,7 +3,7 @@ - + diff --git a/WordPress/src/main/res/color/grey_min_orange_jazzy_grey_disabled_selector.xml b/WordPress/src/main/res/color/grey_min_orange_jazzy_neutral_400_selector.xml similarity index 56% rename from WordPress/src/main/res/color/grey_min_orange_jazzy_grey_disabled_selector.xml rename to WordPress/src/main/res/color/grey_min_orange_jazzy_neutral_400_selector.xml index add1d354fbf9..3ffd4fd45161 100644 --- a/WordPress/src/main/res/color/grey_min_orange_jazzy_grey_disabled_selector.xml +++ b/WordPress/src/main/res/color/grey_min_orange_jazzy_neutral_400_selector.xml @@ -3,8 +3,8 @@ - - + + diff --git a/WordPress/src/main/res/color/grey_min_blue_medium_grey_disabled_selector.xml b/WordPress/src/main/res/color/grey_min_primary_400_neutral_400_selector.xml similarity index 76% rename from WordPress/src/main/res/color/grey_min_blue_medium_grey_disabled_selector.xml rename to WordPress/src/main/res/color/grey_min_primary_400_neutral_400_selector.xml index ed2f9373f986..b0d0eb6072bf 100644 --- a/WordPress/src/main/res/color/grey_min_blue_medium_grey_disabled_selector.xml +++ b/WordPress/src/main/res/color/grey_min_primary_400_neutral_400_selector.xml @@ -3,7 +3,7 @@ - + diff --git a/WordPress/src/main/res/color/reader_count_text.xml b/WordPress/src/main/res/color/reader_count_text.xml index 13354a469e7c..6fe2b7e23c6a 100644 --- a/WordPress/src/main/res/color/reader_count_text.xml +++ b/WordPress/src/main/res/color/reader_count_text.xml @@ -3,7 +3,7 @@ - + diff --git a/WordPress/src/main/res/layout/reader_bookmark_button.xml b/WordPress/src/main/res/layout/reader_bookmark_button.xml index 3d5face3f8d3..cb75a00301c6 100644 --- a/WordPress/src/main/res/layout/reader_bookmark_button.xml +++ b/WordPress/src/main/res/layout/reader_bookmark_button.xml @@ -17,7 +17,7 @@ android:layout_height="@dimen/reader_count_icon" android:layout_width="@dimen/reader_count_icon" android:src="@drawable/ic_bookmark_outline_bookmark_selector_24dp" - android:tint="@color/grey_min_blue_medium_grey_disabled_selector" > + android:tint="@color/grey_min_primary_400_neutral_400_selector" > diff --git a/WordPress/src/main/res/layout/reader_cardview_post.xml b/WordPress/src/main/res/layout/reader_cardview_post.xml index af38cb451df7..b909f0cb90cb 100644 --- a/WordPress/src/main/res/layout/reader_cardview_post.xml +++ b/WordPress/src/main/res/layout/reader_cardview_post.xml @@ -259,7 +259,7 @@ android:layout_toStartOf="@id/count_comments" android:padding="@dimen/margin_medium" android:src="@drawable/ic_bookmark_outline_bookmark_selector_24dp" - android:tint="@color/grey_min_blue_medium_grey_disabled_selector" > + android:tint="@color/grey_min_primary_400_neutral_400_selector" > - @color/neutral_400 @color/neutral_0 From 0b83ddf7fd84a53555d45b6db2e6bb9d6db4f005 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 13:28:38 -0700 Subject: [PATCH 024/167] Update color references from grey lighten 30 to neutral 0 --- WordPress/lint-baseline.xml | 36 +++++++++---------- .../android/ui/reader/ReaderResourceVars.java | 2 +- .../reader/adapters/ReaderCommentAdapter.java | 2 +- .../ReaderSearchSuggestionAdapter.java | 2 +- .../android/ui/stats/StatsBarGraph.java | 2 +- .../util/image/ImagePlaceholderManager.kt | 6 ++-- .../comment_reply_background.xml | 2 +- .../drawable-ldrtl/people_list_divider.xml | 2 +- .../bg_grey_lighten_30_with_radius.xml | 2 +- .../res/drawable/comment_reply_background.xml | 2 +- .../src/main/res/drawable/list_divider.xml | 2 +- .../drawable/notifications_list_divider.xml | 2 +- .../notifications_list_divider_full_width.xml | 2 +- .../nux_flat_button_grey_text_selector.xml | 2 +- .../main/res/drawable/people_list_divider.xml | 2 +- .../drawable/photo_picker_item_background.xml | 2 +- .../res/drawable/related_posts_divider.xml | 4 +-- .../stats_barchart_no_activity_background.xml | 2 +- .../drawable/stats_list_item_background.xml | 2 +- .../stats_list_item_child_background.xml | 2 +- .../stats_list_item_expanded_background.xml | 2 +- ...s_visitors_and_views_button_blue_light.xml | 2 +- ...ors_and_views_button_latest_blue_light.xml | 2 +- .../stats_visitors_and_views_button_white.xml | 2 +- .../res/layout-land/login_signup_screen.xml | 2 +- .../res/layout-sw720dp/stats_activity.xml | 2 +- .../history_detail_container_fragment.xml | 2 +- .../main/res/layout/login_signup_screen.xml | 2 +- .../res/layout/media_browser_activity.xml | 2 +- .../src/main/res/layout/my_site_fragment.xml | 2 +- ...e_creation_verticals_search_input_item.xml | 2 +- .../src/main/res/layout/note_block_header.xml | 2 +- .../notifications_fragment_notes_list.xml | 4 +-- .../res/layout/notifications_list_item.xml | 2 +- .../main/res/layout/number_picker_dialog.xml | 4 +-- .../res/layout/plugin_detail_activity.xml | 2 +- .../reader_comments_post_header_view.xml | 2 +- .../res/layout/reader_fragment_post_cards.xml | 4 +-- .../src/main/res/layout/reader_photo_view.xml | 2 +- .../res/layout/reader_site_header_view.xml | 2 +- .../main/res/layout/related_posts_dialog.xml | 2 +- .../layout/site_creation_domain_header.xml | 2 +- .../res/layout/site_creation_domain_input.xml | 2 +- .../res/layout/site_creation_form_screen.xml | 4 +-- .../site_settings_tag_detail_fragment.xml | 2 +- .../src/main/res/layout/stats_activity.xml | 2 +- .../res/layout/stats_activity_view_all.xml | 2 +- .../res/layout/stats_block_divider_item.xml | 2 +- .../main/res/layout/stats_block_list_item.xml | 2 +- .../main/res/layout/stats_block_tabs_item.xml | 2 +- .../res/layout/stats_insights_header_line.xml | 2 +- .../main/res/layout/stats_vertical_line.xml | 2 +- .../main/res/layout/stats_widget_layout.xml | 2 +- .../username_changer_dialog_fragment.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles.xml | 4 +-- .../src/main/res/values/styles_calypso.xml | 2 +- 57 files changed, 81 insertions(+), 82 deletions(-) diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml index ad197de075c9..a176e719f5ab 100644 --- a/WordPress/lint-baseline.xml +++ b/WordPress/lint-baseline.xml @@ -3578,12 +3578,12 @@ R.drawable.ic_user_circle_grey_24dp ImageType.BLAVATAR -> R.drawable.bg_rectangle_grey_lighten_20_globe_32dp ImageType.IMAGE -> null // don't display any error drawable - ImageType.PHOTO -> R.color.grey_lighten_30 + ImageType.PHOTO -> R.color.neutral_0 ImageType.PLAN -> R.drawable.bg_oval_grey_plans_32dp ImageType.PLUGIN -> R.drawable.plugin_placeholder - ImageType.THEME -> R.color.grey_lighten_30 + ImageType.THEME -> R.color.neutral_0 ImageType.UNKNOWN -> R.drawable.ic_notice_white_24dp - ImageType.VIDEO -> R.color.grey_lighten_30 + ImageType.VIDEO -> R.color.neutral_0 ImageType.ICON -> R.drawable.bg_grey_lighten_30_with_radius } } diff --git a/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml b/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml index 0efcff711e31..74289e26f9ab 100644 --- a/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml +++ b/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml @@ -10,7 +10,7 @@ android:right="@dimen/margin_extra_large" android:top="9dp"> - + diff --git a/WordPress/src/main/res/drawable-ldrtl/people_list_divider.xml b/WordPress/src/main/res/drawable-ldrtl/people_list_divider.xml index 5af33981017e..aa02aa3fbfc9 100644 --- a/WordPress/src/main/res/drawable-ldrtl/people_list_divider.xml +++ b/WordPress/src/main/res/drawable-ldrtl/people_list_divider.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/bg_grey_lighten_30_with_radius.xml b/WordPress/src/main/res/drawable/bg_grey_lighten_30_with_radius.xml index 197a95719f16..824fb56d5682 100644 --- a/WordPress/src/main/res/drawable/bg_grey_lighten_30_with_radius.xml +++ b/WordPress/src/main/res/drawable/bg_grey_lighten_30_with_radius.xml @@ -1,5 +1,5 @@ - + diff --git a/WordPress/src/main/res/drawable/comment_reply_background.xml b/WordPress/src/main/res/drawable/comment_reply_background.xml index 0a018816e44d..b0418d2d6821 100644 --- a/WordPress/src/main/res/drawable/comment_reply_background.xml +++ b/WordPress/src/main/res/drawable/comment_reply_background.xml @@ -10,7 +10,7 @@ android:right="@dimen/margin_extra_large" android:top="9dp"> - + diff --git a/WordPress/src/main/res/drawable/list_divider.xml b/WordPress/src/main/res/drawable/list_divider.xml index 3ab5e0fc21a8..b77ecc323d91 100644 --- a/WordPress/src/main/res/drawable/list_divider.xml +++ b/WordPress/src/main/res/drawable/list_divider.xml @@ -3,6 +3,6 @@ android:insetLeft="@dimen/margin_extra_large" android:insetRight="@dimen/margin_extra_large"> - + diff --git a/WordPress/src/main/res/drawable/notifications_list_divider.xml b/WordPress/src/main/res/drawable/notifications_list_divider.xml index 35e8c2c206da..9e8f0289ba2e 100644 --- a/WordPress/src/main/res/drawable/notifications_list_divider.xml +++ b/WordPress/src/main/res/drawable/notifications_list_divider.xml @@ -4,7 +4,7 @@ android:insetRight="@dimen/margin_extra_large"> - + diff --git a/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml b/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml index efaf0ee83845..19dba6c9b995 100644 --- a/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml +++ b/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml b/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml index c5a85735c205..3b7999bc75ec 100644 --- a/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml +++ b/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml @@ -1,5 +1,5 @@ - + diff --git a/WordPress/src/main/res/drawable/people_list_divider.xml b/WordPress/src/main/res/drawable/people_list_divider.xml index 2826aed083d9..93d6768005a5 100644 --- a/WordPress/src/main/res/drawable/people_list_divider.xml +++ b/WordPress/src/main/res/drawable/people_list_divider.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/photo_picker_item_background.xml b/WordPress/src/main/res/drawable/photo_picker_item_background.xml index 3110b5bfb1a6..df320fccae4d 100644 --- a/WordPress/src/main/res/drawable/photo_picker_item_background.xml +++ b/WordPress/src/main/res/drawable/photo_picker_item_background.xml @@ -3,6 +3,6 @@ - + diff --git a/WordPress/src/main/res/drawable/related_posts_divider.xml b/WordPress/src/main/res/drawable/related_posts_divider.xml index 16e006514c7d..45cdafbee64b 100644 --- a/WordPress/src/main/res/drawable/related_posts_divider.xml +++ b/WordPress/src/main/res/drawable/related_posts_divider.xml @@ -4,10 +4,10 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + android:drawable="@color/neutral_0" /> diff --git a/WordPress/src/main/res/drawable/stats_barchart_no_activity_background.xml b/WordPress/src/main/res/drawable/stats_barchart_no_activity_background.xml index 3f488f09039c..3d84d810af4c 100644 --- a/WordPress/src/main/res/drawable/stats_barchart_no_activity_background.xml +++ b/WordPress/src/main/res/drawable/stats_barchart_no_activity_background.xml @@ -5,7 +5,7 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_list_item_background.xml b/WordPress/src/main/res/drawable/stats_list_item_background.xml index 7c94255ffdf1..ef98074a2f60 100644 --- a/WordPress/src/main/res/drawable/stats_list_item_background.xml +++ b/WordPress/src/main/res/drawable/stats_list_item_background.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_list_item_child_background.xml b/WordPress/src/main/res/drawable/stats_list_item_child_background.xml index d58d7f6200c5..e8e99d1e04d5 100644 --- a/WordPress/src/main/res/drawable/stats_list_item_child_background.xml +++ b/WordPress/src/main/res/drawable/stats_list_item_child_background.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml b/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml index d58d7f6200c5..e8e99d1e04d5 100644 --- a/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml +++ b/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml index 17a2b3f89f70..fd1296d4ca40 100644 --- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml +++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml index d4bfad37b7f6..411d5f35cf56 100644 --- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml +++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml index 930b821b1d02..1301136c8cd7 100644 --- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml +++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/layout-land/login_signup_screen.xml b/WordPress/src/main/res/layout-land/login_signup_screen.xml index e9e81ac42196..2971e21016bf 100644 --- a/WordPress/src/main/res/layout-land/login_signup_screen.xml +++ b/WordPress/src/main/res/layout-land/login_signup_screen.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:background="@color/grey_lighten_30" + android:background="@color/neutral_0" android:orientation="horizontal" android:clipToPadding="false" android:padding="@dimen/margin_large"> diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml index f57a42f9ab9b..60fdfb0509dd 100644 --- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml +++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml @@ -41,7 +41,7 @@ android:id="@+id/ptr_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey_lighten_30" + android:background="@color/neutral_0" app:layout_behavior="@string/appbar_scrolling_view_behavior"> + android:background="@color/neutral_0"> diff --git a/WordPress/src/main/res/layout/login_signup_screen.xml b/WordPress/src/main/res/layout/login_signup_screen.xml index 1c481787127d..975710cb2144 100644 --- a/WordPress/src/main/res/layout/login_signup_screen.xml +++ b/WordPress/src/main/res/layout/login_signup_screen.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:background="@color/grey_lighten_30" + android:background="@color/neutral_0" android:orientation="vertical" android:clipToPadding="false" android:padding="@dimen/margin_extra_large"> diff --git a/WordPress/src/main/res/layout/media_browser_activity.xml b/WordPress/src/main/res/layout/media_browser_activity.xml index 692fecb964bf..e411664dbf19 100755 --- a/WordPress/src/main/res/layout/media_browser_activity.xml +++ b/WordPress/src/main/res/layout/media_browser_activity.xml @@ -54,7 +54,7 @@ + android:background="@color/neutral_0"/> diff --git a/WordPress/src/main/res/layout/note_block_header.xml b/WordPress/src/main/res/layout/note_block_header.xml index 28f9ff0f2c22..3d7ffb0cfc15 100644 --- a/WordPress/src/main/res/layout/note_block_header.xml +++ b/WordPress/src/main/res/layout/note_block_header.xml @@ -94,7 +94,7 @@ diff --git a/WordPress/src/main/res/layout/notifications_fragment_notes_list.xml b/WordPress/src/main/res/layout/notifications_fragment_notes_list.xml index 1a8c9e8b5f5e..0eb6e8a34680 100644 --- a/WordPress/src/main/res/layout/notifications_fragment_notes_list.xml +++ b/WordPress/src/main/res/layout/notifications_fragment_notes_list.xml @@ -50,7 +50,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="@string/notifications_label_new_notifications" - android:textColor="@color/grey_lighten_30" + android:textColor="@color/neutral_0" android:textSize="@dimen/text_sz_large"> @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="@string/notifications_label_new_notifications_subtitle" - android:textColor="@color/grey_lighten_30" + android:textColor="@color/neutral_0" android:textSize="@dimen/text_sz_small"> diff --git a/WordPress/src/main/res/layout/notifications_list_item.xml b/WordPress/src/main/res/layout/notifications_list_item.xml index 3d9ffd1ee0f8..1180ce8f648e 100644 --- a/WordPress/src/main/res/layout/notifications_list_item.xml +++ b/WordPress/src/main/res/layout/notifications_list_item.xml @@ -118,7 +118,7 @@ diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml index d4b2574c3599..9f3cc017b7f3 100644 --- a/WordPress/src/main/res/layout/number_picker_dialog.xml +++ b/WordPress/src/main/res/layout/number_picker_dialog.xml @@ -47,7 +47,7 @@ + android:background="@color/neutral_0" /> + android:background="@color/neutral_0" /> diff --git a/WordPress/src/main/res/layout/plugin_detail_activity.xml b/WordPress/src/main/res/layout/plugin_detail_activity.xml index 7f062fb389b7..672832be86a5 100644 --- a/WordPress/src/main/res/layout/plugin_detail_activity.xml +++ b/WordPress/src/main/res/layout/plugin_detail_activity.xml @@ -80,7 +80,7 @@ diff --git a/WordPress/src/main/res/layout/reader_fragment_post_cards.xml b/WordPress/src/main/res/layout/reader_fragment_post_cards.xml index 22cf398eab7d..c241b51def50 100644 --- a/WordPress/src/main/res/layout/reader_fragment_post_cards.xml +++ b/WordPress/src/main/res/layout/reader_fragment_post_cards.xml @@ -38,14 +38,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/reader_label_new_posts" - android:textColor="@color/grey_lighten_30" + android:textColor="@color/neutral_0" android:textSize="@dimen/text_sz_large"/> diff --git a/WordPress/src/main/res/layout/reader_photo_view.xml b/WordPress/src/main/res/layout/reader_photo_view.xml index 8c41fbee2595..a1fe59caaed8 100644 --- a/WordPress/src/main/res/layout/reader_photo_view.xml +++ b/WordPress/src/main/res/layout/reader_photo_view.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="@string/reader_toast_err_view_image" - android:textColor="@color/grey_lighten_30" + android:textColor="@color/neutral_0" android:textSize="@dimen/text_sz_large" android:visibility="gone" tools:visibility="visible" /> diff --git a/WordPress/src/main/res/layout/reader_site_header_view.xml b/WordPress/src/main/res/layout/reader_site_header_view.xml index 5672e3f57c71..6432d11b71aa 100644 --- a/WordPress/src/main/res/layout/reader_site_header_view.xml +++ b/WordPress/src/main/res/layout/reader_site_header_view.xml @@ -67,7 +67,7 @@ diff --git a/WordPress/src/main/res/layout/related_posts_dialog.xml b/WordPress/src/main/res/layout/related_posts_dialog.xml index 5ee7060fa0ac..4669953ff75c 100644 --- a/WordPress/src/main/res/layout/related_posts_dialog.xml +++ b/WordPress/src/main/res/layout/related_posts_dialog.xml @@ -7,7 +7,7 @@ android:paddingTop="@dimen/site_settings_divider_height" android:paddingBottom="@dimen/site_settings_divider_height" android:orientation="vertical" - android:background="@color/grey_lighten_30"> + android:background="@color/neutral_0"> diff --git a/WordPress/src/main/res/layout/site_creation_form_screen.xml b/WordPress/src/main/res/layout/site_creation_form_screen.xml index a8b1ad648a1e..32adf10f7593 100644 --- a/WordPress/src/main/res/layout/site_creation_form_screen.xml +++ b/WordPress/src/main/res/layout/site_creation_form_screen.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey_lighten_30"> + android:background="@color/neutral_0"> diff --git a/WordPress/src/main/res/layout/site_settings_tag_detail_fragment.xml b/WordPress/src/main/res/layout/site_settings_tag_detail_fragment.xml index cca8773690ee..136199939cb7 100644 --- a/WordPress/src/main/res/layout/site_settings_tag_detail_fragment.xml +++ b/WordPress/src/main/res/layout/site_settings_tag_detail_fragment.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey_lighten_30"> + android:background="@color/neutral_0"> + android:background="@color/neutral_0"> diff --git a/WordPress/src/main/res/layout/stats_block_list_item.xml b/WordPress/src/main/res/layout/stats_block_list_item.xml index 4681949dfee2..017ff869d483 100644 --- a/WordPress/src/main/res/layout/stats_block_list_item.xml +++ b/WordPress/src/main/res/layout/stats_block_list_item.xml @@ -113,7 +113,7 @@ android:id="@+id/divider" android:layout_width="0dp" android:layout_height="1dp" - android:background="@color/grey_lighten_30" + android:background="@color/neutral_0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/text"/> diff --git a/WordPress/src/main/res/layout/stats_block_tabs_item.xml b/WordPress/src/main/res/layout/stats_block_tabs_item.xml index 140813f139f4..063fa55f7f1c 100644 --- a/WordPress/src/main/res/layout/stats_block_tabs_item.xml +++ b/WordPress/src/main/res/layout/stats_block_tabs_item.xml @@ -21,5 +21,5 @@ + android:background="@color/neutral_0"/> diff --git a/WordPress/src/main/res/layout/stats_insights_header_line.xml b/WordPress/src/main/res/layout/stats_insights_header_line.xml index 8463b5357782..6f5b696af375 100644 --- a/WordPress/src/main/res/layout/stats_insights_header_line.xml +++ b/WordPress/src/main/res/layout/stats_insights_header_line.xml @@ -2,4 +2,4 @@ + android:background="@color/neutral_0" /> diff --git a/WordPress/src/main/res/layout/stats_vertical_line.xml b/WordPress/src/main/res/layout/stats_vertical_line.xml index 9c4e65a4bff7..e6f5dbd8a40a 100644 --- a/WordPress/src/main/res/layout/stats_vertical_line.xml +++ b/WordPress/src/main/res/layout/stats_vertical_line.xml @@ -1,4 +1,4 @@ + android:background="@color/neutral_0" /> diff --git a/WordPress/src/main/res/layout/stats_widget_layout.xml b/WordPress/src/main/res/layout/stats_widget_layout.xml index 9d3345209623..9df18e839cab 100644 --- a/WordPress/src/main/res/layout/stats_widget_layout.xml +++ b/WordPress/src/main/res/layout/stats_widget_layout.xml @@ -40,7 +40,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:orientation="horizontal" - android:background="@color/grey_lighten_30" /> + android:background="@color/neutral_0" /> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index a4e6bdef3145..bc444f6ba6d9 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -18,7 +18,6 @@ - @color/neutral_0 @color/neutral_100 @color/neutral_200 @color/neutral_400 diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 08ba7cc74f90..2aa5307cabe9 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -462,7 +462,7 @@ @@ -821,6 +821,6 @@ diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml index 28f113768524..d0dd58c0b619 100644 --- a/WordPress/src/main/res/values/styles_calypso.xml +++ b/WordPress/src/main/res/values/styles_calypso.xml @@ -27,7 +27,7 @@ @style/Calypso.ActionMode @color/grey_darken_10 - @color/grey_lighten_30 + @color/neutral_0 @style/Calypso.Dialog.Alert @style/Calypso.Dialog.Alert @color/primary_400 From b7c1e7d005e4e61be8c777d3cefb59ff815b77a6 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 13:35:17 -0700 Subject: [PATCH 025/167] Update color references from grey lighten 20 to neutral 100 --- .../android/ui/AddQuickPressShortcutActivity.java | 2 +- .../refresh/lists/sections/viewholders/DayViewHolder.kt | 2 +- .../android/util/image/ImagePlaceholderManager.kt | 6 +++--- .../main/res/color/grey_blue_radio_button_state_list.xml | 2 +- .../src/main/res/color/related_posts_preview_header.xml | 2 +- ...e_32dp.xml => bg_rectangle_neutral_100_globe_32dp.xml} | 2 +- ...00dp.xml => bg_rectangle_neutral_100_themes_100dp.xml} | 2 +- ...er_32dp.xml => bg_rectangle_neutral_100_user_32dp.xml} | 2 +- WordPress/src/main/res/drawable/blavatar_border.xml | 2 +- WordPress/src/main/res/drawable/button_frame.xml | 4 ++-- .../res/drawable/img_illustration_site_about_182dp.xml | 8 ++++---- .../res/drawable/img_illustration_site_about_280dp.xml | 8 ++++---- .../res/drawable/img_illustration_site_brush_191dp.xml | 4 ++-- .../res/drawable/img_site_error_camera_pencils_226dp.xml | 2 +- .../drawable/img_site_wordpress_camera_pencils_226dp.xml | 2 +- WordPress/src/main/res/drawable/media_item_background.xml | 2 +- WordPress/src/main/res/drawable/plugin_placeholder.xml | 2 +- .../src/main/res/layout/activity_log_item_detail.xml | 2 +- .../main/res/layout/activity_log_list_progress_item.xml | 2 +- WordPress/src/main/res/layout/endlist_indicator.xml | 4 ++-- .../src/main/res/layout/login_epilogue_sites_listitem.xml | 2 +- WordPress/src/main/res/layout/main_activity.xml | 2 +- WordPress/src/main/res/layout/my_site_fragment.xml | 2 +- WordPress/src/main/res/layout/person_detail_fragment.xml | 2 +- WordPress/src/main/res/layout/plugin_detail_activity.xml | 2 +- .../src/main/res/layout/publicize_listitem_connection.xml | 2 +- .../src/main/res/layout/publicize_listitem_service.xml | 2 +- WordPress/src/main/res/layout/reader_cardview_post.xml | 4 ++-- WordPress/src/main/res/layout/reader_cardview_xpost.xml | 4 ++-- .../main/res/layout/reader_comments_post_header_view.xml | 2 +- .../src/main/res/layout/reader_include_comment_box.xml | 2 +- WordPress/src/main/res/layout/reader_listitem_comment.xml | 2 +- .../main/res/layout/reader_post_detail_header_view.xml | 4 ++-- WordPress/src/main/res/layout/reader_simple_post_view.xml | 2 +- WordPress/src/main/res/layout/reader_site_header_view.xml | 6 +++--- .../src/main/res/layout/reader_site_search_result.xml | 2 +- WordPress/src/main/res/layout/site_picker_listitem.xml | 4 ++-- .../src/main/res/layout/site_settings_tag_list_row.xml | 2 +- .../src/main/res/layout/stats_block_activity_item.xml | 2 +- WordPress/src/main/res/layout/stats_block_list_item.xml | 2 +- WordPress/src/main/res/layout/tags_list_row.xml | 2 +- WordPress/src/main/res/layout/theme_grid_item.xml | 2 +- WordPress/src/main/res/values/colors.xml | 3 +-- WordPress/src/main/res/values/styles.xml | 4 ++-- WordPress/src/main/res/values/styles_calypso.xml | 2 +- 45 files changed, 63 insertions(+), 64 deletions(-) rename WordPress/src/main/res/drawable/{bg_rectangle_grey_lighten_20_globe_32dp.xml => bg_rectangle_neutral_100_globe_32dp.xml} (90%) rename WordPress/src/main/res/drawable/{bg_rectangle_grey_lighten_20_themes_100dp.xml => bg_rectangle_neutral_100_themes_100dp.xml} (89%) rename WordPress/src/main/res/drawable/{bg_rectangle_grey_lighten_20_user_32dp.xml => bg_rectangle_neutral_100_user_32dp.xml} (90%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java index e54b8b3556fb..c1309a2154f6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java +++ b/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; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt index 99092de2a895..b4ec97278bc8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt @@ -24,7 +24,7 @@ class DayViewHolder(parent: ViewGroup) : ViewHolder( fun bind(box: Box) { val color = when (box) { INVISIBLE -> android.R.color.transparent - VERY_LOW -> R.color.grey_lighten_20 + VERY_LOW -> R.color.neutral_100 LOW -> R.color.stats_low_activity MEDIUM -> R.color.stats_medium_activity HIGH -> R.color.stats_high_activity diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt index a7ba0220e835..aa23ee2117f6 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt @@ -8,10 +8,10 @@ import javax.inject.Singleton class ImagePlaceholderManager @Inject constructor() { fun getErrorResource(imgType: ImageType): Int? { return when (imgType) { - ImageType.AVATAR -> R.drawable.bg_rectangle_grey_lighten_20_user_32dp + ImageType.AVATAR -> R.drawable.bg_rectangle_neutral_100_user_32dp ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_grey_user_32dp ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp - ImageType.BLAVATAR -> R.drawable.bg_rectangle_grey_lighten_20_globe_32dp + ImageType.BLAVATAR -> R.drawable.bg_rectangle_neutral_100_globe_32dp ImageType.IMAGE -> null // don't display any error drawable ImageType.PHOTO -> R.color.neutral_0 ImageType.PLAN -> R.drawable.bg_oval_grey_plans_32dp @@ -33,7 +33,7 @@ class ImagePlaceholderManager @Inject constructor() { ImageType.PHOTO -> R.color.neutral_0 ImageType.PLAN -> R.drawable.bg_oval_grey_plans_32dp ImageType.PLUGIN -> R.drawable.plugin_placeholder - ImageType.THEME -> R.drawable.bg_rectangle_grey_lighten_20_themes_100dp + ImageType.THEME -> R.drawable.bg_rectangle_neutral_100_themes_100dp ImageType.UNKNOWN -> R.drawable.legacy_dashicon_format_image_big_grey ImageType.VIDEO -> R.color.neutral_0 ImageType.ICON -> R.drawable.bg_grey_light_with_radius diff --git a/WordPress/src/main/res/color/grey_blue_radio_button_state_list.xml b/WordPress/src/main/res/color/grey_blue_radio_button_state_list.xml index e093c87bfe8c..3e59ed36ae6f 100644 --- a/WordPress/src/main/res/color/grey_blue_radio_button_state_list.xml +++ b/WordPress/src/main/res/color/grey_blue_radio_button_state_list.xml @@ -2,5 +2,5 @@ - + diff --git a/WordPress/src/main/res/color/related_posts_preview_header.xml b/WordPress/src/main/res/color/related_posts_preview_header.xml index dd4d53cf85d8..fd2228af3fc3 100644 --- a/WordPress/src/main/res/color/related_posts_preview_header.xml +++ b/WordPress/src/main/res/color/related_posts_preview_header.xml @@ -8,6 +8,6 @@ android:state_enabled="true" /> + android:color="@color/neutral_100" /> diff --git a/WordPress/src/main/res/drawable/bg_rectangle_grey_lighten_20_globe_32dp.xml b/WordPress/src/main/res/drawable/bg_rectangle_neutral_100_globe_32dp.xml similarity index 90% rename from WordPress/src/main/res/drawable/bg_rectangle_grey_lighten_20_globe_32dp.xml rename to WordPress/src/main/res/drawable/bg_rectangle_neutral_100_globe_32dp.xml index 424bd8c06bc5..5fac27d0d34e 100644 --- a/WordPress/src/main/res/drawable/bg_rectangle_grey_lighten_20_globe_32dp.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_neutral_100_globe_32dp.xml @@ -10,7 +10,7 @@ android:shape="rectangle" > + android:color="@color/neutral_100" > + android:color="@color/neutral_100" > + android:color="@color/neutral_100" > + android:color="@color/neutral_100"/> - + @@ -13,7 +13,7 @@ + android:color="@color/neutral_100"/> diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml index ed68e7ce1916..68d8f11c1b38 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml @@ -6,12 +6,12 @@ android:viewportWidth="182.0"> @@ -136,12 +136,12 @@ diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml index be4f0789f24d..022e3511d6cc 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml @@ -11,12 +11,12 @@ @@ -141,12 +141,12 @@ diff --git a/WordPress/src/main/res/drawable/img_illustration_site_brush_191dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_brush_191dp.xml index db6ec5b337a0..d1a0e2ec7214 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_brush_191dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_brush_191dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="191.0"> @@ -56,7 +56,7 @@ diff --git a/WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml b/WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml index 58ff42f43f9d..3971353fb180 100644 --- a/WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml +++ b/WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml @@ -9,7 +9,7 @@ android:fillColor="@color/neutral_300" android:pathData="M108.8 71.7c0-1.5 0.5-2.5 1-3s1.5-1 3-1 2.5 0.5 3 1 1 1.5 1 3c0 1-0.5 2-1 3s-1.5 1-3 1-2.5-0.5-3-1-1-1.5-1-3zm7-8.1h-5.5l-1-22.7h8.1l-1.6 22.7z"/> diff --git a/WordPress/src/main/res/drawable/media_item_background.xml b/WordPress/src/main/res/drawable/media_item_background.xml index 1d55a3fb1940..f5f43a17ef94 100644 --- a/WordPress/src/main/res/drawable/media_item_background.xml +++ b/WordPress/src/main/res/drawable/media_item_background.xml @@ -1,7 +1,7 @@ - + diff --git a/WordPress/src/main/res/drawable/plugin_placeholder.xml b/WordPress/src/main/res/drawable/plugin_placeholder.xml index 669e0c52cd92..e27cd99cbc61 100644 --- a/WordPress/src/main/res/drawable/plugin_placeholder.xml +++ b/WordPress/src/main/res/drawable/plugin_placeholder.xml @@ -1,7 +1,7 @@ - + + android:background="@color/neutral_100" /> + android:background="@color/neutral_100" /> diff --git a/WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml b/WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml index 408cffd48fc7..24f0ddfa5aca 100644 --- a/WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml +++ b/WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml @@ -19,7 +19,7 @@ android:layout_marginEnd="@dimen/margin_extra_large" android:gravity="center_vertical" android:background="@drawable/blavatar_border" - android:src="@drawable/bg_rectangle_grey_lighten_20_globe_32dp" + android:src="@drawable/bg_rectangle_neutral_100_globe_32dp" android:contentDescription="@null"/> + android:background="@color/neutral_100"/> + tools:src="@drawable/bg_rectangle_neutral_100_globe_32dp" /> + android:background="@color/neutral_100"/> diff --git a/WordPress/src/main/res/layout/plugin_detail_activity.xml b/WordPress/src/main/res/layout/plugin_detail_activity.xml index 672832be86a5..3fbb9123ecaa 100644 --- a/WordPress/src/main/res/layout/plugin_detail_activity.xml +++ b/WordPress/src/main/res/layout/plugin_detail_activity.xml @@ -34,7 +34,7 @@ android:id="@+id/image_banner" android:layout_width="match_parent" android:layout_height="@dimen/plugin_banner_size" - android:background="@color/grey_lighten_20" + android:background="@color/neutral_100" android:contentDescription="@string/plugin_detail_banner_desc" /> diff --git a/WordPress/src/main/res/layout/publicize_listitem_service.xml b/WordPress/src/main/res/layout/publicize_listitem_service.xml index 1a67c3573ac6..fa14587fe2a3 100644 --- a/WordPress/src/main/res/layout/publicize_listitem_service.xml +++ b/WordPress/src/main/res/layout/publicize_listitem_service.xml @@ -13,7 +13,7 @@ android:layout_centerVertical="true" android:layout_marginEnd="@dimen/margin_large" android:contentDescription="@null" - tools:src="@drawable/bg_rectangle_grey_lighten_20_globe_32dp"/> + tools:src="@drawable/bg_rectangle_neutral_100_globe_32dp"/> @@ -180,7 +180,7 @@ android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" android:layout_marginEnd="@dimen/margin_large" - android:src="@drawable/bg_rectangle_grey_lighten_20_user_32dp" + android:src="@drawable/bg_rectangle_neutral_100_user_32dp" android:contentDescription="@string/reader_blavatar_desc" style="@style/ReaderImageView.Avatar.Small" > diff --git a/WordPress/src/main/res/layout/reader_cardview_xpost.xml b/WordPress/src/main/res/layout/reader_cardview_xpost.xml index de6e58c34d42..8a245a5a79ce 100644 --- a/WordPress/src/main/res/layout/reader_cardview_xpost.xml +++ b/WordPress/src/main/res/layout/reader_cardview_xpost.xml @@ -34,7 +34,7 @@ android:layout_height="@dimen/blavatar_sz" android:layout_gravity="top|start" android:contentDescription="@string/reader_blavatar_desc" - android:src="@drawable/bg_rectangle_grey_lighten_20_globe_32dp" /> + android:src="@drawable/bg_rectangle_neutral_100_globe_32dp" /> diff --git a/WordPress/src/main/res/layout/reader_comments_post_header_view.xml b/WordPress/src/main/res/layout/reader_comments_post_header_view.xml index cc8fa300543f..6c36597c0d85 100644 --- a/WordPress/src/main/res/layout/reader_comments_post_header_view.xml +++ b/WordPress/src/main/res/layout/reader_comments_post_header_view.xml @@ -41,7 +41,7 @@ android:layout_width="16dp" android:layout_height="16dp" android:layout_gravity="center_vertical" - tools:src="@drawable/bg_rectangle_grey_lighten_20_user_32dp" + tools:src="@drawable/bg_rectangle_neutral_100_user_32dp" android:layout_marginEnd="@dimen/margin_medium" android:contentDescription="@null"/> diff --git a/WordPress/src/main/res/layout/reader_include_comment_box.xml b/WordPress/src/main/res/layout/reader_include_comment_box.xml index d62d93eb482c..cb88fc5694a6 100644 --- a/WordPress/src/main/res/layout/reader_include_comment_box.xml +++ b/WordPress/src/main/res/layout/reader_include_comment_box.xml @@ -17,7 +17,7 @@ android:id="@+id/divider_comment" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/grey_lighten_20" /> + android:background="@color/neutral_100" /> + tools:src="@drawable/bg_rectangle_neutral_100_globe_32dp"/> diff --git a/WordPress/src/main/res/layout/reader_simple_post_view.xml b/WordPress/src/main/res/layout/reader_simple_post_view.xml index c0c522088ef3..3287ea9e9d9f 100644 --- a/WordPress/src/main/res/layout/reader_simple_post_view.xml +++ b/WordPress/src/main/res/layout/reader_simple_post_view.xml @@ -42,7 +42,7 @@ android:id="@+id/image_avatar" style="@style/ReaderImageView.Avatar.ExtraSmall" android:layout_centerVertical="true" - tools:src="@drawable/bg_rectangle_grey_lighten_20_user_32dp" + tools:src="@drawable/bg_rectangle_neutral_100_user_32dp" android:layout_marginEnd="@dimen/margin_medium" android:contentDescription="@null"/> diff --git a/WordPress/src/main/res/layout/reader_site_header_view.xml b/WordPress/src/main/res/layout/reader_site_header_view.xml index 6432d11b71aa..e38b6cd763a8 100644 --- a/WordPress/src/main/res/layout/reader_site_header_view.xml +++ b/WordPress/src/main/res/layout/reader_site_header_view.xml @@ -23,7 +23,7 @@ android:id="@+id/image_blavatar" style="@style/ReaderImageView.Avatar" android:layout_centerVertical="true" - android:src="@drawable/bg_rectangle_grey_lighten_20_globe_32dp" + android:src="@drawable/bg_rectangle_neutral_100_globe_32dp" android:layout_marginEnd="@dimen/margin_large" android:contentDescription="@null"/> @@ -97,7 +97,7 @@ android:layout_height="1dp" android:layout_gravity="center_vertical" android:layout_weight="1" - android:background="@color/grey_lighten_20" /> + android:background="@color/neutral_100" /> + android:background="@color/neutral_100" /> diff --git a/WordPress/src/main/res/layout/reader_site_search_result.xml b/WordPress/src/main/res/layout/reader_site_search_result.xml index 274a408d5022..b07182f8aba8 100644 --- a/WordPress/src/main/res/layout/reader_site_search_result.xml +++ b/WordPress/src/main/res/layout/reader_site_search_result.xml @@ -20,7 +20,7 @@ android:layout_width="@dimen/avatar_sz_small" android:layout_height="@dimen/avatar_sz_small" android:contentDescription="@null" - tools:src="@drawable/bg_rectangle_grey_lighten_20_globe_32dp"/> + tools:src="@drawable/bg_rectangle_neutral_100_globe_32dp"/> diff --git a/WordPress/src/main/res/layout/site_settings_tag_list_row.xml b/WordPress/src/main/res/layout/site_settings_tag_list_row.xml index 1a2ee4f42927..2087c6f9b238 100644 --- a/WordPress/src/main/res/layout/site_settings_tag_list_row.xml +++ b/WordPress/src/main/res/layout/site_settings_tag_list_row.xml @@ -42,6 +42,6 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/grey_lighten_20" /> + android:background="@color/neutral_100" /> diff --git a/WordPress/src/main/res/layout/stats_block_activity_item.xml b/WordPress/src/main/res/layout/stats_block_activity_item.xml index 99399748b699..ad9ec5330ebf 100644 --- a/WordPress/src/main/res/layout/stats_block_activity_item.xml +++ b/WordPress/src/main/res/layout/stats_block_activity_item.xml @@ -73,7 +73,7 @@ diff --git a/WordPress/src/main/res/layout/tags_list_row.xml b/WordPress/src/main/res/layout/tags_list_row.xml index 79fde7c60c27..7d83f2f30090 100644 --- a/WordPress/src/main/res/layout/tags_list_row.xml +++ b/WordPress/src/main/res/layout/tags_list_row.xml @@ -22,6 +22,6 @@ android:layout_height="1dp" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/margin_medium" - android:background="@color/grey_lighten_20"/> + android:background="@color/neutral_100"/> diff --git a/WordPress/src/main/res/layout/theme_grid_item.xml b/WordPress/src/main/res/layout/theme_grid_item.xml index a1cb7e0440fd..04def9a6ca20 100644 --- a/WordPress/src/main/res/layout/theme_grid_item.xml +++ b/WordPress/src/main/res/layout/theme_grid_item.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:adjustViewBounds="true" android:contentDescription="@string/theme_image_desc" - tools:src="@drawable/bg_rectangle_grey_lighten_20_themes_100dp"/> + tools:src="@drawable/bg_rectangle_neutral_100_themes_100dp"/> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index bc444f6ba6d9..2376426a06e2 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -10,7 +10,7 @@ @color/blue_light_translucent_80 - @color/grey_lighten_20 + @color/neutral_100 @color/neutral_0 @@ -18,7 +18,6 @@ - @color/neutral_100 @color/neutral_200 @color/neutral_400 @color/neutral_500 diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 2aa5307cabe9..effdcff53e69 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -583,7 +583,7 @@ @@ -748,7 +748,7 @@ diff --git a/WordPress/src/main/res/values/stats_styles.xml b/WordPress/src/main/res/values/stats_styles.xml index e3acd9a13da9..45613bfdbdc3 100644 --- a/WordPress/src/main/res/values/stats_styles.xml +++ b/WordPress/src/main/res/values/stats_styles.xml @@ -61,7 +61,7 @@ diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index effdcff53e69..6d63a4f00b40 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -162,7 +162,7 @@ @@ -650,7 +650,7 @@ wrap_content wrap_content center_vertical - @color/grey_darken_10 + @color/neutral_400 @dimen/text_sz_medium @@ -664,7 +664,7 @@ @@ -757,7 +757,7 @@ @dimen/actionable_empty_view_text_margin_horizontal @dimen/actionable_empty_view_text_maximum_width center - @color/grey_darken_10 + @color/neutral_400 @dimen/text_sz_extra_large diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml index 91bb74067a30..63ea6045fae7 100644 --- a/WordPress/src/main/res/values/styles_calypso.xml +++ b/WordPress/src/main/res/values/styles_calypso.xml @@ -25,7 +25,7 @@ true @style/Calypso.ActionMode.Button @style/Calypso.ActionMode - @color/grey_darken_10 + @color/neutral_400 @color/neutral_0 @style/Calypso.Dialog.Alert @@ -50,7 +50,7 @@ @@ -189,7 +189,7 @@ @dimen/margin_extra_large @dimen/margin_extra_large 8dp - @color/grey_darken_20 + @color/neutral_500 @dimen/text_sz_small @drawable/shape_rectangle_blue_dark diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 6d63a4f00b40..cf29206f1d94 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -315,7 +315,7 @@ true end 1 - @color/grey_darken_20 + @color/neutral_500 @dimen/text_sz_small @dimen/margin_large @dimen/margin_large @@ -455,7 +455,7 @@ wrap_content @dimen/margin_extra_large wrap_content - @color/grey_darken_20 + @color/neutral_500 14sp @@ -506,7 +506,7 @@ match_parent 1 @dimen/content_margin - @color/grey_darken_20 + @color/neutral_500 @dimen/text_sz_medium @@ -600,7 +600,7 @@ wrap_content @dimen/margin_extra_large match_parent - @color/grey_darken_20 + @color/neutral_500 @dimen/text_sz_medium diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml index 63ea6045fae7..5e31cc67dafb 100644 --- a/WordPress/src/main/res/values/styles_calypso.xml +++ b/WordPress/src/main/res/values/styles_calypso.xml @@ -11,13 +11,13 @@ From 732c3c522c989a2ff77d209f7a165afc31d6e52c Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 13:52:40 -0700 Subject: [PATCH 029/167] Update color references from grey darken 30 to neutral 600 --- .../ui/comments/CommentDetailFragment.java | 2 +- .../android/ui/media/MediaGridFragment.java | 2 +- .../ui/photopicker/PhotoPickerFragment.java | 4 ++-- .../NotificationsSettingsFragment.java | 6 +++--- .../android/ui/reader/ReaderResourceVars.java | 2 +- .../android/ui/stats/StatsBarGraph.java | 4 ++-- ...StatsInsightsLatestPostSummaryFragment.java | 2 +- .../stats/StatsSingleItemDetailsActivity.java | 2 +- .../stats/StatsVisitorsAndViewsFragment.java | 2 +- .../img_illustration_site_about_182dp.xml | 18 +++++++++--------- .../img_illustration_site_about_280dp.xml | 18 +++++++++--------- .../res/drawable/tab_divider_wordpress.xml | 2 +- .../stats_insights_all_time_item.xml | 8 ++++---- .../res/layout/reader_include_comment_box.xml | 2 +- .../main/res/layout/start_over_preference.xml | 2 +- .../layout/stats_insights_all_time_item.xml | 8 ++++---- .../stats_insights_most_popular_item.xml | 4 ++-- .../stats_visitors_and_views_fragment.xml | 4 ++-- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles.xml | 6 +++--- 20 files changed, 49 insertions(+), 50 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index a2e4cd415cfa..acadb83c3913 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -662,7 +662,7 @@ public void onClick(View v) { txtName.setOnClickListener(authorListener); txtName.setTextColor(ContextCompat.getColor(getActivity(), R.color.reader_hyperlink)); } else { - txtName.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_darken_30)); + txtName.setTextColor(ContextCompat.getColor(getActivity(), R.color.neutral_600)); } showPostTitle(mSite, mComment.getRemotePostId()); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java index 911347c2f534..1a12c105a13f 100755 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java @@ -791,7 +791,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) { inflater.inflate(R.menu.media_multiselect, menu); setSwipeToRefreshEnabled(false); getAdapter().setInMultiSelect(true); - WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.grey_darken_30); + WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.neutral_600); updateActionModeTitle(selectCount); return true; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java index 3617e7a6567e..0ee46720eedb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java @@ -30,7 +30,6 @@ import org.wordpress.android.ui.media.MediaBrowserType; import org.wordpress.android.ui.photopicker.PhotoPickerAdapter.PhotoPickerAdapterListener; import org.wordpress.android.ui.prefs.EmptyViewRecyclerView; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.AniUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.DisplayUtils; @@ -38,6 +37,7 @@ import org.wordpress.android.util.WPActivityUtils; import org.wordpress.android.util.WPMediaUtils; import org.wordpress.android.util.WPPermissionUtils; +import org.wordpress.android.util.analytics.AnalyticsUtils; import java.util.ArrayList; import java.util.HashMap; @@ -451,7 +451,7 @@ private final class ActionModeCallback implements ActionMode.Callback { @Override public boolean onCreateActionMode(ActionMode actionMode, Menu menu) { mActionMode = actionMode; - WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.grey_darken_30); + WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.neutral_600); MenuInflater inflater = actionMode.getMenuInflater(); inflater.inflate(R.menu.photo_picker_action_mode, menu); hideBottomBar(); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java index a9768972bf26..4e0825cda252 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java @@ -715,7 +715,7 @@ private void addPreferencesForPreferenceScreen(PreferenceScreen preferenceScreen ); timelinePreference.setIcon(ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_bell_white_24dp, - R.color.grey_darken_30)); + R.color.neutral_600)); timelinePreference.setTitle(R.string.notifications_tab); timelinePreference.setDialogTitle(R.string.notifications_tab); timelinePreference.setSummary(R.string.notifications_tab_summary); @@ -727,7 +727,7 @@ private void addPreferencesForPreferenceScreen(PreferenceScreen preferenceScreen ); emailPreference.setIcon(ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_mail_white_24dp, - R.color.grey_darken_30)); + R.color.neutral_600)); emailPreference.setTitle(R.string.email); emailPreference.setDialogTitle(R.string.email); emailPreference.setSummary(R.string.notifications_email_summary); @@ -742,7 +742,7 @@ private void addPreferencesForPreferenceScreen(PreferenceScreen preferenceScreen ); devicePreference.setIcon(ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_phone_white_24dp, - R.color.grey_darken_30)); + R.color.neutral_600)); devicePreference.setTitle(R.string.app_notifications); devicePreference.setDialogTitle(R.string.app_notifications); devicePreference.setSummary(R.string.notifications_push_summary); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderResourceVars.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderResourceVars.java index 22c298db819c..1e5040c792e3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderResourceVars.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderResourceVars.java @@ -40,7 +40,7 @@ class ReaderResourceVars { mMarginMediumPx = resources.getDimensionPixelSize(R.dimen.margin_medium); mLinkColorStr = HtmlUtils.colorResToHtmlColor(context, R.color.reader_hyperlink); - mGreyMediumDarkStr = HtmlUtils.colorResToHtmlColor(context, R.color.grey_darken_30); + mGreyMediumDarkStr = HtmlUtils.colorResToHtmlColor(context, R.color.neutral_600); mGreyLightStr = HtmlUtils.colorResToHtmlColor(context, R.color.neutral_0); mGreyExtraLightStr = HtmlUtils.colorResToHtmlColor(context, R.color.neutral_0); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java index 515de6bc24ce..b4370706c019 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java @@ -144,7 +144,7 @@ public int get(int index) { if (mBarPositionToHighlight == index) { return getResources().getColor(R.color.orange_jazzy); } else { - return getResources().getColor(R.color.grey_darken_30); + return getResources().getColor(R.color.neutral_600); } } } @@ -152,7 +152,7 @@ public int get(int index) { private void setProperties() { GraphViewStyle gStyle = getGraphViewStyle(); gStyle.setHorizontalLabelsIndexDependentColor(new HorizontalLabelsColor()); - gStyle.setHorizontalLabelsColor(getResources().getColor(R.color.grey_darken_30)); + gStyle.setHorizontalLabelsColor(getResources().getColor(R.color.neutral_600)); gStyle.setVerticalLabelsColor(getResources().getColor(R.color.neutral_400)); gStyle.setTextSize(getResources().getDimensionPixelSize(R.dimen.text_sz_extra_small)); gStyle.setGridXColor(Color.TRANSPARENT); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java index 081ea9894bde..c0eff5be96e4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java @@ -226,7 +226,7 @@ private void setupTab(LinearLayout currentTab, String total, if (itemType == StatsVisitorsAndViewsFragment.OverviewLabel.VIEWS) { value.setTextColor(getResources().getColor(R.color.primary_500)); } else { - value.setTextColor(getResources().getColor(R.color.grey_darken_30)); + value.setTextColor(getResources().getColor(R.color.neutral_600)); } } icon = currentTab.findViewById(R.id.stats_visitors_and_views_tab_icon); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java index ed2881d5cf50..a1183a5092f4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java @@ -463,7 +463,7 @@ private void updateUI() { mGraphView.addSeries(mCurrentSeriesOnScreen); // mGraphView.getGraphViewStyle().setNumHorizontalLabels(getNumOfHorizontalLabels(dataToShowOnGraph.length)); mGraphView.getGraphViewStyle().setNumHorizontalLabels(dataToShowOnGraph.length); - mGraphView.getGraphViewStyle().setVerticalLabelsColor(getResources().getColor(R.color.grey_darken_30)); + mGraphView.getGraphViewStyle().setVerticalLabelsColor(getResources().getColor(R.color.neutral_600)); mGraphView.getGraphViewStyle().setMaxColumnWidth( DisplayUtils.dpToPx(this, StatsConstants.STATS_GRAPH_BAR_MAX_COLUMN_WIDTH_DP)); mGraphView.getGraphViewStyle().setTextSize( diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java index 7b3cfa3df4ba..bd414b7ce07f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java @@ -487,7 +487,7 @@ protected void updateUI() { DisplayUtils.dpToPx(getActivity(), StatsConstants.STATS_GRAPH_BAR_MAX_COLUMN_WIDTH_DP)); mGraphView.getGraphViewStyle().setTextSize( getResources().getDimensionPixelOffset(R.dimen.stats_legent_text_size)); - mGraphView.getGraphViewStyle().setVerticalLabelsColor(getResources().getColor(R.color.grey_darken_30)); + mGraphView.getGraphViewStyle().setVerticalLabelsColor(getResources().getColor(R.color.neutral_600)); mGraphView.setHorizontalLabels(horLabels); mGraphView.setAccessibleHorizontalLabels(makeAccessibleHorizontalLabels(horLabels, mainSeriesItems, selectedStatsType)); diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml index 483f2f6332ea..2b78f38dab18 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml @@ -66,7 +66,7 @@ @@ -76,27 +76,27 @@ @@ -111,17 +111,17 @@ diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml index 69fe07ff4f70..5b808c10de42 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml @@ -71,7 +71,7 @@ @@ -81,27 +81,27 @@ @@ -116,17 +116,17 @@ diff --git a/WordPress/src/main/res/drawable/tab_divider_wordpress.xml b/WordPress/src/main/res/drawable/tab_divider_wordpress.xml index c5b828e22dd8..a92f4acc0588 100644 --- a/WordPress/src/main/res/drawable/tab_divider_wordpress.xml +++ b/WordPress/src/main/res/drawable/tab_divider_wordpress.xml @@ -1,6 +1,6 @@ - + diff --git a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml index 2585c025f8fc..235a711123f2 100644 --- a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml +++ b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml @@ -45,7 +45,7 @@ diff --git a/WordPress/src/main/res/layout/start_over_preference.xml b/WordPress/src/main/res/layout/start_over_preference.xml index 11cf74ee3175..8132dd03aee9 100644 --- a/WordPress/src/main/res/layout/start_over_preference.xml +++ b/WordPress/src/main/res/layout/start_over_preference.xml @@ -25,7 +25,7 @@ android:padding="@dimen/start_over_icon_padding" android:contentDescription="@null" android:layout_gravity="center_vertical" - android:tint="@color/grey_darken_30" + android:tint="@color/neutral_600" android:layout_marginEnd="@dimen/start_over_icon_margin_right"/> + android:textColor="@color/neutral_600"/> + android:textColor="@color/neutral_600"/> + android:textColor="@color/neutral_600"/> + android:textColor="@color/neutral_600"/> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 6c8b31dbd605..466ceabd6947 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -18,7 +18,6 @@ - @color/neutral_600 @color/neutral diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index cf29206f1d94..207e48cbbafd 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -278,7 +278,7 @@ @@ -164,7 +164,7 @@ @color/neutral_400 - @color/grey_text_min + @color/neutral @color/primary_500 viewStart start @@ -184,7 +184,7 @@ @@ -257,7 +257,7 @@ @@ -575,8 +575,8 @@ @@ -719,7 +719,7 @@ wrap_content end 1 - @color/grey_text_min + @color/neutral @dimen/text_sz_small diff --git a/WordPress/src/main/res/xml/app_settings.xml b/WordPress/src/main/res/xml/app_settings.xml index 993719cb9f84..b3b50f418099 100644 --- a/WordPress/src/main/res/xml/app_settings.xml +++ b/WordPress/src/main/res/xml/app_settings.xml @@ -21,7 +21,7 @@ android:icon="@drawable/ic_stats_white_24dp" android:layout="@layout/wp_preference_layout" android:title="@string/preference_collect_information" - app:iconTint="@color/grey_text_min"/> + app:iconTint="@color/neutral"/> + app:iconTint="@color/neutral"/> From 8f71fd8708362e8c9608290c454a5c3afc6e366d Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 14:35:16 -0700 Subject: [PATCH 031/167] Update color references from orange jazzy to accent --- .../wordpress/android/ui/comments/CommentDetailFragment.java | 4 ++-- .../android/ui/reader/views/ReaderIconCountView.java | 2 +- .../java/org/wordpress/android/ui/stats/StatsBarGraph.java | 2 +- .../android/ui/stats/StatsVisitorsAndViewsFragment.java | 2 +- .../org/wordpress/android/ui/uploads/PostUploadNotifier.java | 4 ++-- .../java/org/wordpress/android/ui/uploads/UploadUtils.java | 2 +- ...0_selector.xml => neutral_accent_neutral_400_selector.xml} | 2 +- ...notification_badge.xml => bg_oval_accent_stroke_white.xml} | 2 +- WordPress/src/main/res/layout/navbar_item.xml | 2 +- WordPress/src/main/res/layout/reader_icon_count_view.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles_calypso.xml | 2 +- 12 files changed, 13 insertions(+), 14 deletions(-) rename WordPress/src/main/res/color/{neutral_orange_jazzy_neutral_400_selector.xml => neutral_accent_neutral_400_selector.xml} (78%) rename WordPress/src/main/res/drawable/{notification_badge.xml => bg_oval_accent_stroke_white.xml} (82%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index 8689d9c38546..3cfe0fd047a4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -1012,7 +1012,7 @@ private void setModerateButtonForStatus(CommentStatus status) { int color; if (status == CommentStatus.APPROVED) { - color = R.color.orange_jazzy; + color = R.color.accent; mBtnModerateTextView.setText(R.string.comment_status_approved); } else { color = R.color.neutral; @@ -1142,7 +1142,7 @@ private void toggleLikeButton(boolean isLiked) { int drawable; if (isLiked) { - color = R.color.orange_jazzy; + color = R.color.accent; drawable = R.drawable.ic_star_white_24dp; mBtnLikeTextView.setText(getResources().getString(R.string.mnu_comment_liked)); mBtnLikeComment.setActivated(true); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java index b18afa570384..5d0386d94601 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java @@ -55,7 +55,7 @@ private void initView(Context context, AttributeSet attrs) { mImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.reader_button_like)); mImageView.setImageTintList(getResources().getColorStateList( - R.color.neutral_orange_jazzy_neutral_400_selector)); + R.color.neutral_accent_neutral_400_selector)); break; case ICON_COMMENT: mImageView.setImageDrawable(ContextCompat.getDrawable(context, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java index b4370706c019..0bd5e6897cc9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java @@ -142,7 +142,7 @@ public boolean onTouchEvent(MotionEvent event) { private class HorizontalLabelsColor implements IndexDependentColor { public int get(int index) { if (mBarPositionToHighlight == index) { - return getResources().getColor(R.color.orange_jazzy); + return getResources().getColor(R.color.accent); } else { return getResources().getColor(R.color.neutral_600); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java index 632e6999ef7d..0a998c016a15 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java @@ -184,7 +184,7 @@ private class TabViewHolder { public void updateBackGroundAndIcon(int currentValue) { if (mIsChecked) { - mValue.setTextColor(getResources().getColor(R.color.orange_jazzy)); + mValue.setTextColor(getResources().getColor(R.color.accent)); } else { if (currentValue == 0) { mValue.setTextColor(getResources().getColor(R.color.neutral)); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java index 1fcb273b5f98..c854c50874c0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java @@ -489,7 +489,7 @@ void updateNotificationErrorForPost(@NonNull PostModel post, @NonNull SiteModel PendingIntent.FLAG_CANCEL_CURRENT); notificationBuilder.addAction(0, mContext.getString(R.string.retry), actionPendingIntent) - .setColor(mContext.getResources().getColor(R.color.orange_jazzy)); + .setColor(mContext.getResources().getColor(R.color.accent)); } EventBus.getDefault().postSticky(new UploadService.UploadErrorEvent(post, snackbarMessage)); @@ -558,7 +558,7 @@ void updateNotificationErrorForMedia(@NonNull List mediaList, @NonNu PendingIntent.FLAG_CANCEL_CURRENT); notificationBuilder.addAction(0, mContext.getString(R.string.retry), actionPendingIntent) - .setColor(mContext.getResources().getColor(R.color.orange_jazzy)); + .setColor(mContext.getResources().getColor(R.color.accent)); } EventBus.getDefault().postSticky(new UploadService.UploadErrorEvent(mediaList, snackbarMessage)); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java index bf282164ab99..691c4dcdd621 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java @@ -227,7 +227,7 @@ public static void showSnackbarSuccessActionOrange(View view, int messageRes, in View.OnClickListener onClickListener) { Snackbar.make(view, messageRes, Snackbar.LENGTH_LONG) .setAction(buttonTitleRes, onClickListener). - setActionTextColor(view.getResources().getColor(R.color.orange_jazzy)) + setActionTextColor(view.getResources().getColor(R.color.accent)) .show(); } diff --git a/WordPress/src/main/res/color/neutral_orange_jazzy_neutral_400_selector.xml b/WordPress/src/main/res/color/neutral_accent_neutral_400_selector.xml similarity index 78% rename from WordPress/src/main/res/color/neutral_orange_jazzy_neutral_400_selector.xml rename to WordPress/src/main/res/color/neutral_accent_neutral_400_selector.xml index a9a16b76b4d1..4248f6a9d3fa 100644 --- a/WordPress/src/main/res/color/neutral_orange_jazzy_neutral_400_selector.xml +++ b/WordPress/src/main/res/color/neutral_accent_neutral_400_selector.xml @@ -5,7 +5,7 @@ - + diff --git a/WordPress/src/main/res/drawable/notification_badge.xml b/WordPress/src/main/res/drawable/bg_oval_accent_stroke_white.xml similarity index 82% rename from WordPress/src/main/res/drawable/notification_badge.xml rename to WordPress/src/main/res/drawable/bg_oval_accent_stroke_white.xml index 4c3b43ec82b4..ea489eac9742 100644 --- a/WordPress/src/main/res/drawable/notification_badge.xml +++ b/WordPress/src/main/res/drawable/bg_oval_accent_stroke_white.xml @@ -1,7 +1,7 @@ - + diff --git a/WordPress/src/main/res/layout/navbar_item.xml b/WordPress/src/main/res/layout/navbar_item.xml index 7cdeb26d1598..cd3ede7060ec 100644 --- a/WordPress/src/main/res/layout/navbar_item.xml +++ b/WordPress/src/main/res/layout/navbar_item.xml @@ -26,7 +26,7 @@ android:layout_width="12dp" android:layout_height="12dp" android:layout_gravity="top" - android:background="@drawable/notification_badge" + android:background="@drawable/bg_oval_accent_stroke_white" android:visibility="gone" tools:visibility="visible"/> diff --git a/WordPress/src/main/res/layout/reader_icon_count_view.xml b/WordPress/src/main/res/layout/reader_icon_count_view.xml index 45d395d73dab..8a555cf262a2 100644 --- a/WordPress/src/main/res/layout/reader_icon_count_view.xml +++ b/WordPress/src/main/res/layout/reader_icon_count_view.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_extra_small" android:layout_width="wrap_content" - android:textColor="@color/neutral_orange_jazzy_neutral_400_selector" + android:textColor="@color/neutral_accent_neutral_400_selector" android:textSize="@dimen/text_sz_medium" tools:text="2" > diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index a1514dab3883..67edc3715fbe 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -25,7 +25,6 @@ @color/neutral_50 - @color/accent_500 @color/accent_600 @color/accent_400 @color/accent_700 diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml index 5e31cc67dafb..905a9028338d 100644 --- a/WordPress/src/main/res/values/styles_calypso.xml +++ b/WordPress/src/main/res/values/styles_calypso.xml @@ -32,7 +32,7 @@ @style/Calypso.Dialog.Alert @color/primary_400 @color/neutral_100 - @color/orange_jazzy + @color/accent @drawable/preferences_divider @dimen/site_settings_divider_height From e81e9e04d79c62af6b58afeaacd80badfc797fb2 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 14:38:04 -0700 Subject: [PATCH 032/167] Update color references from orange fire to accent 600 --- .../android/ui/stats/StatsVisitorsAndViewsFragment.java | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java index 0a998c016a15..7c562e6e2754 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java @@ -463,7 +463,7 @@ protected void updateUI() { GraphViewSeries secondarySeries = new GraphViewSeries(secondarySeriesItems); secondarySeries.getStyle().padding = DisplayUtils.dpToPx(getActivity(), 10); secondarySeries.getStyle().color = getResources().getColor(R.color.stats_bar_graph_secondary_series); - secondarySeries.getStyle().highlightColor = getResources().getColor(R.color.orange_fire); + secondarySeries.getStyle().highlightColor = getResources().getColor(R.color.accent_600); mGraphView.addSeries(secondarySeries); } diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 67edc3715fbe..456585459da2 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -25,7 +25,6 @@ @color/neutral_50 - @color/accent_600 @color/accent_400 @color/accent_700 From 67d183f9087aa0422ba1ebfaaaebd2e21aa29c5f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 14:40:07 -0700 Subject: [PATCH 033/167] Update color references from orange active to accent 400 --- .../refresh/lists/sections/viewholders/BarChartViewHolder.kt | 4 ++-- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt index 84f3b7bdcb27..bd0945582553 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt @@ -233,7 +233,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( dataSet.isHighlightEnabled = true dataSet.highLightColor = ContextCompat.getColor( context, - color.orange_active + color.accent_400 ) dataSet.highLightAlpha = 255 return dataSet @@ -282,7 +282,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( dataSet.isHighlightEnabled = true dataSet.highLightColor = ContextCompat.getColor( context, - color.orange_active + color.accent_400 ) dataSet.setDrawValues(false) dataSet.highLightAlpha = 51 diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 456585459da2..4cd368b6f668 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -25,7 +25,6 @@ @color/neutral_50 - @color/accent_400 @color/accent_700 From 41d6695fc2b05e5f87139f4449b8faa0cb8db90d Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 14:40:48 -0700 Subject: [PATCH 034/167] Update color references from orange dark active to accent 700 --- .../refresh/lists/sections/viewholders/BarChartViewHolder.kt | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt index bd0945582553..0c5141f21553 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt @@ -256,7 +256,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( dataSet.isHighlightEnabled = true dataSet.highLightColor = ContextCompat.getColor( context, - color.orange_dark_active + color.accent_700 ) dataSet.highLightAlpha = 255 return dataSet diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 4cd368b6f668..8a4edcc2d577 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -25,7 +25,6 @@ @color/neutral_50 - @color/accent_700 @color/warning_500 From acf598d377ab327ad205ff1546479d17cb87459a Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 14:45:52 -0700 Subject: [PATCH 035/167] Update color references from alert yellow to warning 500 --- .../android/ui/plugins/PluginBrowserActivity.java | 2 +- .../wordpress/android/ui/plugins/PluginListFragment.java | 2 +- .../android/ui/stats/StatsSingleItemDetailsActivity.java | 8 ++++---- .../res/layout-sw720dp/stats_insights_all_time_item.xml | 4 ++-- WordPress/src/main/res/layout/main_activity.xml | 2 +- WordPress/src/main/res/layout/plugin_browser_row.xml | 4 ++-- WordPress/src/main/res/layout/plugin_list_row.xml | 4 ++-- .../src/main/res/layout/stats_insights_all_time_item.xml | 4 ++-- WordPress/src/main/res/values/colors.xml | 1 - 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java index f89aec817636..a0a27bb34d53 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java @@ -426,7 +426,7 @@ public void onBindViewHolder(ViewHolder viewHolder, int position) { drawableResId = android.R.color.transparent; } else if (PluginUtils.isUpdateAvailable(plugin)) { textResId = R.string.plugin_needs_update; - colorResId = R.color.alert_yellow; + colorResId = R.color.warning_500; drawableResId = R.drawable.ic_sync_white_24dp; } else if (plugin.isActive()) { textResId = R.string.plugin_active; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java index 276a39e64945..be1f83851f31 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java @@ -270,7 +270,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { drawableResId = android.R.color.transparent; } else if (PluginUtils.isUpdateAvailable(plugin)) { textResId = R.string.plugin_needs_update; - colorResId = R.color.alert_yellow; + colorResId = R.color.warning_500; drawableResId = R.drawable.ic_sync_white_24dp; } else if (plugin.isActive()) { textResId = R.string.plugin_active; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java index a1183a5092f4..a929f98fa4d9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java @@ -597,7 +597,7 @@ public void onClick(View view) { if (currentDay.getCount() == maxReachedValue && maxReachedValue > 0) { holder.imgMore.setVisibility(View.VISIBLE); ColorUtils.INSTANCE.setImageResourceWithTint(holder.imgMore, R.drawable.ic_trophy_white_24dp, - R.color.alert_yellow); + R.color.warning_500); holder.imgMore.setBackgroundColor(Color.TRANSPARENT); // Hide the default click indicator } else { holder.imgMore.setVisibility(View.GONE); @@ -690,7 +690,7 @@ public View getGroupView(final int groupPosition, boolean isExpanded, if (shouldShowTheTrophyIcon) { holder.imgMore.setVisibility(View.VISIBLE); ColorUtils.INSTANCE.setImageResourceWithTint(holder.imgMore, R.drawable.ic_trophy_white_24dp, - R.color.alert_yellow); + R.color.warning_500); holder.imgMore.setBackgroundColor(Color.TRANSPARENT); // Hide the default click indicator } else { holder.imgMore.setVisibility(View.GONE); @@ -782,7 +782,7 @@ public void onClick(View view) { if (currentMonth.getCount() == maxReachedValue && maxReachedValue > 0) { holder.imgMore.setVisibility(View.VISIBLE); ColorUtils.INSTANCE.setImageResourceWithTint(holder.imgMore, R.drawable.ic_trophy_white_24dp, - R.color.alert_yellow); + R.color.warning_500); holder.imgMore.setBackgroundColor(Color.TRANSPARENT); // Hide the default click indicator } else { holder.imgMore.setVisibility(View.GONE); @@ -851,7 +851,7 @@ public View getGroupView(final int groupPosition, boolean isExpanded, if (shouldShowTheTrophyIcon) { holder.imgMore.setVisibility(View.VISIBLE); ColorUtils.INSTANCE.setImageResourceWithTint(holder.imgMore, R.drawable.ic_trophy_white_24dp, - R.color.alert_yellow); + R.color.warning_500); holder.imgMore.setBackgroundColor(Color.TRANSPARENT); // Hide the default click indicator } else { holder.imgMore.setVisibility(View.GONE); diff --git a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml index 235a711123f2..e1edf30805a8 100644 --- a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml +++ b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml @@ -170,11 +170,11 @@ android:layout_marginEnd="3dp" android:contentDescription="@null" android:src="@drawable/ic_trophy_white_24dp" - android:tint="@color/alert_yellow" /> + android:tint="@color/warning_500" /> + tools:tint="@color/warning_500" /> diff --git a/WordPress/src/main/res/layout/plugin_list_row.xml b/WordPress/src/main/res/layout/plugin_list_row.xml index 446c563833aa..ba25b4dcd002 100644 --- a/WordPress/src/main/res/layout/plugin_list_row.xml +++ b/WordPress/src/main/res/layout/plugin_list_row.xml @@ -65,7 +65,7 @@ android:layout_gravity="center_vertical" android:contentDescription="@null" tools:src="@drawable/ic_sync_white_24dp" - tools:tint="@color/alert_yellow" /> + tools:tint="@color/warning_500" /> diff --git a/WordPress/src/main/res/layout/stats_insights_all_time_item.xml b/WordPress/src/main/res/layout/stats_insights_all_time_item.xml index 2fa600d6ce69..802c23e6a4ac 100644 --- a/WordPress/src/main/res/layout/stats_insights_all_time_item.xml +++ b/WordPress/src/main/res/layout/stats_insights_all_time_item.xml @@ -184,11 +184,11 @@ android:layout_marginEnd="3dp" android:contentDescription="@null" android:src="@drawable/ic_trophy_white_24dp" - android:tint="@color/alert_yellow" /> + android:tint="@color/warning_500" /> - @color/warning_500 @color/warning_700 @color/error_500 @color/success_500 From 1110525da4a5de561d68c6ae8ceec03d62292954 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 14:46:40 -0700 Subject: [PATCH 036/167] Update color references from alert yellow dark to warning 700 --- .../java/org/wordpress/android/ui/posts/PostViewHolder.kt | 8 ++++---- WordPress/src/main/res/layout/page_list_item.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt index ce58a3ac5574..e0ba95b19c6c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt @@ -180,23 +180,23 @@ class PostViewHolder(private val view: View, private val config: PostViewHolderC } else if (postAdapterItem.isLocalDraft) { statusTextResId = R.string.local_draft statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_yellow_dark + statusColorResId = R.color.warning_700 } else if (postAdapterItem.isLocallyChanged) { statusTextResId = R.string.local_changes statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_yellow_dark + statusColorResId = R.color.warning_700 } else { when (postAdapterItem.postStatus) { PostStatus.DRAFT -> { statusTextResId = R.string.post_status_draft statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_yellow_dark + statusColorResId = R.color.warning_700 } PostStatus.PRIVATE -> statusTextResId = R.string.post_status_post_private PostStatus.PENDING -> { statusTextResId = R.string.post_status_pending_review statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_yellow_dark + statusColorResId = R.color.warning_700 } PostStatus.SCHEDULED -> { statusTextResId = R.string.post_status_scheduled diff --git a/WordPress/src/main/res/layout/page_list_item.xml b/WordPress/src/main/res/layout/page_list_item.xml index 953ab663e523..fd911bfc7bd6 100644 --- a/WordPress/src/main/res/layout/page_list_item.xml +++ b/WordPress/src/main/res/layout/page_list_item.xml @@ -76,7 +76,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginTop="3dp" - android:textColor="@color/alert_yellow_dark" + android:textColor="@color/warning_700" android:textSize="14sp" app:layout_constraintStart_toEndOf="@+id/time_posted" app:layout_constraintTop_toBottomOf="@+id/page_title" diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index d80793524dfe..ab4c7596375a 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -27,7 +27,6 @@ - @color/warning_700 @color/error_500 @color/success_500 From db2f3650907d01c11593361670b82b68ded0a1ba Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 14:51:20 -0700 Subject: [PATCH 037/167] Update color references from alert red to error 500 --- .../android/ui/activitylog/list/ActivityLogListItem.kt | 2 +- .../wordpress/android/ui/media/MediaBrowserActivity.java | 2 +- .../wordpress/android/ui/people/PeopleInviteFragment.java | 2 +- .../java/org/wordpress/android/ui/posts/PostViewHolder.kt | 6 +++--- .../java/org/wordpress/android/widgets/PostListButton.java | 2 +- .../drawable/{shape_oval_red.xml => bg_oval_error_500.xml} | 2 +- ...hite_16dp.xml => bg_oval_error_500_minus_white_16dp.xml} | 2 +- .../res/drawable/img_site_error_camera_pencils_226dp.xml | 2 +- .../main/res/layout/history_detail_container_fragment.xml | 2 +- WordPress/src/main/res/layout/history_list_item.xml | 2 +- WordPress/src/main/res/layout/people_invite_error_view.xml | 2 +- WordPress/src/main/res/layout/stats_block_value_item.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 13 files changed, 14 insertions(+), 15 deletions(-) rename WordPress/src/main/res/drawable/{shape_oval_red.xml => bg_oval_error_500.xml} (83%) rename WordPress/src/main/res/drawable/{bg_oval_alert_red_minus_white_16dp.xml => bg_oval_error_500_minus_white_16dp.xml} (91%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt index 5b08722b3de5..dd1950e01f22 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt @@ -72,7 +72,7 @@ sealed class ActivityLogListItem(val type: ViewType) { } enum class Status(val value: String, @DrawableRes val color: Int) { - NEGATIVE("error", R.drawable.shape_oval_red), + NEGATIVE("error", R.drawable.bg_oval_error_500), INFO("warning", R.drawable.shape_oval_blue_wordpress), POSITIVE("success", R.drawable.shape_oval_green), NEUTRAL("", R.drawable.shape_oval_grey); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java index 27f897d2e9c6..5f1e0068bd18 100755 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java @@ -241,7 +241,7 @@ private void formatQuotaDiskSpace() { mQuotaText.setText(getString(R.string.media_space_used, quota)); mQuotaText.setTextColor( - getResources().getColor(mSite.getSpacePercentUsed() > 90 ? R.color.alert_red : R.color.neutral)); + getResources().getColor(mSite.getSpacePercentUsed() > 90 ? R.color.error_500 : R.color.neutral)); } private void showQuota(boolean show) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index e41be079900e..aac09848e405 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -513,7 +513,7 @@ private void styleButton(String username, @Nullable String validationResultMessa TextView textView = (TextView) mUsernameButtons.get(username).findViewById(R.id.username); textView.setTextColor(ContextCompat.getColor(getActivity(), validationResultMessage == null ? R.color.neutral_700 - : (validationResultMessage.equals(FLAG_SUCCESS) ? R.color.primary_500 : R.color.alert_red))); + : (validationResultMessage.equals(FLAG_SUCCESS) ? R.color.primary_500 : R.color.error_500))); } private diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt index e0ba95b19c6c..bef900b052a9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt @@ -162,7 +162,7 @@ class PostViewHolder(private val view: View, private val config: PostViewHolderC errorMessage = UploadUtils.getErrorMessageFromPostError(context, false, uploadError.postError) } statusIconResId = R.drawable.ic_cloud_upload_white_24dp - statusColorResId = R.color.alert_red + statusColorResId = R.color.error_500 } else if (postAdapterItem.uploadStatus.isUploading) { statusTextResId = R.string.post_uploading statusIconResId = R.drawable.ic_cloud_upload_white_24dp @@ -176,7 +176,7 @@ class PostViewHolder(private val view: View, private val config: PostViewHolderC } else if (postAdapterItem.isConflicted) { statusTextResId = R.string.local_post_is_conflicted statusIconResId = R.drawable.ic_notice_white_24dp - statusColorResId = R.color.alert_red + statusColorResId = R.color.error_500 } else if (postAdapterItem.isLocalDraft) { statusTextResId = R.string.local_draft statusIconResId = R.drawable.ic_pages_white_24dp @@ -206,7 +206,7 @@ class PostViewHolder(private val view: View, private val config: PostViewHolderC PostStatus.TRASHED -> { statusTextResId = R.string.post_status_trashed statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_red + statusColorResId = R.color.error_500 } PostStatus.UNKNOWN -> { } diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButton.java b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButton.java index cd43d2b9a397..16f60dca6cf7 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButton.java +++ b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButton.java @@ -154,7 +154,7 @@ int getButtonIconResId(int buttonType) { int getTextColorResId(int buttonType) { switch (buttonType) { case BUTTON_RETRY: - return R.color.alert_red; + return R.color.error_500; default: return R.color.primary_500; } diff --git a/WordPress/src/main/res/drawable/shape_oval_red.xml b/WordPress/src/main/res/drawable/bg_oval_error_500.xml similarity index 83% rename from WordPress/src/main/res/drawable/shape_oval_red.xml rename to WordPress/src/main/res/drawable/bg_oval_error_500.xml index 51b98c10f824..0565b056e0a4 100644 --- a/WordPress/src/main/res/drawable/shape_oval_red.xml +++ b/WordPress/src/main/res/drawable/bg_oval_error_500.xml @@ -3,5 +3,5 @@ xmlns:tools="http://schemas.android.com/tools" android:shape="oval" tools:ignore="UnusedResources"> - + diff --git a/WordPress/src/main/res/drawable/bg_oval_alert_red_minus_white_16dp.xml b/WordPress/src/main/res/drawable/bg_oval_error_500_minus_white_16dp.xml similarity index 91% rename from WordPress/src/main/res/drawable/bg_oval_alert_red_minus_white_16dp.xml rename to WordPress/src/main/res/drawable/bg_oval_error_500_minus_white_16dp.xml index 66b6761ac98b..cb879b5ba7bd 100644 --- a/WordPress/src/main/res/drawable/bg_oval_alert_red_minus_white_16dp.xml +++ b/WordPress/src/main/res/drawable/bg_oval_error_500_minus_white_16dp.xml @@ -10,7 +10,7 @@ android:shape="oval" > + android:color="@color/error_500" > diff --git a/WordPress/src/main/res/layout/stats_block_value_item.xml b/WordPress/src/main/res/layout/stats_block_value_item.xml index 60f8d34930b0..eebdaa039c4b 100644 --- a/WordPress/src/main/res/layout/stats_block_value_item.xml +++ b/WordPress/src/main/res/layout/stats_block_value_item.xml @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:textColor="@color/alert_red" + android:textColor="@color/error_500" android:textSize="16sp" android:visibility="gone"/> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index ab4c7596375a..aeaecf8d98d7 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -27,7 +27,6 @@ - @color/error_500 @color/success_500 From 2aeb48726594138c56e0e9b1d641a7b957fff506 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 14:53:05 -0700 Subject: [PATCH 038/167] Update color references from alert green to success 500 --- .../android/ui/activitylog/list/ActivityLogListItem.kt | 2 +- .../wordpress/android/ui/plugins/PluginBrowserActivity.java | 4 ++-- .../org/wordpress/android/ui/plugins/PluginListFragment.java | 4 ++-- .../wordpress/android/ui/reader/views/ReaderFollowButton.java | 2 +- .../{shape_oval_green.xml => bg_oval_success_500.xml} | 2 +- WordPress/src/main/res/layout/stats_block_value_item.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 7 files changed, 8 insertions(+), 9 deletions(-) rename WordPress/src/main/res/drawable/{shape_oval_green.xml => bg_oval_success_500.xml} (82%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt index dd1950e01f22..ed27570b9369 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt @@ -74,7 +74,7 @@ sealed class ActivityLogListItem(val type: ViewType) { enum class Status(val value: String, @DrawableRes val color: Int) { NEGATIVE("error", R.drawable.bg_oval_error_500), INFO("warning", R.drawable.shape_oval_blue_wordpress), - POSITIVE("success", R.drawable.shape_oval_green), + POSITIVE("success", R.drawable.bg_oval_success_500), NEUTRAL("", R.drawable.shape_oval_grey); companion object { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java index a0a27bb34d53..8dad0181d185 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java @@ -422,7 +422,7 @@ public void onBindViewHolder(ViewHolder viewHolder, int position) { boolean isAutoManaged = PluginUtils.isAutoManaged(mViewModel.getSite(), plugin); if (isAutoManaged) { textResId = R.string.plugin_auto_managed; - colorResId = R.color.alert_green; + colorResId = R.color.success_500; drawableResId = android.R.color.transparent; } else if (PluginUtils.isUpdateAvailable(plugin)) { textResId = R.string.plugin_needs_update; @@ -430,7 +430,7 @@ public void onBindViewHolder(ViewHolder viewHolder, int position) { drawableResId = R.drawable.ic_sync_white_24dp; } else if (plugin.isActive()) { textResId = R.string.plugin_active; - colorResId = R.color.alert_green; + colorResId = R.color.success_500; drawableResId = R.drawable.ic_checkmark_white_24dp; } else { textResId = R.string.plugin_inactive; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java index be1f83851f31..b5178eea4f41 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java @@ -266,7 +266,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { @DrawableRes int drawableResId; if (PluginUtils.isAutoManaged(mViewModel.getSite(), plugin)) { textResId = R.string.plugin_auto_managed; - colorResId = R.color.alert_green; + colorResId = R.color.success_500; drawableResId = android.R.color.transparent; } else if (PluginUtils.isUpdateAvailable(plugin)) { textResId = R.string.plugin_needs_update; @@ -274,7 +274,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { drawableResId = R.drawable.ic_sync_white_24dp; } else if (plugin.isActive()) { textResId = R.string.plugin_active; - colorResId = R.color.alert_green; + colorResId = R.color.success_500; drawableResId = R.drawable.ic_checkmark_white_24dp; } else { textResId = R.string.plugin_inactive; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.java index 5384b6577645..d5252defbd12 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.java @@ -77,7 +77,7 @@ private void updateFollowText() { int colorId; if (mIsFollowed) { drawableId = R.drawable.ic_reader_following_white_24dp; - colorId = R.color.alert_green; + colorId = R.color.success_500; } else { drawableId = R.drawable.ic_reader_follow_white_24dp; colorId = R.color.primary_400; diff --git a/WordPress/src/main/res/drawable/shape_oval_green.xml b/WordPress/src/main/res/drawable/bg_oval_success_500.xml similarity index 82% rename from WordPress/src/main/res/drawable/shape_oval_green.xml rename to WordPress/src/main/res/drawable/bg_oval_success_500.xml index 2bcc2a307cd2..421c1c27d170 100644 --- a/WordPress/src/main/res/drawable/shape_oval_green.xml +++ b/WordPress/src/main/res/drawable/bg_oval_success_500.xml @@ -3,5 +3,5 @@ xmlns:tools="http://schemas.android.com/tools" android:shape="oval" tools:ignore="UnusedResources"> - + diff --git a/WordPress/src/main/res/layout/stats_block_value_item.xml b/WordPress/src/main/res/layout/stats_block_value_item.xml index eebdaa039c4b..2123867188ba 100644 --- a/WordPress/src/main/res/layout/stats_block_value_item.xml +++ b/WordPress/src/main/res/layout/stats_block_value_item.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:textColor="@color/alert_green" + android:textColor="@color/success_500" android:textSize="16sp" android:visibility="gone"/> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index aeaecf8d98d7..6c4de0555fa2 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -27,7 +27,6 @@ - @color/success_500 #66000000 From 556d664d6aa9ceb7a28eab9ae5467a7d7c5f6b89 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 15:11:32 -0700 Subject: [PATCH 039/167] Rename drawable resources form shape to bg --- .../android/ui/activitylog/list/ActivityLogListItem.kt | 4 ++-- .../android/ui/notifications/adapters/NotesAdapter.java | 4 ++-- .../wordpress/android/util/image/ImagePlaceholderManager.kt | 2 +- ..._oval_translucent.xml => bg_oval_black_translucent_50.xml} | 0 .../{shape_oval_grey_light.xml => bg_oval_neutral_0.xml} | 0 ...hape_oval_white.xml => bg_oval_neutral_0_stroke_white.xml} | 0 .../drawable/{shape_oval_grey.xml => bg_oval_neutral_300.xml} | 0 .../drawable/{shape_oval_blue.xml => bg_oval_primary_400.xml} | 0 ...te_stroke.xml => bg_oval_primary_400_stroke_neutral_0.xml} | 0 ...{shape_oval_blue_wordpress.xml => bg_oval_primary_500.xml} | 0 .../drawable/{shape_oval_orange.xml => bg_oval_warning.xml} | 0 ...tangle_blue_dark.xml => bg_rectangle_primary_700_16dp.xml} | 0 .../src/main/res/layout/activity_log_list_event_item.xml | 2 +- .../src/main/res/layout/activity_log_list_progress_item.xml | 2 +- WordPress/src/main/res/layout/comment_listitem.xml | 2 +- WordPress/src/main/res/layout/me_fragment.xml | 2 +- WordPress/src/main/res/layout/notifications_list_item.xml | 2 +- .../src/main/res/layout/reader_post_detail_header_view.xml | 2 +- WordPress/src/main/res/values/stats_styles.xml | 2 +- 19 files changed, 12 insertions(+), 12 deletions(-) rename WordPress/src/main/res/drawable/{shape_oval_translucent.xml => bg_oval_black_translucent_50.xml} (100%) rename WordPress/src/main/res/drawable/{shape_oval_grey_light.xml => bg_oval_neutral_0.xml} (100%) rename WordPress/src/main/res/drawable/{shape_oval_white.xml => bg_oval_neutral_0_stroke_white.xml} (100%) rename WordPress/src/main/res/drawable/{shape_oval_grey.xml => bg_oval_neutral_300.xml} (100%) rename WordPress/src/main/res/drawable/{shape_oval_blue.xml => bg_oval_primary_400.xml} (100%) rename WordPress/src/main/res/drawable/{shape_oval_blue_white_stroke.xml => bg_oval_primary_400_stroke_neutral_0.xml} (100%) rename WordPress/src/main/res/drawable/{shape_oval_blue_wordpress.xml => bg_oval_primary_500.xml} (100%) rename WordPress/src/main/res/drawable/{shape_oval_orange.xml => bg_oval_warning.xml} (100%) rename WordPress/src/main/res/drawable/{shape_rectangle_blue_dark.xml => bg_rectangle_primary_700_16dp.xml} (100%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt index ed27570b9369..0008301bd4f3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt @@ -73,9 +73,9 @@ sealed class ActivityLogListItem(val type: ViewType) { enum class Status(val value: String, @DrawableRes val color: Int) { NEGATIVE("error", R.drawable.bg_oval_error_500), - INFO("warning", R.drawable.shape_oval_blue_wordpress), + INFO("warning", R.drawable.bg_oval_primary_500), POSITIVE("success", R.drawable.bg_oval_success_500), - NEUTRAL("", R.drawable.shape_oval_grey); + NEUTRAL("", R.drawable.bg_oval_neutral_300); companion object { private val map = Status.values().associateBy(Status::value) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java index bd50a28fe21d..762ff2eb84c1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java @@ -285,9 +285,9 @@ public void onBindViewHolder(NoteViewHolder noteViewHolder, int position) { String noticonCharacter = note.getNoticonCharacter(); noteViewHolder.mNoteIcon.setText(noticonCharacter); if (commentStatus == CommentStatus.UNAPPROVED) { - noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.shape_oval_orange); + noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.bg_oval_warning); } else if (isUnread) { - noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.shape_oval_blue_white_stroke); + noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.bg_oval_primary_400_stroke_neutral_0); } else { noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.bg_oval_neutral_200_stroke_white); } diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt index aa23ee2117f6..2f7411cd753d 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt @@ -25,7 +25,7 @@ class ImagePlaceholderManager @Inject constructor() { fun getPlaceholderResource(imgType: ImageType): Int? { return when (imgType) { - ImageType.AVATAR -> R.drawable.shape_oval_grey_light + ImageType.AVATAR -> R.drawable.bg_oval_neutral_0 ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_grey_user_32dp ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp ImageType.BLAVATAR -> R.color.neutral_0 diff --git a/WordPress/src/main/res/drawable/shape_oval_translucent.xml b/WordPress/src/main/res/drawable/bg_oval_black_translucent_50.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_oval_translucent.xml rename to WordPress/src/main/res/drawable/bg_oval_black_translucent_50.xml diff --git a/WordPress/src/main/res/drawable/shape_oval_grey_light.xml b/WordPress/src/main/res/drawable/bg_oval_neutral_0.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_oval_grey_light.xml rename to WordPress/src/main/res/drawable/bg_oval_neutral_0.xml diff --git a/WordPress/src/main/res/drawable/shape_oval_white.xml b/WordPress/src/main/res/drawable/bg_oval_neutral_0_stroke_white.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_oval_white.xml rename to WordPress/src/main/res/drawable/bg_oval_neutral_0_stroke_white.xml diff --git a/WordPress/src/main/res/drawable/shape_oval_grey.xml b/WordPress/src/main/res/drawable/bg_oval_neutral_300.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_oval_grey.xml rename to WordPress/src/main/res/drawable/bg_oval_neutral_300.xml diff --git a/WordPress/src/main/res/drawable/shape_oval_blue.xml b/WordPress/src/main/res/drawable/bg_oval_primary_400.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_oval_blue.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_400.xml diff --git a/WordPress/src/main/res/drawable/shape_oval_blue_white_stroke.xml b/WordPress/src/main/res/drawable/bg_oval_primary_400_stroke_neutral_0.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_oval_blue_white_stroke.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_400_stroke_neutral_0.xml diff --git a/WordPress/src/main/res/drawable/shape_oval_blue_wordpress.xml b/WordPress/src/main/res/drawable/bg_oval_primary_500.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_oval_blue_wordpress.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_500.xml diff --git a/WordPress/src/main/res/drawable/shape_oval_orange.xml b/WordPress/src/main/res/drawable/bg_oval_warning.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_oval_orange.xml rename to WordPress/src/main/res/drawable/bg_oval_warning.xml diff --git a/WordPress/src/main/res/drawable/shape_rectangle_blue_dark.xml b/WordPress/src/main/res/drawable/bg_rectangle_primary_700_16dp.xml similarity index 100% rename from WordPress/src/main/res/drawable/shape_rectangle_blue_dark.xml rename to WordPress/src/main/res/drawable/bg_rectangle_primary_700_16dp.xml diff --git a/WordPress/src/main/res/layout/activity_log_list_event_item.xml b/WordPress/src/main/res/layout/activity_log_list_event_item.xml index 97aa4a5f62c5..a7ded1d9637d 100644 --- a/WordPress/src/main/res/layout/activity_log_list_event_item.xml +++ b/WordPress/src/main/res/layout/activity_log_list_event_item.xml @@ -26,7 +26,7 @@ android:layout_margin="@dimen/activity_log_icon_margin" android:layout_width="@dimen/activity_log_icon_size" android:padding="@dimen/margin_medium" - tools:background="@drawable/shape_oval_grey" + tools:background="@drawable/bg_oval_neutral_300" tools:src="@drawable/ic_comment_white_24dp" > diff --git a/WordPress/src/main/res/layout/activity_log_list_progress_item.xml b/WordPress/src/main/res/layout/activity_log_list_progress_item.xml index 3f594a455bbf..45ef6f505c5d 100644 --- a/WordPress/src/main/res/layout/activity_log_list_progress_item.xml +++ b/WordPress/src/main/res/layout/activity_log_list_progress_item.xml @@ -19,7 +19,7 @@ diff --git a/WordPress/src/main/res/values/stats_styles.xml b/WordPress/src/main/res/values/stats_styles.xml index 754f5ba54906..5351354f2f0c 100644 --- a/WordPress/src/main/res/values/stats_styles.xml +++ b/WordPress/src/main/res/values/stats_styles.xml @@ -191,7 +191,7 @@ 8dp @color/neutral_500 @dimen/text_sz_small - @drawable/shape_rectangle_blue_dark + @drawable/bg_rectangle_primary_700_16dp From 17806739723905f7e66c29b4c863ef1f52885814 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 16:04:57 -0700 Subject: [PATCH 054/167] Rename color from action mode status bar tint to status bar action mode --- .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java | 2 +- WordPress/src/main/res/values/colors.xml | 2 +- libs/login/WordPressLoginFlow/src/main/res/values/colors.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java index 4c71af531318..f357e3a5a50c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java @@ -1841,7 +1841,7 @@ public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) { @Override public boolean onCreateActionMode(ActionMode actionMode, Menu menu) { - WPActivityUtils.setStatusBarColor(mDialog.getWindow(), R.color.action_mode_status_bar_tint); + WPActivityUtils.setStatusBarColor(mDialog.getWindow(), R.color.status_bar_action_mode); mActionMode = actionMode; MenuInflater inflater = actionMode.getMenuInflater(); inflater.inflate(R.menu.list_editor, menu); diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index e572f92e66fb..fb97f61613b2 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -39,7 +39,7 @@ @color/primary_dark - @color/neutral + @color/neutral @color/neutral_600 diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml b/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml index deb880aaf326..35ba79acb7af 100644 --- a/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml +++ b/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml @@ -92,7 +92,7 @@ #006b98 - #ff517188 + #ff517188 @color/blue_medium From 14600216a6b5dcde9eb625fb29f928181f2176da Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 16:49:44 -0700 Subject: [PATCH 055/167] Rename color from stats text color to text --- .../org/wordpress/android/ui/stats/StatsCommentsFragment.java | 2 +- .../wordpress/android/ui/stats/StatsFollowersFragment.java | 2 +- .../wordpress/android/ui/stats/StatsSearchTermsFragment.java | 2 +- .../java/org/wordpress/android/ui/stats/StatsViewHolder.java | 2 +- WordPress/src/main/res/layout/stats_list_cell.xml | 4 ++-- .../src/main/res/layout/stats_top_module_pager_button.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java index 50cd0c373eb5..7718314c270a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java @@ -220,7 +220,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) { final StatsViewHolder holder = (StatsViewHolder) rowView.getTag(); // entries - holder.setEntryText(currentRowData.getName(), getResources().getColor(R.color.stats_text_color)); + holder.setEntryText(currentRowData.getName(), getResources().getColor(R.color.text)); // totals holder.totalsTextView.setText(FormatUtils.formatDecimal(currentRowData.getViews())); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java index 860eb32a9295..e6c4b9ce000f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java @@ -332,7 +332,7 @@ public View getView(int position, View convertView, ViewGroup parent) { final FollowerModel currentRowData = mList.get(position); final StatsViewHolder holder = (StatsViewHolder) rowView.getTag(); - holder.entryTextView.setTextColor(mContext.getResources().getColor(R.color.stats_text_color)); + holder.entryTextView.setTextColor(mContext.getResources().getColor(R.color.text)); holder.rowContent.setClickable(false); final FollowDataModel followData = currentRowData.getFollowData(); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java index f4952355b795..a297a6177c67 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java @@ -196,7 +196,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) { holder.setEntryTextOrLink(UNKNOWN_SEARCH_TERMS_HELP_PAGE, getString(R.string.stats_search_terms_unknown_search_terms)); } else { - holder.setEntryText(term, getResources().getColor(R.color.stats_text_color)); + holder.setEntryText(term, getResources().getColor(R.color.text)); } // totals diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java index 45832d6a374c..9856ad820e9b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java @@ -51,7 +51,7 @@ public void setEntryTextOrLink(final String linkURL, String linkName) { entryTextView.setText(linkName); if (TextUtils.isEmpty(linkURL)) { - entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.stats_text_color)); + entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.text)); rowContent.setClickable(false); return; } diff --git a/WordPress/src/main/res/layout/stats_list_cell.xml b/WordPress/src/main/res/layout/stats_list_cell.xml index 170e083e4685..45b724a919e0 100644 --- a/WordPress/src/main/res/layout/stats_list_cell.xml +++ b/WordPress/src/main/res/layout/stats_list_cell.xml @@ -70,7 +70,7 @@ android:maxLines="3" android:gravity="center_vertical|start" android:autoLink="none" - android:textColor="@color/stats_text_color" + android:textColor="@color/text" android:textColorLink="@color/stats_link_text_color" android:textColorHighlight="@android:color/transparent" android:textAlignment="viewStart" @@ -100,7 +100,7 @@ android:id="@+id/stats_list_cell_total" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/stats_text_color" + android:textColor="@color/text" android:textSize="@dimen/text_sz_medium" /> diff --git a/WordPress/src/main/res/layout/stats_top_module_pager_button.xml b/WordPress/src/main/res/layout/stats_top_module_pager_button.xml index ffd003bfbd19..f621f468b831 100644 --- a/WordPress/src/main/res/layout/stats_top_module_pager_button.xml +++ b/WordPress/src/main/res/layout/stats_top_module_pager_button.xml @@ -2,7 +2,7 @@ @color/white - @color/neutral_800 @color/accent @color/neutral @color/neutral From 796bb512d6d267be3de6f78e275b97011c178222 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 16:54:27 -0700 Subject: [PATCH 056/167] Rename color from stats link text color to link stats --- .../wordpress/android/ui/stats/StatsAuthorsFragment.java | 2 +- .../org/wordpress/android/ui/stats/StatsClicksFragment.java | 2 +- .../wordpress/android/ui/stats/StatsFollowersFragment.java | 2 +- .../ui/stats/StatsInsightsLatestPostSummaryFragment.java | 4 ++-- .../android/ui/stats/StatsInsightsTodayFragment.java | 2 +- .../wordpress/android/ui/stats/StatsReferrersFragment.java | 2 +- .../android/ui/stats/StatsSingleItemDetailsActivity.java | 6 +++--- .../android/ui/stats/StatsTagsAndCategoriesFragment.java | 2 +- .../org/wordpress/android/ui/stats/StatsViewHolder.java | 4 ++-- WordPress/src/main/res/layout-sw720dp/stats_activity.xml | 2 +- WordPress/src/main/res/layout/stats_activity.xml | 2 +- WordPress/src/main/res/layout/stats_list_cell.xml | 2 +- WordPress/src/main/res/layout/stats_pagination_item.xml | 4 ++-- WordPress/src/main/res/values/colors.xml | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java index 0a1a99bc12e9..bf0aee08b031 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java @@ -240,7 +240,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, String icon = group.getAvatar(); int children = getChildrenCount(groupPosition); - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); // totals holder.totalsTextView.setText(FormatUtils.formatDecimal(total)); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java index d9ecc91a3dab..10b6016f4419 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java @@ -229,7 +229,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, int children = getChildrenCount(groupPosition); if (children > 0) { - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); } else { holder.setEntryTextOrLink(url, name); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java index e6c4b9ce000f..e84656428690 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java @@ -367,7 +367,7 @@ public void onClick(View view) { // Open the in-app web browser holder.setEntryTextOrLink(currentRowData.getURL(), currentRowData.getLabel()); } - holder.entryTextView.setTextColor(mContext.getResources().getColor(R.color.stats_link_text_color)); + holder.entryTextView.setTextColor(mContext.getResources().getColor(R.color.link_stats)); } else { // Email followers, or wpcom followers with empty URL and no blogID holder.setEntryText(currentRowData.getLabel()); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java index 499c2311d633..c8c9b17825b3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java @@ -136,7 +136,7 @@ protected void updateUI() { TextView moduleTitle = (TextView) getView().findViewById(R.id.stats_module_title); moduleTitle.setOnClickListener(mViewsTabOnClickListener); - moduleTitle.setTextColor(getResources().getColor(R.color.stats_link_text_color)); + moduleTitle.setTextColor(getResources().getColor(R.color.link_stats)); // update the tabs and the text now LinearLayout ll = (LinearLayout) getActivity().getLayoutInflater() @@ -161,7 +161,7 @@ protected void updateUI() { endIndex = startIndex + postTitle.length() + 1; Spannable descriptionTextToSpan = new SpannableString(trendLabelFormatted); - descriptionTextToSpan.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.stats_link_text_color)), + descriptionTextToSpan.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.link_stats)), startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); TextView trendLabelTextField = ll.findViewById(R.id.stats_post_trend_label); trendLabelTextField.setText(descriptionTextToSpan); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsTodayFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsTodayFragment.java index 167f66209cd0..17f60c302962 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsTodayFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsTodayFragment.java @@ -46,7 +46,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa TextView moduleTitle = view.findViewById(R.id.stats_module_title); moduleTitle.setTag(StatsVisitorsAndViewsFragment.OverviewLabel.VIEWS); moduleTitle.setOnClickListener(mButtonsOnClickListener); - moduleTitle.setTextColor(getResources().getColor(R.color.stats_link_text_color)); + moduleTitle.setTextColor(getResources().getColor(R.color.link_stats)); return view; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java index f0eae1812a26..0cce2633b366 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java @@ -285,7 +285,7 @@ public View getGroupView(final int groupPosition, boolean isExpanded, int children = getChildrenCount(groupPosition); if (children > 0) { - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); } else { holder.setEntryTextOrLink(url, name); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java index a929f98fa4d9..2949c14be515 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java @@ -219,7 +219,7 @@ public void run() { mStatsForLabel.setText(mItemTitle != null ? mItemTitle : mItemURL); // make the label clickable if the URL is available if (mItemURL != null) { - mStatsForLabel.setTextColor(getResources().getColor(R.color.stats_link_text_color)); + mStatsForLabel.setTextColor(getResources().getColor(R.color.link_stats)); mStatsForLabel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -674,7 +674,7 @@ public View getGroupView(final int groupPosition, boolean isExpanded, StatsConstants.STATS_INPUT_DATE_FORMAT, GROUP_DATE_FORMAT); } - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); holder.networkImageView.setVisibility(View.GONE); @@ -846,7 +846,7 @@ public View getGroupView(final int groupPosition, boolean isExpanded, } } - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); if (shouldShowTheTrophyIcon) { holder.imgMore.setVisibility(View.VISIBLE); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java index 185023ebc29d..5d41f01955d5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java @@ -243,7 +243,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, int children = getChildrenCount(groupPosition); if (children > 0) { - holder.setEntryText(groupName.toString(), getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(groupName.toString(), getResources().getColor(R.color.link_stats)); } else { holder.setEntryTextOrLink(tags.get(0).getLink(), groupName.toString()); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java index 9856ad820e9b..ea2ea9bf7e42 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java @@ -85,7 +85,7 @@ public void onClick(View view) { } ); - entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.stats_link_text_color)); + entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.link_stats)); } public void setEntryText(String text) { @@ -116,7 +116,7 @@ public void onClick(View view) { ActivityLauncher.viewStatsSinglePostDetails(view.getContext(), currentItem); } }); - entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.stats_link_text_color)); + entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.link_stats)); } /* diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml index 60fdfb0509dd..d60707e56043 100644 --- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml +++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml @@ -251,7 +251,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_small" - android:textColor="@color/stats_link_text_color" + android:textColor="@color/link_stats" android:gravity="start" android:textAlignment="viewStart" android:textSize="@dimen/text_sz_small" diff --git a/WordPress/src/main/res/layout/stats_activity.xml b/WordPress/src/main/res/layout/stats_activity.xml index dd8dbb7db808..5ee574090859 100644 --- a/WordPress/src/main/res/layout/stats_activity.xml +++ b/WordPress/src/main/res/layout/stats_activity.xml @@ -208,7 +208,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_small" - android:textColor="@color/stats_link_text_color" + android:textColor="@color/link_stats" android:gravity="start" android:textAlignment="viewStart" android:textSize="@dimen/text_sz_small" diff --git a/WordPress/src/main/res/layout/stats_list_cell.xml b/WordPress/src/main/res/layout/stats_list_cell.xml index 45b724a919e0..15ee9e809744 100644 --- a/WordPress/src/main/res/layout/stats_list_cell.xml +++ b/WordPress/src/main/res/layout/stats_list_cell.xml @@ -71,7 +71,7 @@ android:gravity="center_vertical|start" android:autoLink="none" android:textColor="@color/text" - android:textColorLink="@color/stats_link_text_color" + android:textColorLink="@color/link_stats" android:textColorHighlight="@android:color/transparent" android:textAlignment="viewStart" android:textSize="@dimen/text_sz_medium" /> diff --git a/WordPress/src/main/res/layout/stats_pagination_item.xml b/WordPress/src/main/res/layout/stats_pagination_item.xml index c991c3221b00..7d854433bb9d 100644 --- a/WordPress/src/main/res/layout/stats_pagination_item.xml +++ b/WordPress/src/main/res/layout/stats_pagination_item.xml @@ -15,7 +15,7 @@ android:layout_weight="1" android:background="?android:selectableItemBackground" android:text="@string/previous_button" - android:textColor="@color/stats_link_text_color" /> + android:textColor="@color/link_stats" /> + android:textColor="@color/link_stats" /> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 72098a843bca..76917589c6da 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -59,7 +59,7 @@ @color/white - @color/accent + @color/accent @color/neutral @color/neutral @color/primary From da7d8ad74bd59ba0bf66c15b266155703c4d1315 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 16:55:08 -0700 Subject: [PATCH 057/167] Update color references from stats module content list header to neutral --- .../src/main/res/layout/stats_expandable_list_fragment.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/stats_styles.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/res/layout/stats_expandable_list_fragment.xml b/WordPress/src/main/res/layout/stats_expandable_list_fragment.xml index d06be1717de7..24447252458e 100644 --- a/WordPress/src/main/res/layout/stats_expandable_list_fragment.xml +++ b/WordPress/src/main/res/layout/stats_expandable_list_fragment.xml @@ -50,7 +50,7 @@ @color/accent - @color/neutral @color/neutral @color/primary @color/accent diff --git a/WordPress/src/main/res/values/stats_styles.xml b/WordPress/src/main/res/values/stats_styles.xml index 5351354f2f0c..4f5939392464 100644 --- a/WordPress/src/main/res/values/stats_styles.xml +++ b/WordPress/src/main/res/values/stats_styles.xml @@ -2,7 +2,7 @@ From 9146328abaca1fadd562ca389467f057e66909a2 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 18:01:51 -0700 Subject: [PATCH 076/167] Update color references from comment status unapproved to accent --- .../java/org/wordpress/android/ui/comments/CommentAdapter.java | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java index 2252508c1556..c11ef4b54246 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java @@ -132,7 +132,7 @@ public boolean onLongClick(View v) { mSite = site; mStatusColorSpam = ContextCompat.getColor(context, R.color.comment_status_spam); - mStatusColorUnapproved = ContextCompat.getColor(context, R.color.comment_status_unapproved); + mStatusColorUnapproved = ContextCompat.getColor(context, R.color.accent); mUnselectedColor = ContextCompat.getColor(context, android.R.color.white); mSelectedColor = ContextCompat.getColor(context, R.color.gray_50); diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 4b02dfae3184..6faecc316fc6 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -68,7 +68,6 @@ @color/primary - @color/accent @color/error From c3dd9ad20c57b175874bfdc2e543fd1d773b6019 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 18:02:57 -0700 Subject: [PATCH 077/167] Update color references from comment status spam to error --- .../org/wordpress/android/ui/comments/CommentAdapter.java | 2 +- .../wordpress/android/ui/comments/CommentDetailFragment.java | 4 ++-- WordPress/src/main/res/values/colors.xml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java index c11ef4b54246..2f57aeb4c511 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java @@ -131,7 +131,7 @@ public boolean onLongClick(View v) { mSite = site; - mStatusColorSpam = ContextCompat.getColor(context, R.color.comment_status_spam); + mStatusColorSpam = ContextCompat.getColor(context, R.color.error); mStatusColorUnapproved = ContextCompat.getColor(context, R.color.accent); mUnselectedColor = ContextCompat.getColor(context, android.R.color.white); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index 8d6062fd9c0a..b3b0daf3d7db 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -913,12 +913,12 @@ private void updateStatusViews() { break; case SPAM: statusTextResId = R.string.comment_status_spam; - statusColor = ContextCompat.getColor(getActivity(), R.color.comment_status_spam); + statusColor = ContextCompat.getColor(getActivity(), R.color.error); break; case TRASH: default: statusTextResId = R.string.comment_status_trash; - statusColor = ContextCompat.getColor(getActivity(), R.color.comment_status_spam); + statusColor = ContextCompat.getColor(getActivity(), R.color.error); break; } diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 6faecc316fc6..462af50ef219 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -68,7 +68,6 @@ @color/primary - @color/error @color/warning From c73d7c8bd4395c6cf02c0de98cac3048651a5d21 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 18:42:41 -0700 Subject: [PATCH 078/167] Update color references from notification status unapproved to warning --- .../android/ui/notifications/blocks/CommentUserNoteBlock.java | 4 ++-- ...ved_background.xml => bg_rectangle_unapproved_warning.xml} | 2 +- ...ckground.xml => bg_rectangle_unapproved_warning_white.xml} | 2 +- WordPress/src/main/res/drawable/bg_oval_warning.xml | 2 +- ...ved_background.xml => bg_rectangle_unapproved_warning.xml} | 2 +- ...ckground.xml => bg_rectangle_unapproved_warning_white.xml} | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 7 files changed, 7 insertions(+), 8 deletions(-) rename WordPress/src/main/res/drawable-ldrtl/{comment_unapproved_background.xml => bg_rectangle_unapproved_warning.xml} (86%) rename WordPress/src/main/res/drawable-ldrtl/{comment_reply_unapproved_background.xml => bg_rectangle_unapproved_warning_white.xml} (89%) rename WordPress/src/main/res/drawable/{comment_unapproved_background.xml => bg_rectangle_unapproved_warning.xml} (86%) rename WordPress/src/main/res/drawable/{comment_reply_unapproved_background.xml => bg_rectangle_unapproved_warning_white.xml} (89%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java index fad790d041d3..a8cd1bd0ea3f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java @@ -133,9 +133,9 @@ public void onClick(View v) { if (mCommentStatus == CommentStatus.UNAPPROVED) { if (hasCommentNestingLevel()) { paddingStart = mIndentedLeftPadding; - view.setBackgroundResource(R.drawable.comment_reply_unapproved_background); + view.setBackgroundResource(R.drawable.bg_rectangle_unapproved_warning_white); } else { - view.setBackgroundResource(R.drawable.comment_unapproved_background); + view.setBackgroundResource(R.drawable.bg_rectangle_unapproved_warning); } noteBlockHolder.mDividerView.setVisibility(View.INVISIBLE); diff --git a/WordPress/src/main/res/drawable-ldrtl/comment_unapproved_background.xml b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning.xml similarity index 86% rename from WordPress/src/main/res/drawable-ldrtl/comment_unapproved_background.xml rename to WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning.xml index 81bbe08909bd..9a12a4653cde 100644 --- a/WordPress/src/main/res/drawable-ldrtl/comment_unapproved_background.xml +++ b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable-ldrtl/comment_reply_unapproved_background.xml b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning_white.xml similarity index 89% rename from WordPress/src/main/res/drawable-ldrtl/comment_reply_unapproved_background.xml rename to WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning_white.xml index a0fde27ce512..3589b784c4a0 100644 --- a/WordPress/src/main/res/drawable-ldrtl/comment_reply_unapproved_background.xml +++ b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning_white.xml @@ -8,7 +8,7 @@ - + diff --git a/WordPress/src/main/res/drawable/bg_oval_warning.xml b/WordPress/src/main/res/drawable/bg_oval_warning.xml index 943e969676d3..ffa4c3352e8e 100644 --- a/WordPress/src/main/res/drawable/bg_oval_warning.xml +++ b/WordPress/src/main/res/drawable/bg_oval_warning.xml @@ -1,4 +1,4 @@ - + diff --git a/WordPress/src/main/res/drawable/comment_unapproved_background.xml b/WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning.xml similarity index 86% rename from WordPress/src/main/res/drawable/comment_unapproved_background.xml rename to WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning.xml index 94dd3ca54d5d..803b18826559 100644 --- a/WordPress/src/main/res/drawable/comment_unapproved_background.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/comment_reply_unapproved_background.xml b/WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning_white.xml similarity index 89% rename from WordPress/src/main/res/drawable/comment_reply_unapproved_background.xml rename to WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning_white.xml index ab7b9adcf4e6..ae1584d23ee9 100644 --- a/WordPress/src/main/res/drawable/comment_reply_unapproved_background.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning_white.xml @@ -8,7 +8,7 @@ - + diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 462af50ef219..b5eddc1b5b1f 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -70,7 +70,6 @@ - @color/warning @color/warning_600 @color/warning_0 From f0506672b2bcbf3b0c9dab885bab8e84bcdad6e8 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 18:43:19 -0700 Subject: [PATCH 079/167] Update color references from notification status unapproved dark to warning 600 --- .../wordpress/android/ui/comments/CommentDetailFragment.java | 4 ++-- .../android/ui/notifications/blocks/CommentUserNoteBlock.java | 2 +- .../main/res/layout/stats_activity_single_post_details.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index b3b0daf3d7db..baf72b4ad0c9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -905,11 +905,11 @@ private void updateStatusViews() { switch (commentStatus) { case APPROVED: statusTextResId = R.string.comment_status_approved; - statusColor = ContextCompat.getColor(getActivity(), R.color.notification_status_unapproved_dark); + statusColor = ContextCompat.getColor(getActivity(), R.color.warning_600); break; case UNAPPROVED: statusTextResId = R.string.comment_status_unapproved; - statusColor = ContextCompat.getColor(getActivity(), R.color.notification_status_unapproved_dark); + statusColor = ContextCompat.getColor(getActivity(), R.color.warning_600); break; case SPAM: statusTextResId = R.string.comment_status_spam; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java index a8cd1bd0ea3f..53f49f7ea818 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java @@ -252,7 +252,7 @@ public void configureResources(Context context) { mNormalTextColor = context.getResources().getColor(R.color.neutral_700); mNormalBackgroundColor = context.getResources().getColor(android.R.color.white); mAgoTextColor = context.getResources().getColor(R.color.neutral); - mUnapprovedTextColor = context.getResources().getColor(R.color.notification_status_unapproved_dark); + mUnapprovedTextColor = context.getResources().getColor(R.color.warning_600); // Double margin_extra_large for increased indent in comment replies mIndentedLeftPadding = context.getResources().getDimensionPixelSize(R.dimen.margin_extra_large) * 2; } diff --git a/WordPress/src/main/res/layout/stats_activity_single_post_details.xml b/WordPress/src/main/res/layout/stats_activity_single_post_details.xml index 2783d88d8739..75b38b8968df 100644 --- a/WordPress/src/main/res/layout/stats_activity_single_post_details.xml +++ b/WordPress/src/main/res/layout/stats_activity_single_post_details.xml @@ -75,7 +75,7 @@ style="@style/StatsInsightsLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/notification_status_unapproved_dark" + android:textColor="@color/warning_600" android:text="@string/stats_default_number_zero" android:layout_alignParentEnd="true"/> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index b5eddc1b5b1f..36565ef928a3 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -70,7 +70,6 @@ - @color/warning_600 @color/warning_0 From 8bf39bb816e8c41ce4a61a349754b40259d41d10 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 18:44:47 -0700 Subject: [PATCH 080/167] Update color references from notification status unapproved background to warning 0 --- .../android/ui/notifications/blocks/CommentUserNoteBlock.java | 4 ++-- ...pproved_warning.xml => bg_rectangle_warning_0_warning.xml} | 2 +- ...ing_white.xml => bg_rectangle_warning_0_warning_white.xml} | 2 +- ...pproved_warning.xml => bg_rectangle_warning_0_warning.xml} | 2 +- ...ing_white.xml => bg_rectangle_warning_0_warning_white.xml} | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 6 files changed, 6 insertions(+), 7 deletions(-) rename WordPress/src/main/res/drawable-ldrtl/{bg_rectangle_unapproved_warning.xml => bg_rectangle_warning_0_warning.xml} (83%) rename WordPress/src/main/res/drawable-ldrtl/{bg_rectangle_unapproved_warning_white.xml => bg_rectangle_warning_0_warning_white.xml} (87%) rename WordPress/src/main/res/drawable/{bg_rectangle_unapproved_warning.xml => bg_rectangle_warning_0_warning.xml} (83%) rename WordPress/src/main/res/drawable/{bg_rectangle_unapproved_warning_white.xml => bg_rectangle_warning_0_warning_white.xml} (87%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java index 53f49f7ea818..1a66e50dd384 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java @@ -133,9 +133,9 @@ public void onClick(View v) { if (mCommentStatus == CommentStatus.UNAPPROVED) { if (hasCommentNestingLevel()) { paddingStart = mIndentedLeftPadding; - view.setBackgroundResource(R.drawable.bg_rectangle_unapproved_warning_white); + view.setBackgroundResource(R.drawable.bg_rectangle_warning_0_warning_white); } else { - view.setBackgroundResource(R.drawable.bg_rectangle_unapproved_warning); + view.setBackgroundResource(R.drawable.bg_rectangle_warning_0_warning); } noteBlockHolder.mDividerView.setVisibility(View.INVISIBLE); diff --git a/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning.xml b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning.xml similarity index 83% rename from WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning.xml rename to WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning.xml index 9a12a4653cde..debb65578fa9 100644 --- a/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning.xml +++ b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning.xml @@ -10,7 +10,7 @@ - + diff --git a/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning_white.xml b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning_white.xml similarity index 87% rename from WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning_white.xml rename to WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning_white.xml index 3589b784c4a0..d106e2129ed2 100644 --- a/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_unapproved_warning_white.xml +++ b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning_white.xml @@ -16,7 +16,7 @@ - + diff --git a/WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning.xml b/WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning.xml similarity index 83% rename from WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning.xml rename to WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning.xml index 803b18826559..f69c23a24c5d 100644 --- a/WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning.xml @@ -10,7 +10,7 @@ - + diff --git a/WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning_white.xml b/WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning_white.xml similarity index 87% rename from WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning_white.xml rename to WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning_white.xml index ae1584d23ee9..399436cd100d 100644 --- a/WordPress/src/main/res/drawable/bg_rectangle_unapproved_warning_white.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning_white.xml @@ -16,7 +16,7 @@ - + diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 36565ef928a3..39bb8019324b 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -70,7 +70,6 @@ - @color/warning_0 @color/neutral_100 From ec52985ac4cf11164774b68695a1ed5ece060ee1 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 18:53:01 -0700 Subject: [PATCH 081/167] Update color references from nux grey button to neutral 100 --- .../neutral_100_neutral_0_selector.xml} | 2 +- ...{nux_primary_button.xml => white_neutral_100_selector.xml} | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles.xml | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) rename WordPress/src/main/res/{drawable/nux_flat_button_grey_text_selector.xml => color/neutral_100_neutral_0_selector.xml} (79%) rename WordPress/src/main/res/color/{nux_primary_button.xml => white_neutral_100_selector.xml} (67%) diff --git a/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml b/WordPress/src/main/res/color/neutral_100_neutral_0_selector.xml similarity index 79% rename from WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml rename to WordPress/src/main/res/color/neutral_100_neutral_0_selector.xml index 3b7999bc75ec..f7f208a04aaa 100644 --- a/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml +++ b/WordPress/src/main/res/color/neutral_100_neutral_0_selector.xml @@ -1,5 +1,5 @@ - + diff --git a/WordPress/src/main/res/color/nux_primary_button.xml b/WordPress/src/main/res/color/white_neutral_100_selector.xml similarity index 67% rename from WordPress/src/main/res/color/nux_primary_button.xml rename to WordPress/src/main/res/color/white_neutral_100_selector.xml index 3b250508a520..0cff67e58b1c 100644 --- a/WordPress/src/main/res/color/nux_primary_button.xml +++ b/WordPress/src/main/res/color/white_neutral_100_selector.xml @@ -1,5 +1,5 @@ - + diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 39bb8019324b..b7a707709488 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -72,7 +72,6 @@ - @color/neutral_100 @color/neutral_800 @color/primary @color/neutral_100 diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 7a618dd4eeb5..33b1f4faaac7 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -221,7 +221,7 @@ @@ -413,7 +413,7 @@ From 2601dcbb90190aae1ed0a09b42fdc7983fbe9459 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:21:42 -0700 Subject: [PATCH 088/167] Update color references from notifications settings divider color to divider --- WordPress/src/main/res/layout/notifications_settings_switch.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/res/layout/notifications_settings_switch.xml b/WordPress/src/main/res/layout/notifications_settings_switch.xml index ccc14c00637b..0e7b19487f83 100644 --- a/WordPress/src/main/res/layout/notifications_settings_switch.xml +++ b/WordPress/src/main/res/layout/notifications_settings_switch.xml @@ -55,7 +55,7 @@ diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 92c30aa7dc66..f319bc24d568 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -86,7 +86,6 @@ - @color/divider @color/divider From 5aed97526d5b56a5166ad089de44b015791dacbb Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:28:56 -0700 Subject: [PATCH 089/167] Update color references from site settings pref divider color to divider --- .../wordpress/android/ui/prefs/SiteSettingsFragment.java | 2 +- .../{preferences_divider.xml => bg_rectangle_divider.xml} | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles_calypso.xml | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) rename WordPress/src/main/res/drawable/{preferences_divider.xml => bg_rectangle_divider.xml} (80%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java index f357e3a5a50c..a9f8e339c22a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java @@ -822,7 +822,7 @@ private void setupPreferenceList(ListView prefList, Resources res) { // customize list dividers //noinspection deprecation - prefList.setDivider(res.getDrawable(R.drawable.preferences_divider)); + prefList.setDivider(res.getDrawable(R.drawable.bg_rectangle_divider)); prefList.setDividerHeight(res.getDimensionPixelSize(R.dimen.site_settings_divider_height)); // handle long clicks on preferences to display hints prefList.setOnItemLongClickListener(this); diff --git a/WordPress/src/main/res/drawable/preferences_divider.xml b/WordPress/src/main/res/drawable/bg_rectangle_divider.xml similarity index 80% rename from WordPress/src/main/res/drawable/preferences_divider.xml rename to WordPress/src/main/res/drawable/bg_rectangle_divider.xml index b912aac177e8..1276cffc3b1a 100644 --- a/WordPress/src/main/res/drawable/preferences_divider.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_divider.xml @@ -9,7 +9,7 @@ android:shape="rectangle"> + android:color="@color/divider" /> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index f319bc24d568..e89439a463d0 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -88,7 +88,6 @@ - @color/divider @color/success diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml index 905a9028338d..76d40502ff41 100644 --- a/WordPress/src/main/res/values/styles_calypso.xml +++ b/WordPress/src/main/res/values/styles_calypso.xml @@ -33,7 +33,7 @@ @color/primary_400 @color/neutral_100 @color/accent - @drawable/preferences_divider + @drawable/bg_rectangle_divider @dimen/site_settings_divider_height @@ -58,7 +58,7 @@ @color/primary_dark @color/primary_400 @style/Calypso.ActionMode - @drawable/preferences_divider + @drawable/bg_rectangle_divider @dimen/site_settings_divider_height @@ -67,7 +67,7 @@ @color/primary_dark @color/primary_400 @style/Calypso.ActionMode - @drawable/preferences_divider + @drawable/bg_rectangle_divider @dimen/site_settings_divider_height From 75a19e790445b66499cec8275cb02e677816ad4e Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:29:45 -0700 Subject: [PATCH 090/167] Update color references from theme price to success --- WordPress/src/main/res/layout/theme_grid_item.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/res/layout/theme_grid_item.xml b/WordPress/src/main/res/layout/theme_grid_item.xml index 7c3b0eb8747a..a062a79d3be2 100644 --- a/WordPress/src/main/res/layout/theme_grid_item.xml +++ b/WordPress/src/main/res/layout/theme_grid_item.xml @@ -64,7 +64,7 @@ android:id="@+id/theme_grid_item_price" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/theme_price" + android:textColor="@color/success" android:textStyle="bold" android:layout_marginStart="@dimen/theme_browser_cardview_margin_large"/> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index e89439a463d0..f579eb28144d 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -90,7 +90,6 @@ - @color/success @color/primary_50 From 2fa9b73b84854afa3da852a91d39862faf18566a Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:30:27 -0700 Subject: [PATCH 091/167] Update color references from theme active to primary 50 --- WordPress/src/main/res/layout/theme_grid_item.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/res/layout/theme_grid_item.xml b/WordPress/src/main/res/layout/theme_grid_item.xml index a062a79d3be2..14ae57d10b32 100644 --- a/WordPress/src/main/res/layout/theme_grid_item.xml +++ b/WordPress/src/main/res/layout/theme_grid_item.xml @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:text="@string/active" android:textAllCaps="true" - android:textColor="@color/theme_active" + android:textColor="@color/primary_50" android:textSize="@dimen/text_sz_extra_small" android:textStyle="bold" android:visibility="gone" diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index f579eb28144d..c49b966d98ca 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -90,7 +90,6 @@ - @color/primary_50 From c468a3536eca7041c6638332893113f830df182e Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:32:29 -0700 Subject: [PATCH 092/167] Update color references from divider grey to divider --- WordPress/src/main/res/layout/list_editor.xml | 2 +- WordPress/src/main/res/layout/photo_picker_fragment.xml | 2 +- WordPress/src/main/res/layout/plan_details_fragment.xml | 2 +- WordPress/src/main/res/layout/publicize_detail_fragment.xml | 2 +- WordPress/src/main/res/layout/publicize_listitem_connection.xml | 2 +- WordPress/src/main/res/layout/publicize_listitem_service.xml | 2 +- WordPress/src/main/res/layout/wp_simple_list_item_1.xml | 2 +- WordPress/src/main/res/layout/wppref_view.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles.xml | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) diff --git a/WordPress/src/main/res/layout/list_editor.xml b/WordPress/src/main/res/layout/list_editor.xml index 3a957137ea4e..71e09f0bc917 100644 --- a/WordPress/src/main/res/layout/list_editor.xml +++ b/WordPress/src/main/res/layout/list_editor.xml @@ -28,7 +28,7 @@ android:textColor="@color/neutral_400" /> + android:background="@color/divider"/> + android:background="@color/divider"/> + android:background="@color/divider" /> diff --git a/WordPress/src/main/res/layout/wppref_view.xml b/WordPress/src/main/res/layout/wppref_view.xml index 379439641f3e..7b229504047b 100644 --- a/WordPress/src/main/res/layout/wppref_view.xml +++ b/WordPress/src/main/res/layout/wppref_view.xml @@ -69,6 +69,6 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="@dimen/list_divider_height" - android:background="@color/divider_grey" /> + android:background="@color/divider" /> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index c49b966d98ca..722ee2db300e 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -93,7 +93,6 @@ - @color/divider @color/neutral_0 diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 0c4b977ec96d..e17264a974c9 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -171,7 +171,7 @@ @dimen/text_sz_medium From 0fd7745595aff2527d794ea9cbeb8d7b4c78ea54 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:35:38 -0700 Subject: [PATCH 093/167] Update color references from login background color to default background --- .../org/wordpress/android/ui/ShareIntentReceiverActivity.java | 4 ++-- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java index f75392175054..45347bd1344f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java +++ b/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.default_background); } private void refreshContent() { diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 722ee2db300e..ab60f597b58b 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -95,7 +95,6 @@ - @color/neutral_0 @color/primary From f7a721b6b75f04cc0d1fd96940833a380079d8bc Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:40:52 -0700 Subject: [PATCH 094/167] Update color references from quickstart focus inner circle to primary --- .../{quick_start_focus_inner_circle.xml => bg_oval_primary.xml} | 2 +- WordPress/src/main/res/layout/quick_start_focus_circle.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename WordPress/src/main/res/drawable/{quick_start_focus_inner_circle.xml => bg_oval_primary.xml} (70%) diff --git a/WordPress/src/main/res/drawable/quick_start_focus_inner_circle.xml b/WordPress/src/main/res/drawable/bg_oval_primary.xml similarity index 70% rename from WordPress/src/main/res/drawable/quick_start_focus_inner_circle.xml rename to WordPress/src/main/res/drawable/bg_oval_primary.xml index f4d6515478b3..11123c08e037 100644 --- a/WordPress/src/main/res/drawable/quick_start_focus_inner_circle.xml +++ b/WordPress/src/main/res/drawable/bg_oval_primary.xml @@ -2,5 +2,5 @@ + android:color="@color/primary"/> diff --git a/WordPress/src/main/res/layout/quick_start_focus_circle.xml b/WordPress/src/main/res/layout/quick_start_focus_circle.xml index dd8e1280e07c..ec4161b06630 100644 --- a/WordPress/src/main/res/layout/quick_start_focus_circle.xml +++ b/WordPress/src/main/res/layout/quick_start_focus_circle.xml @@ -17,6 +17,6 @@ android:layout_height="16dp" android:layout_centerInParent="true" android:contentDescription="@null" - android:src="@drawable/quick_start_focus_inner_circle"/> + android:src="@drawable/bg_oval_primary"/> diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index ab60f597b58b..dea3123da3e9 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -97,7 +97,6 @@ - @color/primary @color/primary_100 @color/primary_400 From d75280d3a455204c846c5dbbc517abdb1c70c7f9 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:42:15 -0700 Subject: [PATCH 095/167] Update color references from quickstart focus outer circle to primary 100 --- ...ick_start_focus_outer_circle.xml => bg_oval_primary_100.xml} | 2 +- WordPress/src/main/res/layout/quick_start_focus_circle.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename WordPress/src/main/res/drawable/{quick_start_focus_outer_circle.xml => bg_oval_primary_100.xml} (70%) diff --git a/WordPress/src/main/res/drawable/quick_start_focus_outer_circle.xml b/WordPress/src/main/res/drawable/bg_oval_primary_100.xml similarity index 70% rename from WordPress/src/main/res/drawable/quick_start_focus_outer_circle.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_100.xml index 2a4d6e578e28..e2b6e3a65c0b 100644 --- a/WordPress/src/main/res/drawable/quick_start_focus_outer_circle.xml +++ b/WordPress/src/main/res/drawable/bg_oval_primary_100.xml @@ -2,5 +2,5 @@ + android:color="@color/primary_100"/> diff --git a/WordPress/src/main/res/layout/quick_start_focus_circle.xml b/WordPress/src/main/res/layout/quick_start_focus_circle.xml index ec4161b06630..e55d6c99187e 100644 --- a/WordPress/src/main/res/layout/quick_start_focus_circle.xml +++ b/WordPress/src/main/res/layout/quick_start_focus_circle.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:contentDescription="@null" - android:src="@drawable/quick_start_focus_outer_circle"/> + android:src="@drawable/bg_oval_primary_100"/> - @color/primary_100 @color/primary_400 #00be28 From c22522366e6f87c3e419bf00bf8b7599f86217a6 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:44:48 -0700 Subject: [PATCH 096/167] Update color references from switch tint to primary 400 --- .../java/org/wordpress/android/ui/pages/PageItemViewHolder.kt | 2 +- .../wordpress/android/ui/prefs/SiteSettingsFormatDialog.java | 2 +- .../org/wordpress/android/ui/prefs/WPSwitchPreference.java | 4 ++-- ...n_thumb.xml => primary_400_gray_200_gray_400_selector.xml} | 2 +- ...n_track.xml => primary_400_gray_900_gray_500_selector.xml} | 2 +- WordPress/src/main/res/layout/detail_list_preference.xml | 2 +- WordPress/src/main/res/layout/role_list_row.xml | 2 +- .../src/main/res/layout/single_choice_recycler_view_item.xml | 2 +- WordPress/src/main/res/layout/site_creation_domain_item.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - WordPress/src/main/res/values/styles.xml | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) rename WordPress/src/main/res/color/{dialog_compound_button_thumb.xml => primary_400_gray_200_gray_400_selector.xml} (81%) rename WordPress/src/main/res/color/{dialog_compound_button_track.xml => primary_400_gray_900_gray_500_selector.xml} (81%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt index 7687a5251fa5..1ddfd6643ab7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt @@ -144,7 +144,7 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou @Suppress("DEPRECATION") CompoundButtonCompat.setButtonTintList(radioButton, - radioButton.resources.getColorStateList(R.color.dialog_compound_button_thumb)) + radioButton.resources.getColorStateList(R.color.primary_400_gray_200_gray_400_selector)) } } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFormatDialog.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFormatDialog.java index 17cd3f0b199f..e523198c9973 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFormatDialog.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFormatDialog.java @@ -125,7 +125,7 @@ private void createRadioButtons() { for (int i = 0; i < mEntries.length; i++) { RadioButton radio = new RadioButton(getActivity()); CompoundButtonCompat.setButtonTintList(radio, - getResources().getColorStateList(R.color.dialog_compound_button_thumb)); + getResources().getColorStateList(R.color.primary_400_gray_200_gray_400_selector)); radio.setText(mEntries[i]); radio.setId(i); mRadioGroup.addView(radio); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPSwitchPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPSwitchPreference.java index e0c73e73741c..ce416cb0b34c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPSwitchPreference.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPSwitchPreference.java @@ -67,9 +67,9 @@ protected void onBindView(@NonNull View view) { Switch switchControl = getSwitch((ViewGroup) view); if (switchControl != null) { switchControl.setThumbTintList(ContextCompat.getColorStateList(this.getContext(), - R.color.dialog_compound_button_thumb)); + R.color.primary_400_gray_200_gray_400_selector)); switchControl.setTrackTintList(ContextCompat.getColorStateList(this.getContext(), - R.color.dialog_compound_button_track)); + R.color.primary_400_gray_900_gray_500_selector)); } } diff --git a/WordPress/src/main/res/color/dialog_compound_button_thumb.xml b/WordPress/src/main/res/color/primary_400_gray_200_gray_400_selector.xml similarity index 81% rename from WordPress/src/main/res/color/dialog_compound_button_thumb.xml rename to WordPress/src/main/res/color/primary_400_gray_200_gray_400_selector.xml index eb7a3b6dd6ba..f712833b1c86 100644 --- a/WordPress/src/main/res/color/dialog_compound_button_thumb.xml +++ b/WordPress/src/main/res/color/primary_400_gray_200_gray_400_selector.xml @@ -5,6 +5,6 @@ - + diff --git a/WordPress/src/main/res/color/dialog_compound_button_track.xml b/WordPress/src/main/res/color/primary_400_gray_900_gray_500_selector.xml similarity index 81% rename from WordPress/src/main/res/color/dialog_compound_button_track.xml rename to WordPress/src/main/res/color/primary_400_gray_900_gray_500_selector.xml index 2aa3dc6379af..54e62a8943eb 100644 --- a/WordPress/src/main/res/color/dialog_compound_button_track.xml +++ b/WordPress/src/main/res/color/primary_400_gray_900_gray_500_selector.xml @@ -5,6 +5,6 @@ - + diff --git a/WordPress/src/main/res/layout/detail_list_preference.xml b/WordPress/src/main/res/layout/detail_list_preference.xml index 946bd2f40f0e..17ecd87e5cf0 100644 --- a/WordPress/src/main/res/layout/detail_list_preference.xml +++ b/WordPress/src/main/res/layout/detail_list_preference.xml @@ -16,7 +16,7 @@ android:focusable="true" > + android:buttonTint="@color/primary_400_gray_200_gray_400_selector" > - @color/primary_400 #00be28 diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index e17264a974c9..68c39e668ca9 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -529,7 +529,7 @@ From 76729622bb27f277a43790db93d7b0d5be8aba73 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:47:45 -0700 Subject: [PATCH 097/167] Update color references from jetpack green to jetpack --- .../src/main/res/layout/jetpack_remote_install_fragment.xml | 2 +- WordPress/src/main/res/values/colors.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/res/layout/jetpack_remote_install_fragment.xml b/WordPress/src/main/res/layout/jetpack_remote_install_fragment.xml index eb85412a85b2..0d9f5003d818 100644 --- a/WordPress/src/main/res/layout/jetpack_remote_install_fragment.xml +++ b/WordPress/src/main/res/layout/jetpack_remote_install_fragment.xml @@ -26,7 +26,7 @@ android:layout_marginTop="@dimen/margin_extra_large" android:contentDescription="@string/content_description_people_looking_charts" android:src="@drawable/ic_plans_white_24dp" - android:tint="@color/jetpack_green"/> + android:tint="@color/jetpack"/> - #00be28 + #00be28 @color/warning_0 From c21fe4dfa77589d446e37d11be8e47ba39fcdbf4 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:48:34 -0700 Subject: [PATCH 098/167] Update color references from revision diff del action underline to error --- .../src/main/java/org/wordpress/android/widgets/DiffView.kt | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt index 1babcce84190..4f0c4b7b9afc 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt +++ b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt @@ -53,7 +53,7 @@ class DiffView : AppCompatTextView { ColorUnderlineSpan( ContextCompat.getColor( context, - R.color.revision_diff_del_action_underline + R.color.error ) ), 0, diffContent.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 940271c62d08..5e1f7b7e7af0 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -104,7 +104,6 @@ @color/warning_0 - @color/error @color/error_0 @color/primary @color/primary_0 From c15a57b443e856d22759ad2a40d05f59625b0998 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:48:58 -0700 Subject: [PATCH 099/167] Update color references from revision diff del action background to error 0 --- .../src/main/java/org/wordpress/android/widgets/DiffView.kt | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt index 4f0c4b7b9afc..f2659f0914af 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt +++ b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt @@ -61,7 +61,7 @@ class DiffView : AppCompatTextView { BackgroundColorSpan( ContextCompat.getColor( context, - R.color.revision_diff_del_action_background + R.color.error_0 ) ), 0, diffContent.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 5e1f7b7e7af0..11acee952297 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -104,7 +104,6 @@ @color/warning_0 - @color/error_0 @color/primary @color/primary_0 From 4ad9dea59d33220f0f19642288c2c2395437e77f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:49:18 -0700 Subject: [PATCH 100/167] Update color references from revision diff add action underline to primary --- .../src/main/java/org/wordpress/android/widgets/DiffView.kt | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt index f2659f0914af..c9c4d1657dfc 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt +++ b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt @@ -35,7 +35,7 @@ class DiffView : AppCompatTextView { ColorUnderlineSpan( ContextCompat.getColor( context, - R.color.revision_diff_add_action_underline + R.color.primary ) ), 0, diffContent.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 11acee952297..081cc1bd4c9b 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -104,7 +104,6 @@ @color/warning_0 - @color/primary @color/primary_0 From 861c01eae6eea23696f0e58778a2880b1b79dfe4 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:49:37 -0700 Subject: [PATCH 101/167] Update color references from revision diff add action background to primary 0 --- .../src/main/java/org/wordpress/android/widgets/DiffView.kt | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt index c9c4d1657dfc..47a6da506174 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt +++ b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt @@ -43,7 +43,7 @@ class DiffView : AppCompatTextView { BackgroundColorSpan( ContextCompat.getColor( context, - R.color.revision_diff_add_action_background + R.color.primary_0 ) ), 0, diffContent.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 081cc1bd4c9b..549a26408b63 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -104,7 +104,6 @@ @color/warning_0 - @color/primary_0 @color/hot_pink_500 From 5cff9a25d67fc67190b43b2057f443c05b7c433a Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 19:57:53 -0700 Subject: [PATCH 102/167] Remove unused color resources --- WordPress/src/main/res/values/colors.xml | 83 ------------------------ 1 file changed, 83 deletions(-) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 549a26408b63..d140283d7998 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -4,107 +4,24 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> - @color/white - - @color/accent - @color/primary_50 - - - @color/neutral_100 @color/neutral_0 - - - - - - - - - - #333333 - @color/neutral_50 - - - - - - #66000000 #80000000 #80e9eff3 #66ffffff #a6ffffff - - - - @color/primary_dark @color/neutral - - - @color/neutral_600 - @color/neutral_700 - @color/neutral_50 - - - @color/neutral_800 - @color/white - @color/accent - @color/neutral_800 - - @color/primary - @color/primary_50 - @color/white @color/white - - @color/accent @color/primary_light @color/primary @color/primary_dark - - @color/primary - - - - - - - @color/neutral_800 - @color/neutral_100 - @color/neutral_200 - - - @color/neutral_100 - @color/neutral_800 - - - - - - - - - - - - - - - - - - #00be28 - - @color/warning_0 - - - @color/hot_pink_500 @color/hot_pink_0 From 12cadc7a769ecaa12c34d4bd518090471e55528f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 20:02:39 -0700 Subject: [PATCH 103/167] Update color resources with application and standard sections --- WordPress/src/main/res/values/colors.xml | 25 +++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index d140283d7998..a5de60845daa 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -4,23 +4,26 @@ xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> + @color/neutral_0 + #00be28 + @color/primary + @color/accent + @color/neutral_800 + @color/primary_dark + @color/primary_light + @color/primary + @color/primary_dark + @color/neutral + @color/primary + @color/white + + #66000000 #80000000 #80e9eff3 #66ffffff #a6ffffff - @color/primary_dark - @color/neutral - @color/primary - @color/white - @color/accent - @color/primary_light - @color/primary - @color/primary_dark - @color/primary - @color/neutral_800 - #00be28 @color/hot_pink_500 From d236a05023e010a1c51061dad9623d6f447378a9 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 20:04:09 -0700 Subject: [PATCH 104/167] Rename background color resources --- .../org/wordpress/android/ui/ShareIntentReceiverActivity.java | 2 +- WordPress/src/main/res/layout/dialog_snackbar.xml | 2 +- WordPress/src/main/res/layout/edit_post_settings_fragment.xml | 2 +- WordPress/src/main/res/layout/help_activity.xml | 2 +- WordPress/src/main/res/layout/notifications_list_item.xml | 2 +- .../src/main/res/layout/notifications_settings_activity.xml | 2 +- WordPress/src/main/res/layout/page_empty_item.xml | 2 +- WordPress/src/main/res/layout/post_list_fragment.xml | 2 +- WordPress/src/main/res/layout/post_preview_activity.xml | 2 +- WordPress/src/main/res/layout/stats_empty_view.xml | 2 +- WordPress/src/main/res/values/colors.xml | 4 ++-- WordPress/src/main/res/values/styles.xml | 2 +- libs/login/WordPressLoginFlow/src/main/res/values/colors.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java index 45347bd1344f..91e50ef9cc32 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java @@ -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.default_background); + findViewById(R.id.main_view).setBackgroundResource(R.color.background_default); } private void refreshContent() { diff --git a/WordPress/src/main/res/layout/dialog_snackbar.xml b/WordPress/src/main/res/layout/dialog_snackbar.xml index 1bbc42ecdb2f..b3fa2e510e22 100644 --- a/WordPress/src/main/res/layout/dialog_snackbar.xml +++ b/WordPress/src/main/res/layout/dialog_snackbar.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/snackbar_background" + android:background="@color/background_snackbar" android:paddingBottom="@dimen/margin_medium"> + android:background="@color/background_default"> + android:background="@color/background_default"> diff --git a/WordPress/src/main/res/layout/stats_empty_view.xml b/WordPress/src/main/res/layout/stats_empty_view.xml index 6ee2add65b55..bbd56bc30acd 100644 --- a/WordPress/src/main/res/layout/stats_empty_view.xml +++ b/WordPress/src/main/res/layout/stats_empty_view.xml @@ -5,7 +5,7 @@ android:id="@+id/actionable_empty_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/default_background" + android:background="@color/background_default" android:visibility="gone" app:aevButton="@string/stats_button_manage_insights" app:aevImage="@drawable/img_illustration_insights_94dp" diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index a5de60845daa..14357ce66819 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -5,11 +5,11 @@ tools:ignore="UnusedResources"> - @color/neutral_0 + @color/neutral_0 + @color/neutral_800 #00be28 @color/primary @color/accent - @color/neutral_800 @color/primary_dark @color/primary_light @color/primary diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 68c39e668ca9..12b4c691ec1a 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -9,7 +9,7 @@ @color/primary_300 @color/neutral_100 - @color/default_background + @color/background_default @style/PopupMenu.WordPress @style/DropDownListView.Light.WordPress @style/DropDownNav.WordPress diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml b/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml index 35ba79acb7af..ec74e8753299 100644 --- a/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml +++ b/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml @@ -23,7 +23,7 @@ #F1F1F1 #000000 - @color/grey_lighten_30 + @color/grey_lighten_30 From 9733dafd1b23bc3678da71826b06df4d40144e8f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 20:08:32 -0700 Subject: [PATCH 105/167] Update color references from tab background to primary --- WordPress/src/main/res/layout/media_browser_activity.xml | 2 +- WordPress/src/main/res/layout/reader_activity_subs.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/res/layout/media_browser_activity.xml b/WordPress/src/main/res/layout/media_browser_activity.xml index 57cb26f9496c..9b269eb2efa9 100755 --- a/WordPress/src/main/res/layout/media_browser_activity.xml +++ b/WordPress/src/main/res/layout/media_browser_activity.xml @@ -18,7 +18,7 @@ diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 14357ce66819..f775eaec1334 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -15,7 +15,6 @@ @color/primary @color/primary_dark @color/neutral - @color/primary @color/white From 6821d033aad869ba3e6547b8d235a1c1b2fab15f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sat, 23 Mar 2019 20:10:12 -0700 Subject: [PATCH 106/167] Update color references from tab indicator to white --- WordPress/src/main/res/layout/media_browser_activity.xml | 2 +- WordPress/src/main/res/layout/reader_activity_subs.xml | 2 +- WordPress/src/main/res/layout/reader_search_tabs.xml | 2 +- WordPress/src/main/res/values/colors.xml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/res/layout/media_browser_activity.xml b/WordPress/src/main/res/layout/media_browser_activity.xml index 9b269eb2efa9..d1c836313080 100755 --- a/WordPress/src/main/res/layout/media_browser_activity.xml +++ b/WordPress/src/main/res/layout/media_browser_activity.xml @@ -23,7 +23,7 @@ android:layout_below="@+id/toolbar" android:layout_height="wrap_content" android:layout_width="match_parent" - app:tabIndicatorColor="@color/tab_indicator" + app:tabIndicatorColor="@android:color/white" app:tabMode="scrollable" > diff --git a/WordPress/src/main/res/layout/reader_activity_subs.xml b/WordPress/src/main/res/layout/reader_activity_subs.xml index 5bbeba4a6a85..8d89944849ef 100644 --- a/WordPress/src/main/res/layout/reader_activity_subs.xml +++ b/WordPress/src/main/res/layout/reader_activity_subs.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/toolbar" android:background="@color/primary" - app:tabIndicatorColor="@color/tab_indicator" /> + app:tabIndicatorColor="@android:color/white" /> @color/primary @color/primary_dark @color/neutral - @color/white #66000000 From e564c6f5349857f8dc080d87bafbb20c7eaa226c Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 17:42:59 -0700 Subject: [PATCH 107/167] Update animation assets for login prologue --- WordPress/src/main/assets/login_anims/jetpack.json | 2 +- WordPress/src/main/assets/login_anims/notifications.json | 2 +- WordPress/src/main/assets/login_anims/post.json | 2 +- WordPress/src/main/assets/login_anims/reader.json | 2 +- WordPress/src/main/assets/login_anims/stats.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WordPress/src/main/assets/login_anims/jetpack.json b/WordPress/src/main/assets/login_anims/jetpack.json index 382d6fb532bb..091d451c7361 100644 --- a/WordPress/src/main/assets/login_anims/jetpack.json +++ b/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":[]} \ No newline at end of file diff --git a/WordPress/src/main/assets/login_anims/notifications.json b/WordPress/src/main/assets/login_anims/notifications.json index a86a9ed0ca01..51e757825516 100644 --- a/WordPress/src/main/assets/login_anims/notifications.json +++ b/WordPress/src/main/assets/login_anims/notifications.json @@ -1 +1 @@ -{"v":"4.7.0","fr":30,"ip":0,"op":47,"w":310,"h":464,"nm":"Notifications","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"notification-01 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":7,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14,"s":[100],"e":[100]},{"t":17}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,222.086,0]},"a":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":7,"s":[115,73,0],"e":[115,83,0],"to":[0,1.66666662693024,0],"ti":[0,-1.66666662693024,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":14,"s":[115,83,0],"e":[115,83,0],"to":[0,0,0],"ti":[0,0,0]},{"t":17}]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":7,"s":[75,75,100],"e":[103,103,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":14,"s":[103,103,100],"e":[100,100,100]},{"t":17}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.81,0.213],[3.849,-0.037],[3.849,-0.838],[-0.276,-1.284],[-0.879,-0.193],[-3.849,-0.064],[-3.849,1.004],[0.332,1.285]],"o":[[-3.849,-1.005],[-3.849,0.064],[-1.278,0.278],[0.203,0.942],[3.849,0.836],[3.849,0.038],[1.277,-0.334],[-0.225,-0.872]],"v":[[-54.525,-12.412],[-66.074,-13.557],[-77.622,-12.412],[-79.436,-9.584],[-77.622,-7.761],[-66.074,-6.617],[-54.525,-7.761],[-52.812,-10.691]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.162,0.067],[9.639,0.219],[9.64,-0.071],[9.64,-0.253],[9.639,-0.434],[-0.056,-1.284],[-1.181,-0.057],[-9.639,-0.168],[-9.639,-0.106],[-9.64,0.075],[-9.639,0.528],[0.07,1.285]],"o":[[-9.639,-0.53],[-9.64,-0.075],[-9.639,0.107],[-9.639,0.17],[-1.278,0.056],[0.055,1.211],[9.639,0.434],[9.64,0.256],[9.64,0.071],[9.639,-0.219],[1.279,-0.07],[-0.064,-1.194]],"v":[[77.454,-12.377],[48.536,-13.335],[19.616,-13.505],[-9.303,-13.218],[-38.223,-12.377],[-40.434,-9.949],[-38.223,-7.727],[-9.303,-6.889],[19.616,-6.6],[48.536,-6.77],[77.454,-7.727],[79.643,-10.18]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.81,0.212],[3.85,-0.037],[3.851,-0.838],[-0.276,-1.284],[-0.879,-0.193],[-3.849,-0.063],[-3.85,1.005],[0.333,1.284]],"o":[[-3.85,-1.005],[-3.849,0.063],[-1.277,0.278],[0.203,0.941],[3.851,0.837],[3.85,0.038],[1.278,-0.333],[-0.224,-0.872]],"v":[[53.143,7.742],[41.594,6.597],[30.045,7.742],[28.232,10.569],[30.045,12.392],[41.594,13.536],[53.143,12.392],[54.855,9.463]],"c":true}},"nm":"Path 3","mn":"ADBE Vector Shape - Group"},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[-0.097,-1.15],[1.277,-0.109],[6.212,-0.219],[6.212,0.074],[6.212,0.254],[6.212,0.434],[0.081,1.174],[-1.278,0.088],[-6.211,0.169],[-6.212,0.107],[-6.211,-0.151],[-6.212,-0.529]],"o":[[0.108,1.284],[-6.212,0.529],[-6.211,0.15],[-6.212,-0.107],[-6.211,-0.17],[-1.137,-0.078],[-0.089,-1.286],[6.212,-0.434],[6.212,-0.254],[6.212,-0.075],[6.212,0.219],[1.108,0.093]],"v":[[11.233,9.87],[9.116,12.392],[-9.521,13.349],[-28.156,13.52],[-46.791,13.232],[-65.426,12.392],[-67.579,10.229],[-65.426,7.742],[-46.791,6.902],[-28.156,6.614],[-9.521,6.785],[9.116,7.742]],"c":true}},"nm":"Path 4","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[113.584,60.612],"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":5,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,5.545],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[5.525,0]],"v":[[39.855,3.918],[39.855,-13.956],[-39.855,-13.956],[-39.855,13.956],[29.851,13.956]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.667,0.8629999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[113.857,108.956],"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"},{"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":[[-95.5,54.501],[95.5,54.501],[95.5,-54.501],[-95.5,-54.501]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[114.5,80.501],"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"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,305,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.6666667,0.8627451,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9137255,0.9372549,0.9529412,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file +{"v":"5.3.4","fr":30,"ip":0,"op":47,"w":310,"h":464,"nm":"Notifications","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"notification-01 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":7,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14,"s":[100],"e":[100]},{"t":17}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,222.086,0],"ix":2},"a":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":7,"s":[115,73,0],"e":[115,83,0],"to":[0,1.66666662693024,0],"ti":[0,-1.66666662693024,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":14,"s":[115,83,0],"e":[115,83,0],"to":[0,0,0],"ti":[0,0,0]},{"t":17}],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":7,"s":[75,75,100],"e":[103,103,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":14,"s":[103,103,100],"e":[100,100,100]},{"t":17}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.81,0.213],[3.849,-0.037],[3.849,-0.838],[-0.276,-1.284],[-0.879,-0.193],[-3.849,-0.064],[-3.849,1.004],[0.332,1.285]],"o":[[-3.849,-1.005],[-3.849,0.064],[-1.278,0.278],[0.203,0.942],[3.849,0.836],[3.849,0.038],[1.277,-0.334],[-0.225,-0.872]],"v":[[-54.525,-12.412],[-66.074,-13.557],[-77.622,-12.412],[-79.436,-9.584],[-77.622,-7.761],[-66.074,-6.617],[-54.525,-7.761],[-52.812,-10.691]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.162,0.067],[9.639,0.219],[9.64,-0.071],[9.64,-0.253],[9.639,-0.434],[-0.056,-1.284],[-1.181,-0.057],[-9.639,-0.168],[-9.639,-0.106],[-9.64,0.075],[-9.639,0.528],[0.07,1.285]],"o":[[-9.639,-0.53],[-9.64,-0.075],[-9.639,0.107],[-9.639,0.17],[-1.278,0.056],[0.055,1.211],[9.639,0.434],[9.64,0.256],[9.64,0.071],[9.639,-0.219],[1.279,-0.07],[-0.064,-1.194]],"v":[[77.454,-12.377],[48.536,-13.335],[19.616,-13.505],[-9.303,-13.218],[-38.223,-12.377],[-40.434,-9.949],[-38.223,-7.727],[-9.303,-6.889],[19.616,-6.6],[48.536,-6.77],[77.454,-7.727],[79.643,-10.18]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.81,0.212],[3.85,-0.037],[3.851,-0.838],[-0.276,-1.284],[-0.879,-0.193],[-3.849,-0.063],[-3.85,1.005],[0.333,1.284]],"o":[[-3.85,-1.005],[-3.849,0.063],[-1.277,0.278],[0.203,0.941],[3.851,0.837],[3.85,0.038],[1.278,-0.333],[-0.224,-0.872]],"v":[[53.143,7.742],[41.594,6.597],[30.045,7.742],[28.232,10.569],[30.045,12.392],[41.594,13.536],[53.143,12.392],[54.855,9.463]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[-0.097,-1.15],[1.277,-0.109],[6.212,-0.219],[6.212,0.074],[6.212,0.254],[6.212,0.434],[0.081,1.174],[-1.278,0.088],[-6.211,0.169],[-6.212,0.107],[-6.211,-0.151],[-6.212,-0.529]],"o":[[0.108,1.284],[-6.212,0.529],[-6.211,0.15],[-6.212,-0.107],[-6.211,-0.17],[-1.137,-0.078],[-0.089,-1.286],[6.212,-0.434],[6.212,-0.254],[6.212,-0.075],[6.212,0.219],[1.108,0.093]],"v":[[11.233,9.87],[9.116,12.392],[-9.521,13.349],[-28.156,13.52],[-46.791,13.232],[-65.426,12.392],[-67.579,10.229],[-65.426,7.742],[-46.791,6.902],[-28.156,6.614],[-9.521,6.785],[9.116,7.742]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.882352941176,0.886274509804,0.886274509804,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":[113.584,60.612],"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":5,"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,5.545],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[5.525,0]],"v":[[39.855,3.918],[39.855,-13.956],[-39.855,-13.956],[-39.855,13.956],[29.851,13.956]],"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":[113.857,108.956],"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,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-95.5,54.501],[95.5,54.501],[95.5,-54.501],[-95.5,-54.501]],"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":[114.5,80.501],"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":[0.964705882353,0.964705882353,0.964705882353,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":[]} \ No newline at end of file diff --git a/WordPress/src/main/assets/login_anims/post.json b/WordPress/src/main/assets/login_anims/post.json index 2b47826b9df9..69b51fbdd20e 100644 --- a/WordPress/src/main/assets/login_anims/post.json +++ b/WordPress/src/main/assets/login_anims/post.json @@ -1 +1 @@ -{"v":"4.7.0","fr":30,"ip":0,"op":135,"w":310,"h":464,"nm":"post-on-the-go","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 4 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":34,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":36,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":82,"s":[100],"e":[0]},{"t":84}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,0.228],[-4.59,0.075],[-4.589,-1.191],[0.396,-1.524],[0.966,-0.253],[4.589,0.044],[4.59,0.992],[-0.329,1.524]],"o":[[4.59,-0.993],[4.589,-0.045],[1.524,0.395],[-0.267,1.034],[-4.589,1.191],[-4.59,-0.075],[-1.522,-0.329],[0.241,-1.116]],"v":[[-13.742,-2.757],[0.027,-4.115],[13.794,-2.757],[15.836,0.717],[13.794,2.758],[0.027,4.116],[-13.742,2.758],[-15.903,-0.596]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[169.994,185.684],"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"}],"ip":22,"op":84,"st":22,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 5 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":28,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":30,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":84,"s":[100],"e":[0]},{"t":86}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,0.228],[-4.589,0.075],[-4.589,-1.191],[0.395,-1.524],[0.965,-0.253],[4.59,0.044],[4.589,0.992],[-0.329,1.524]],"o":[[4.589,-0.993],[4.59,-0.045],[1.523,0.395],[-0.268,1.034],[-4.589,1.191],[-4.589,-0.075],[-1.523,-0.329],[0.242,-1.116]],"v":[[-13.741,-2.757],[0.027,-4.115],[13.795,-2.757],[15.837,0.717],[13.795,2.758],[0.027,4.116],[-13.741,2.758],[-15.903,-0.596]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[126.146,185.684],"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"}],"ip":20,"op":86,"st":20,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 6 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":25,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":27,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":87,"s":[100],"e":[0]},{"t":89}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.357,0.093],[-7.415,0.2],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.628],[0.13,-1.524],[1.323,-0.111],[7.415,-0.26],[7.416,0.088],[7.415,0.301],[7.415,0.514],[-0.106,1.525]],"o":[[7.415,-0.515],[7.415,-0.303],[7.416,-0.089],[7.415,0.259],[1.525,0.129],[-0.115,1.367],[-7.415,0.628],[-7.415,0.179],[-7.415,-0.127],[-7.415,-0.202],[-1.525,-0.106],[0.097,-1.396]],"v":[[-44.611,-2.761],[-22.365,-3.757],[-0.12,-4.1],[22.126,-3.897],[44.372,-2.761],[46.899,0.234],[44.372,2.762],[22.126,3.898],[-0.12,4.101],[-22.365,3.759],[-44.611,2.762],[-47.181,-0.191]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[47.029,185.684],"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"}],"ip":17,"op":89,"st":17,"bm":0,"sr":1},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 3 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":16,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":18,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":93,"s":[100],"e":[0]},{"t":95}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.302,0.067],[-10.625,0.201],[-10.625,0.127],[-10.625,-0.089],[-10.625,-0.629],[0.077,-1.525],[1.279,-0.081],[10.624,-0.259],[10.624,0.084],[10.624,0.302],[10.624,0.515],[-0.063,1.525]],"o":[[10.624,-0.515],[10.624,-0.302],[10.624,-0.084],[10.624,0.26],[1.408,0.083],[-0.071,1.419],[-10.625,0.628],[-10.625,0.09],[-10.625,-0.127],[-10.625,-0.201],[-1.409,-0.068],[0.06,-1.439]],"v":[[-63.704,-2.761],[-31.83,-3.758],[0.043,-4.1],[31.917,-3.898],[63.79,-2.761],[66.2,0.151],[63.79,2.761],[31.917,3.897],[0.043,4.1],[-31.83,3.758],[-63.704,2.761],[-66.14,-0.123]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[163.797,162.199],"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"}],"ip":11,"op":95,"st":11,"bm":0,"sr":1},{"ddd":0,"ind":5,"ty":4,"nm":"Layer 7 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":9,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":95,"s":[100],"e":[0]},{"t":97}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.33,0.107],[-6.293,0.2],[-6.293,0.127],[-6.294,-0.179],[-6.293,-0.628],[0.153,-1.525],[1.288,-0.126],[6.292,-0.26],[6.293,0.089],[6.293,0.301],[6.292,0.515],[-0.125,1.525]],"o":[[6.292,-0.515],[6.293,-0.303],[6.293,-0.089],[6.292,0.259],[1.525,0.152],[-0.133,1.338],[-6.293,0.629],[-6.294,0.179],[-6.293,-0.127],[-6.293,-0.202],[-1.525,-0.124],[0.112,-1.373]],"v":[[-37.884,-2.761],[-19.005,-3.757],[-0.126,-4.1],[18.754,-3.897],[37.633,-2.761],[40.118,0.276],[37.633,2.761],[18.754,3.898],[-0.126,4.1],[-19.005,3.759],[-37.884,2.761],[-40.42,-0.225]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[40.271,162.189],"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"}],"ip":9,"op":97,"st":9,"bm":0,"sr":1},{"ddd":0,"ind":6,"ty":4,"nm":"text-bodymovin Outlines 2","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,232.087,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.242,-1.118],[-1.525,-0.33],[-4.596,-0.076],[-4.594,1.193],[-0.268,1.037],[1.526,0.396],[4.595,-0.044],[4.595,-0.993]],"o":[[-0.33,1.524],[4.595,0.995],[4.595,0.044],[0.967,-0.254],[0.396,-1.525],[-4.594,-1.192],[-4.596,0.076],[-1.049,0.228]],"v":[[-114.981,28.062],[-112.816,31.42],[-99.03,32.78],[-85.245,31.42],[-83.2,29.375],[-85.245,25.897],[-99.03,24.538],[-112.816,25.897]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.069],[-10.625,-0.201],[-10.625,-0.126],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.084],[10.624,0.259],[10.624,-0.085],[10.624,-0.302],[10.624,-0.514]],"o":[[-0.063,1.526],[10.624,0.514],[10.624,0.302],[10.624,0.085],[10.624,-0.259],[1.279,-0.081],[0.077,-1.526],[-10.625,-0.628],[-10.625,-0.09],[-10.625,0.127],[-10.625,0.201],[-1.302,0.068]],"v":[[-17.344,-28.749],[-14.908,-25.863],[16.966,-24.867],[48.839,-24.525],[80.713,-24.728],[112.586,-25.863],[114.996,-28.474],[112.586,-31.387],[80.713,-32.522],[48.839,-32.725],[16.966,-32.383],[-14.908,-31.387]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.293,-0.127],[-6.294,0.179],[-6.293,0.628],[-0.134,1.338],[1.525,0.152],[6.292,0.26],[6.293,-0.088],[6.294,-0.302],[6.293,-0.515]],"o":[[-0.125,1.525],[6.293,0.515],[6.294,0.302],[6.293,0.088],[6.292,-0.26],[1.288,-0.128],[0.152,-1.525],[-6.293,-0.628],[-6.294,-0.179],[-6.293,0.127],[-6.293,0.201],[-1.329,0.107]],"v":[[-115.149,-28.861],[-112.613,-25.874],[-93.734,-24.878],[-74.855,-24.535],[-55.975,-24.738],[-37.096,-25.874],[-34.61,-28.36],[-37.096,-31.397],[-55.975,-32.533],[-74.855,-32.736],[-93.734,-32.393],[-112.613,-31.397]],"c":true}},"nm":"Path 3","mn":"ADBE Vector Shape - Group"},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.065,-1.438],[-1.526,-0.067],[-11.508,-0.201],[-11.508,-0.127],[-11.508,0.089],[-11.508,0.629],[-0.077,1.419],[1.525,0.083],[11.507,0.259],[11.507,-0.084],[11.507,-0.303],[11.507,-0.515]],"o":[[-0.068,1.525],[11.507,0.515],[11.507,0.302],[11.507,0.084],[11.507,-0.26],[1.385,-0.08],[0.084,-1.525],[-11.508,-0.628],[-11.508,-0.09],[-11.508,0.127],[-11.508,0.2],[-1.41,0.067]],"v":[[-68.421,28.495],[-65.783,31.379],[-31.26,32.376],[3.262,32.718],[37.785,32.516],[72.308,31.379],[74.918,28.769],[72.308,25.857],[37.785,24.721],[3.262,24.518],[-31.26,24.861],[-65.783,25.857]],"c":true}},"nm":"Path 4","mn":"ADBE Vector Shape - Group"},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.242,-1.117],[-1.525,-0.33],[-4.596,-0.075],[-4.596,1.192],[-0.268,1.036],[1.525,0.396],[4.596,-0.044],[4.595,-0.994]],"o":[[-0.329,1.526],[4.595,0.994],[4.596,0.044],[0.967,-0.253],[0.396,-1.525],[-4.596,-1.193],[-4.596,0.075],[-1.049,0.229]],"v":[[-0.778,-0.621],[1.387,2.738],[15.173,4.097],[28.959,2.738],[31.003,0.693],[28.959,-2.785],[15.173,-4.144],[1.387,-2.785]],"c":true}},"nm":"Path 5","mn":"ADBE Vector Shape - Group"},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-1.357,0.093],[-7.415,0.201],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.629],[0.129,-1.525],[1.323,-0.111],[7.415,-0.259],[7.415,0.089],[7.416,0.303],[7.415,0.514],[-0.106,1.525]],"o":[[7.415,-0.514],[7.416,-0.302],[7.415,-0.088],[7.415,0.259],[1.526,0.129],[-0.116,1.367],[-7.415,0.628],[-7.415,0.179],[-7.415,-0.127],[-7.415,-0.2],[-1.525,-0.106],[0.096,-1.396]],"v":[[-112.582,-2.785],[-90.336,-3.782],[-68.09,-4.124],[-45.844,-3.921],[-23.599,-2.785],[-21.071,0.21],[-23.599,2.738],[-45.844,3.874],[-68.09,4.077],[-90.336,3.734],[-112.582,2.738],[-115.151,-0.215]],"c":true}},"nm":"Path 6","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,104.848],"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 7","np":7,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":7,"ty":4,"nm":"text-bodymovin Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,232.087,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[12.516,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,-12.516],[0,0],[0,0],[0,0]],"v":[[-96.144,18.343],[115.035,18.343],[115.035,4.32],[92.373,-18.343],[-115,-18.343],[-115,18.343]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,18.343],"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 6","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":8,"ty":4,"nm":"Image Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":10,"s":[155,374,0],"e":[155,402,0],"to":[0,4.66666650772095,0],"ti":[0,-4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":12,"s":[155,402,0],"e":[155,402,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":25,"s":[155,402,0],"e":[155,430,0],"to":[0,4.66666650772095,0],"ti":[0,-4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":27,"s":[155,430,0],"e":[155,430,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":87,"s":[155,430,0],"e":[155,402,0],"to":[0,-4.66666650772095,0],"ti":[0,4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":89,"s":[155,402,0],"e":[155,402,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":94,"s":[155,402,0],"e":[155,374,0],"to":[0,-4.66666650772095,0],"ti":[0,4.66666650772095,0]},{"t":96}]},"a":{"a":0,"k":[115,70,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[191.039,37.805],"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"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,1.83],[0,0],[26.664,3.881],[44.378,51.841],[0,0],[0,0]],"o":[[0,0],[-11.598,-14.112],[-48.045,-6.995],[0,0],[0,0],[1.83,0]],"v":[[115,46.772],[115,19.79],[56.449,-6.075],[-115,-50.085],[-115,50.085],[111.687,50.085]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,89.771],"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"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.83,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,1.83]],"v":[[111.687,69.855],[-115,69.855],[-115,-69.855],[115,-69.855],[115,66.542]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-115,-70.001],[115,-70.001],[115,69.999],[-115,69.999]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ty":"mm","mm":4,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,70.001],"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":4,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":9,"ty":4,"nm":"iPhone Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,305,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file +{"v":"5.3.4","fr":30,"ip":0,"op":135,"w":310,"h":464,"nm":"post-on-the-go","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 4 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":34,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":36,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":82,"s":[100],"e":[0]},{"t":84}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,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":[[-1.047,0.228],[-4.59,0.075],[-4.589,-1.191],[0.396,-1.524],[0.966,-0.253],[4.589,0.044],[4.59,0.992],[-0.329,1.524]],"o":[[4.59,-0.993],[4.589,-0.045],[1.524,0.395],[-0.267,1.034],[-4.589,1.191],[-4.59,-0.075],[-1.522,-0.329],[0.241,-1.116]],"v":[[-13.742,-2.757],[0.027,-4.115],[13.794,-2.757],[15.836,0.717],[13.794,2.758],[0.027,4.116],[-13.742,2.758],[-15.903,-0.596]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,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":[169.994,185.684],"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}],"ip":22,"op":84,"st":22,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 5 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":28,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":30,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":84,"s":[100],"e":[0]},{"t":86}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,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":[[-1.047,0.228],[-4.589,0.075],[-4.589,-1.191],[0.395,-1.524],[0.965,-0.253],[4.59,0.044],[4.589,0.992],[-0.329,1.524]],"o":[[4.589,-0.993],[4.59,-0.045],[1.523,0.395],[-0.268,1.034],[-4.589,1.191],[-4.589,-0.075],[-1.523,-0.329],[0.242,-1.116]],"v":[[-13.741,-2.757],[0.027,-4.115],[13.795,-2.757],[15.837,0.717],[13.795,2.758],[0.027,4.116],[-13.741,2.758],[-15.903,-0.596]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,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":[126.146,185.684],"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}],"ip":20,"op":86,"st":20,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 6 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":25,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":27,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":87,"s":[100],"e":[0]},{"t":89}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,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":[[-1.357,0.093],[-7.415,0.2],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.628],[0.13,-1.524],[1.323,-0.111],[7.415,-0.26],[7.416,0.088],[7.415,0.301],[7.415,0.514],[-0.106,1.525]],"o":[[7.415,-0.515],[7.415,-0.303],[7.416,-0.089],[7.415,0.259],[1.525,0.129],[-0.115,1.367],[-7.415,0.628],[-7.415,0.179],[-7.415,-0.127],[-7.415,-0.202],[-1.525,-0.106],[0.097,-1.396]],"v":[[-44.611,-2.761],[-22.365,-3.757],[-0.12,-4.1],[22.126,-3.897],[44.372,-2.761],[46.899,0.234],[44.372,2.762],[22.126,3.898],[-0.12,4.101],[-22.365,3.759],[-44.611,2.762],[-47.181,-0.191]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,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":[47.029,185.684],"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}],"ip":17,"op":89,"st":17,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 3 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":16,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":18,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":93,"s":[100],"e":[0]},{"t":95}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,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":[[-1.302,0.067],[-10.625,0.201],[-10.625,0.127],[-10.625,-0.089],[-10.625,-0.629],[0.077,-1.525],[1.279,-0.081],[10.624,-0.259],[10.624,0.084],[10.624,0.302],[10.624,0.515],[-0.063,1.525]],"o":[[10.624,-0.515],[10.624,-0.302],[10.624,-0.084],[10.624,0.26],[1.408,0.083],[-0.071,1.419],[-10.625,0.628],[-10.625,0.09],[-10.625,-0.127],[-10.625,-0.201],[-1.409,-0.068],[0.06,-1.439]],"v":[[-63.704,-2.761],[-31.83,-3.758],[0.043,-4.1],[31.917,-3.898],[63.79,-2.761],[66.2,0.151],[63.79,2.761],[31.917,3.897],[0.043,4.1],[-31.83,3.758],[-63.704,2.761],[-66.14,-0.123]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,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":[163.797,162.199],"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}],"ip":11,"op":95,"st":11,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Layer 7 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":9,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":95,"s":[100],"e":[0]},{"t":97}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,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":[[-1.33,0.107],[-6.293,0.2],[-6.293,0.127],[-6.294,-0.179],[-6.293,-0.628],[0.153,-1.525],[1.288,-0.126],[6.292,-0.26],[6.293,0.089],[6.293,0.301],[6.292,0.515],[-0.125,1.525]],"o":[[6.292,-0.515],[6.293,-0.303],[6.293,-0.089],[6.292,0.259],[1.525,0.152],[-0.133,1.338],[-6.293,0.629],[-6.294,0.179],[-6.293,-0.127],[-6.293,-0.202],[-1.525,-0.124],[0.112,-1.373]],"v":[[-37.884,-2.761],[-19.005,-3.757],[-0.126,-4.1],[18.754,-3.897],[37.633,-2.761],[40.118,0.276],[37.633,2.761],[18.754,3.898],[-0.126,4.1],[-19.005,3.759],[-37.884,2.761],[-40.42,-0.225]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,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":[40.271,162.189],"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}],"ip":9,"op":97,"st":9,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"text-bodymovin Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,232.087,0],"ix":2},"a":{"a":0,"k":[115,100,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.242,-1.118],[-1.525,-0.33],[-4.596,-0.076],[-4.594,1.193],[-0.268,1.037],[1.526,0.396],[4.595,-0.044],[4.595,-0.993]],"o":[[-0.33,1.524],[4.595,0.995],[4.595,0.044],[0.967,-0.254],[0.396,-1.525],[-4.594,-1.192],[-4.596,0.076],[-1.049,0.228]],"v":[[-114.981,28.062],[-112.816,31.42],[-99.03,32.78],[-85.245,31.42],[-83.2,29.375],[-85.245,25.897],[-99.03,24.538],[-112.816,25.897]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.069],[-10.625,-0.201],[-10.625,-0.126],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.084],[10.624,0.259],[10.624,-0.085],[10.624,-0.302],[10.624,-0.514]],"o":[[-0.063,1.526],[10.624,0.514],[10.624,0.302],[10.624,0.085],[10.624,-0.259],[1.279,-0.081],[0.077,-1.526],[-10.625,-0.628],[-10.625,-0.09],[-10.625,0.127],[-10.625,0.201],[-1.302,0.068]],"v":[[-17.344,-28.749],[-14.908,-25.863],[16.966,-24.867],[48.839,-24.525],[80.713,-24.728],[112.586,-25.863],[114.996,-28.474],[112.586,-31.387],[80.713,-32.522],[48.839,-32.725],[16.966,-32.383],[-14.908,-31.387]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.293,-0.127],[-6.294,0.179],[-6.293,0.628],[-0.134,1.338],[1.525,0.152],[6.292,0.26],[6.293,-0.088],[6.294,-0.302],[6.293,-0.515]],"o":[[-0.125,1.525],[6.293,0.515],[6.294,0.302],[6.293,0.088],[6.292,-0.26],[1.288,-0.128],[0.152,-1.525],[-6.293,-0.628],[-6.294,-0.179],[-6.293,0.127],[-6.293,0.201],[-1.329,0.107]],"v":[[-115.149,-28.861],[-112.613,-25.874],[-93.734,-24.878],[-74.855,-24.535],[-55.975,-24.738],[-37.096,-25.874],[-34.61,-28.36],[-37.096,-31.397],[-55.975,-32.533],[-74.855,-32.736],[-93.734,-32.393],[-112.613,-31.397]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.065,-1.438],[-1.526,-0.067],[-11.508,-0.201],[-11.508,-0.127],[-11.508,0.089],[-11.508,0.629],[-0.077,1.419],[1.525,0.083],[11.507,0.259],[11.507,-0.084],[11.507,-0.303],[11.507,-0.515]],"o":[[-0.068,1.525],[11.507,0.515],[11.507,0.302],[11.507,0.084],[11.507,-0.26],[1.385,-0.08],[0.084,-1.525],[-11.508,-0.628],[-11.508,-0.09],[-11.508,0.127],[-11.508,0.2],[-1.41,0.067]],"v":[[-68.421,28.495],[-65.783,31.379],[-31.26,32.376],[3.262,32.718],[37.785,32.516],[72.308,31.379],[74.918,28.769],[72.308,25.857],[37.785,24.721],[3.262,24.518],[-31.26,24.861],[-65.783,25.857]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.242,-1.117],[-1.525,-0.33],[-4.596,-0.075],[-4.596,1.192],[-0.268,1.036],[1.525,0.396],[4.596,-0.044],[4.595,-0.994]],"o":[[-0.329,1.526],[4.595,0.994],[4.596,0.044],[0.967,-0.253],[0.396,-1.525],[-4.596,-1.193],[-4.596,0.075],[-1.049,0.229]],"v":[[-0.778,-0.621],[1.387,2.738],[15.173,4.097],[28.959,2.738],[31.003,0.693],[28.959,-2.785],[15.173,-4.144],[1.387,-2.785]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-1.357,0.093],[-7.415,0.201],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.629],[0.129,-1.525],[1.323,-0.111],[7.415,-0.259],[7.415,0.089],[7.416,0.303],[7.415,0.514],[-0.106,1.525]],"o":[[7.415,-0.514],[7.416,-0.302],[7.415,-0.088],[7.415,0.259],[1.526,0.129],[-0.116,1.367],[-7.415,0.628],[-7.415,0.179],[-7.415,-0.127],[-7.415,-0.2],[-1.525,-0.106],[0.096,-1.396]],"v":[[-112.582,-2.785],[-90.336,-3.782],[-68.09,-4.124],[-45.844,-3.921],[-23.599,-2.785],[-21.071,0.21],[-23.599,2.738],[-45.844,3.874],[-68.09,4.077],[-90.336,3.734],[-112.582,2.738],[-115.151,-0.215]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,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":[115,104.848],"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 7","np":7,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"text-bodymovin Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,232.087,0],"ix":2},"a":{"a":0,"k":[115,100,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],[12.516,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,-12.516],[0,0],[0,0],[0,0]],"v":[[-96.144,18.343],[115.035,18.343],[115.035,4.32],[92.373,-18.343],[-115,-18.343],[-115,18.343]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.435294117647,0.576470588235,0.678431372549,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":[115,18.343],"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 6","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Image Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":10,"s":[155,374,0],"e":[155,402,0],"to":[0,4.66666650772095,0],"ti":[0,-4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":12,"s":[155,402,0],"e":[155,402,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":25,"s":[155,402,0],"e":[155,430,0],"to":[0,4.66666650772095,0],"ti":[0,-4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":27,"s":[155,430,0],"e":[155,430,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":87,"s":[155,430,0],"e":[155,402,0],"to":[0,-4.66666650772095,0],"ti":[0,4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":89,"s":[155,402,0],"e":[155,402,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":94,"s":[155,402,0],"e":[155,374,0],"to":[0,-4.66666650772095,0],"ti":[0,4.66666650772095,0]},{"t":96}],"ix":2},"a":{"a":0,"k":[115,70,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,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"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":[191.039,37.805],"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,1.83],[0,0],[26.664,3.881],[44.378,51.841],[0,0],[0,0]],"o":[[0,0],[-11.598,-14.112],[-48.045,-6.995],[0,0],[0,0],[1.83,0]],"v":[[115,46.772],[115,19.79],[56.449,-6.075],[-115,-50.085],[-115,50.085],[111.687,50.085]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.435294117647,0.576470588235,0.678431372549,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":[115,89.771],"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":[[1.83,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,1.83]],"v":[[111.687,69.855],[-115,69.855],[-115,-69.855],[115,-69.855],[115,66.542]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.733333333333,0.788235294118,0.835294117647,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":[115,70.001],"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":4,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":9,"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.328,303.21],"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":[]} \ No newline at end of file diff --git a/WordPress/src/main/assets/login_anims/reader.json b/WordPress/src/main/assets/login_anims/reader.json index 900748778ed3..0b8560c5c9e6 100644 --- a/WordPress/src/main/assets/login_anims/reader.json +++ b/WordPress/src/main/assets/login_anims/reader.json @@ -1 +1 @@ -{"v":"4.7.0","fr":30,"ip":0,"op":150,"w":306,"h":462,"nm":"Reader","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"iphone-outline Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[153,303,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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,2.5],[135,2.5],[135,-2.5],[-135,-2.5]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,113.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"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[135,-192],[135,-187],[135,243],[-135,243],[-135,-187],[-135,-192],[-135,-246],[135,-246]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[23.1,0],[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0]],"o":[[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1]],"v":[[111,-303],[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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":4,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Cards Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.967],"y":[1]},"o":{"x":[0.158],"y":[0]},"n":["0p967_1_0p158_0"],"t":10,"s":[153],"e":[153]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.205],"y":[0]},"n":["0p833_1_0p205_0"],"t":46,"s":[153],"e":[153]},{"i":{"x":[0.985],"y":[1]},"o":{"x":[0.015],"y":[0]},"n":["0p985_1_0p015_0"],"t":90,"s":[153],"e":[153]},{"t":110}]},"y":{"a":1,"k":[{"i":{"x":[0.069],"y":[1]},"o":{"x":[0.216],"y":[0]},"n":["0p069_1_0p216_0"],"t":10,"s":[431],"e":[97]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.205],"y":[0.185]},"n":["0p833_1_0p205_0p185"],"t":44,"s":[97],"e":[97]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.301],"y":[0]},"n":["0_1_0p301_0"],"t":90,"s":[97],"e":[431]},{"t":118}]}},"a":{"a":0,"k":[115,300,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,-0.229],[-4.59,-0.075],[-4.589,1.191],[0.396,1.524],[0.966,0.253],[4.589,-0.044],[4.59,-0.992],[-0.329,-1.524]],"o":[[4.59,0.992],[4.589,0.044],[1.524,-0.396],[-0.267,-1.035],[-4.589,-1.191],[-4.59,0.075],[-1.522,0.329],[0.241,1.115]],"v":[[41.252,-80.641],[55.021,-79.284],[68.788,-80.641],[70.83,-84.115],[68.788,-86.157],[55.021,-87.514],[41.252,-86.157],[39.091,-82.802]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.048,-0.229],[-4.589,-0.075],[-4.588,1.191],[0.396,1.524],[0.966,0.253],[4.59,-0.044],[4.589,-0.992],[-0.329,-1.524]],"o":[[4.589,0.992],[4.59,0.044],[1.524,-0.396],[-0.267,-1.035],[-4.588,-1.191],[-4.589,0.075],[-1.523,0.329],[0.241,1.115]],"v":[[-2.595,-80.641],[11.173,-79.284],[24.94,-80.641],[26.982,-84.115],[24.94,-86.157],[11.173,-87.514],[-2.595,-86.157],[-4.757,-82.802]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[-1.358,-0.093],[-7.415,-0.201],[-7.415,-0.127],[-7.415,0.178],[-7.415,0.628],[0.129,1.525],[1.323,0.112],[7.415,0.259],[7.415,-0.088],[7.416,-0.301],[7.415,-0.514],[-0.106,-1.526]],"o":[[7.415,0.515],[7.416,0.302],[7.415,0.088],[7.415,-0.26],[1.526,-0.129],[-0.116,-1.366],[-7.415,-0.627],[-7.415,-0.179],[-7.415,0.127],[-7.415,0.202],[-1.526,0.107],[0.096,1.395]],"v":[[-112.581,-80.637],[-90.336,-79.641],[-68.09,-79.298],[-45.844,-79.501],[-23.599,-80.637],[-21.071,-83.633],[-23.599,-86.161],[-45.844,-87.296],[-68.09,-87.499],[-90.336,-87.157],[-112.581,-86.161],[-115.151,-83.207]],"c":true}},"nm":"Path 3","mn":"ADBE Vector Shape - Group"},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.241,-1.116],[-1.522,-0.329],[-4.59,-0.076],[-4.589,1.191],[-0.267,1.035],[1.524,0.396],[4.589,-0.044],[4.59,-0.992]],"o":[[-0.329,1.523],[4.59,0.993],[4.589,0.044],[0.966,-0.253],[0.396,-1.523],[-4.589,-1.191],[-4.59,0.075],[-1.047,0.229]],"v":[[39.091,177.251],[41.252,180.605],[55.021,181.963],[68.788,180.605],[70.83,178.563],[68.788,175.089],[55.021,173.732],[41.252,175.089]],"c":true}},"nm":"Path 4","mn":"ADBE Vector Shape - Group"},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.241,-1.116],[-1.523,-0.329],[-4.589,-0.076],[-4.588,1.191],[-0.267,1.035],[1.524,0.396],[4.59,-0.044],[4.589,-0.992]],"o":[[-0.329,1.523],[4.589,0.993],[4.59,0.044],[0.966,-0.253],[0.396,-1.523],[-4.588,-1.191],[-4.589,0.075],[-1.048,0.229]],"v":[[-4.757,177.251],[-2.595,180.605],[11.173,181.963],[24.94,180.605],[26.982,178.563],[24.94,175.089],[11.173,173.732],[-2.595,175.089]],"c":true}},"nm":"Path 5","mn":"ADBE Vector Shape - Group"},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.096,-1.396],[-1.526,-0.105],[-7.415,-0.2],[-7.415,-0.127],[-7.415,0.178],[-7.415,0.628],[-0.116,1.366],[1.526,0.129],[7.415,0.26],[7.415,-0.088],[7.416,-0.301],[7.415,-0.515]],"o":[[-0.106,1.525],[7.415,0.515],[7.416,0.303],[7.415,0.089],[7.415,-0.259],[1.323,-0.111],[0.129,-1.526],[-7.415,-0.628],[-7.415,-0.179],[-7.415,0.127],[-7.415,0.202],[-1.358,0.092]],"v":[[-115.151,177.656],[-112.581,180.609],[-90.336,181.605],[-68.09,181.948],[-45.844,181.745],[-23.599,180.609],[-21.071,178.082],[-23.599,175.086],[-45.844,173.95],[-68.09,173.747],[-90.336,174.089],[-112.581,175.086]],"c":true}},"nm":"Path 6","mn":"ADBE Vector Shape - Group"},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.069],[-10.625,-0.201],[-10.625,-0.126],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.083],[10.624,0.259],[10.624,-0.084],[10.624,-0.303],[10.624,-0.514]],"o":[[-0.063,1.525],[10.624,0.513],[10.624,0.301],[10.624,0.084],[10.624,-0.259],[1.279,-0.081],[0.077,-1.525],[-10.625,-0.628],[-10.625,-0.089],[-10.625,0.127],[-10.625,0.2],[-1.302,0.068]],"v":[[-17.344,154.239],[-14.908,157.125],[16.966,158.121],[48.839,158.463],[80.713,158.26],[112.586,157.125],[114.996,154.513],[112.586,151.601],[80.713,150.465],[48.839,150.262],[16.966,150.605],[-14.908,151.601]],"c":true}},"nm":"Path 7","mn":"ADBE Vector Shape - Group"},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.292,-0.127],[-6.294,0.178],[-6.293,0.628],[-0.134,1.337],[1.525,0.153],[6.292,0.259],[6.294,-0.088],[6.294,-0.301],[6.293,-0.514]],"o":[[-0.125,1.525],[6.293,0.515],[6.294,0.303],[6.294,0.088],[6.292,-0.26],[1.288,-0.128],[0.153,-1.526],[-6.293,-0.627],[-6.294,-0.179],[-6.292,0.127],[-6.293,0.202],[-1.329,0.108]],"v":[[-115.149,154.127],[-112.613,157.114],[-93.734,158.11],[-74.855,158.453],[-55.975,158.25],[-37.096,157.114],[-34.61,154.628],[-37.096,151.59],[-55.975,150.455],[-74.855,150.252],[-93.734,150.594],[-112.613,151.59]],"c":true}},"nm":"Path 8","mn":"ADBE Vector Shape - Group"},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[0.242,-1.117],[-1.525,-0.329],[-4.595,-0.075],[-4.594,1.193],[-0.268,1.036],[1.526,0.396],[4.595,-0.045],[4.595,-0.994]],"o":[[-0.33,1.526],[4.595,0.994],[4.595,0.045],[0.967,-0.253],[0.396,-1.525],[-4.594,-1.193],[-4.595,0.075],[-1.049,0.229]],"v":[[-114.981,-121.151],[-112.816,-117.792],[-99.03,-116.433],[-85.245,-117.792],[-83.2,-119.837],[-85.245,-123.315],[-99.03,-124.674],[-112.816,-123.315]],"c":true}},"nm":"Path 9","mn":"ADBE Vector Shape - Group"},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.068],[-10.625,-0.201],[-10.625,-0.127],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.083],[10.624,0.26],[10.624,-0.085],[10.624,-0.302],[10.624,-0.514]],"o":[[-0.063,1.526],[10.624,0.515],[10.624,0.302],[10.624,0.084],[10.624,-0.259],[1.279,-0.081],[0.077,-1.526],[-10.625,-0.628],[-10.625,-0.09],[-10.625,0.127],[-10.625,0.201],[-1.302,0.068]],"v":[[-17.344,-177.961],[-14.908,-175.076],[16.966,-174.079],[48.839,-173.737],[80.713,-173.94],[112.586,-175.076],[114.996,-177.686],[112.586,-180.599],[80.713,-181.735],[48.839,-181.937],[16.966,-181.595],[-14.908,-180.599]],"c":true}},"nm":"Path 10","mn":"ADBE Vector Shape - Group"},{"ind":10,"ty":"sh","ix":11,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.292,-0.127],[-6.294,0.179],[-6.293,0.628],[-0.134,1.338],[1.525,0.152],[6.292,0.259],[6.294,-0.089],[6.294,-0.303],[6.293,-0.515]],"o":[[-0.125,1.526],[6.293,0.514],[6.294,0.302],[6.294,0.088],[6.292,-0.26],[1.288,-0.128],[0.153,-1.526],[-6.293,-0.628],[-6.294,-0.179],[-6.292,0.127],[-6.293,0.2],[-1.329,0.107]],"v":[[-115.149,-178.074],[-112.613,-175.086],[-93.734,-174.09],[-74.855,-173.747],[-55.975,-173.95],[-37.096,-175.086],[-34.61,-177.572],[-37.096,-180.609],[-55.975,-181.745],[-74.855,-181.948],[-93.734,-181.605],[-112.613,-180.609]],"c":true}},"nm":"Path 11","mn":"ADBE Vector Shape - Group"},{"ind":11,"ty":"sh","ix":12,"ks":{"a":0,"k":{"i":[[0.065,-1.439],[-1.526,-0.069],[-11.508,-0.201],[-11.508,-0.126],[-11.508,0.09],[-11.508,0.628],[-0.077,1.418],[1.525,0.084],[11.507,0.26],[11.508,-0.084],[11.507,-0.302],[11.507,-0.514]],"o":[[-0.068,1.525],[11.507,0.514],[11.507,0.302],[11.508,0.084],[11.507,-0.258],[1.385,-0.081],[0.084,-1.525],[-11.508,-0.628],[-11.508,-0.089],[-11.508,0.127],[-11.508,0.201],[-1.41,0.068]],"v":[[-68.421,-120.717],[-65.783,-117.832],[-31.26,-116.836],[3.262,-116.494],[37.785,-116.697],[72.308,-117.832],[74.918,-120.443],[72.308,-123.356],[37.785,-124.492],[3.262,-124.695],[-31.26,-124.352],[-65.783,-123.356]],"c":true}},"nm":"Path 12","mn":"ADBE Vector Shape - Group"},{"ind":12,"ty":"sh","ix":13,"ks":{"a":0,"k":{"i":[[0.242,-1.118],[-1.525,-0.33],[-4.596,-0.075],[-4.596,1.192],[-0.268,1.036],[1.525,0.395],[4.596,-0.044],[4.595,-0.995]],"o":[[-0.329,1.525],[4.595,0.993],[4.596,0.045],[0.967,-0.254],[0.396,-1.525],[-4.596,-1.193],[-4.596,0.076],[-1.049,0.228]],"v":[[-0.778,-149.833],[1.387,-146.474],[15.173,-145.116],[28.959,-146.474],[31.003,-148.519],[28.959,-151.997],[15.173,-153.357],[1.387,-151.997]],"c":true}},"nm":"Path 13","mn":"ADBE Vector Shape - Group"},{"ind":13,"ty":"sh","ix":14,"ks":{"a":0,"k":{"i":[[-1.358,0.092],[-7.415,0.201],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.628],[0.129,-1.525],[1.323,-0.111],[7.415,-0.26],[7.415,0.088],[7.416,0.302],[7.415,0.515],[-0.106,1.524]],"o":[[7.415,-0.515],[7.416,-0.302],[7.415,-0.089],[7.415,0.259],[1.526,0.128],[-0.116,1.367],[-7.415,0.628],[-7.415,0.178],[-7.415,-0.127],[-7.415,-0.201],[-1.526,-0.106],[0.096,-1.396]],"v":[[-112.581,-151.997],[-90.336,-152.994],[-68.09,-153.336],[-45.844,-153.133],[-23.599,-151.997],[-21.071,-149.002],[-23.599,-146.474],[-45.844,-145.338],[-68.09,-145.135],[-90.336,-145.478],[-112.581,-146.474],[-115.151,-149.427]],"c":true}},"nm":"Path 14","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,354.135],"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":15,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.464,-1.615],[-2.528,5.622]],"o":[[-3.106,3.428],[1.811,-4.028]],"v":[[-1.597,-3.845],[2.892,-0.161]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[126.659,443.744],"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"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.818,2.02],[3.963,-4.719]],"o":[[1.736,-4.288],[-2.84,3.382]],"v":[[-4.207,-0.767],[1.062,1.673]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[201.302,439.586],"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"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.817,2.02],[2.556,-3.602]],"o":[[1.737,-4.288],[-2.555,3.602]],"v":[[-2.993,-1.016],[1.254,1.702]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[177.04,420.634],"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 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.178,-0.091],[-4.251,1.194]],"o":[[-4.622,0.192],[4.252,-1.194]],"v":[[-0.38,-3.009],[0.751,1.905]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[198.404,379.927],"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 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.456,-1.241],[-4.251,1.194]],"o":[[-4.456,1.241],[4.252,-1.194]],"v":[[-0.463,-2.434],[0.668,2.48]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[154.751,386.841],"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 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.397,-1.477],[-0.458,-0.982],[-0.423,-0.219],[-0.108,-0.053],[-0.159,-0.008],[-0.338,0.02],[-1.422,0.465],[-2.715,1.657],[-2.597,1.948],[-4.737,4.567],[-4.492,4.831],[-4.051,5.145],[-2.962,5.657],[-0.774,2.887],[-0.142,0.714],[-0.036,0.346],[0,0],[0,0],[0.596,0.653],[1.319,0.095],[0.711,-0.06],[0.74,-0.225],[2.825,-1.639],[0,0],[0.339,0.585],[-0.445,0.375],[-3.349,1.406],[-2.038,0.076],[-0.261,-0.012],[0,0],[-0.268,-0.043],[0,0],[-0.267,-0.12],[0,0],[-0.462,-0.401],[-0.379,-0.473],[-0.265,-0.522],[-0.075,-1.012],[0.365,-1.807],[1.474,-3.168],[4.036,-5.49],[4.542,-5.015],[4.979,-4.615],[5.628,-3.936],[3.109,-1.6],[1.665,-0.631],[0.844,-0.289],[0.913,-0.167],[2.069,0.423],[0.509,0.181],[0.25,0.137],[0.223,0.216],[0.332,1.105],[-0.788,1.626],[-1.188,1.25],[-0.246,-0.233],[0.132,-0.239]],"o":[[-0.795,1.435],[-0.403,1.458],[0.264,0.452],[0.081,0.076],[0.129,0.035],[0.297,0.03],[1.236,0.071],[2.852,-0.899],[2.757,-1.605],[5.206,-3.894],[4.799,-4.498],[4.516,-4.81],[4.032,-5.149],[1.473,-2.818],[0.229,-0.729],[0.063,-0.355],[0,0],[0,0],[-0.028,-1.302],[-0.571,-0.67],[-0.644,-0.077],[-0.722,0.14],[-2.974,0.781],[0,0],[-0.584,0.338],[-0.302,-0.52],[2.62,-2.218],[1.671,-0.705],[0.255,-0.007],[0,0],[0.267,0.03],[0,0],[0.272,0.088],[0,0],[0.544,0.251],[0.496,0.378],[0.367,0.485],[0.404,1.042],[0.202,2.043],[-0.705,3.637],[-3.008,6.314],[-4.055,5.482],[-4.58,4.981],[-5.027,4.557],[-2.822,1.957],[-1.561,0.785],[-0.811,0.344],[-0.874,0.25],[-1.813,0.335],[-0.504,-0.07],[-0.256,-0.078],[-0.247,-0.163],[-0.96,-0.749],[-0.497,-2.26],[0.819,-1.639],[0.233,-0.245],[0.207,0.197],[0,0]],"v":[[-38.758,32.822],[-40.631,37.209],[-40.629,41.168],[-39.655,42.181],[-39.309,42.323],[-38.941,42.447],[-38.075,42.566],[-33.98,41.953],[-25.566,37.936],[-17.577,32.487],[-2.702,19.679],[11.171,5.569],[24.045,-9.373],[34.8,-25.553],[38.298,-34.177],[38.743,-36.321],[38.834,-37.353],[38.876,-37.867],[38.848,-38.345],[37.918,-41.382],[35.012,-42.575],[32.942,-42.502],[30.75,-42.031],[22.038,-38.12],[22.031,-38.116],[20.359,-38.561],[20.627,-40.108],[29.515,-45.652],[35.053,-46.937],[35.818,-46.957],[36.617,-46.881],[37.418,-46.784],[38.238,-46.552],[39.051,-46.281],[39.845,-45.866],[41.305,-44.798],[42.474,-43.421],[43.288,-41.882],[44.039,-38.76],[43.681,-32.991],[40.156,-22.894],[29.27,-5.393],[16.249,10.255],[1.924,24.636],[-13.991,37.469],[-22.864,42.84],[-27.696,44.975],[-30.238,45.846],[-32.911,46.478],[-38.747,46.546],[-40.302,46.046],[-41.065,45.639],[-41.794,45.148],[-43.744,42.192],[-42.832,36.36],[-39.729,32.085],[-38.862,32.063],[-38.748,32.804]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.518,0.753,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[76.621,402.73],"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 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.953,-21.002],[21.895,7.258],[-2.144,21.472],[-21.188,-4.084]],"o":[[-4.953,21.002],[-20.482,-6.789],[2.407,-24.099],[22.139,4.268]],"v":[[36.814,8.758],[-9.791,35.815],[-39.622,-7.907],[6.122,-38.989]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[77.475,404.954],"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 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group"},{"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":[[115,69.859],[-115.538,69.859],[-115.538,-69.859],[115,-69.859]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,403.141],"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 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[191.039,37.805],"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 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,1.83],[0,0],[26.664,3.882],[44.378,51.842],[0,0],[0,0]],"o":[[0,0],[-11.598,-14.111],[-48.045,-6.994],[0,0],[0,0],[1.83,0]],"v":[[115,46.771],[115,19.788],[56.449,-6.074],[-115,-50.084],[-115,50.084],[111.687,50.084]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,89.771],"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 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.83,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,1.83]],"v":[[111.687,69.855],[-115,69.855],[-115,-69.855],[115,-69.855],[115,66.542]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,70],"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 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"Background","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[153,303,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"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,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,244.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":1,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file +{"v":"4.7.0","fr":30,"ip":0,"op":150,"w":306,"h":462,"nm":"Reader","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Mask Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[152.724,28.147,0]},"a":{"a":0,"k":[135,217.5,0]},"s":{"a":0,"k":[84.074,13.103,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0]],"o":[[0,0]],"v":[[185.879,-169.017]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0.1372549,0.2078431,0.2941176,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"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":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"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":[[-134.937,27.126],[135.188,27.06],[135.25,-27.016],[-135,-27]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.0039216,0.3764706,0.5294118,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[135.174,643.654],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[118.777,759.676],"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"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-141.244,223.056],[146.374,223.056],[136.711,-211.481],[-136.783,-210.554],[-140.45,-160.256]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.1372549,0.2078431,0.2941177,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[135,217.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100.332,103.011],"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":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Cards Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.967],"y":[1]},"o":{"x":[0.158],"y":[0]},"n":["0p967_1_0p158_0"],"t":10,"s":[153],"e":[153]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.205],"y":[0]},"n":["0p833_1_0p205_0"],"t":46,"s":[153],"e":[153]},{"i":{"x":[0.985],"y":[1]},"o":{"x":[0.015],"y":[0]},"n":["0p985_1_0p015_0"],"t":90,"s":[153],"e":[153]},{"t":110}]},"y":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["1_1_0p167_0"],"t":0,"s":[431],"e":[432]},{"i":{"x":[0.069],"y":[1]},"o":{"x":[0.216],"y":[0]},"n":["0p069_1_0p216_0"],"t":10,"s":[432],"e":[98]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.205],"y":[0.185]},"n":["0p833_1_0p205_0p185"],"t":44,"s":[98],"e":[98]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.301],"y":[0]},"n":["0_1_0p301_0"],"t":90,"s":[98],"e":[432]},{"t":118}]}},"a":{"a":0,"k":[115,300,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,-0.229],[-4.59,-0.075],[-4.589,1.191],[0.396,1.524],[0.966,0.253],[4.589,-0.044],[4.59,-0.992],[-0.329,-1.524]],"o":[[4.59,0.992],[4.589,0.044],[1.524,-0.396],[-0.267,-1.035],[-4.589,-1.191],[-4.59,0.075],[-1.522,0.329],[0.241,1.115]],"v":[[41.252,-80.641],[55.021,-79.284],[68.788,-80.641],[70.83,-84.115],[68.788,-86.157],[55.021,-87.514],[41.252,-86.157],[39.091,-82.802]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.048,-0.229],[-4.589,-0.075],[-4.588,1.191],[0.396,1.524],[0.966,0.253],[4.59,-0.044],[4.589,-0.992],[-0.329,-1.524]],"o":[[4.589,0.992],[4.59,0.044],[1.524,-0.396],[-0.267,-1.035],[-4.588,-1.191],[-4.589,0.075],[-1.523,0.329],[0.241,1.115]],"v":[[-2.595,-80.641],[11.173,-79.284],[24.94,-80.641],[26.982,-84.115],[24.94,-86.157],[11.173,-87.514],[-2.595,-86.157],[-4.757,-82.802]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[-1.358,-0.093],[-7.415,-0.201],[-7.415,-0.127],[-7.415,0.178],[-7.415,0.628],[0.129,1.525],[1.323,0.112],[7.415,0.259],[7.415,-0.088],[7.416,-0.301],[7.415,-0.514],[-0.106,-1.526]],"o":[[7.415,0.515],[7.416,0.302],[7.415,0.088],[7.415,-0.26],[1.526,-0.129],[-0.116,-1.366],[-7.415,-0.627],[-7.415,-0.179],[-7.415,0.127],[-7.415,0.202],[-1.526,0.107],[0.096,1.395]],"v":[[-112.581,-80.637],[-90.336,-79.641],[-68.09,-79.298],[-45.844,-79.501],[-23.599,-80.637],[-21.071,-83.633],[-23.599,-86.161],[-45.844,-87.296],[-68.09,-87.499],[-90.336,-87.157],[-112.581,-86.161],[-115.151,-83.207]],"c":true}},"nm":"Path 3","mn":"ADBE Vector Shape - Group"},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.241,-1.116],[-1.522,-0.329],[-4.59,-0.076],[-4.589,1.191],[-0.267,1.035],[1.524,0.396],[4.589,-0.044],[4.59,-0.992]],"o":[[-0.329,1.523],[4.59,0.993],[4.589,0.044],[0.966,-0.253],[0.396,-1.523],[-4.589,-1.191],[-4.59,0.075],[-1.047,0.229]],"v":[[39.091,177.251],[41.252,180.605],[55.021,181.963],[68.788,180.605],[70.83,178.563],[68.788,175.089],[55.021,173.732],[41.252,175.089]],"c":true}},"nm":"Path 4","mn":"ADBE Vector Shape - Group"},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.241,-1.116],[-1.523,-0.329],[-4.589,-0.076],[-4.588,1.191],[-0.267,1.035],[1.524,0.396],[4.59,-0.044],[4.589,-0.992]],"o":[[-0.329,1.523],[4.589,0.993],[4.59,0.044],[0.966,-0.253],[0.396,-1.523],[-4.588,-1.191],[-4.589,0.075],[-1.048,0.229]],"v":[[-4.757,177.251],[-2.595,180.605],[11.173,181.963],[24.94,180.605],[26.982,178.563],[24.94,175.089],[11.173,173.732],[-2.595,175.089]],"c":true}},"nm":"Path 5","mn":"ADBE Vector Shape - Group"},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.096,-1.396],[-1.526,-0.105],[-7.415,-0.2],[-7.415,-0.127],[-7.415,0.178],[-7.415,0.628],[-0.116,1.366],[1.526,0.129],[7.415,0.26],[7.415,-0.088],[7.416,-0.301],[7.415,-0.515]],"o":[[-0.106,1.525],[7.415,0.515],[7.416,0.303],[7.415,0.089],[7.415,-0.259],[1.323,-0.111],[0.129,-1.526],[-7.415,-0.628],[-7.415,-0.179],[-7.415,0.127],[-7.415,0.202],[-1.358,0.092]],"v":[[-115.151,177.656],[-112.581,180.609],[-90.336,181.605],[-68.09,181.948],[-45.844,181.745],[-23.599,180.609],[-21.071,178.082],[-23.599,175.086],[-45.844,173.95],[-68.09,173.747],[-90.336,174.089],[-112.581,175.086]],"c":true}},"nm":"Path 6","mn":"ADBE Vector Shape - Group"},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.069],[-10.625,-0.201],[-10.625,-0.126],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.083],[10.624,0.259],[10.624,-0.084],[10.624,-0.303],[10.624,-0.514]],"o":[[-0.063,1.525],[10.624,0.513],[10.624,0.301],[10.624,0.084],[10.624,-0.259],[1.279,-0.081],[0.077,-1.525],[-10.625,-0.628],[-10.625,-0.089],[-10.625,0.127],[-10.625,0.2],[-1.302,0.068]],"v":[[-17.344,154.239],[-14.908,157.125],[16.966,158.121],[48.839,158.463],[80.713,158.26],[112.586,157.125],[114.996,154.513],[112.586,151.601],[80.713,150.465],[48.839,150.262],[16.966,150.605],[-14.908,151.601]],"c":true}},"nm":"Path 7","mn":"ADBE Vector Shape - Group"},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.292,-0.127],[-6.294,0.178],[-6.293,0.628],[-0.134,1.337],[1.525,0.153],[6.292,0.259],[6.294,-0.088],[6.294,-0.301],[6.293,-0.514]],"o":[[-0.125,1.525],[6.293,0.515],[6.294,0.303],[6.294,0.088],[6.292,-0.26],[1.288,-0.128],[0.153,-1.526],[-6.293,-0.627],[-6.294,-0.179],[-6.292,0.127],[-6.293,0.202],[-1.329,0.108]],"v":[[-115.149,154.127],[-112.613,157.114],[-93.734,158.11],[-74.855,158.453],[-55.975,158.25],[-37.096,157.114],[-34.61,154.628],[-37.096,151.59],[-55.975,150.455],[-74.855,150.252],[-93.734,150.594],[-112.613,151.59]],"c":true}},"nm":"Path 8","mn":"ADBE Vector Shape - Group"},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[0.242,-1.117],[-1.525,-0.329],[-4.595,-0.075],[-4.594,1.193],[-0.268,1.036],[1.526,0.396],[4.595,-0.045],[4.595,-0.994]],"o":[[-0.33,1.526],[4.595,0.994],[4.595,0.045],[0.967,-0.253],[0.396,-1.525],[-4.594,-1.193],[-4.595,0.075],[-1.049,0.229]],"v":[[-114.981,-121.151],[-112.816,-117.792],[-99.03,-116.433],[-85.245,-117.792],[-83.2,-119.837],[-85.245,-123.315],[-99.03,-124.674],[-112.816,-123.315]],"c":true}},"nm":"Path 9","mn":"ADBE Vector Shape - Group"},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.068],[-10.625,-0.201],[-10.625,-0.127],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.083],[10.624,0.26],[10.624,-0.085],[10.624,-0.302],[10.624,-0.514]],"o":[[-0.063,1.526],[10.624,0.515],[10.624,0.302],[10.624,0.084],[10.624,-0.259],[1.279,-0.081],[0.077,-1.526],[-10.625,-0.628],[-10.625,-0.09],[-10.625,0.127],[-10.625,0.201],[-1.302,0.068]],"v":[[-17.344,-177.961],[-14.908,-175.076],[16.966,-174.079],[48.839,-173.737],[80.713,-173.94],[112.586,-175.076],[114.996,-177.686],[112.586,-180.599],[80.713,-181.735],[48.839,-181.937],[16.966,-181.595],[-14.908,-180.599]],"c":true}},"nm":"Path 10","mn":"ADBE Vector Shape - Group"},{"ind":10,"ty":"sh","ix":11,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.292,-0.127],[-6.294,0.179],[-6.293,0.628],[-0.134,1.338],[1.525,0.152],[6.292,0.259],[6.294,-0.089],[6.294,-0.303],[6.293,-0.515]],"o":[[-0.125,1.526],[6.293,0.514],[6.294,0.302],[6.294,0.088],[6.292,-0.26],[1.288,-0.128],[0.153,-1.526],[-6.293,-0.628],[-6.294,-0.179],[-6.292,0.127],[-6.293,0.2],[-1.329,0.107]],"v":[[-115.149,-178.074],[-112.613,-175.086],[-93.734,-174.09],[-74.855,-173.747],[-55.975,-173.95],[-37.096,-175.086],[-34.61,-177.572],[-37.096,-180.609],[-55.975,-181.745],[-74.855,-181.948],[-93.734,-181.605],[-112.613,-180.609]],"c":true}},"nm":"Path 11","mn":"ADBE Vector Shape - Group"},{"ind":11,"ty":"sh","ix":12,"ks":{"a":0,"k":{"i":[[0.065,-1.439],[-1.526,-0.069],[-11.508,-0.201],[-11.508,-0.126],[-11.508,0.09],[-11.508,0.628],[-0.077,1.418],[1.525,0.084],[11.507,0.26],[11.508,-0.084],[11.507,-0.302],[11.507,-0.514]],"o":[[-0.068,1.525],[11.507,0.514],[11.507,0.302],[11.508,0.084],[11.507,-0.258],[1.385,-0.081],[0.084,-1.525],[-11.508,-0.628],[-11.508,-0.089],[-11.508,0.127],[-11.508,0.201],[-1.41,0.068]],"v":[[-68.421,-120.717],[-65.783,-117.832],[-31.26,-116.836],[3.262,-116.494],[37.785,-116.697],[72.308,-117.832],[74.918,-120.443],[72.308,-123.356],[37.785,-124.492],[3.262,-124.695],[-31.26,-124.352],[-65.783,-123.356]],"c":true}},"nm":"Path 12","mn":"ADBE Vector Shape - Group"},{"ind":12,"ty":"sh","ix":13,"ks":{"a":0,"k":{"i":[[0.242,-1.118],[-1.525,-0.33],[-4.596,-0.075],[-4.596,1.192],[-0.268,1.036],[1.525,0.395],[4.596,-0.044],[4.595,-0.995]],"o":[[-0.329,1.525],[4.595,0.993],[4.596,0.045],[0.967,-0.254],[0.396,-1.525],[-4.596,-1.193],[-4.596,0.076],[-1.049,0.228]],"v":[[-0.778,-149.833],[1.387,-146.474],[15.173,-145.116],[28.959,-146.474],[31.003,-148.519],[28.959,-151.997],[15.173,-153.357],[1.387,-151.997]],"c":true}},"nm":"Path 13","mn":"ADBE Vector Shape - Group"},{"ind":13,"ty":"sh","ix":14,"ks":{"a":0,"k":{"i":[[-1.358,0.092],[-7.415,0.201],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.628],[0.129,-1.525],[1.323,-0.111],[7.415,-0.26],[7.415,0.088],[7.416,0.302],[7.415,0.515],[-0.106,1.524]],"o":[[7.415,-0.515],[7.416,-0.302],[7.415,-0.089],[7.415,0.259],[1.526,0.128],[-0.116,1.367],[-7.415,0.628],[-7.415,0.178],[-7.415,-0.127],[-7.415,-0.201],[-1.526,-0.106],[0.096,-1.396]],"v":[[-112.581,-151.997],[-90.336,-152.994],[-68.09,-153.336],[-45.844,-153.133],[-23.599,-151.997],[-21.071,-149.002],[-23.599,-146.474],[-45.844,-145.338],[-68.09,-145.135],[-90.336,-145.478],[-112.581,-146.474],[-115.151,-149.427]],"c":true}},"nm":"Path 14","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.8470588,0.8705882,0.8941176,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,354.135],"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":15,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.464,-1.615],[-2.528,5.622]],"o":[[-3.106,3.428],[1.811,-4.028]],"v":[[-1.597,-3.845],[2.892,-0.161]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[126.659,443.744],"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"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.818,2.02],[3.963,-4.719]],"o":[[1.736,-4.288],[-2.84,3.382]],"v":[[-4.207,-0.767],[1.062,1.673]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[201.302,439.586],"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"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.817,2.02],[2.556,-3.602]],"o":[[1.737,-4.288],[-2.555,3.602]],"v":[[-2.993,-1.016],[1.254,1.702]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[177.04,420.634],"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 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.178,-0.091],[-4.251,1.194]],"o":[[-4.622,0.192],[4.252,-1.194]],"v":[[-0.38,-3.009],[0.751,1.905]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[198.404,379.927],"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 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.456,-1.241],[-4.251,1.194]],"o":[[-4.456,1.241],[4.252,-1.194]],"v":[[-0.463,-2.434],[0.668,2.48]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[154.751,386.841],"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 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.397,-1.477],[-0.458,-0.982],[-0.423,-0.219],[-0.108,-0.053],[-0.159,-0.008],[-0.338,0.02],[-1.422,0.465],[-2.715,1.657],[-2.597,1.948],[-4.737,4.567],[-4.492,4.831],[-4.051,5.145],[-2.962,5.657],[-0.774,2.887],[-0.142,0.714],[-0.036,0.346],[0,0],[0,0],[0.596,0.653],[1.319,0.095],[0.711,-0.06],[0.74,-0.225],[2.825,-1.639],[0,0],[0.339,0.585],[-0.445,0.375],[-3.349,1.406],[-2.038,0.076],[-0.261,-0.012],[0,0],[-0.268,-0.043],[0,0],[-0.267,-0.12],[0,0],[-0.462,-0.401],[-0.379,-0.473],[-0.265,-0.522],[-0.075,-1.012],[0.365,-1.807],[1.474,-3.168],[4.036,-5.49],[4.542,-5.015],[4.979,-4.615],[5.628,-3.936],[3.109,-1.6],[1.665,-0.631],[0.844,-0.289],[0.913,-0.167],[2.069,0.423],[0.509,0.181],[0.25,0.137],[0.223,0.216],[0.332,1.105],[-0.788,1.626],[-1.188,1.25],[-0.246,-0.233],[0.132,-0.239]],"o":[[-0.795,1.435],[-0.403,1.458],[0.264,0.452],[0.081,0.076],[0.129,0.035],[0.297,0.03],[1.236,0.071],[2.852,-0.899],[2.757,-1.605],[5.206,-3.894],[4.799,-4.498],[4.516,-4.81],[4.032,-5.149],[1.473,-2.818],[0.229,-0.729],[0.063,-0.355],[0,0],[0,0],[-0.028,-1.302],[-0.571,-0.67],[-0.644,-0.077],[-0.722,0.14],[-2.974,0.781],[0,0],[-0.584,0.338],[-0.302,-0.52],[2.62,-2.218],[1.671,-0.705],[0.255,-0.007],[0,0],[0.267,0.03],[0,0],[0.272,0.088],[0,0],[0.544,0.251],[0.496,0.378],[0.367,0.485],[0.404,1.042],[0.202,2.043],[-0.705,3.637],[-3.008,6.314],[-4.055,5.482],[-4.58,4.981],[-5.027,4.557],[-2.822,1.957],[-1.561,0.785],[-0.811,0.344],[-0.874,0.25],[-1.813,0.335],[-0.504,-0.07],[-0.256,-0.078],[-0.247,-0.163],[-0.96,-0.749],[-0.497,-2.26],[0.819,-1.639],[0.233,-0.245],[0.207,0.197],[0,0]],"v":[[-38.758,32.822],[-40.631,37.209],[-40.629,41.168],[-39.655,42.181],[-39.309,42.323],[-38.941,42.447],[-38.075,42.566],[-33.98,41.953],[-25.566,37.936],[-17.577,32.487],[-2.702,19.679],[11.171,5.569],[24.045,-9.373],[34.8,-25.553],[38.298,-34.177],[38.743,-36.321],[38.834,-37.353],[38.876,-37.867],[38.848,-38.345],[37.918,-41.382],[35.012,-42.575],[32.942,-42.502],[30.75,-42.031],[22.038,-38.12],[22.031,-38.116],[20.359,-38.561],[20.627,-40.108],[29.515,-45.652],[35.053,-46.937],[35.818,-46.957],[36.617,-46.881],[37.418,-46.784],[38.238,-46.552],[39.051,-46.281],[39.845,-45.866],[41.305,-44.798],[42.474,-43.421],[43.288,-41.882],[44.039,-38.76],[43.681,-32.991],[40.156,-22.894],[29.27,-5.393],[16.249,10.255],[1.924,24.636],[-13.991,37.469],[-22.864,42.84],[-27.696,44.975],[-30.238,45.846],[-32.911,46.478],[-38.747,46.546],[-40.302,46.046],[-41.065,45.639],[-41.794,45.148],[-43.744,42.192],[-42.832,36.36],[-39.729,32.085],[-38.862,32.063],[-38.748,32.804]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.0039216,0.3764706,0.5294118,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[76.621,402.73],"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 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.953,-21.002],[21.895,7.258],[-2.144,21.472],[-21.188,-4.084]],"o":[[-4.953,21.002],[-20.482,-6.789],[2.407,-24.099],[22.139,4.268]],"v":[[36.814,8.758],[-9.791,35.815],[-39.622,-7.907],[6.122,-38.989]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[77.475,404.954],"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 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group"},{"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":[[115,69.859],[-115.538,69.859],[-115.538,-69.859],[115,-69.859]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.7333333,0.7882353,0.8352941,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,403.141],"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 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[191.039,37.805],"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 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,1.83],[0,0],[26.664,3.882],[44.378,51.842],[0,0],[0,0]],"o":[[0,0],[-11.598,-14.111],[-48.045,-6.994],[0,0],[0,0],[1.83,0]],"v":[[115,46.771],[115,19.788],[56.449,-6.074],[-115,-50.084],[-115,50.084],[111.687,50.084]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.4352941,0.5764706,0.6784314,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,89.771],"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 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.83,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,1.83]],"v":[[111.687,69.855],[-115,69.855],[-115,-69.855],[115,-69.855],[115,66.542]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.7333333,0.7882353,0.8352941,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,70],"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 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"iPhone Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[153,303,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.0039216,0.3764706,0.5294118,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.1372549,0.2078431,0.2941176,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153.134,303.104],"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"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file diff --git a/WordPress/src/main/assets/login_anims/stats.json b/WordPress/src/main/assets/login_anims/stats.json index 286a334973bc..d4f4ba1fd61c 100644 --- a/WordPress/src/main/assets/login_anims/stats.json +++ b/WordPress/src/main/assets/login_anims/stats.json @@ -1 +1 @@ -{"v":"4.7.0","fr":30,"ip":0,"op":67,"w":310,"h":464,"nm":"Stats","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"stats-01 Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,274.891,0]},"a":{"a":0,"k":[115,117,0]},"s":{"a":0,"k":[144.195,144.195,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.161,0.067],[9.64,0.219],[9.64,-0.071],[9.64,-0.254],[9.639,-0.434],[-0.057,-1.284],[-1.181,-0.056],[-9.64,-0.169],[-9.64,-0.107],[-9.64,0.076],[-9.64,0.529],[0.07,1.284]],"o":[[-9.64,-0.53],[-9.64,-0.075],[-9.64,0.106],[-9.64,0.17],[-1.279,0.056],[0.055,1.211],[9.639,0.434],[9.64,0.255],[9.64,0.071],[9.64,-0.218],[1.278,-0.07],[-0.065,-1.195]],"v":[[57.921,-14.887],[29.002,-15.845],[0.082,-16.014],[-28.837,-15.727],[-57.756,-14.887],[-59.967,-12.458],[-57.756,-10.237],[-28.837,-9.398],[0.082,-9.109],[29.002,-9.28],[57.921,-10.237],[60.109,-12.689]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-0.071,-1.15],[0.94,-0.109],[4.57,-0.218],[4.571,0.075],[4.571,0.254],[4.571,0.433],[0.06,1.175],[-0.94,0.089],[-4.57,0.169],[-4.571,0.107],[-4.571,-0.152],[-4.57,-0.529]],"o":[[0.08,1.284],[-4.57,0.529],[-4.571,0.15],[-4.571,-0.107],[-4.57,-0.17],[-0.836,-0.079],[-0.065,-1.285],[4.571,-0.433],[4.571,-0.255],[4.571,-0.075],[4.57,0.218],[0.815,0.093]],"v":[[-2.124,12.36],[-3.682,14.883],[-17.394,15.839],[-31.106,16.01],[-44.818,15.722],[-58.53,14.883],[-60.114,12.719],[-58.53,10.232],[-44.818,9.393],[-31.106,9.105],[-17.394,9.276],[-3.682,10.232]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[112.118,59.122],"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":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"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":[[-15.628,22.126],[15.628,22.126],[15.628,-22.126],[-15.628,-22.126]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[162.101,209.788],"ix":2},"a":{"a":0,"k":[0,22],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":21,"s":[100,0],"e":[100,100]},{"t":35}],"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":"bar 3-2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"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":[[-15.628,51.566],[15.628,51.566],[15.628,-51.567],[-15.628,-51.567]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[162.101,209.9],"ix":2},"a":{"a":0,"k":[0,51.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":16,"s":[100,0],"e":[100,100]},{"t":30}],"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":"bar 3-1","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"},{"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":[[-15.628,14.665],[15.628,14.665],[15.628,-14.665],[-15.628,-14.665]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,209.7],"ix":2},"a":{"a":0,"k":[0,14.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":14,"s":[100,0],"e":[100,100]},{"t":29}],"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":"bar 2-2","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group"},{"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":[[-15.628,34.178],[15.628,34.178],[15.628,-34.178],[-15.628,-34.178]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,209.736],"ix":2},"a":{"a":0,"k":[0,34],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":9,"s":[100,0],"e":[100,100]},{"t":20}],"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":"bar 2-1","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group"},{"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":[[-15.628,9.493],[15.628,9.493],[15.628,-9.493],[-15.628,-9.493]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[67.899,209.9],"ix":2},"a":{"a":0,"k":[0,9.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":8,"s":[100,0],"e":[100,100]},{"t":19}],"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":"bar 1-2","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group"},{"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":[[-15.628,22.126],[15.628,22.126],[15.628,-22.126],[-15.628,-22.126]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[67.899,209.788],"ix":2},"a":{"a":0,"k":[0,22],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":4,"s":[100,0],"e":[100,100]},{"t":13}],"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":"bar 1-1","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,305,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"},{"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}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"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"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file +{"v":"5.3.4","fr":30,"ip":0,"op":67,"w":310,"h":464,"nm":"Stats","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"stats-01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,274.891,0],"ix":2},"a":{"a":0,"k":[115,117,0],"ix":1},"s":{"a":0,"k":[144.195,144.195,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.161,0.067],[9.64,0.219],[9.64,-0.071],[9.64,-0.254],[9.639,-0.434],[-0.057,-1.284],[-1.181,-0.056],[-9.64,-0.169],[-9.64,-0.107],[-9.64,0.076],[-9.64,0.529],[0.07,1.284]],"o":[[-9.64,-0.53],[-9.64,-0.075],[-9.64,0.106],[-9.64,0.17],[-1.279,0.056],[0.055,1.211],[9.639,0.434],[9.64,0.255],[9.64,0.071],[9.64,-0.218],[1.278,-0.07],[-0.065,-1.195]],"v":[[57.921,-14.887],[29.002,-15.845],[0.082,-16.014],[-28.837,-15.727],[-57.756,-14.887],[-59.967,-12.458],[-57.756,-10.237],[-28.837,-9.398],[0.082,-9.109],[29.002,-9.28],[57.921,-10.237],[60.109,-12.689]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-0.071,-1.15],[0.94,-0.109],[4.57,-0.218],[4.571,0.075],[4.571,0.254],[4.571,0.433],[0.06,1.175],[-0.94,0.089],[-4.57,0.169],[-4.571,0.107],[-4.571,-0.152],[-4.57,-0.529]],"o":[[0.08,1.284],[-4.57,0.529],[-4.571,0.15],[-4.571,-0.107],[-4.57,-0.17],[-0.836,-0.079],[-0.065,-1.285],[4.571,-0.433],[4.571,-0.255],[4.571,-0.075],[4.57,0.218],[0.815,0.093]],"v":[[-2.124,12.36],[-3.682,14.883],[-17.394,15.839],[-31.106,16.01],[-44.818,15.722],[-58.53,14.883],[-60.114,12.719],[-58.53,10.232],[-44.818,9.393],[-31.106,9.105],[-17.394,9.276],[-3.682,10.232]],"c":true},"ix":2},"nm":"Path 2","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":[112.118,59.122],"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":3,"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":[[-15.628,22.126],[15.628,22.126],[15.628,-22.126],[-15.628,-22.126]],"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":[162.101,209.788],"ix":2},"a":{"a":0,"k":[0,22],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":21,"s":[100,0],"e":[100,100]},{"t":35}],"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":"bar 3-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,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,51.566],[15.628,51.566],[15.628,-51.567],[-15.628,-51.567]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.274509803922,0.474509803922,0.603921568627,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":[162.101,209.9],"ix":2},"a":{"a":0,"k":[0,51.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":16,"s":[100,0],"e":[100,100]},{"t":30}],"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":"bar 3-1","np":2,"cix":2,"ix":3,"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":[[-15.628,14.665],[15.628,14.665],[15.628,-14.665],[-15.628,-14.665]],"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":[115.079,209.776],"ix":2},"a":{"a":0,"k":[0,14.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":14,"s":[100,0],"e":[100,100]},{"t":29}],"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":"bar 2-2","np":2,"cix":2,"ix":4,"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":[[-15.628,34.178],[15.628,34.178],[15.628,-34.178],[-15.628,-34.178]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.274509803922,0.474509803922,0.603921568627,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":[115,209.736],"ix":2},"a":{"a":0,"k":[0,34],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":9,"s":[100,0],"e":[100,100]},{"t":20}],"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":"bar 2-1","np":2,"cix":2,"ix":5,"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":[[-15.628,9.493],[15.628,9.493],[15.628,-9.493],[-15.628,-9.493]],"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":[67.823,210.07],"ix":2},"a":{"a":0,"k":[0,9.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":8,"s":[100,0],"e":[100,100]},{"t":19}],"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":"bar 1-2","np":2,"cix":2,"ix":6,"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":[[-15.628,22.126],[15.628,22.126],[15.628,-22.126],[-15.628,-22.126]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.274509803922,0.474509803922,0.603921568627,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":[67.899,209.788],"ix":2},"a":{"a":0,"k":[0,22],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":4,"s":[100,0],"e":[100,100]},{"t":13}],"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":"bar 1-1","np":2,"cix":2,"ix":7,"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.242,303.477],"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":[]} \ No newline at end of file From f19aa9aa131b03f5c7b91503e3001b3ef14e8281 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 17:43:38 -0700 Subject: [PATCH 108/167] Update icon source and tint in new site creation segment item layout --- .../src/main/res/layout/new_site_creation_segment_item.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/res/layout/new_site_creation_segment_item.xml b/WordPress/src/main/res/layout/new_site_creation_segment_item.xml index 0b92305a9469..c3c0e823923f 100644 --- a/WordPress/src/main/res/layout/new_site_creation_segment_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_segment_item.xml @@ -22,7 +22,8 @@ app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title" - tools:srcCompat="@drawable/ic_add_grey_24dp"/> + tools:src="@drawable/ic_add_white_24dp" + tools:tint="@color/neutral_700"/> Date: Sun, 24 Mar 2019 18:48:07 -0700 Subject: [PATCH 109/167] Add image illustration email alert --- .../img_illustration_email_alert_120dp.xml | 271 ++++++++++++++++++ ...=> img_illustration_email_alert_120dp.xml} | 0 .../login_magic_link_sent_screen.xml | 2 +- .../res/layout-land/signup_magic_link.xml | 2 +- .../layout/login_magic_link_sent_screen.xml | 2 +- .../src/main/res/layout/signup_magic_link.xml | 2 +- 6 files changed, 275 insertions(+), 4 deletions(-) create mode 100644 WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml rename libs/login/WordPressLoginFlow/src/main/res/drawable/{img_email_alert_120dp.xml => img_illustration_email_alert_120dp.xml} (100%) diff --git a/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml b/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml new file mode 100644 index 000000000000..905c549a94d5 --- /dev/null +++ b/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/img_email_alert_120dp.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/img_illustration_email_alert_120dp.xml similarity index 100% rename from libs/login/WordPressLoginFlow/src/main/res/drawable/img_email_alert_120dp.xml rename to libs/login/WordPressLoginFlow/src/main/res/drawable/img_illustration_email_alert_120dp.xml diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout-land/login_magic_link_sent_screen.xml b/libs/login/WordPressLoginFlow/src/main/res/layout-land/login_magic_link_sent_screen.xml index bc1fe4146925..3618c77c53e4 100644 --- a/libs/login/WordPressLoginFlow/src/main/res/layout-land/login_magic_link_sent_screen.xml +++ b/libs/login/WordPressLoginFlow/src/main/res/layout-land/login_magic_link_sent_screen.xml @@ -22,7 +22,7 @@ android:layout_height="@dimen/magic_link_sent_illustration_sz" android:scaleType="centerInside" android:contentDescription="@null" - app:srcCompat="@drawable/img_email_alert_120dp"/> + app:srcCompat="@drawable/img_illustration_email_alert_120dp"/> + app:srcCompat="@drawable/img_illustration_email_alert_120dp" > + app:srcCompat="@drawable/img_illustration_email_alert_120dp"/> + app:srcCompat="@drawable/img_illustration_email_alert_120dp" > Date: Sun, 24 Mar 2019 19:04:11 -0700 Subject: [PATCH 110/167] Update colors in image confetti vector drawable --- .../main/res/drawable/img_confetti_284dp.xml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_confetti_284dp.xml b/WordPress/src/main/res/drawable/img_confetti_284dp.xml index 47d0fc8e7a33..b4af1017f612 100644 --- a/WordPress/src/main/res/drawable/img_confetti_284dp.xml +++ b/WordPress/src/main/res/drawable/img_confetti_284dp.xml @@ -8,77 +8,77 @@ + android:fillColor="@color/blue_600"/> + android:fillColor="@color/hot_blue_100"/> + android:fillColor="@color/hot_yellow_500"/> + android:fillColor="@color/hot_blue_50"/> + android:fillColor="@android:color/white"/> + android:fillColor="@color/hot_blue_100"/> + android:fillColor="@android:color/white"/> + android:fillColor="@color/hot_blue_100"/> + android:fillColor="@android:color/white"/> + android:fillColor="@color/hot_blue_200"/> + android:fillColor="@android:color/white"/> + android:fillColor="@color/hot_blue_200"/> + android:fillColor="@color/hot_purple_200"/> + android:fillColor="@color/green_200"/> + android:fillColor="@color/green_100"/> + android:fillColor="@color/hot_yellow_300"/> + android:fillColor="@color/hot_purple_200"/> + android:fillColor="@color/hot_purple_300"/> + android:fillColor="@color/hot_blue_50"/> From e6cc8589d23758f928d38bc02e579e058ab2c457 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:11:15 -0700 Subject: [PATCH 111/167] Update colors in image illustration add media vector drawable --- .../img_illustration_add_media_150dp.xml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_add_media_150dp.xml b/WordPress/src/main/res/drawable/img_illustration_add_media_150dp.xml index 53f2a3d239e5..3f251a018ed6 100644 --- a/WordPress/src/main/res/drawable/img_illustration_add_media_150dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_add_media_150dp.xml @@ -10,122 +10,122 @@ tools:ignore="UnusedAttribute" > @@ -135,19 +135,19 @@ From 765da71ee21485d0960f0502af96151561fc028a Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:11:39 -0700 Subject: [PATCH 112/167] Update colors in image illustration checkmark vector drawable --- .../main/res/drawable/img_illustration_checkmark_280dp.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_checkmark_280dp.xml b/WordPress/src/main/res/drawable/img_illustration_checkmark_280dp.xml index 0d20351ea1d0..a7afe439724d 100644 --- a/WordPress/src/main/res/drawable/img_illustration_checkmark_280dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_checkmark_280dp.xml @@ -8,17 +8,17 @@ android:viewportWidth="280" > From 13453bb38d63b999b2a69a737c40ee8dc38cdc85 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:12:56 -0700 Subject: [PATCH 113/167] Update colors in image illustration empty results vector drawable --- .../img_illustration_empty_results_216dp.xml | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_empty_results_216dp.xml b/WordPress/src/main/res/drawable/img_illustration_empty_results_216dp.xml index 91ae13a7fc51..e40827576104 100644 --- a/WordPress/src/main/res/drawable/img_illustration_empty_results_216dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_empty_results_216dp.xml @@ -6,297 +6,297 @@ android:viewportWidth="216" > From 5052b4aefd2660e7e7171a8ae164efdcadc8be03 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:14:13 -0700 Subject: [PATCH 114/167] Update colors in image illustration info outline vector drawable --- .../main/res/drawable/img_illustration_info_outline_88dp.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_info_outline_88dp.xml b/WordPress/src/main/res/drawable/img_illustration_info_outline_88dp.xml index c763790ce859..d1341171f75e 100644 --- a/WordPress/src/main/res/drawable/img_illustration_info_outline_88dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_info_outline_88dp.xml @@ -5,6 +5,6 @@ android:viewportWidth="88.0" android:viewportHeight="88.0" > - - + + From cff6e5c61d827cd713aef2a274674c7f8d612b5b Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:14:45 -0700 Subject: [PATCH 115/167] Update colors in image illustration insights vector drawable --- .../img_illustration_insights_94dp.xml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml b/WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml index 0e12d1f00330..b1f7286a48e6 100644 --- a/WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - + android:viewportWidth="88" android:width="88dp" xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + From 34e59793fa19717fc8df80c06143f8e6165b41ed Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:16:40 -0700 Subject: [PATCH 116/167] Update colors in image illustration notifications vector drawable --- .../img_illustration_notifications_152dp.xml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_notifications_152dp.xml b/WordPress/src/main/res/drawable/img_illustration_notifications_152dp.xml index c78337f0460e..7b2593d5f1ed 100644 --- a/WordPress/src/main/res/drawable/img_illustration_notifications_152dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_notifications_152dp.xml @@ -6,152 +6,152 @@ android:viewportWidth="226.0" tools:ignore="UnusedAttribute"> From 2b70fa9b7fca0d046b2bf43259c56d0841d909fd Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:17:41 -0700 Subject: [PATCH 117/167] Update colors in image illustration pages vector drawable --- .../main/res/drawable/img_illustration_pages_104dp.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml b/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml index cdcf6a9eef5c..17c932802e27 100644 --- a/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml @@ -6,22 +6,22 @@ android:viewportWidth="104" > From 86ff05ea828aa1e92115835c5291edb4af4e0d42 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:18:05 -0700 Subject: [PATCH 118/167] Update colors in image illustration posts vector drawable --- .../src/main/res/drawable/img_illustration_posts_75dp.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml b/WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml index 08bf0086f19a..a7a0fba9b79c 100644 --- a/WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml @@ -6,22 +6,22 @@ android:viewportWidth="75" > From 35d444bb6159e4b2d6c2070ba8297a82fa59dca1 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:34:13 -0700 Subject: [PATCH 119/167] Update colors in image illustration site about vector drawables --- .../img_illustration_site_about_182dp.xml | 222 ++++++++--------- .../img_illustration_site_about_280dp.xml | 224 +++++++++--------- 2 files changed, 223 insertions(+), 223 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml index 2b78f38dab18..4080ef0ed067 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml @@ -6,127 +6,127 @@ android:viewportWidth="182.0"> @@ -136,12 +136,12 @@ @@ -151,7 +151,7 @@ @@ -161,27 +161,27 @@ @@ -191,12 +191,12 @@ @@ -206,52 +206,52 @@ @@ -261,12 +261,12 @@ @@ -281,37 +281,37 @@ @@ -321,132 +321,132 @@ @@ -456,157 +456,157 @@ diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml index 5b808c10de42..f987ed6a9d20 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml @@ -6,132 +6,132 @@ android:viewportWidth="280.0" > @@ -141,12 +141,12 @@ @@ -156,7 +156,7 @@ @@ -166,27 +166,27 @@ @@ -196,12 +196,12 @@ @@ -211,52 +211,52 @@ @@ -266,12 +266,12 @@ @@ -286,37 +286,37 @@ @@ -326,132 +326,132 @@ @@ -461,157 +461,157 @@ From df52d66af704d795250cd9b2d4ea291d4642b9ee Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:34:56 -0700 Subject: [PATCH 120/167] Update colors in image illustration stats vector drawable --- .../drawable/img_illustration_stats_226dp.xml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_illustration_stats_226dp.xml b/WordPress/src/main/res/drawable/img_illustration_stats_226dp.xml index 78350be30e7b..1fa3919ab023 100644 --- a/WordPress/src/main/res/drawable/img_illustration_stats_226dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_stats_226dp.xml @@ -6,87 +6,87 @@ android:viewportWidth="226.0" tools:ignore="UnusedAttribute"> From f46ebaa19ccebbdabe1acfd0122fda30477308df Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:39:46 -0700 Subject: [PATCH 121/167] Update colors in image promo editor vector drawable --- .../main/res/drawable/img_promo_editor.xml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_promo_editor.xml b/WordPress/src/main/res/drawable/img_promo_editor.xml index bbfde9143591..0e1ad11a615e 100644 --- a/WordPress/src/main/res/drawable/img_promo_editor.xml +++ b/WordPress/src/main/res/drawable/img_promo_editor.xml @@ -6,45 +6,45 @@ android:viewportWidth="280.0" tools:ignore="UnusedAttribute"> From c16e612ca2b4aadca1cd1061b75966dcf86837c7 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:40:14 -0700 Subject: [PATCH 122/167] Update colors in image promo stats vector drawable --- .../res/drawable/img_promo_stats_widget.xml | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/WordPress/src/main/res/drawable/img_promo_stats_widget.xml b/WordPress/src/main/res/drawable/img_promo_stats_widget.xml index 7b538eafdcbc..3ff0d0402af4 100644 --- a/WordPress/src/main/res/drawable/img_promo_stats_widget.xml +++ b/WordPress/src/main/res/drawable/img_promo_stats_widget.xml @@ -6,52 +6,51 @@ android:viewportWidth="420.0" tools:ignore="UnusedAttribute"> From 5941285032c2eb424adc3c99523e4eebc9503bba Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:47:38 -0700 Subject: [PATCH 123/167] Update colors in image illustration hand checkmark button vector drawable --- .../android/ui/posts/EditPostActivity.java | 2 +- ...illustration_hand_checkmark_button_124dp.xml} | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) rename WordPress/src/main/res/drawable/{img_publish_button_124dp.xml => img_illustration_hand_checkmark_button_124dp.xml} (94%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index a7a3932cf7f5..9150083867e0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -3936,7 +3936,7 @@ private void showAsyncPromoDialog(boolean isPage, boolean isScheduled) { getString(title), getString(description), getString(button), - R.drawable.img_publish_button_124dp, + R.drawable.img_illustration_hand_checkmark_button_124dp, getString(R.string.keep_editing), getString(R.string.async_promo_link)); diff --git a/WordPress/src/main/res/drawable/img_publish_button_124dp.xml b/WordPress/src/main/res/drawable/img_illustration_hand_checkmark_button_124dp.xml similarity index 94% rename from WordPress/src/main/res/drawable/img_publish_button_124dp.xml rename to WordPress/src/main/res/drawable/img_illustration_hand_checkmark_button_124dp.xml index 466657d51259..20cca14f092e 100644 --- a/WordPress/src/main/res/drawable/img_publish_button_124dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_hand_checkmark_button_124dp.xml @@ -11,42 +11,42 @@ android:pathData="M0 42h125v100H0V42z" android:strokeWidth="1"/> From 8b383fc7a9fdba55006d7c1ae99eeaca0e045cbd Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:52:22 -0700 Subject: [PATCH 124/167] Update colors in image illustration site error camera pencils vector drawable --- .../signup/SiteCreationCreatingFragment.java | 2 +- ...ation_site_error_camera_pencils_226dp.xml} | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) rename WordPress/src/main/res/drawable/{img_site_error_camera_pencils_226dp.xml => img_illustration_site_error_camera_pencils_226dp.xml} (93%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java index 58192e4e387a..1dfee10c66ce 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java @@ -295,7 +295,7 @@ private void configureBackButton() { } private void configureImage(boolean hasFailure) { - mImageView.setImageResource(hasFailure ? R.drawable.img_site_error_camera_pencils_226dp + mImageView.setImageResource(hasFailure ? R.drawable.img_illustration_site_error_camera_pencils_226dp : R.drawable.img_site_wordpress_camera_pencils_226dp); } diff --git a/WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_error_camera_pencils_226dp.xml similarity index 93% rename from WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_error_camera_pencils_226dp.xml index f20d0c50a00c..33173e9c95c3 100644 --- a/WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_error_camera_pencils_226dp.xml @@ -6,48 +6,48 @@ android:viewportWidth="226" tools:ignore="UnusedAttribute"> From 1ea7670fca7dfbc466af7af2a216f6992e76897f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 19:55:51 -0700 Subject: [PATCH 125/167] Update colors in image illustration site wordpress camera pencils vector drawable --- .../signup/SiteCreationCreatingFragment.java | 2 +- ...n_site_wordpress_camera_pencils_226dp.xml} | 30 +++++++++---------- .../src/main/res/layout/my_site_fragment.xml | 2 +- .../layout/site_creation_creating_screen.xml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) rename WordPress/src/main/res/drawable/{img_site_wordpress_camera_pencils_226dp.xml => img_illustration_site_wordpress_camera_pencils_226dp.xml} (93%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java index 1dfee10c66ce..24a3bf470795 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java @@ -296,7 +296,7 @@ private void configureBackButton() { private void configureImage(boolean hasFailure) { mImageView.setImageResource(hasFailure ? R.drawable.img_illustration_site_error_camera_pencils_226dp - : R.drawable.img_site_wordpress_camera_pencils_226dp); + : R.drawable.img_illustration_site_wordpress_camera_pencils_226dp); } private void handleFailure(final SiteCreationState failedState) { diff --git a/WordPress/src/main/res/drawable/img_site_wordpress_camera_pencils_226dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_wordpress_camera_pencils_226dp.xml similarity index 93% rename from WordPress/src/main/res/drawable/img_site_wordpress_camera_pencils_226dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_wordpress_camera_pencils_226dp.xml index a4cd3ca246a7..fef318606fc7 100644 --- a/WordPress/src/main/res/drawable/img_site_wordpress_camera_pencils_226dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_wordpress_camera_pencils_226dp.xml @@ -6,77 +6,77 @@ android:viewportWidth="226" > diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml index a8ff5d176f84..ac05989404d9 100644 --- a/WordPress/src/main/res/layout/my_site_fragment.xml +++ b/WordPress/src/main/res/layout/my_site_fragment.xml @@ -592,7 +592,7 @@ android:layout_width="match_parent" android:visibility="gone" app:aevButton="@string/my_site_add_new_site" - app:aevImage="@drawable/img_site_wordpress_camera_pencils_226dp" + app:aevImage="@drawable/img_illustration_site_wordpress_camera_pencils_226dp" app:aevSubtitle="@string/my_site_create_new_site" app:aevTitle="@string/my_site_create_new_site_title" > diff --git a/WordPress/src/main/res/layout/site_creation_creating_screen.xml b/WordPress/src/main/res/layout/site_creation_creating_screen.xml index 02160c44247c..4a5a79efc266 100644 --- a/WordPress/src/main/res/layout/site_creation_creating_screen.xml +++ b/WordPress/src/main/res/layout/site_creation_creating_screen.xml @@ -24,7 +24,7 @@ android:layout_height="@dimen/site_creation_creating_illustration_height" android:scaleType="centerInside" android:importantForAccessibility="no" - android:src="@drawable/img_site_wordpress_camera_pencils_226dp"/> + android:src="@drawable/img_illustration_site_wordpress_camera_pencils_226dp"/> Date: Sun, 24 Mar 2019 20:00:55 -0700 Subject: [PATCH 126/167] Update colors in image illustration site blog cup vector drawable --- ...> img_illustration_site_blog_cup_80dp.xml} | 20 +++++++++---------- .../layout/site_creation_category_screen.xml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) rename WordPress/src/main/res/drawable/{img_type_blog_80dp.xml => img_illustration_site_blog_cup_80dp.xml} (91%) diff --git a/WordPress/src/main/res/drawable/img_type_blog_80dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_blog_cup_80dp.xml similarity index 91% rename from WordPress/src/main/res/drawable/img_type_blog_80dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_blog_cup_80dp.xml index e8e3c8fbe014..c622dab30bd8 100644 --- a/WordPress/src/main/res/drawable/img_type_blog_80dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_blog_cup_80dp.xml @@ -6,33 +6,33 @@ android:viewportWidth="1457.93" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/layout/site_creation_category_screen.xml b/WordPress/src/main/res/layout/site_creation_category_screen.xml index 9720e93c5625..d54606a15fae 100644 --- a/WordPress/src/main/res/layout/site_creation_category_screen.xml +++ b/WordPress/src/main/res/layout/site_creation_category_screen.xml @@ -73,7 +73,7 @@ android:layout_centerVertical="true" android:importantForAccessibility="no" android:scaleType="centerInside" - android:src="@drawable/img_type_blog_80dp"/> + android:src="@drawable/img_illustration_site_blog_cup_80dp"/> Date: Sun, 24 Mar 2019 20:02:32 -0700 Subject: [PATCH 127/167] Update colors in image illustration site media camera pencils vector drawable --- ...ration_site_media_camera_pencils_80dp.xml} | 56 +++++++++---------- .../layout/site_creation_category_screen.xml | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) rename WordPress/src/main/res/drawable/{img_type_portfolio_80dp.xml => img_illustration_site_media_camera_pencils_80dp.xml} (92%) diff --git a/WordPress/src/main/res/drawable/img_type_portfolio_80dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_media_camera_pencils_80dp.xml similarity index 92% rename from WordPress/src/main/res/drawable/img_type_portfolio_80dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_media_camera_pencils_80dp.xml index 894baa7412ce..127bda32cdae 100644 --- a/WordPress/src/main/res/drawable/img_type_portfolio_80dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_media_camera_pencils_80dp.xml @@ -6,90 +6,90 @@ android:viewportWidth="1466.56" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/layout/site_creation_category_screen.xml b/WordPress/src/main/res/layout/site_creation_category_screen.xml index d54606a15fae..b7fa1c53ac3d 100644 --- a/WordPress/src/main/res/layout/site_creation_category_screen.xml +++ b/WordPress/src/main/res/layout/site_creation_category_screen.xml @@ -181,7 +181,7 @@ android:layout_centerVertical="true" android:importantForAccessibility="no" android:scaleType="centerInside" - android:src="@drawable/img_type_portfolio_80dp"/> + android:src="@drawable/img_illustration_site_media_camera_pencils_80dp"/> Date: Sun, 24 Mar 2019 20:03:38 -0700 Subject: [PATCH 128/167] Update colors in image illustration site website cards vector drawable --- ..._illustration_site_website_cards_80dp.xml} | 36 +++++++++---------- .../layout/site_creation_category_screen.xml | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) rename WordPress/src/main/res/drawable/{img_type_website_80dp.xml => img_illustration_site_website_cards_80dp.xml} (88%) diff --git a/WordPress/src/main/res/drawable/img_type_website_80dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_website_cards_80dp.xml similarity index 88% rename from WordPress/src/main/res/drawable/img_type_website_80dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_website_cards_80dp.xml index 264f0d6cb502..37d9707f1c26 100644 --- a/WordPress/src/main/res/drawable/img_type_website_80dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_website_cards_80dp.xml @@ -6,57 +6,57 @@ android:viewportWidth="1454.44" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/layout/site_creation_category_screen.xml b/WordPress/src/main/res/layout/site_creation_category_screen.xml index b7fa1c53ac3d..2dc81aef3cd9 100644 --- a/WordPress/src/main/res/layout/site_creation_category_screen.xml +++ b/WordPress/src/main/res/layout/site_creation_category_screen.xml @@ -127,7 +127,7 @@ android:layout_centerVertical="true" android:importantForAccessibility="no" android:scaleType="centerInside" - android:src="@drawable/img_type_website_80dp"/> + android:src="@drawable/img_illustration_site_website_cards_80dp"/> Date: Sun, 24 Mar 2019 20:07:39 -0700 Subject: [PATCH 129/167] Update colors in image giphy vector drawable --- .../android/ui/giphy/GiphyPickerActivity.kt | 2 +- ...ribution_100dp.xml => img_giphy_100dp.xml} | 56 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) rename WordPress/src/main/res/drawable/{giphy_attribution_100dp.xml => img_giphy_100dp.xml} (74%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/giphy/GiphyPickerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/giphy/GiphyPickerActivity.kt index 03ebe4309911..87107e6c0c65 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/giphy/GiphyPickerActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/giphy/GiphyPickerActivity.kt @@ -199,7 +199,7 @@ class GiphyPickerActivity : AppCompatActivity() { val emptyView: ActionableEmptyView = actionable_empty_view emptyView.run { image.setImageResource(R.drawable.img_illustration_media_105dp) - bottomImage.setImageResource(R.drawable.giphy_attribution_100dp) + bottomImage.setImageResource(R.drawable.img_giphy_100dp) bottomImage.contentDescription = getString(string.giphy_powered_by_giphy) } diff --git a/WordPress/src/main/res/drawable/giphy_attribution_100dp.xml b/WordPress/src/main/res/drawable/img_giphy_100dp.xml similarity index 74% rename from WordPress/src/main/res/drawable/giphy_attribution_100dp.xml rename to WordPress/src/main/res/drawable/img_giphy_100dp.xml index 0824913ef528..101ab29a7660 100644 --- a/WordPress/src/main/res/drawable/giphy_attribution_100dp.xml +++ b/WordPress/src/main/res/drawable/img_giphy_100dp.xml @@ -1,31 +1,31 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + From d11d7fa8293e9184db6e7370be449c8a27219f9e Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 20:34:53 -0700 Subject: [PATCH 130/167] Update colors of background and text in login prologue animation fragment --- .../ui/accounts/login/LoginPrologueAnimationFragment.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java index ec4cf27891a1..cdd712bdfcf1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java @@ -47,12 +47,11 @@ public void onCreate(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.primary_300 : R.color.primary_400)); + rootView.setBackgroundColor(getResources().getColor(mLightBackground ? R.color.primary : R.color.primary)); TextView promoText = (TextView) rootView.findViewById(R.id.promo_text); promoText.setText(mPromoText); - promoText.setTextColor(getResources().getColor(mLightBackground ? R.color.primary_700 : android.R.color.white)); + promoText.setTextColor(getResources().getColor(mLightBackground ? R.color.white : R.color.white)); mLottieAnimationView = (LottieAnimationView) rootView.findViewById(R.id.animation_view); mLottieAnimationView.setAnimation(mAnimationFilename, LottieAnimationView.CacheStrategy.Weak); From 0b96ceee532815163751a5adae8731cf9e83a622 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 20:38:55 -0700 Subject: [PATCH 131/167] Update colors of bar data set in bar chart view holder class --- .../lists/sections/viewholders/BarChartViewHolder.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt index 0610b151d497..d23087ff81f4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt @@ -218,14 +218,14 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( private fun buildDataSet(context: Context, cut: List): BarDataSet { val dataSet = BarDataSet(cut, "Data") - dataSet.color = ContextCompat.getColor(context, R.color.primary_500) + dataSet.color = ContextCompat.getColor(context, R.color.blue_400) dataSet.setGradientColor( ContextCompat.getColor( context, - R.color.primary_500 + R.color.blue_400 ), ContextCompat.getColor( context, - R.color.primary_500 + R.color.blue_400 ) ) dataSet.formLineWidth = 0f From 1098e1c15a80350177cb3e23da0cfcd67fd96353 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 23:33:47 -0700 Subject: [PATCH 132/167] Update colors of map in map view holder class --- .../refresh/lists/sections/viewholders/MapViewHolder.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt index b1f682d6a2e2..0333202db2c0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt @@ -1,6 +1,7 @@ package org.wordpress.android.ui.stats.refresh.lists.sections.viewholders import android.net.http.SslError +import android.support.v4.content.ContextCompat import android.support.v7.widget.RecyclerView import android.view.View import android.view.ViewGroup @@ -15,6 +16,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.wordpress.android.R.color import org.wordpress.android.R.id import org.wordpress.android.R.layout import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.MapItem @@ -31,6 +33,8 @@ class MapViewHolder(parent: ViewGroup) : BlockListItemViewHolder( // Loading the v42 of the Google Charts API, since the latest stable version has a problem with // the legend. https://github.com/wordpress-mobile/WordPress-Android/issues/4131 // https://developers.google.com/chart/interactive/docs/release_notes#release-candidate-details + val colorLow = Integer.toHexString(ContextCompat.getColor(itemView.context, color.accent_50) and 0xffffff) + val colorHigh = Integer.toHexString(ContextCompat.getColor(itemView.context, color.accent) and 0xffffff) val htmlPage = ("" + "" + "" + @@ -43,7 +47,8 @@ class MapViewHolder(parent: ViewGroup) : BlockListItemViewHolder( " [" + " ['Country', '${itemView.resources.getString(item.label)}'],${item.mapData}]);" + " var options = {keepAspectRatio: true, region: 'world', colorAxis:" + - " { colors: [ '#FFF088', '#F24606' ] }, enableRegionInteractivity: false};" + + " { colors: [ '#" + colorLow + "', '#" + colorHigh + "' ] }," + + " enableRegionInteractivity: false};" + " var chart = new google.visualization.GeoChart(document.getElementById('regions_div'));" + " chart.draw(data, options);" + " }" + From 3d516f62444444ef6eeedd6086d1e5d2ec9de9e3 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 23:38:15 -0700 Subject: [PATCH 133/167] Rename background drawables with updated color references --- .../bg_oval_neutral_200_stroke_white.xml | 17 ++++++++++++++--- .../src/main/res/drawable/bg_oval_warning.xml | 11 +++++++++-- .../bg_rectangle_neutral_0_radius_2dp.xml | 16 +++++++++++++--- ...gle_neutral_50_radius_margin_extra_large.xml | 15 +++++++++++++++ ...tangle_primary_radius_margin_extra_small.xml | 15 +++++++++++++++ .../wp_blue_medium_extra_small_rounded_bg.xml | 5 ----- .../drawable/wp_grey_lighten_30_rounded_bg.xml | 5 ----- .../layout/new_site_creation_domains_screen.xml | 2 +- ...site_creation_preview_web_view_container.xml | 2 +- 9 files changed, 68 insertions(+), 20 deletions(-) create mode 100644 WordPress/src/main/res/drawable/bg_rectangle_neutral_50_radius_margin_extra_large.xml create mode 100644 WordPress/src/main/res/drawable/bg_rectangle_primary_radius_margin_extra_small.xml delete mode 100644 WordPress/src/main/res/drawable/wp_blue_medium_extra_small_rounded_bg.xml delete mode 100644 WordPress/src/main/res/drawable/wp_grey_lighten_30_rounded_bg.xml diff --git a/WordPress/src/main/res/drawable/bg_oval_neutral_200_stroke_white.xml b/WordPress/src/main/res/drawable/bg_oval_neutral_200_stroke_white.xml index ecdca6328d4e..4e8a358c86ea 100644 --- a/WordPress/src/main/res/drawable/bg_oval_neutral_200_stroke_white.xml +++ b/WordPress/src/main/res/drawable/bg_oval_neutral_200_stroke_white.xml @@ -1,5 +1,16 @@ - - - + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/bg_oval_warning.xml b/WordPress/src/main/res/drawable/bg_oval_warning.xml index ffa4c3352e8e..dd75d907ec29 100644 --- a/WordPress/src/main/res/drawable/bg_oval_warning.xml +++ b/WordPress/src/main/res/drawable/bg_oval_warning.xml @@ -1,4 +1,11 @@ - - + + + + + + diff --git a/WordPress/src/main/res/drawable/bg_rectangle_neutral_0_radius_2dp.xml b/WordPress/src/main/res/drawable/bg_rectangle_neutral_0_radius_2dp.xml index 824fb56d5682..0133b05e9ed1 100644 --- a/WordPress/src/main/res/drawable/bg_rectangle_neutral_0_radius_2dp.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_neutral_0_radius_2dp.xml @@ -1,5 +1,15 @@ - - - + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/bg_rectangle_neutral_50_radius_margin_extra_large.xml b/WordPress/src/main/res/drawable/bg_rectangle_neutral_50_radius_margin_extra_large.xml new file mode 100644 index 000000000000..856a1f825cfc --- /dev/null +++ b/WordPress/src/main/res/drawable/bg_rectangle_neutral_50_radius_margin_extra_large.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/bg_rectangle_primary_radius_margin_extra_small.xml b/WordPress/src/main/res/drawable/bg_rectangle_primary_radius_margin_extra_small.xml new file mode 100644 index 000000000000..81f92564f8cb --- /dev/null +++ b/WordPress/src/main/res/drawable/bg_rectangle_primary_radius_margin_extra_small.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/wp_blue_medium_extra_small_rounded_bg.xml b/WordPress/src/main/res/drawable/wp_blue_medium_extra_small_rounded_bg.xml deleted file mode 100644 index 8d1d2f5d435c..000000000000 --- a/WordPress/src/main/res/drawable/wp_blue_medium_extra_small_rounded_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/drawable/wp_grey_lighten_30_rounded_bg.xml b/WordPress/src/main/res/drawable/wp_grey_lighten_30_rounded_bg.xml deleted file mode 100644 index 61c7004ad983..000000000000 --- a/WordPress/src/main/res/drawable/wp_grey_lighten_30_rounded_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/layout/new_site_creation_domains_screen.xml b/WordPress/src/main/res/layout/new_site_creation_domains_screen.xml index b897accca98d..b6a858fb3685 100644 --- a/WordPress/src/main/res/layout/new_site_creation_domains_screen.xml +++ b/WordPress/src/main/res/layout/new_site_creation_domains_screen.xml @@ -64,7 +64,7 @@ android:layout_height="@dimen/new_site_creation_domains_create_site_button_height" android:layout_gravity="end" android:layout_margin="@dimen/margin_extra_large" - android:background="@drawable/wp_blue_medium_extra_small_rounded_bg" + android:background="@drawable/bg_rectangle_primary_radius_margin_extra_small" android:fontFamily="sans-serif-medium" android:paddingEnd="@dimen/margin_medium" android:paddingStart="@dimen/margin_medium" diff --git a/WordPress/src/main/res/layout/new_site_creation_preview_web_view_container.xml b/WordPress/src/main/res/layout/new_site_creation_preview_web_view_container.xml index 75cb021be5c4..ab322c1556e4 100644 --- a/WordPress/src/main/res/layout/new_site_creation_preview_web_view_container.xml +++ b/WordPress/src/main/res/layout/new_site_creation_preview_web_view_container.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/margin_medium" - android:background="@drawable/wp_grey_lighten_30_rounded_bg" + android:background="@drawable/bg_rectangle_neutral_50_radius_margin_extra_large" android:paddingBottom="@dimen/margin_medium" android:paddingEnd="@dimen/margin_extra_large" android:paddingStart="@dimen/margin_extra_large" From 49da2f3b050ba0fb8f9be73ea0bb2b9e2ddbbdaf Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 23:39:46 -0700 Subject: [PATCH 134/167] Remove hard-coded color reference from stock media picker activity --- .../android/ui/stockmedia/StockMediaPickerActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java index ec71539d9ac9..e758f52121ad 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java @@ -316,8 +316,7 @@ private void showEmptyView(boolean show) { if (isEmpty) { actionableEmptyView.title.setText(R.string.stock_media_picker_initial_empty_text); - // Leave span with hard-coded #0087be to override jazzy orange until accent color is blue_wordpress. - String link = "Pexels"; + String link = "Pexels"; Spanned html = Html.fromHtml(getString(R.string.stock_media_picker_initial_empty_subtext, link)); actionableEmptyView.subtitle.setText(html); actionableEmptyView.getSubtitle().setMovementMethod(WPLinkMovementMethod.getInstance()); From 2f901479e03d98c2659f43ee1924d644795a034b Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 23:49:18 -0700 Subject: [PATCH 135/167] Update color of background for unread notifications in notes adapter --- .../android/ui/notifications/adapters/NotesAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java index 762ff2eb84c1..69b98a4145e6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java @@ -97,7 +97,7 @@ public NotesAdapter(Context context, DataLoadedListener dataLoadedListener, OnLo mAvatarSz = (int) context.getResources().getDimension(R.dimen.notifications_avatar_sz); mColorRead = context.getResources().getColor(android.R.color.white); - mColorUnread = context.getResources().getColor(R.color.neutral_0); + mColorUnread = context.getResources().getColor(R.color.primary_50); mTextIndentSize = context.getResources().getDimensionPixelSize(R.dimen.notifications_text_indent_sz); } From 7812b64cefbda0616caad8bc325b6cebcba0fd66 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 23:52:59 -0700 Subject: [PATCH 136/167] Update color references from wp blue to primary --- .../sitecreation/domains/NewSiteCreationDomainViewHolder.kt | 2 +- .../verticals/NewSiteCreationVerticalsViewHolder.kt | 2 +- .../res/layout/new_site_creation_suggestions_error_item.xml | 2 +- .../src/main/res/layout/site_creation_error_with_retry.xml | 2 +- .../src/main/res/layout/stats_block_selectable_column.xml | 2 +- WordPress/src/main/res/layout/stats_block_tabs_item.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainViewHolder.kt index 9fd96fdb44b2..66e353051df0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainViewHolder.kt @@ -58,7 +58,7 @@ sealed class NewSiteCreationDomainViewHolder(internal val parent: ViewGroup, @La private fun addRetryCompoundDrawable() { val drawable = itemView.context.getDrawable(drawable.retry_icon) - drawable.setTint(ContextCompat.getColor(itemView.context, color.wp_blue)) + drawable.setTint(ContextCompat.getColor(itemView.context, color.primary)) retry.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsViewHolder.kt index e48031e0276a..0270208716a0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsViewHolder.kt @@ -69,7 +69,7 @@ sealed class NewSiteCreationVerticalsViewHolder(internal val parent: ViewGroup, private fun addRetryCompoundDrawable() { val drawable = itemView.context.getDrawable(drawable.retry_icon) - drawable.setTint(ContextCompat.getColor(itemView.context, color.wp_blue)) + drawable.setTint(ContextCompat.getColor(itemView.context, color.primary)) retry.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) } diff --git a/WordPress/src/main/res/layout/new_site_creation_suggestions_error_item.xml b/WordPress/src/main/res/layout/new_site_creation_suggestions_error_item.xml index 308bca39c147..e0443ad2492d 100644 --- a/WordPress/src/main/res/layout/new_site_creation_suggestions_error_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_suggestions_error_item.xml @@ -32,7 +32,7 @@ android:drawablePadding="@dimen/margin_large" android:gravity="center" android:text="@string/retry" - android:textColor="@color/wp_blue" + android:textColor="@color/primary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" diff --git a/WordPress/src/main/res/layout/site_creation_error_with_retry.xml b/WordPress/src/main/res/layout/site_creation_error_with_retry.xml index de20dea5776e..22e60a6ad960 100644 --- a/WordPress/src/main/res/layout/site_creation_error_with_retry.xml +++ b/WordPress/src/main/res/layout/site_creation_error_with_retry.xml @@ -14,7 +14,7 @@ android:contentDescription="@string/cancel_new_site_wizard_content_description" android:padding="@dimen/margin_extra_large" android:src="@drawable/ic_close_white_24dp" - android:tint="@color/wp_blue" + android:tint="@color/primary" android:visibility="gone"/> diff --git a/WordPress/src/main/res/layout/stats_block_tabs_item.xml b/WordPress/src/main/res/layout/stats_block_tabs_item.xml index df5858a1e2fd..77fd8a01153c 100644 --- a/WordPress/src/main/res/layout/stats_block_tabs_item.xml +++ b/WordPress/src/main/res/layout/stats_block_tabs_item.xml @@ -12,8 +12,8 @@ android:layout_height="wrap_content" android:layout_gravity="top" app:tabGravity="center" - app:tabIndicatorColor="@color/wp_blue" - app:tabSelectedTextColor="@color/wp_blue" + app:tabIndicatorColor="@color/primary" + app:tabSelectedTextColor="@color/primary" app:tabPaddingStart="@dimen/margin_extra_large" app:tabPaddingEnd="@dimen/margin_extra_large" app:tabTextColor="@color/neutral_500"/> From 23f3217c6f64ba66137d1ba9f755366a1a2c765d Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Sun, 24 Mar 2019 23:53:16 -0700 Subject: [PATCH 137/167] Update color references from link to primary --- WordPress/src/main/res/layout/site_settings_format_dialog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/layout/site_settings_format_dialog.xml b/WordPress/src/main/res/layout/site_settings_format_dialog.xml index a05dd7a6beec..16e73b14cbc0 100644 --- a/WordPress/src/main/res/layout/site_settings_format_dialog.xml +++ b/WordPress/src/main/res/layout/site_settings_format_dialog.xml @@ -49,7 +49,7 @@ android:background="?android:selectableItemBackground" android:gravity="center_vertical|start" android:text="@string/site_settings_format_help" - android:textColor="@color/link" + android:textColor="@color/primary" android:textSize="@dimen/text_sz_small" android:textAlignment="viewStart" android:paddingStart="@dimen/margin_small"/> From ada70580caf193b998c22c376c345c2b79c76b5f Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Mon, 25 Mar 2019 00:05:11 -0700 Subject: [PATCH 138/167] Update color references from wp grey dark to neutral 800 --- .../sitecreation/previews/NewSiteCreationPreviewFragment.kt | 2 +- .../verticals/NewSiteCreationSiteInfoViewModel.kt | 2 +- .../src/main/res/layout/new_site_creation_domains_item.xml | 2 +- .../src/main/res/layout/new_site_creation_header_item.xml | 2 +- .../src/main/res/layout/new_site_creation_segment_item.xml | 4 ++-- .../main/res/layout/new_site_creation_site_info_screen.xml | 6 +++--- .../new_site_creation_verticals_custom_suggestion_item.xml | 2 +- .../layout/new_site_creation_verticals_suggestion_item.xml | 2 +- .../src/main/res/layout/site_creation_error_with_retry.xml | 2 +- WordPress/src/main/res/values/styles.xml | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSiteCreationPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSiteCreationPreviewFragment.kt index 5b909639fdb2..2e6c6c4f48b6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSiteCreationPreviewFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSiteCreationPreviewFragment.kt @@ -261,7 +261,7 @@ class NewSiteCreationPreviewFragment : NewSiteCreationBaseFormFragment(), ): Spannable { val spannableTitle = SpannableString(url) spannableTitle.setSpan( - ForegroundColorSpan(ContextCompat.getColor(context, R.color.wp_grey_dark)), + ForegroundColorSpan(ContextCompat.getColor(context, R.color.neutral_800)), subdomainSpan.first, subdomainSpan.second, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt index 74b308ab68ef..15e8287b7956 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt @@ -106,7 +106,7 @@ class NewSiteCreationSiteInfoViewModel @Inject constructor( ) { SKIP( text = R.string.new_site_creation_button_skip, - textColor = R.color.wp_grey_dark, + textColor = R.color.neutral_800, backgroundColor = android.R.color.white ), NEXT( diff --git a/WordPress/src/main/res/layout/new_site_creation_domains_item.xml b/WordPress/src/main/res/layout/new_site_creation_domains_item.xml index 5cf926071b22..0cf77ca8cf03 100644 --- a/WordPress/src/main/res/layout/new_site_creation_domains_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_domains_item.xml @@ -23,7 +23,7 @@ android:paddingStart="@dimen/new_site_creation_domains_radio_button_padding_start" android:paddingTop="@dimen/margin_medium" android:textAlignment="viewStart" - android:textColor="@color/wp_grey_dark" + android:textColor="@color/neutral_800" android:textSize="@dimen/text_sz_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/WordPress/src/main/res/layout/new_site_creation_header_item.xml b/WordPress/src/main/res/layout/new_site_creation_header_item.xml index de53ce4e9153..3a29895c2c25 100644 --- a/WordPress/src/main/res/layout/new_site_creation_header_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_header_item.xml @@ -20,7 +20,7 @@ android:fontFamily="sans-serif-medium" android:gravity="center" android:lineSpacingMultiplier="1.1" - android:textColor="@color/wp_grey_dark" + android:textColor="@color/neutral_800" android:textSize="@dimen/text_sz_large" app:fixWidowWords="true" tools:text="What's the focus of your business?"/> diff --git a/WordPress/src/main/res/layout/new_site_creation_segment_item.xml b/WordPress/src/main/res/layout/new_site_creation_segment_item.xml index c3c0e823923f..0183296e001a 100644 --- a/WordPress/src/main/res/layout/new_site_creation_segment_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_segment_item.xml @@ -23,7 +23,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title" tools:src="@drawable/ic_add_white_24dp" - tools:tint="@color/neutral_700"/> + tools:tint="@color/neutral_800"/> @@ -78,7 +78,7 @@ android:inputType="text" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="@color/wp_grey_dark"> + android:textColor="@color/neutral_800"> @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:backgroundTint="@color/wp_grey" android:textAlignment="viewStart" - android:textColor="@color/wp_grey_dark"> + android:textColor="@color/neutral_800"> diff --git a/WordPress/src/main/res/layout/new_site_creation_verticals_custom_suggestion_item.xml b/WordPress/src/main/res/layout/new_site_creation_verticals_custom_suggestion_item.xml index 578e5882c8f4..d8784efb0a37 100644 --- a/WordPress/src/main/res/layout/new_site_creation_verticals_custom_suggestion_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_verticals_custom_suggestion_item.xml @@ -17,7 +17,7 @@ android:layout_marginStart="@dimen/margin_extra_large" android:layout_marginTop="@dimen/margin_extra_large" android:textAlignment="viewStart" - android:textColor="@color/wp_grey_dark" + android:textColor="@color/neutral_800" android:textSize="@dimen/text_sz_large" android:textStyle="italic" app:layout_constraintBottom_toBottomOf="parent" diff --git a/WordPress/src/main/res/layout/new_site_creation_verticals_suggestion_item.xml b/WordPress/src/main/res/layout/new_site_creation_verticals_suggestion_item.xml index b579e615be86..bc22185c3247 100644 --- a/WordPress/src/main/res/layout/new_site_creation_verticals_suggestion_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_verticals_suggestion_item.xml @@ -18,7 +18,7 @@ android:layout_marginStart="@dimen/margin_extra_large" android:layout_marginTop="@dimen/margin_large" android:textAlignment="viewStart" - android:textColor="@color/wp_grey_dark" + android:textColor="@color/neutral_800" android:textSize="@dimen/text_sz_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/WordPress/src/main/res/layout/site_creation_error_with_retry.xml b/WordPress/src/main/res/layout/site_creation_error_with_retry.xml index 22e60a6ad960..c10f05e2fa3f 100644 --- a/WordPress/src/main/res/layout/site_creation_error_with_retry.xml +++ b/WordPress/src/main/res/layout/site_creation_error_with_retry.xml @@ -42,7 +42,7 @@ android:layout_marginStart="@dimen/margin_extra_extra_medium_large" android:layout_marginTop="@dimen/margin_medium" android:gravity="center" - android:textColor="@color/wp_grey_dark" + android:textColor="@color/neutral_800" android:textSize="@dimen/text_sz_large" app:fixWidowWords="true" app:layout_constraintBottom_toTopOf="@+id/error_retry" diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 12b4c691ec1a..45f656c9e3a8 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -806,7 +806,7 @@ @string/new_site_creation_preview_title center sans-serif-medium - @color/wp_grey_dark + @color/neutral_800 @dimen/text_sz_extra_large From 2a7d8725576a4752bcded9f9bbc0a30d1adfc687 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Mon, 25 Mar 2019 00:06:02 -0700 Subject: [PATCH 139/167] Update color references from wp grey to neutral 300 --- .../lists/sections/viewholders/BarChartViewHolder.kt | 2 +- .../res/layout/new_site_creation_site_info_screen.xml | 8 ++++---- WordPress/src/main/res/values/stats_styles.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt index d23087ff81f4..92ea484c1415 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt @@ -85,7 +85,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( data = BarData(dataSets) val greyColor = ContextCompat.getColor( context, - color.wp_grey + color.neutral_300 ) val lightGreyColor = ContextCompat.getColor( context, diff --git a/WordPress/src/main/res/layout/new_site_creation_site_info_screen.xml b/WordPress/src/main/res/layout/new_site_creation_site_info_screen.xml index 092a62d1c787..8964e1c194c5 100644 --- a/WordPress/src/main/res/layout/new_site_creation_site_info_screen.xml +++ b/WordPress/src/main/res/layout/new_site_creation_site_info_screen.xml @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_extra_extra_medium_large" android:hint="@string/new_site_creation_site_title_hint" - android:textColorHint="@color/wp_grey" + android:textColorHint="@color/neutral_300" android:labelFor="@+id/site_info_site_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -74,7 +74,7 @@ android:id="@+id/site_info_site_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:backgroundTint="@color/wp_grey" + android:backgroundTint="@color/neutral_300" android:inputType="text" android:singleLine="true" android:textAlignment="viewStart" @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_extra_extra_medium_large" android:hint="@string/new_site_creation_tag_line_hint" - android:textColorHint="@color/wp_grey" + android:textColorHint="@color/neutral_300" android:labelFor="@+id/site_info_tag_line" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -98,7 +98,7 @@ android:id="@+id/site_info_tag_line" android:layout_width="match_parent" android:layout_height="wrap_content" - android:backgroundTint="@color/wp_grey" + android:backgroundTint="@color/neutral_300" android:textAlignment="viewStart" android:textColor="@color/neutral_800"> diff --git a/WordPress/src/main/res/values/stats_styles.xml b/WordPress/src/main/res/values/stats_styles.xml index 4f5939392464..a12ac6bbdeec 100644 --- a/WordPress/src/main/res/values/stats_styles.xml +++ b/WordPress/src/main/res/values/stats_styles.xml @@ -138,7 +138,7 @@ @@ -158,7 +158,7 @@ From 6043da22920b736bdd89514227832449cb7242b6 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Mon, 25 Mar 2019 00:07:04 -0700 Subject: [PATCH 140/167] Update color references from wp grey lighten 30 to neutral 50 --- .../refresh/lists/sections/viewholders/BarChartViewHolder.kt | 2 +- .../main/res/layout-land/new_site_creation_preview_screen.xml | 2 +- .../src/main/res/layout/new_site_creation_domains_item.xml | 2 +- .../src/main/res/layout/new_site_creation_domains_screen.xml | 4 ++-- .../res/layout/new_site_creation_preview_screen_default.xml | 4 ++-- .../layout/new_site_creation_preview_web_view_container.xml | 2 +- .../src/main/res/layout/new_site_creation_segment_item.xml | 2 +- .../res/layout/new_site_creation_skip_button_container.xml | 2 +- .../new_site_creation_verticals_custom_suggestion_item.xml | 2 +- .../layout/new_site_creation_verticals_suggestion_item.xml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt index 92ea484c1415..2baa43105912 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt @@ -89,7 +89,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( ) val lightGreyColor = ContextCompat.getColor( context, - color.wp_grey_lighten_30 + color.neutral_50 ) axisLeft.apply { valueFormatter = object : LargeValueFormatter() { diff --git a/WordPress/src/main/res/layout-land/new_site_creation_preview_screen.xml b/WordPress/src/main/res/layout-land/new_site_creation_preview_screen.xml index e172098f6ba7..1ec11d8c66fe 100644 --- a/WordPress/src/main/res/layout-land/new_site_creation_preview_screen.xml +++ b/WordPress/src/main/res/layout-land/new_site_creation_preview_screen.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/wp_grey_lighten_30" + android:background="@color/neutral_50" android:orientation="vertical"> diff --git a/WordPress/src/main/res/layout/new_site_creation_preview_web_view_container.xml b/WordPress/src/main/res/layout/new_site_creation_preview_web_view_container.xml index ab322c1556e4..ddf1721a4d34 100644 --- a/WordPress/src/main/res/layout/new_site_creation_preview_web_view_container.xml +++ b/WordPress/src/main/res/layout/new_site_creation_preview_web_view_container.xml @@ -51,7 +51,7 @@ android:id="@+id/sitePreviewWebViewShimmerLayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/wp_grey_lighten_30"> + android:background="@color/neutral_50"> diff --git a/WordPress/src/main/res/layout/new_site_creation_segment_item.xml b/WordPress/src/main/res/layout/new_site_creation_segment_item.xml index 0183296e001a..9a781c4b3141 100644 --- a/WordPress/src/main/res/layout/new_site_creation_segment_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_segment_item.xml @@ -65,7 +65,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginStart="@dimen/site_creation_segments_list_divider_start_margin" - android:background="@color/wp_grey_lighten_30" + android:background="@color/neutral_50" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/WordPress/src/main/res/layout/new_site_creation_skip_button_container.xml b/WordPress/src/main/res/layout/new_site_creation_skip_button_container.xml index b082da307d1f..685e487e9a0d 100644 --- a/WordPress/src/main/res/layout/new_site_creation_skip_button_container.xml +++ b/WordPress/src/main/res/layout/new_site_creation_skip_button_container.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/wp_grey_lighten_30" + app:cardBackgroundColor="@color/neutral_50" app:cardCornerRadius="0dp" app:cardElevation="@dimen/new_site_creation_container_elevation"> diff --git a/WordPress/src/main/res/layout/new_site_creation_verticals_custom_suggestion_item.xml b/WordPress/src/main/res/layout/new_site_creation_verticals_custom_suggestion_item.xml index d8784efb0a37..acb3d5a0f3fc 100644 --- a/WordPress/src/main/res/layout/new_site_creation_verticals_custom_suggestion_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_verticals_custom_suggestion_item.xml @@ -51,7 +51,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginStart="@dimen/site_creation_verticals_list_divider_start_margin" - android:background="@color/wp_grey_lighten_30" + android:background="@color/neutral_50" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" diff --git a/WordPress/src/main/res/layout/new_site_creation_verticals_suggestion_item.xml b/WordPress/src/main/res/layout/new_site_creation_verticals_suggestion_item.xml index bc22185c3247..cb11b9d367cf 100644 --- a/WordPress/src/main/res/layout/new_site_creation_verticals_suggestion_item.xml +++ b/WordPress/src/main/res/layout/new_site_creation_verticals_suggestion_item.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginStart="@dimen/site_creation_verticals_list_divider_start_margin" - android:background="@color/wp_grey_lighten_30" + android:background="@color/neutral_50" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" From d18f3d22cf9cb1e9e5409af8f1e8f92796c1c9fa Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Mon, 25 Mar 2019 00:07:50 -0700 Subject: [PATCH 141/167] Update color references from wp blue medium to primary 400 --- .../sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt | 2 +- .../src/main/res/layout/site_creation_error_with_retry.xml | 2 +- WordPress/src/main/res/values/styles.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt index 15e8287b7956..718dfebad9d9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt @@ -112,7 +112,7 @@ class NewSiteCreationSiteInfoViewModel @Inject constructor( NEXT( text = R.string.next, textColor = android.R.color.white, - backgroundColor = R.color.wp_blue_medium + backgroundColor = R.color.primary_400 ) } diff --git a/WordPress/src/main/res/layout/site_creation_error_with_retry.xml b/WordPress/src/main/res/layout/site_creation_error_with_retry.xml index c10f05e2fa3f..831942a18dc7 100644 --- a/WordPress/src/main/res/layout/site_creation_error_with_retry.xml +++ b/WordPress/src/main/res/layout/site_creation_error_with_retry.xml @@ -76,7 +76,7 @@ android:gravity="center" android:text="@string/contact_support" android:textAllCaps="true" - android:textColor="@color/wp_blue_medium" + android:textColor="@color/primary_400" android:visibility="gone" app:fixWidowWords="true" app:layout_constraintBottom_toBottomOf="parent" diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 45f656c9e3a8..c7a6218dd8d3 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -813,7 +813,7 @@ From 40f1836c4ef362c4faf2d23205316ad131749092 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Mon, 25 Mar 2019 00:08:50 -0700 Subject: [PATCH 142/167] Update highlight color of quick start prompt from primary 300 to accent 300 --- .../src/main/java/org/wordpress/android/util/QuickStartUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt index 39383455946c..0585a5744c13 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt @@ -73,7 +73,7 @@ class QuickStartUtils { Html.fromHtml(formattedMessage) } - val highlightColor = ContextCompat.getColor(context, R.color.primary_300) + val highlightColor = ContextCompat.getColor(context, R.color.accent_300) val mutableSpannedMessage = SpannableStringBuilder(spannedMessage) val foregroundColorSpan = mutableSpannedMessage From a64525a461c411dd8ba58d1ad6ca395cd8c56bb6 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Mon, 25 Mar 2019 00:09:26 -0700 Subject: [PATCH 143/167] Update floating action button color of media settings activity from primary 500 to accent --- WordPress/src/main/res/layout/media_settings_activity.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/layout/media_settings_activity.xml b/WordPress/src/main/res/layout/media_settings_activity.xml index 06bcd44c464c..6b45da9522f5 100644 --- a/WordPress/src/main/res/layout/media_settings_activity.xml +++ b/WordPress/src/main/res/layout/media_settings_activity.xml @@ -538,7 +538,7 @@ android:layout_marginEnd="@dimen/fab_margin" android:contentDescription="@string/fab_content_description_preview" android:visibility="gone" - app:backgroundTint="@color/primary_500" + app:backgroundTint="@color/accent" app:elevation="8dp" app:fabSize="normal" app:layout_anchor="@id/app_bar_layout" From 2a151f9475f7945e8dd739905ccd3befb7142f09 Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Mon, 25 Mar 2019 00:10:01 -0700 Subject: [PATCH 144/167] Update actionable empty state title text color from neutral 400 to neutral --- WordPress/src/main/res/values/styles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index c7a6218dd8d3..9c516feffae7 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -757,7 +757,7 @@ @dimen/actionable_empty_view_text_margin_horizontal @dimen/actionable_empty_view_text_maximum_width center - @color/neutral_400 + @color/neutral @dimen/text_sz_extra_large From 088e5bb18fda557c1854e4ca26bb1ac51450afac Mon Sep 17 00:00:00 2001 From: Tyler Heck Date: Mon, 25 Mar 2019 00:18:33 -0700 Subject: [PATCH 145/167] Update color references from white to android resource --- WordPress/lint-baseline.xml | 92 +++++++++---------- .../login/LoginPrologueAnimationFragment.java | 7 +- .../img_illustration_email_alert_120dp.xml | 20 ++-- .../src/main/res/values/stats_styles.xml | 2 +- WordPress/src/main/res/values/styles.xml | 16 ++-- .../src/main/res/values/styles_calypso.xml | 4 +- 6 files changed, 70 insertions(+), 71 deletions(-) diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml index 5eeb67362db8..5ab05f2f6802 100644 --- a/WordPress/lint-baseline.xml +++ b/WordPress/lint-baseline.xml @@ -2794,12 +2794,12 @@ @@ -28,7 +28,7 @@ @@ -38,7 +38,7 @@ @@ -48,7 +48,7 @@ @@ -113,7 +113,7 @@ @@ -193,7 +193,7 @@ @@ -258,12 +258,12 @@ diff --git a/WordPress/src/main/res/values/stats_styles.xml b/WordPress/src/main/res/values/stats_styles.xml index a12ac6bbdeec..30a94acb3020 100644 --- a/WordPress/src/main/res/values/stats_styles.xml +++ b/WordPress/src/main/res/values/stats_styles.xml @@ -99,7 +99,7 @@ @@ -196,17 +196,17 @@ @@ -815,7 +815,7 @@ @dimen/new_site_creation_preview_ok_button_height @color/primary_400 @string/dialog_button_ok - @color/white + @android:color/white @@ -73,7 +73,7 @@ @@ -86,7 +85,6 @@