Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public class FullScreenDialogFragment extends DialogFragment {
private FullScreenDialogController mController;
private OnConfirmListener mOnConfirmListener;
private OnDismissListener mOnDismissListener;
private OnShownListener mOnShownListener;
private String mAction;
private MenuItem mActionItem;
private String mSubtitle;
Expand Down Expand Up @@ -91,12 +92,17 @@ public interface OnDismissListener {
void onDismiss();
}

public interface OnShownListener {
void onShown();
}

protected static FullScreenDialogFragment newInstance(Builder builder) {
FullScreenDialogFragment dialog = new FullScreenDialogFragment();
dialog.setArguments(setArguments(builder));
dialog.setContent(Fragment.instantiate(builder.mContext, builder.mClass.getName(), builder.mArguments));
dialog.setOnConfirmListener(builder.mOnConfirmListener);
dialog.setOnDismissListener(builder.mOnDismissListener);
dialog.setOnShownListener(builder.mOnShownListener);
dialog.setHideActivityBar(builder.mHideActivityBar);
dialog.setLiftOnScroll(builder.mIsLiftOnScroll);
return dialog;
Expand Down Expand Up @@ -217,6 +223,7 @@ public void show(FragmentManager manager, String tag) {
@Override
public int show(FragmentTransaction transaction, String tag) {
initBuilderArguments();
shown();
transaction.setCustomAnimations(R.anim.full_screen_dialog_fragment_slide_up, 0, 0,
R.anim.full_screen_dialog_fragment_slide_down);
return transaction.add(android.R.id.content, this, tag).addToBackStack(null).commit();
Expand All @@ -230,6 +237,12 @@ protected void confirm(Bundle result) {
dismiss();
}

protected void shown() {
if (mOnShownListener != null) {
mOnShownListener.onShown();
}
}

/**
* Get {@link Fragment} to be able to interact directly with it.
*
Expand Down Expand Up @@ -383,6 +396,16 @@ public void setOnDismissListener(@Nullable OnDismissListener listener) {
this.mOnDismissListener = listener;
}

/**
* Set callback to call when dialog is shown due to shown requested.
*
* @param listener {@link OnShownListener} interface to call on shown executed
*/
public void setOnShownListener(@Nullable OnShownListener listener) {
this.mOnShownListener = listener;
}


/**
* Set {@link FullScreenDialogFragment} subtitle text.
*
Expand Down Expand Up @@ -447,6 +470,7 @@ public static class Builder {
Context mContext;
OnConfirmListener mOnConfirmListener;
OnDismissListener mOnDismissListener;
OnShownListener mOnShownListener;
String mAction = "";
String mSubtitle = "";
String mTitle = "";
Expand Down Expand Up @@ -606,6 +630,17 @@ public Builder setOnDismissListener(@Nullable OnDismissListener listener) {
return this;
}

/**
* Set callback to call when dialog is shown.
*
* @param listener {@link OnShownListener} interface to call on shown
* @return {@link Builder} object to allow for chaining of calls to set methods
*/
public Builder setOnShownListener(@Nullable OnShownListener listener) {
this.mOnShownListener = listener;
return this;
}

/**
* Set flag to enable or disable AppBar's lift on scroll.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@
import org.wordpress.android.util.AppLog.T;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;

import javax.inject.Inject;

Expand Down Expand Up @@ -71,6 +73,7 @@ public abstract class BaseUsernameChangerFullScreenDialogFragment extends Dagger
private boolean mIsShowingDismissDialog;
private boolean mShouldWatchText; // Flag handling text watcher to avoid network call on device rotation.
private int mUsernameSelectedIndex;
private int mSearchCount = 0;

public static final String EXTRA_DISPLAY_NAME = "EXTRA_DISPLAY_NAME";
public static final String EXTRA_USERNAME = "EXTRA_USERNAME";
Expand All @@ -80,7 +83,10 @@ public abstract class BaseUsernameChangerFullScreenDialogFragment extends Dagger
public static final String KEY_USERNAME_SELECTED_INDEX = "KEY_USERNAME_SELECTED_INDEX";
public static final String KEY_USERNAME_SUGGESTIONS = "KEY_USERNAME_SUGGESTIONS";
public static final String RESULT_USERNAME = "RESULT_USERNAME";
public static final String KEY_SEARCH_COUNT = "KEY_SEARCH_COUNT";
public static final int GET_SUGGESTIONS_INTERVAL_MS = 1000;
public static final String SOURCE = "source";
public static final String SEARCH_COUNT = "search_count";

@Inject protected Dispatcher mDispatcher;

Expand Down Expand Up @@ -109,6 +115,12 @@ public abstract class BaseUsernameChangerFullScreenDialogFragment extends Dagger
*/
abstract Spanned getHeaderText(String username, String display);

/**
* Fragments that extend this class are required to provide the tracking event source
* @return String
*/
abstract String getTrackEventSource();

public static Bundle newBundle(String displayName, String username) {
Bundle bundle = new Bundle();
bundle.putString(EXTRA_DISPLAY_NAME, displayName);
Expand Down Expand Up @@ -149,6 +161,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
mShouldWatchText = savedInstanceState.getBoolean(KEY_SHOULD_WATCH_TEXT);
mUsernameSelected = savedInstanceState.getString(KEY_USERNAME_SELECTED);
mUsernameSelectedIndex = savedInstanceState.getInt(KEY_USERNAME_SELECTED_INDEX);
mSearchCount = savedInstanceState.getInt(KEY_SEARCH_COUNT);
ArrayList<String> suggestions = savedInstanceState.getStringArrayList(KEY_USERNAME_SUGGESTIONS);
if (suggestions != null) {
setUsernameSuggestions(suggestions);
Expand All @@ -166,6 +179,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
mUsernameSelectedIndex = 0;
mUsernameSuggestionInput = getUsernameQueryFromDisplayName();
getUsernameSuggestions(mUsernameSuggestionInput);
mSearchCount = 0;
}

mHeaderView = getView().findViewById(R.id.header);
Expand Down Expand Up @@ -199,6 +213,8 @@ public void afterTextChanged(Editable s) {

mGetSuggestionsHandler = new Handler();
mGetSuggestionsRunnable = () -> {
mSearchCount++;
trackSearch();
mUsernameSuggestionInput = mUsernameView.getText().toString();
getUsernameSuggestions(mUsernameSuggestionInput);
};
Expand Down Expand Up @@ -260,6 +276,7 @@ public void onSaveInstanceState(@NotNull Bundle outState) {
if (mUsernamesAdapter != null) {
outState.putStringArrayList(KEY_USERNAME_SUGGESTIONS, new ArrayList<>(mUsernamesAdapter.mItems));
}
outState.putInt(KEY_SEARCH_COUNT, mSearchCount);
}

@Override
Expand Down Expand Up @@ -342,6 +359,12 @@ protected void showProgress(boolean showProgress) {
mProgressBar.setVisibility(showProgress ? View.VISIBLE : View.GONE);
}

private void trackSearch() {
Map<String, String> props = new HashMap<>();
props.put(SOURCE, getTrackEventSource());
props.put(SEARCH_COUNT, String.valueOf(mSearchCount));
AnalyticsTracker.track(Stat.CHANGE_USERNAME_SEARCH_PERFORMED, props);
}
@SuppressWarnings("unused")
@Subscribe(threadMode = ThreadMode.MAIN)
public void onUsernameSuggestionsFetched(OnUsernameSuggestionsFetched event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class SettingsUsernameChangerFragment : BaseUsernameChangerFullScreenDialogFragm
), HtmlCompat.FROM_HTML_MODE_LEGACY
)

override fun getTrackEventSource() = SOURCE

override fun setController(controller: FullScreenDialogController) {
super.setController(controller)
dialogController = controller
Expand Down Expand Up @@ -186,4 +188,8 @@ class SettingsUsernameChangerFragment : BaseUsernameChangerFullScreenDialogFragm
)
.show()
}

companion object {
const val SOURCE = "account_settings"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.wordpress.android.R;
import org.wordpress.android.WordPress;
import org.wordpress.android.analytics.AnalyticsTracker;
import org.wordpress.android.analytics.AnalyticsTracker.Stat;
import org.wordpress.android.fluxc.Dispatcher;
import org.wordpress.android.fluxc.action.AccountAction;
import org.wordpress.android.fluxc.generated.AccountActionBuilder;
Expand All @@ -56,6 +57,7 @@
import org.wordpress.android.ui.FullScreenDialogFragment;
import org.wordpress.android.ui.FullScreenDialogFragment.OnConfirmListener;
import org.wordpress.android.ui.FullScreenDialogFragment.OnDismissListener;
import org.wordpress.android.ui.FullScreenDialogFragment.OnShownListener;
import org.wordpress.android.ui.RequestCodes;
import org.wordpress.android.ui.accounts.UnifiedLoginTracker;
import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Click;
Expand Down Expand Up @@ -87,14 +89,15 @@
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;

import javax.inject.Inject;

import static org.wordpress.android.analytics.AnalyticsTracker.Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_GALLERY_PICKED;
import static org.wordpress.android.analytics.AnalyticsTracker.Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_SHOT_NEW;

public class SignupEpilogueFragment extends LoginBaseFormFragment<SignupEpilogueListener>
implements OnConfirmListener, OnDismissListener {
implements OnConfirmListener, OnDismissListener, OnShownListener {
private EditText mEditTextDisplayName;
private EditText mEditTextUsername;
private FullScreenDialogFragment mDialog;
Expand Down Expand Up @@ -134,6 +137,9 @@ public class SignupEpilogueFragment extends LoginBaseFormFragment<SignupEpilogue
private static final String KEY_HAS_UPDATED_PASSWORD = "KEY_HAS_UPDATED_PASSWORD";
private static final String KEY_HAS_MADE_UPDATES = "KEY_HAS_MADE_UPDATES";

private static final String SOURCE = "source";
private static final String SOURCE_SIGNUP_EPILOGUE = "signup_epilogue";

public static final String TAG = "signup_epilogue_fragment_tag";

@Inject protected AccountStore mAccount;
Expand Down Expand Up @@ -447,9 +453,19 @@ public void onConfirm(@Nullable Bundle result) {

@Override
public void onDismiss() {
Map<String, String> props = new HashMap<>();
props.put(SOURCE, SOURCE_SIGNUP_EPILOGUE);
AnalyticsTracker.track(Stat.CHANGE_USERNAME_DISMISSED, props);
mDialog = null;
}

@Override
public void onShown() {
Map<String, String> props = new HashMap<>();
props.put(SOURCE, SOURCE_SIGNUP_EPILOGUE);
AnalyticsTracker.track(AnalyticsTracker.Stat.CHANGE_USERNAME_DISPLAYED, props);
}

@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
Expand Down Expand Up @@ -582,6 +598,7 @@ protected void launchDialog() {
.setToolbarTheme(R.style.ThemeOverlay_LoginFlow_Toolbar)
.setOnConfirmListener(this)
.setOnDismissListener(this)
.setOnShownListener(this)
.setContent(UsernameChangerFullScreenDialogFragment.class, bundle)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,14 @@ class UsernameChangerFullScreenDialogFragment : BaseUsernameChangerFullScreenDia
)
)

override fun getTrackEventSource() = SOURCE

override fun onUsernameConfirmed(controller: FullScreenDialogController, usernameSelected: String) {
val result = Bundle().apply { putString(RESULT_USERNAME, usernameSelected) }
controller.confirm(result)
}

companion object {
const val SOURCE = "signup_epilogue"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import org.greenrobot.eventbus.ThreadMode;
import org.wordpress.android.R;
import org.wordpress.android.WordPress;
import org.wordpress.android.analytics.AnalyticsTracker;
import org.wordpress.android.analytics.AnalyticsTracker.Stat;
import org.wordpress.android.fluxc.Dispatcher;
import org.wordpress.android.fluxc.generated.AccountActionBuilder;
import org.wordpress.android.fluxc.model.AccountModel;
Expand All @@ -39,6 +41,8 @@
import org.wordpress.android.fluxc.store.SiteStore;
import org.wordpress.android.ui.FullScreenDialogFragment;
import org.wordpress.android.ui.FullScreenDialogFragment.OnConfirmListener;
import org.wordpress.android.ui.FullScreenDialogFragment.OnDismissListener;
import org.wordpress.android.ui.FullScreenDialogFragment.OnShownListener;
import org.wordpress.android.ui.accounts.signup.BaseUsernameChangerFullScreenDialogFragment;
import org.wordpress.android.ui.accounts.signup.SettingsUsernameChangerFragment;
import org.wordpress.android.util.AppLog;
Expand All @@ -51,12 +55,13 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.inject.Inject;

@SuppressWarnings("deprecation")
public class AccountSettingsFragment extends PreferenceFragment implements OnPreferenceChangeListener,
OnConfirmListener {
OnConfirmListener, OnShownListener, OnDismissListener {
private Preference mUsernamePreference;
private EditTextPreferenceWithValidation mEmailPreference;
private DetailListPreference mPrimarySitePreference;
Expand All @@ -65,6 +70,9 @@ public class AccountSettingsFragment extends PreferenceFragment implements OnPre
private ProgressDialog mChangePasswordProgressDialog;
private Snackbar mEmailSnackbar;

private static final String SOURCE = "source";
private static final String SOURCE_ACCOUNT_SETTINGS = "account_settings";

@Inject Dispatcher mDispatcher;
@Inject AccountStore mAccountStore;
@Inject SiteStore mSiteStore;
Expand Down Expand Up @@ -373,7 +381,8 @@ private void showUsernameChangerFragment() {
.setOnConfirmListener(this)
.setHideActivityBar(true)
.setIsLifOnScroll(false)
.setOnDismissListener(null)
.setOnDismissListener(this)
.setOnShownListener(this)
.setContent(SettingsUsernameChangerFragment.class, bundle)
.build()
.show(((AppCompatActivity) getActivity()).getSupportFragmentManager(), FullScreenDialogFragment.TAG);
Expand Down Expand Up @@ -416,6 +425,18 @@ public static String[] getSiteIdsFromSites(List<SiteModel> sites) {
return ids.toArray(new String[ids.size()]);
}

@Override public void onShown() {
Map<String, String> props = new HashMap<>();
props.put(SOURCE, SOURCE_ACCOUNT_SETTINGS);
AnalyticsTracker.track(AnalyticsTracker.Stat.CHANGE_USERNAME_DISPLAYED, props);
}

@Override public void onDismiss() {
Map<String, String> props = new HashMap<>();
props.put(SOURCE, SOURCE_ACCOUNT_SETTINGS);
AnalyticsTracker.track(Stat.CHANGE_USERNAME_DISMISSED, props);
}

/*
* AsyncTask which loads sites from database for primary site preference
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,10 @@ public enum Stat {
MY_SITE_DASHBOARD_SHOWN,
MY_SITE_SITE_MENU_SHOWN,
MY_SITE_DEFAULT_TAB_EXPERIMENT_VARIANT_ASSIGNED,
APP_SETTINGS_INITIAL_SCREEN_CHANGED
APP_SETTINGS_INITIAL_SCREEN_CHANGED,
CHANGE_USERNAME_DISPLAYED,
CHANGE_USERNAME_DISMISSED,
CHANGE_USERNAME_SEARCH_PERFORMED
}

private static final List<Tracker> TRACKERS = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2203,6 +2203,12 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
return "my_site_default_tab_experiment_variant_assigned";
case APP_SETTINGS_INITIAL_SCREEN_CHANGED:
return "app_settings_initial_screen_changed";
case CHANGE_USERNAME_DISPLAYED:
return "change_username_displayed";
case CHANGE_USERNAME_DISMISSED:
return "change_username_dismissed";
case CHANGE_USERNAME_SEARCH_PERFORMED:
return "change_username_search_performed";
}
return null;
}
Expand Down