From 1315e786a1d1105d9e6337530a7ebfedc6f0ce5f Mon Sep 17 00:00:00 2001 From: Annmarie Ziegler Date: Wed, 29 Apr 2020 14:24:46 -0400 Subject: [PATCH 1/6] updated empty view strings --- WordPress/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 0c51cdc90868..81ae76f125c9 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -1768,12 +1768,12 @@ Add tags here to find posts about your favorite topics No followed tags No recommended sites - No followed sites + Posts by blogs you follow No sites matching your search - You are not following any sites yet. Why not follow one now? + When you follow blogs, you\'ll see their content here No recent posts The sites you follow haven\'t posted anything recently - Discover sites + Discover blogs Go to following Nothing liked yet Posts that you like will appear here From daabf2a38646669c019b1ab24d829e36a349ac95 Mon Sep 17 00:00:00 2001 From: Annmarie Ziegler Date: Fri, 1 May 2020 11:56:55 -0400 Subject: [PATCH 2/6] Updated assets and strings --- .../android/ui/reader/ReaderBlogFragment.java | 2 +- .../img_illustration_empty_results_162dp.xml | 31 ++++++++++ .../img_illustration_empty_results_162dp.xml | 62 +++++++++++++++++++ .../src/main/res/layout/reader_empty_view.xml | 2 +- WordPress/src/main/res/values/strings.xml | 6 +- 5 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 WordPress/src/main/res/drawable-night/img_illustration_empty_results_162dp.xml create mode 100644 WordPress/src/main/res/drawable/img_illustration_empty_results_162dp.xml diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java index c6a809668737..382ad6d60fac 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java @@ -90,7 +90,7 @@ private void checkEmptyView() { if (hasBlogAdapter() && getBlogAdapter().isEmpty()) { actionableEmptyView.setVisibility(View.VISIBLE); - actionableEmptyView.image.setImageResource(R.drawable.img_illustration_empty_results_216dp); + actionableEmptyView.image.setImageResource(R.drawable.img_illustration_empty_results_162dp); actionableEmptyView.subtitle.setText(R.string.reader_empty_followed_blogs_description); actionableEmptyView.button.setText(R.string.reader_empty_followed_blogs_button_discover); actionableEmptyView.button.setOnClickListener(new OnClickListener() { diff --git a/WordPress/src/main/res/drawable-night/img_illustration_empty_results_162dp.xml b/WordPress/src/main/res/drawable-night/img_illustration_empty_results_162dp.xml new file mode 100644 index 000000000000..164915df0111 --- /dev/null +++ b/WordPress/src/main/res/drawable-night/img_illustration_empty_results_162dp.xml @@ -0,0 +1,31 @@ + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/img_illustration_empty_results_162dp.xml b/WordPress/src/main/res/drawable/img_illustration_empty_results_162dp.xml new file mode 100644 index 000000000000..97f2211f2bfd --- /dev/null +++ b/WordPress/src/main/res/drawable/img_illustration_empty_results_162dp.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WordPress/src/main/res/layout/reader_empty_view.xml b/WordPress/src/main/res/layout/reader_empty_view.xml index 830d8f496b48..55fbc0ea6fd6 100644 --- a/WordPress/src/main/res/layout/reader_empty_view.xml +++ b/WordPress/src/main/res/layout/reader_empty_view.xml @@ -9,7 +9,7 @@ android:layout_marginTop="@dimen/toolbar_height" android:visibility="gone" app:aevButton="@string/reader_empty_followed_blogs_button_discover" - app:aevImage="@drawable/img_illustration_empty_results_216dp" + app:aevImage="@drawable/img_illustration_empty_results_162dp" app:aevSubtitle="@string/reader_empty_followed_blogs_description" app:aevTitle="@string/reader_empty_followed_blogs_title" tools:visibility="visible" /> diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 81ae76f125c9..d5818e92e99f 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -1768,12 +1768,12 @@ Add tags here to find posts about your favorite topics No followed tags No recommended sites - Posts by blogs you follow + No followed sites No sites matching your search - When you follow blogs, you\'ll see their content here + When you follow sites, you\'ll see their content here No recent posts The sites you follow haven\'t posted anything recently - Discover blogs + Discover sites Go to following Nothing liked yet Posts that you like will appear here From 8d07bf2129729412031c9e4990dee1a0dd40e470 Mon Sep 17 00:00:00 2001 From: Annmarie Ziegler Date: Tue, 5 May 2020 08:44:08 -0400 Subject: [PATCH 3/6] Rename image and swap white color reference --- .../org/wordpress/android/ui/reader/ReaderBlogFragment.java | 2 +- ...l => img_illustration_following_empty_results_196dp.xml} | 2 +- ...l => img_illustration_following_empty_results_196dp.xml} | 6 +++--- WordPress/src/main/res/layout/reader_empty_view.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename WordPress/src/main/res/drawable-night/{img_illustration_empty_results_162dp.xml => img_illustration_following_empty_results_196dp.xml} (96%) rename WordPress/src/main/res/drawable/{img_illustration_empty_results_162dp.xml => img_illustration_following_empty_results_196dp.xml} (98%) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java index 382ad6d60fac..a021a4530016 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java @@ -90,7 +90,7 @@ private void checkEmptyView() { if (hasBlogAdapter() && getBlogAdapter().isEmpty()) { actionableEmptyView.setVisibility(View.VISIBLE); - actionableEmptyView.image.setImageResource(R.drawable.img_illustration_empty_results_162dp); + actionableEmptyView.image.setImageResource(R.drawable.img_illustration_following_empty_results_196dp); actionableEmptyView.subtitle.setText(R.string.reader_empty_followed_blogs_description); actionableEmptyView.button.setText(R.string.reader_empty_followed_blogs_button_discover); actionableEmptyView.button.setOnClickListener(new OnClickListener() { diff --git a/WordPress/src/main/res/drawable-night/img_illustration_empty_results_162dp.xml b/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml similarity index 96% rename from WordPress/src/main/res/drawable-night/img_illustration_empty_results_162dp.xml rename to WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml index 164915df0111..888b330b179d 100644 --- a/WordPress/src/main/res/drawable-night/img_illustration_empty_results_162dp.xml +++ b/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml @@ -13,7 +13,7 @@ android:fillType="evenOdd"/> + android:fillColor="@android:color/white"/> @@ -18,11 +18,11 @@ android:fillType="evenOdd"/> + android:fillColor="@android:color/white"/> + android:fillColor="@android:color/white"/> From b6954877f6e5f428e5f383ae050be940c8e84b9e Mon Sep 17 00:00:00 2001 From: Annmarie Ziegler Date: Mon, 11 May 2020 11:14:47 -0400 Subject: [PATCH 4/6] updated assets --- ...stration_following_empty_results_196dp.xml | 12 ++-- ...stration_following_empty_results_196dp.xml | 68 +++++++------------ 2 files changed, 28 insertions(+), 52 deletions(-) diff --git a/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml b/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml index 888b330b179d..725ee6357fc8 100644 --- a/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml +++ b/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml @@ -5,27 +5,25 @@ android:viewportHeight="162"> + android:fillColor="#1D2327"/> + android:fillColor="#50575E"/> diff --git a/WordPress/src/main/res/drawable/img_illustration_following_empty_results_196dp.xml b/WordPress/src/main/res/drawable/img_illustration_following_empty_results_196dp.xml index 64cdbfcff350..e2da1a977a74 100644 --- a/WordPress/src/main/res/drawable/img_illustration_following_empty_results_196dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_following_empty_results_196dp.xml @@ -5,58 +5,36 @@ android:viewportHeight="162"> + android:fillColor="#ffffff"/> - - - - - - + + - - - - - + - - - - - + - - - - + From ed2ca18dc6060576b2c736f2a890eb8fe3614407 Mon Sep 17 00:00:00 2001 From: Annmarie Ziegler Date: Mon, 11 May 2020 13:24:36 -0400 Subject: [PATCH 5/6] update vector drawable --- .../ui/reader/ReaderPostListFragment.java | 2 +- ...stration_following_empty_results_196dp.xml | 29 ---------- ...stration_following_empty_results_196dp.xml | 56 ++++++++++++++----- .../src/main/res/values-night/colors.xml | 9 +++ WordPress/src/main/res/values/colors.xml | 8 +++ 5 files changed, 61 insertions(+), 43 deletions(-) delete mode 100644 WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml 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 948ac2d1fa61..c7d92be018e6 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 @@ -1761,7 +1761,7 @@ private void setEmptyTitleAndDescriptionForBookmarksList() { SpannableStringBuilder ssb = new SpannableStringBuilder(description); int imagePlaceholderPosition = description.indexOf("%s"); addBookmarkImageSpan(ssb, imagePlaceholderPosition); - + mActionableEmptyView.image.setImageResource(R.drawable.img_illustration_empty_results_216dp); mActionableEmptyView.image.setVisibility(View.VISIBLE); mActionableEmptyView.title.setText(R.string.reader_empty_saved_posts_title); mActionableEmptyView.subtitle.setText(ssb); diff --git a/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml b/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml deleted file mode 100644 index 725ee6357fc8..000000000000 --- a/WordPress/src/main/res/drawable-night/img_illustration_following_empty_results_196dp.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/WordPress/src/main/res/drawable/img_illustration_following_empty_results_196dp.xml b/WordPress/src/main/res/drawable/img_illustration_following_empty_results_196dp.xml index e2da1a977a74..c1d55254ef4a 100644 --- a/WordPress/src/main/res/drawable/img_illustration_following_empty_results_196dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_following_empty_results_196dp.xml @@ -5,36 +5,66 @@ android:viewportHeight="162"> + android:fillColor="@color/reader_following_empty_view_background"/> + android:fillColor="@color/reader_following_empty_view_center_circle"/> + android:pathData="M124.833,64.583H125.333V64.083H124.833V64.583ZM124.833,94.208V94.708H125.333V94.208H124.833ZM65.583,64.583V64.083H65.083V64.583H65.583ZM101.792,117.25V117.75H102.292V117.25H101.792ZM101.792,104.083V103.583H101.292V104.083H101.792ZM111.667,104.083V104.583H112.167V104.083H111.667ZM111.667,94.208V93.708H111.167V94.208H111.667ZM134.708,110.667H135.208V110.167H134.708V110.667ZM134.708,117.25V117.75H135.208V117.25H134.708ZM124.833,110.667H124.333V111.167H124.833V110.667ZM124.833,100.792H125.333V100.292H124.833V100.792ZM118.25,100.792V100.292H117.75V100.792H118.25ZM118.25,110.667V111.167H118.75V110.667H118.25Z" + android:fillColor="@color/reader_following_empty_view_outline"/> + + + + + + + + + + + + + android:pathData="M188,35.033H188.5V34.533H188V35.033ZM161.967,35.033H161.467V35.533H161.967V35.033ZM143.033,9.5H161.967V8.5H143.033V9.5ZM143.533,35.033V9H142.533V35.033H143.533ZM117,35.533H143.033V34.533H117V35.533ZM117.5,53.967V35.033H116.5V53.967H117.5ZM143.033,53.467H117V54.467H143.033V53.467ZM143.533,80V53.967H142.533V80H143.533ZM161.967,79.5H143.033V80.5H161.967V79.5ZM161.467,53.967V80H162.467V53.967H161.467ZM188,53.467H161.967V54.467H188V53.467ZM187.5,35.033V53.967H188.5V35.033H187.5ZM161.967,35.533H188V34.533H161.967V35.533ZM161.467,9V35.033H162.467V9H161.467Z" + android:fillColor="@color/reader_following_empty_view_outline"/> + + + android:fillColor="@color/reader_following_empty_view_outline"/> + + + + + android:pathData="M34.967,89.033H34.467V89.533H34.967V89.033ZM24.033,74.5H34.967V73.5H24.033V74.5ZM24.533,89.033V74H23.533V89.033H24.533ZM9,89.533H24.033V88.533H9V89.533ZM9.5,99.966V89.033H8.5V99.966H9.5ZM24.033,99.466H9V100.466H24.033V99.466ZM24.533,115V99.966H23.533V115H24.533ZM34.967,114.5H24.033V115.5H34.967V114.5ZM34.467,99.966V115H35.467V99.966H34.467ZM50,99.466H34.967V100.466H50V99.466ZM49.5,89.033V99.966H50.5V89.033H49.5ZM34.967,89.533H50V88.533H34.967V89.533ZM34.467,74V89.033H35.467V74H34.467Z" + android:fillColor="@color/reader_following_empty_view_outline"/> diff --git a/WordPress/src/main/res/values-night/colors.xml b/WordPress/src/main/res/values-night/colors.xml index 68135ce34197..16dbb2e76cdc 100644 --- a/WordPress/src/main/res/values-night/colors.xml +++ b/WordPress/src/main/res/values-night/colors.xml @@ -38,4 +38,13 @@ @color/gray_100 + + @color/red_70 + @color/celadon_60 + @color/gray_90 + @color/orange_70 + @color/gray_90 + @color/gray_60 + @color/transparent + diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml index 76089ecbd590..90c4604421e9 100644 --- a/WordPress/src/main/res/values/colors.xml +++ b/WordPress/src/main/res/values/colors.xml @@ -298,4 +298,12 @@ #66ffffff #a6ffffff + + @color/yellow_0 + @color/green_0 + @color/blue_0 + @color/pink_0 + @color/gray_10 + @android:color/white + @android:color/white From 2638d9b1b444f47a41951a41f99dfa66e93c251d Mon Sep 17 00:00:00 2001 From: Annmarie Ziegler Date: Mon, 11 May 2020 13:34:00 -0400 Subject: [PATCH 6/6] Update vector drawable --- WordPress/src/main/res/values-night/colors.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/res/values-night/colors.xml b/WordPress/src/main/res/values-night/colors.xml index 16dbb2e76cdc..cd42c3319274 100644 --- a/WordPress/src/main/res/values-night/colors.xml +++ b/WordPress/src/main/res/values-night/colors.xml @@ -43,8 +43,7 @@ @color/celadon_60 @color/gray_90 @color/orange_70 - @color/gray_90 + @color/transparent @color/gray_60 @color/transparent -