From 759bee11430042582fb953313f0b07a6fbb3ae10 Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Thu, 8 Aug 2019 15:40:59 -0700 Subject: [PATCH 01/16] Added quick actions to layout. Minor style changes. --- .../src/main/res/layout/my_site_fragment.xml | 1065 +++++++++-------- WordPress/src/main/res/values/styles.xml | 28 +- 2 files changed, 616 insertions(+), 477 deletions(-) diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml index 9e4e81601ef1..f03d573d510a 100644 --- a/WordPress/src/main/res/layout/my_site_fragment.xml +++ b/WordPress/src/main/res/layout/my_site_fragment.xml @@ -2,16 +2,16 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_height="match_parent" - android:layout_width="match_parent" > + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:layout_marginTop="@dimen/toolbar_height"> - - - - - + + + + + + + + + + + + android:layout_marginTop="@dimen/margin_large" + android:orientation="vertical"> - - - + android:layout_gravity="center" + android:ellipsize="end" + android:fontFamily="sans-serif-light" + android:gravity="center_vertical" + android:maxLines="1" + android:textColor="@color/neutral_70" + android:textSize="@dimen/text_sz_large" + android:textStyle="bold" + tools:text="Example"/> - - - + + - + - - + - + + + + + + + + android:id="@+id/quick_action_pages_container" + style="@style/MySiteQuickActionButtonContainer"> - - + - + style="@style/MySiteQuickActionButtonLabel" + android:text="@string/pages"/> + + + + + + - + - + - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginBottom="@dimen/margin_large" + android:layout_marginEnd="@dimen/content_margin" + android:layout_marginStart="@dimen/content_margin" + app:cardBackgroundColor="@android:color/white" + app:cardCornerRadius="@dimen/default_cardview_radius" + app:cardElevation="@dimen/card_elevation"> - - - + android:layout_height="wrap_content"> - - - - + android:minHeight="?attr/listPreferredItemHeightSmall" + android:paddingEnd="@dimen/margin_large" + android:paddingStart="@dimen/margin_large"> - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + + + - - - - - - - + android:src="@drawable/ic_notice_white_24dp" + android:tint="@color/alert_yellow"/> - + - + - + - - + + + android:src="@drawable/ic_stats_alt_white_24dp"/> + android:text="@string/stats"/> - - - + + - - + - + - + - + + - - + - + - + - + - - + + + - + + - + - + - + - - - + + - - + - + - + - + - - + + + android:src="@drawable/ic_media_white_24dp"/> + android:text="@string/media"/> - - - - - - - - + + - + - - + - + + + android:id="@+id/my_site_look_and_feel_header" + style="@style/MySiteListHeader" + android:text="@string/my_site_header_look_and_feel"> + - + + - - - + - - + - + + + android:id="@+id/my_site_configuration_header" + style="@style/MySiteListHeader" + android:text="@string/my_site_header_configuration"> + - + + - - - + - - + - + - + + - + - - + - + - + + - + - - + - + - + + - + - - + - + + + style="@style/MySiteListHeader" + android:text="@string/my_site_header_external"> + - + + - - - + - - + - + - + - + + - + - - + - + - + - + - - - - + app:aevTitle="@string/my_site_create_new_site_title"> diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml index 48a554100905..bee2c8d37ad8 100644 --- a/WordPress/src/main/res/values/styles.xml +++ b/WordPress/src/main/res/values/styles.xml @@ -261,12 +261,38 @@ + + + + + + + + - - - - - From a505558dc436fc581761155977956b14e65d7de9 Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Wed, 14 Aug 2019 16:11:44 -0700 Subject: [PATCH 06/16] Visual feedback. --- .../src/main/res/layout/my_site_fragment.xml | 58 +++++++++++-------- WordPress/src/main/res/values/dimens.xml | 3 + 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml index 492a8731765d..764106c52500 100644 --- a/WordPress/src/main/res/layout/my_site_fragment.xml +++ b/WordPress/src/main/res/layout/my_site_fragment.xml @@ -28,40 +28,50 @@ tools:ignore="UselessParent"> - - - + app:cardCornerRadius="@dimen/my_site_blavatar_container_corner_radius" + app:cardElevation="0dp" + app:strokeColor="@color/gray_5" + app:strokeWidth="@dimen/my_site_blavatar_container_border_width"> - + android:layout_margin="@dimen/margin_small" + app:cardCornerRadius="@dimen/my_site_blavatar_corner_radius" + app:cardElevation="0dp"> + + - + + + + 24dp 20dp 10dp + 4dp + 1dp + 2dp 24dp From 88de43b56c002e6080d46f539b560b9deba2b88a Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Thu, 15 Aug 2019 11:08:04 -0700 Subject: [PATCH 07/16] Wrapping site title. --- WordPress/src/main/res/layout/my_site_fragment.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml index 764106c52500..b73d9ee038c8 100644 --- a/WordPress/src/main/res/layout/my_site_fragment.xml +++ b/WordPress/src/main/res/layout/my_site_fragment.xml @@ -88,7 +88,10 @@ android:ellipsize="end" android:fontFamily="sans-serif-medium" android:gravity="center_vertical" - android:maxLines="1" + android:maxLines="2" + android:paddingEnd="@dimen/margin_large" + android:paddingStart="@dimen/margin_large" + android:textAlignment="center" android:textColor="@color/neutral_70" android:textSize="@dimen/text_sz_extra_large" tools:text="Example"/> From 1a50dc47a52334a673cec7934d80ac0d23d1b20e Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Thu, 15 Aug 2019 11:36:20 -0700 Subject: [PATCH 08/16] Visual changes to register domain and quick start. --- .../src/main/res/layout/my_site_fragment.xml | 225 +++++++++--------- 1 file changed, 108 insertions(+), 117 deletions(-) diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml index b73d9ee038c8..02fd275b4a2f 100644 --- a/WordPress/src/main/res/layout/my_site_fragment.xml +++ b/WordPress/src/main/res/layout/my_site_fragment.xml @@ -27,7 +27,6 @@ android:orientation="vertical" tools:ignore="UselessParent"> - - - + android:background="@color/white" + android:paddingEnd="@dimen/content_margin" + android:paddingStart="@dimen/content_margin"> + android:layout_height="wrap_content" + android:minHeight="?attr/listPreferredItemHeightSmall" + android:paddingEnd="@dimen/margin_large" + android:paddingStart="@dimen/margin_large"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:layout_toStartOf="@+id/quick_start_more" + android:ellipsize="end" + android:fontFamily="sans-serif-light" + android:maxLines="1" + android:text="@string/quick_start_sites" + android:textAlignment="viewStart" + android:textColor="@color/neutral_70" + android:textSize="@dimen/text_sz_large" + android:textStyle="bold"> + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 991621a8db2c227f999149ecc3a9001ddac9cda4 Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Tue, 20 Aug 2019 16:08:01 -0700 Subject: [PATCH 09/16] Fixed quick start focus point. --- .../java/org/wordpress/android/ui/main/MySiteFragment.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 a752f64470db..2a875b716f72 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 @@ -1345,10 +1345,8 @@ public void run() { .getDimensionPixelOffset(R.dimen.quick_start_focus_point_bottom_nav_offset); verticalOffset = 0; } else if (mActiveTutorialPrompt.getTask() == QuickStartTask.UPLOAD_SITE_ICON) { - horizontalOffset = - getResources().getDimensionPixelOffset(R.dimen.quick_start_focus_point_my_site_right_offset) - / 2; - verticalOffset = -(quickStartTarget.getWidth() / 2); + horizontalOffset = focusPointSize; + verticalOffset = -focusPointSize / 2; } else { horizontalOffset = getResources().getDimensionPixelOffset(R.dimen.quick_start_focus_point_my_site_right_offset); @@ -1364,7 +1362,6 @@ public void run() { @Override public void run() { mScrollView.smoothScrollTo(0, quickStartTarget.getTop()); - quickStartTarget.setPressed(mActiveTutorialPrompt.getTask() != QuickStartTask.UPLOAD_SITE_ICON); } }); } From afe461692e054e30a5af6dc20f005d68abc92d7b Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Tue, 20 Aug 2019 16:08:08 -0700 Subject: [PATCH 10/16] Added release notes. --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index e82e267966d8..0149fcacac81 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -3,6 +3,7 @@ * Fix issue where establishing LinkedIn connection would always fail * Display author of each post on Blog Posts screen * Moved Notifications settings to Notifications List. +* Redesigned My Site screen to make most commonly used actions easily accessible. 13.1 From 15b829b9018a0344394c4b1cb5589c353c924321 Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Tue, 20 Aug 2019 18:45:54 -0700 Subject: [PATCH 11/16] Added analytics. --- .idea/inspectionProfiles/profiles_settings.xml | 7 ------- .../android/ui/main/MySiteFragment.java | 15 ++++++++++++--- .../android/analytics/AnalyticsTracker.java | 6 +++++- .../analytics/AnalyticsTrackerNosara.java | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 11 deletions(-) delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b312839bf2e..000000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file 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 2a875b716f72..ef37c570e46f 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 @@ -399,15 +399,14 @@ public void onClick(View v) { rootView.findViewById(R.id.row_register_domain).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - AnalyticsUtils.trackWithSiteDetails(Stat.DOMAIN_CREDIT_REDEMPTION_TAPPED, getSelectedSite()); - ActivityLauncher.viewDomainRegistrationActivityForResult(getActivity(), getSelectedSite(), - DomainRegistrationPurpose.CTA_DOMAIN_CREDIT_REDEMPTION); + registerDomain(); } }); rootView.findViewById(R.id.quick_action_stats_button).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + AnalyticsTracker.track(Stat.QUICK_ACTION_STATS_TAPPED); viewStats(); } }); @@ -437,6 +436,7 @@ public void onClick(View v) { rootView.findViewById(R.id.quick_action_posts_button).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + AnalyticsTracker.track(Stat.QUICK_ACTION_POSTS_TAPPED); viewPosts(); } }); @@ -451,6 +451,7 @@ public void onClick(View v) { rootView.findViewById(R.id.quick_action_media_button).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + AnalyticsTracker.track(Stat.QUICK_ACTION_MEDIA_TAPPED); viewMedia(); } }); @@ -465,6 +466,7 @@ public void onClick(View v) { rootView.findViewById(R.id.quick_action_pages_button).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + AnalyticsTracker.track(Stat.QUICK_ACTION_PAGES_TAPPED); viewPages(); } }); @@ -569,6 +571,13 @@ public void onClick(View v) { }); } + private void registerDomain() { + AnalyticsUtils + .trackWithSiteDetails(Stat.DOMAIN_CREDIT_REDEMPTION_TAPPED, getSelectedSite()); + ActivityLauncher.viewDomainRegistrationActivityForResult(getActivity(), getSelectedSite(), + DomainRegistrationPurpose.CTA_DOMAIN_CREDIT_REDEMPTION); + } + private void viewMedia() { ActivityLauncher.viewCurrentBlogMedia(getActivity(), getSelectedSite()); } diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java index 5a6139facce5..babc11b7a6de 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java @@ -585,7 +585,11 @@ public enum Stat { APP_REVIEWS_EVENT_INCREMENTED_BY_OPENING_READER_POST, DOMAIN_CREDIT_PROMPT_SHOWN, DOMAIN_CREDIT_REDEMPTION_TAPPED, - DOMAIN_CREDIT_REDEMPTION_SUCCESS + DOMAIN_CREDIT_REDEMPTION_SUCCESS, + QUICK_ACTION_STATS_TAPPED, + QUICK_ACTION_PAGES_TAPPED, + QUICK_ACTION_POSTS_TAPPED, + QUICK_ACTION_MEDIA_TAPPED } private static final List TRACKERS = new ArrayList<>(); diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java index ab7d4157deff..431534984ebb 100644 --- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java +++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java @@ -444,6 +444,18 @@ public void track(AnalyticsTracker.Stat stat, Map properties) { case APP_REVIEWS_EVENT_INCREMENTED_BY_OPENING_READER_POST: predefinedEventProperties.put("source", "opening_reader_post"); break; + case QUICK_ACTION_STATS_TAPPED: + predefinedEventProperties.put("button", "stats"); + break; + case QUICK_ACTION_PAGES_TAPPED: + predefinedEventProperties.put("button", "pages"); + break; + case QUICK_ACTION_POSTS_TAPPED: + predefinedEventProperties.put("button", "posts"); + break; + case QUICK_ACTION_MEDIA_TAPPED: + predefinedEventProperties.put("button", "media"); + break; } final String user; @@ -1657,6 +1669,11 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) { return "domain_credit_redemption_tapped"; case DOMAIN_CREDIT_REDEMPTION_SUCCESS: return "domain_credit_redemption_success"; + case QUICK_ACTION_STATS_TAPPED: + case QUICK_ACTION_PAGES_TAPPED: + case QUICK_ACTION_POSTS_TAPPED: + case QUICK_ACTION_MEDIA_TAPPED: + return "quick_action_tapped"; } return null; } From 4829a943b9594a4ed9132c4742385e5cf1de0e02 Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Tue, 20 Aug 2019 19:50:59 -0700 Subject: [PATCH 12/16] Reverted removed profile_settings --- .idea/inspectionProfiles/profiles_settings.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 000000000000..d819ece1a28d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + From 85283626826853384ccde0f72536aed536b9e254 Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Tue, 20 Aug 2019 19:55:22 -0700 Subject: [PATCH 13/16] Cleaning up lines. --- .idea/inspectionProfiles/profiles_settings.xml | 2 +- WordPress/src/main/res/values/styles.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml index d819ece1a28d..3b312839bf2e 100644 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -4,4 +4,4 @@