kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fixed review notes

Browse source
This commit is contained in:
Dmitry Donskoy 2018-11-19 13:53:51 +03:00 • committed by Aleksandr Zatsepin
parent 4f6c877b9e
commit 1af3465fde
6 changed files with 60 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
View file

@ -252,7 +252,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
protected boolean onBackPressedInternal(@NonNull BaseMwmFragment currentFragment)
{
return false;
return currentFragment.onBackPressed();
}
/**

6
android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java
View file

@ -43,12 +43,6 @@ public class BookmarksCatalogActivity extends BaseToolbarActivity
return BookmarksCatalogFragment.class;
}
@Override
protected boolean onBackPressedInternal(@NonNull BaseMwmFragment currentFragment)
{
return currentFragment.onBackPressed();
}
@Override
protected void onHomeOptionItemSelected()
{

10
android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
View file

@ -292,16 +292,18 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
if (item.getItemId() == R.id.share)
{
openSharingOptionsScreen();
Statistics.INSTANCE.trackEvent(
Statistics.EventName.BM_BOOKMARKS_LIST_ITEM_SETTINGS,
new Statistics.ParameterBuilder().add(Statistics.EventParam.OPTION,
Statistics.ParamValue.SHARING_OPTIONS));
trackBookmarkListSharingOptions();
return true;
}
return super.onOptionsItemSelected(item);
}
private void trackBookmarkListSharingOptions()
{
Statistics.INSTANCE.trackBookmarkListSharingOptions();
}
private void openSharingOptionsScreen()
{
UgcRouteSharingOptionsActivity.startForResult(getActivity(), getCategoryOrThrow());

8
android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java
View file

@ -88,7 +88,7 @@ public class UgcRouteEditSettingsFragment extends BaseMwmToolbarFragment
private void onSharingOptionsClicked()
{
openSharingOptionsScreen();
Statistics.trackEditSettingsSharingOptionsClick();
Statistics.INSTANCE.trackEditSettingsSharingOptionsClick();
}
private void openSharingOptionsScreen()
@ -124,7 +124,8 @@ public class UgcRouteEditSettingsFragment extends BaseMwmToolbarFragment
public boolean onBackPressed()
{
if (isCategoryDescChanged())
Statistics.trackCategoryDescChanged();
Statistics.INSTANCE.trackCategoryDescChanged();
Statistics.INSTANCE.trackEditSettingsCancel();
return super.onBackPressed();
}
@ -136,8 +137,9 @@ public class UgcRouteEditSettingsFragment extends BaseMwmToolbarFragment
if (isCategoryDescChanged())
{
BookmarkManager.INSTANCE.setCategoryDescription(mCategory.getId(), getEditableCategoryDesc());
Statistics.trackCategoryDescChanged();
Statistics.INSTANCE.trackCategoryDescChanged();
}
Statistics.INSTANCE.trackEditSettingsConfirm();
}
private boolean isCategoryNameChanged()

24
android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java
View file

@ -189,7 +189,7 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
Intent intent = new Intent(getContext(), SendLinkPlaceholderActivity.class)
.putExtra(SendLinkPlaceholderFragment.EXTRA_SHARED_LINK, deepLink);
startActivity(intent);
Statistics.trackSharingOptionsClick(Statistics.ParamValue.EDIT_ON_WEB);
Statistics.INSTANCE.trackSharingOptionsClick(Statistics.ParamValue.EDIT_ON_WEB);
}
private void onPublishedCategoryShared()
@ -205,7 +205,7 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
.putExtra(Intent.EXTRA_SUBJECT, deepLink)
.putExtra(Intent.EXTRA_TEXT, getString(R.string.share_bookmarks_email_body));
startActivity(Intent.createChooser(intent, getString(R.string.share)));
Statistics.trackSharingOptionsClick(Statistics.ParamValue.COPY_LINK);
Statistics.INSTANCE.trackSharingOptionsClick(Statistics.ParamValue.COPY_LINK);
}
private void onDirectLinkShared()
@ -229,7 +229,7 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
.build();
dialog.setTargetFragment(this, REQ_CODE_NO_NETWORK_CONNECTION_DIALOG);
dialog.show(this, NO_NETWORK_CONNECTION_DIALOG_TAG);
Statistics.trackSharingOptionsError(Statistics.EventName.BM_SHARING_OPTIONS_ERROR,
Statistics.INSTANCE.trackSharingOptionsError(Statistics.EventName.BM_SHARING_OPTIONS_ERROR,
Statistics.NetworkErrorType.NO_NETWORK);
}
@ -248,14 +248,14 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
{
mCurrentMode = BookmarkCategory.AccessRules.ACCESS_RULES_PUBLIC;
onUploadBtnClicked();
Statistics.trackSharingOptionsClick(Statistics.ParamValue.PUBLIC);
Statistics.INSTANCE.trackSharingOptionsClick(Statistics.ParamValue.PUBLIC);
}
private void onGetDirectLinkClicked()
{
mCurrentMode = BookmarkCategory.AccessRules.ACCESS_RULES_DIRECT_LINK;
onUploadBtnClicked();
Statistics.trackSharingOptionsClick(Statistics.ParamValue.PRIVATE);
Statistics.INSTANCE.trackSharingOptionsClick(Statistics.ParamValue.PRIVATE);
}
private void onUploadBtnClicked()
@ -359,6 +359,14 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
{
if (success)
onPostAuthCompleted();
else
onPostAuthFailed();
}
private void onPostAuthFailed()
{
Statistics.INSTANCE.trackSharingOptionsError(Statistics.EventName.BM_SHARING_OPTIONS_ERROR,
Statistics.NetworkErrorType.AUTH_FAILED);
}
@Override
@ -376,8 +384,6 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
@Override
public void onSocialAuthenticationError(int type, @Nullable String error)
{
Statistics.trackSharingOptionsError(Statistics.EventName.BM_SHARING_OPTIONS_ERROR,
Statistics.NetworkErrorType.AUTH_FAILED);
}
@Override
@ -425,7 +431,7 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
private void onUploadError(@NonNull BookmarkManager.UploadResult uploadResult)
{
Statistics.trackSharingOptionsError(Statistics.EventName.BM_SHARING_OPTIONS_UPLOAD_ERROR,
Statistics.INSTANCE.trackSharingOptionsError(Statistics.EventName.BM_SHARING_OPTIONS_UPLOAD_ERROR,
uploadResult.ordinal());
if (uploadResult == BookmarkManager.UploadResult.UPLOAD_RESULT_MALFORMED_DATA_ERROR)
{
@ -460,7 +466,7 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
: R.string.upload_and_publish_success;
Toast.makeText(getContext(), successMsgResId, Toast.LENGTH_SHORT).show();
toggleViews();
Statistics.trackSharingOptionsUploadSuccess(mCategory);
Statistics.INSTANCE.trackSharingOptionsUploadSuccess(mCategory);
}
private void checkSuccessUploadedCategoryAccessRules()

48
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -152,54 +152,70 @@ public enum Statistics
{
INSTANCE;
public static void trackCategoryDescChanged()
public void trackCategoryDescChanged()
{
trackEditSettingsScreenOptionClick(ParamValue.ADD_DESC);
}
public static void trackSharingOptionsClick(@NonNull String value)
public void trackSharingOptionsClick(@NonNull String value)
{
ParameterBuilder builder = new ParameterBuilder().add(EventParam.OPTION, value);
INSTANCE.trackEvent(EventName.BM_SHARING_OPTIONS_CLICK, builder);
trackEvent(EventName.BM_SHARING_OPTIONS_CLICK, builder);
}
public static void trackSharingOptionsError(@NonNull String error,
public void trackSharingOptionsError(@NonNull String error,
@NonNull NetworkErrorType value)
{
trackSharingOptionsError(error, value.ordinal());
}
public static void trackSharingOptionsError(@NonNull String error, int value)
public void trackSharingOptionsError(@NonNull String error, int value)
{
ParameterBuilder builder = new ParameterBuilder().add(EventParam.ERROR, value);
INSTANCE.trackEvent(error, builder);
trackEvent(error, builder);
}
public static void trackSharingOptionsUploadSuccess(@NonNull BookmarkCategory category)
public void trackSharingOptionsUploadSuccess(@NonNull BookmarkCategory category)
{
ParameterBuilder builder = new ParameterBuilder().add(EventParam.TRACKS, category.getTracksCount())
.add(EventParam.POINTS, category.getBookmarksCount());
INSTANCE.trackEvent(EventName.BM_SHARING_OPTIONS_UPLOAD_SUCCESS, builder);
trackEvent(EventName.BM_SHARING_OPTIONS_UPLOAD_SUCCESS, builder);
}
public void trackBookmarkListSettingsClick(@NonNull Analytics analytics)
{
ParameterBuilder builder = ParameterBuilder.from(EventParam.OPTION, analytics);
trackEvent(EventName.BM_BOOKMARKS_LIST_SETTINGS_CLICK, builder);
}
private static void trackEditSettingsScreenOptionClick(@NonNull String value)
private void trackEditSettingsScreenOptionClick(@NonNull String value)
{
ParameterBuilder builder = new ParameterBuilder().add(EventParam.OPTION, value);
INSTANCE.trackEvent(EventName.BM_EDIT_SETTINGS_CLICK, builder);
trackEvent(EventName.BM_EDIT_SETTINGS_CLICK, builder);
}
public static void trackEditSettingsSharingOptionsClick()
public void trackEditSettingsCancel()
{
trackEvent(EventName.BM_EDIT_SETTINGS_CANCEL);
}
public void trackEditSettingsConfirm()
{
trackEvent(EventName.BM_EDIT_SETTINGS_CONFIRM);
}
public void trackEditSettingsSharingOptionsClick()
{
trackEditSettingsScreenOptionClick(Statistics.ParamValue.SHARING_OPTIONS);
}
public void trackBookmarkListSharingOptions()
{
trackEvent(Statistics.EventName.BM_BOOKMARKS_LIST_ITEM_SETTINGS,
new Statistics.ParameterBuilder().add(Statistics.EventParam.OPTION,
Statistics.ParamValue.SHARING_OPTIONS));
}
@Retention(RetentionPolicy.SOURCE)
@IntDef({PP_BANNER_STATE_PREVIEW, PP_BANNER_STATE_DETAILS})
public @interface BannerState {}
@ -237,7 +253,9 @@ public enum Statistics
public static final String BM_SHARING_OPTIONS_UPLOAD_ERROR = "Bookmarks_SharingOptions_upload_error";
public static final String BM_SHARING_OPTIONS_ERROR = "Bookmarks_SharingOptions_error";
public static final String BM_SHARING_OPTIONS_CLICK = "Bookmarks_SharingOptions_click";
public static final String BM_EDIT_SETTINGS_CLICK = "Bookmarks_BookmarksListSettings_click";
public static final String BM_EDIT_SETTINGS_CLICK = "Bookmarks_Bookmark_Settings_click";
public static final String BM_EDIT_SETTINGS_CANCEL = "Bookmarks_Bookmark_Settings_cancel";
public static final String BM_EDIT_SETTINGS_CONFIRM = "Bookmarks_Bookmark_Settings_confirm";
public static final String BM_BOOKMARKS_LIST_SETTINGS_CLICK = "Bookmarks_BookmarksList_settings_click";
public static final String BM_BOOKMARKS_LIST_ITEM_SETTINGS = "Bookmarks_BookmarksListItem_settings";
public static final String BM_GROUP_CREATED = "Bookmark. Group created";
@ -1451,9 +1469,9 @@ public enum Statistics
private final Map<String, String> mParams = new HashMap<>();
@NonNull
public static ParameterBuilder from(String option, @NonNull Analytics analytics)
public static ParameterBuilder from(@NonNull String key, @NonNull Analytics analytics)
{
return new ParameterBuilder().add(option,analytics.getName());
return new ParameterBuilder().add(key, analytics.getName());
}
public ParameterBuilder add(String key, String value)