Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/quick actions v1 #10362

Merged
merged 20 commits into from Aug 22, 2019
Merged

Feature/quick actions v1 #10362

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
759bee1
Added quick actions to layout. Minor style changes.
khaykov Aug 8, 2019
f3b899a
Wired quick actions to MySite fragment.
khaykov Aug 8, 2019
525fd07
Extracted some click listeners code.
khaykov Aug 9, 2019
1469a19
Fixed lint waring, removed unused code.
khaykov Aug 9, 2019
e713232
Visual feedback.
khaykov Aug 14, 2019
4587506
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Andro…
khaykov Aug 14, 2019
a505558
Visual feedback.
khaykov Aug 14, 2019
88de43b
Wrapping site title.
khaykov Aug 15, 2019
1a50dc4
Visual changes to register domain and quick start.
khaykov Aug 15, 2019
2521028
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Andro…
khaykov Aug 20, 2019
991621a
Fixed quick start focus point.
khaykov Aug 20, 2019
afe4616
Added release notes.
khaykov Aug 20, 2019
15b829b
Added analytics.
khaykov Aug 21, 2019
4829a94
Reverted removed profile_settings
khaykov Aug 21, 2019
8528362
Cleaning up lines.
khaykov Aug 21, 2019
6db7d7a
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Andro…
khaykov Aug 22, 2019
d0f6490
Addressed PR feedback.
khaykov Aug 22, 2019
04cf520
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Andro…
khaykov Aug 22, 2019
0fc1fb6
Added content margin to quick actions container.
khaykov Aug 22, 2019
9442e44
Update WordPress/src/main/res/layout/my_site_fragment.xml
khaykov Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Expand Up @@ -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
Expand Down
166 changes: 117 additions & 49 deletions WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
View file
Open in desktop
Expand Up @@ -138,6 +138,8 @@ public class MySiteFragment extends Fragment implements
private LinearLayout mThemesContainer;
private LinearLayout mPeopleView;
private LinearLayout mPageView;
private View mQuickActionPageButtonContainer;
private LinearLayout mQuickActionButtonsContainer;
private LinearLayout mPlanContainer;
private LinearLayout mPluginsContainer;
private LinearLayout mActivityLogContainer;
Expand Down Expand Up @@ -351,6 +353,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
mActionableEmptyView = rootView.findViewById(R.id.actionable_empty_view);
mCurrentPlanNameTextView = rootView.findViewById(R.id.my_site_current_plan_text_view);
mPageView = rootView.findViewById(R.id.row_pages);
mQuickActionPageButtonContainer = rootView.findViewById(R.id.quick_action_pages_container);
mQuickActionButtonsContainer = rootView.findViewById(R.id.quick_action_buttons_container);
mQuickStartContainer = rootView.findViewById(R.id.quick_start);
mQuickStartCustomizeView = rootView.findViewById(R.id.quick_start_customize);
mQuickStartCustomizeIcon = rootView.findViewById(R.id.quick_start_customize_icon);
Expand All @@ -372,11 +376,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
}

private void setupClickListeners(View rootView) {
rootView.findViewById(R.id.card_view).setOnClickListener(new View.OnClickListener() {
rootView.findViewById(R.id.site_info_container).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
completeQuickStarTask(QuickStartTask.VIEW_SITE);
ActivityLauncher.viewCurrentSite(getActivity(), getSelectedSite(), true);
viewSite();
}
});

Expand All @@ -390,58 +393,35 @@ public void onClick(View v) {
rootView.findViewById(R.id.row_view_site).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
completeQuickStarTask(QuickStartTask.VIEW_SITE);
ActivityLauncher.viewCurrentSite(getActivity(), getSelectedSite(), false);
viewSite();
}
});

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();
}
});

rootView.findViewById(R.id.row_stats).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SiteModel selectedSite = getSelectedSite();
if (selectedSite != null) {
completeQuickStarTask(QuickStartTask.CHECK_STATS);
if (!mAccountStore.hasAccessToken() && selectedSite.isJetpackConnected()) {
// If the user is not connected to WordPress.com, ask him to connect first.
startWPComLoginForJetpackStats();
} else if (selectedSite.isWPCom() || (selectedSite.isJetpackInstalled() && selectedSite
.isJetpackConnected())) {
ActivityLauncher.viewBlogStats(getActivity(), selectedSite);
} else {
ActivityLauncher.viewConnectJetpackForStats(getActivity(), selectedSite);
}
}
viewStats();
}
});

mBlavatarImageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
AnalyticsTracker.track(Stat.MY_SITE_ICON_TAPPED);
SiteModel site = getSelectedSite();
if (site != null) {
boolean hasIcon = site.getIconUrl() != null;
if (site.getHasCapabilityManageOptions() && site.getHasCapabilityUploadFiles()) {
if (hasIcon) {
showChangeSiteIconDialog();
} else {
showAddSiteIconDialog();
}
completeQuickStarTask(QuickStartTask.UPLOAD_SITE_ICON);
} else {
showEditingSiteIconRequiresPermissionDialog(
hasIcon ? getString(R.string.my_site_icon_dialog_change_requires_permission_message)
: getString(R.string.my_site_icon_dialog_add_requires_permission_message));
}
}
updateBlavatar();
}
});

Expand All @@ -453,25 +433,48 @@ 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();
}
});

rootView.findViewById(R.id.row_blog_posts).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ActivityLauncher.viewCurrentBlogPosts(getActivity(), getSelectedSite());
viewPosts();
}
});

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();
}
});

rootView.findViewById(R.id.row_media).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ActivityLauncher.viewCurrentBlogMedia(getActivity(), getSelectedSite());
viewMedia();
}
});

rootView.findViewById(R.id.row_pages).setOnClickListener(new View.OnClickListener() {
rootView.findViewById(R.id.quick_action_pages_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
requestNextStepOfActiveQuickStartTask();
ActivityLauncher.viewCurrentBlogPages(requireActivity(), getSelectedSite());
AnalyticsTracker.track(Stat.QUICK_ACTION_PAGES_TAPPED);
viewPages();
}
});

mPageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
viewPages();
}
});

Expand Down Expand Up @@ -568,6 +571,67 @@ 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());
}

private void updateBlavatar() {
AnalyticsTracker.track(Stat.MY_SITE_ICON_TAPPED);
SiteModel site = getSelectedSite();
if (site != null) {
boolean hasIcon = site.getIconUrl() != null;
if (site.getHasCapabilityManageOptions() && site.getHasCapabilityUploadFiles()) {
if (hasIcon) {
showChangeSiteIconDialog();
} else {
showAddSiteIconDialog();
}
completeQuickStarTask(QuickStartTask.UPLOAD_SITE_ICON);
} else {
showEditingSiteIconRequiresPermissionDialog(
hasIcon ? getString(R.string.my_site_icon_dialog_change_requires_permission_message)
: getString(R.string.my_site_icon_dialog_add_requires_permission_message));
}
}
}

private void viewPosts() {
ActivityLauncher.viewCurrentBlogPosts(getActivity(), getSelectedSite());
}

private void viewPages() {
requestNextStepOfActiveQuickStartTask();
ActivityLauncher.viewCurrentBlogPages(requireActivity(), getSelectedSite());
}

private void viewStats() {
SiteModel selectedSite = getSelectedSite();
if (selectedSite != null) {
completeQuickStarTask(QuickStartTask.CHECK_STATS);
if (!mAccountStore.hasAccessToken() && selectedSite.isJetpackConnected()) {
// If the user is not connected to WordPress.com, ask him to connect first.
startWPComLoginForJetpackStats();
} else if (selectedSite.isWPCom() || (selectedSite.isJetpackInstalled() && selectedSite
.isJetpackConnected())) {
ActivityLauncher.viewBlogStats(getActivity(), selectedSite);
} else {
ActivityLauncher.viewConnectJetpackForStats(getActivity(), selectedSite);
}
}
}

private void viewSite() {
completeQuickStarTask(QuickStartTask.VIEW_SITE);
ActivityLauncher.viewCurrentSite(getActivity(), getSelectedSite(), true);
}

@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
Expand Down Expand Up @@ -972,8 +1036,15 @@ private void refreshSelectedSiteDetails(SiteModel site) {
}

// Do not show pages menu item to Collaborators.
int pageVisibility = site.isSelfHostedAdmin() || site.getHasCapabilityEditPages() ? View.VISIBLE : View.GONE;
int pageVisibility = site.isSelfHostedAdmin() || site.getHasCapabilityEditPages() ? View.VISIBLE : View.GONE;
khaykov marked this conversation as resolved.
Show resolved Hide resolved
mPageView.setVisibility(pageVisibility);
mQuickActionPageButtonContainer.setVisibility(pageVisibility);

if (pageVisibility == View.VISIBLE) {
mQuickActionButtonsContainer.setWeightSum(100f);
} else {
mQuickActionButtonsContainer.setWeightSum(75f);
}

// Refresh the title
setTitle(site.getName());
Expand Down Expand Up @@ -1283,10 +1354,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);
Expand All @@ -1302,7 +1371,6 @@ public void run() {
@Override
public void run() {
mScrollView.smoothScrollTo(0, quickStartTarget.getTop());
quickStartTarget.setPressed(mActiveTutorialPrompt.getTask() != QuickStartTask.UPLOAD_SITE_ICON);
}
});
}
Expand Down