Skip to content

Async promo dialog #6467

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

Merged
merged 18 commits into from
Aug 3, 2017
Merged

Async promo dialog #6467

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6f9b886
Add extensible builder for PromoDialog
aforcier Aug 1, 2017
ab4d8b6
Add builder to PromoDialogEditor
aforcier Aug 1, 2017
8cf524f
Allow setting PromoDialog's positive button action
aforcier Aug 1, 2017
9825316
Add advanced base promo dialog with link and negative button
aforcier Aug 1, 2017
4628c60
Modify editor promo dialog to extend PromoDialogAdvanced
aforcier Aug 1, 2017
8474b99
Clean up onCreateDialog() methods
aforcier Aug 1, 2017
de468b3
Reorganize promo dialog init code
aforcier Aug 1, 2017
0b353a0
Show promo dialog for async on first publish
aforcier Aug 1, 2017
fa2bb7c
Fix hiding dialog title field
aforcier Aug 2, 2017
4c5022b
Update image for async promo dialog
aforcier Aug 2, 2017
ccd7950
Wrap promo images in container with standard background
aforcier Aug 2, 2017
bb983c0
Fix hiding promo dialog images in landscape
aforcier Aug 2, 2017
eae5185
Add divider above buttons in promo dialogs
aforcier Aug 2, 2017
91f9870
Handle orientation changes for async promo dialog
aforcier Aug 2, 2017
1c1a6de
Make release notes activity customizable
aforcier Aug 2, 2017
e521d3d
Hide link in async promo dialog for now
aforcier Aug 2, 2017
0a81c29
Update comment
aforcier Aug 3, 2017
f4e7063
Rename res id variable naming and use string constants
aforcier Aug 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modify editor promo dialog to extend PromoDialogAdvanced
  • Loading branch information
@aforcier
aforcier committed Aug 2, 2017
commit 4628c60632f1849b7a67456b036043d67a9a8fca
2 changes: 1 addition & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,9 @@ private void showNewEditorPromoDialogIfNeeded() {
R.string.new_editor_promo_title,
R.string.new_editor_promo_description,
R.string.new_editor_promo_button_positive)
.setTitleBetaText(R.string.new_editor_promo_title_beta)
.setLinkText(R.string.new_editor_promo_link)
.setNegativeButtonText(R.string.new_editor_promo_button_negative)
.setTitleBetaText(R.string.new_editor_promo_title_beta)
.build();
newFragment.show(getSupportFragmentManager(), "new-editor-promo");
AppPrefs.setNewEditorPromoRequired(false);
Expand Down
44 changes: 21 additions & 23 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/PromoDialogEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,25 @@
import org.wordpress.android.util.DisplayUtils;
import org.wordpress.android.widgets.WPTextView;

public class PromoDialogEditor extends PromoDialog {
public static class Builder extends PromoDialog.Builder {
@StringRes int titleBetaId;
@StringRes int linkId;
@StringRes int buttonNegativeId;
public class PromoDialogEditor extends PromoDialogAdvanced {
public static class Builder extends PromoDialogAdvanced.Builder {
@StringRes private int titleBetaId;

public Builder(@DrawableRes int drawableId, @StringRes int titleId, @StringRes int descriptionId,
@StringRes int buttonPositiveId) {
super(drawableId, titleId, descriptionId, buttonPositiveId);
}

public Builder setTitleBetaText(@StringRes int titleBetaId) {
this.titleBetaId = titleBetaId;
return this;
}

public Builder setLinkText(@StringRes int linkId) {
this.linkId = linkId;
return this;
return (Builder) super.setLinkText(linkId);
}

public Builder setNegativeButtonText(@StringRes int buttonNegativeId) {
this.buttonNegativeId = buttonNegativeId;
return (Builder) super.setNegativeButtonText(buttonNegativeId);
}

public Builder setTitleBetaText(@StringRes int titleBetaId) {
this.titleBetaId = titleBetaId;
return this;
}

Expand All @@ -56,8 +52,6 @@ public PromoDialogEditor build() {
}
}

protected int mButtonNegativeId;
protected int mLinkId;
protected int mTitleBetaId;

protected static PromoDialogEditor newInstance(Builder builder) {
Expand Down Expand Up @@ -114,27 +108,31 @@ public void onViewCreated(View view, Bundle savedInstanceState) {

WPTextView link = (WPTextView) view.findViewById(R.id.promo_dialog_link);
link.setText(mLinkId);
link.setOnClickListener(
new View.OnClickListener() {
if (mLinkOnClickListener == null) {
link.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(getActivity(), EditorReleaseNotesActivity.class));
AnalyticsTracker.track(AnalyticsTracker.Stat.EDITOR_AZTEC_PROMO_LINK);
}
}
);
});
} else {
link.setOnClickListener(mLinkOnClickListener);
}

Button buttonNegative = (Button) view.findViewById(R.id.promo_dialog_button_negative);
buttonNegative.setText(mButtonNegativeId);
buttonNegative.setOnClickListener(
new View.OnClickListener() {
if (mNegativeButtonOnClickListener == null) {
buttonNegative.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
getDialog().cancel();
AnalyticsTracker.track(AnalyticsTracker.Stat.EDITOR_AZTEC_PROMO_NEGATIVE);
}
}
);
});
} else {
buttonNegative.setOnClickListener(mNegativeButtonOnClickListener);
}

Button buttonPositive = (Button) view.findViewById(R.id.promo_dialog_button_positive);
buttonPositive.setText(mButtonPositiveId);
Expand Down