pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Removed redundant 'open bookmark list' fragment argument

Browse source
This commit is contained in:
alexzatsepin 2020-10-09 14:28:44 +03:00 • committed by Maria Velichko
parent d9e00c0723
commit c2a8894b5f
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -2774,7 +2774,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
mPlacePageToolbar.setTitle(name);
mPlacePageToolbar.setNavigationOnClickListener(v -> {
BookmarkCategory category = BookmarkManager.INSTANCE.getCategoryById(categoryId);
BookmarkCategoriesActivity.startForResult(this, category, true);
BookmarkCategoriesActivity.startForResult(this, category);
closePlacePage();
});
}

12
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java
View file

@ -68,13 +68,12 @@ public class BookmarkCategoriesActivity extends BaseToolbarActivity
}
public static void startForResult(@NonNull Activity context, int initialPage,
@Nullable String catalogDeeplink, boolean openBookmarkList,
@Nullable String catalogDeeplink,
@Nullable BookmarkCategory category)
{
Bundle args = new Bundle();
args.putInt(BookmarkCategoriesPagerFragment.ARG_CATEGORIES_PAGE, initialPage);
args.putString(BookmarkCategoriesPagerFragment.ARG_CATALOG_DEEPLINK, catalogDeeplink);
args.putBoolean(BookmarkCategoriesPagerFragment.ARG_OPEN_BOOKMARK_LIST, openBookmarkList);
args.putParcelable(BookmarksListFragment.EXTRA_CATEGORY, category);
Intent intent = new Intent(context, BookmarkCategoriesActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).putExtras(args);
@ -84,19 +83,18 @@ public class BookmarkCategoriesActivity extends BaseToolbarActivity
public static void startForResult(@NonNull Activity context, int initialPage,
@Nullable String catalogDeeplink)
{
startForResult(context, initialPage, catalogDeeplink, false, null);
startForResult(context, initialPage, catalogDeeplink, null);
}
public static void startForResult(@NonNull Activity context)
{
int initialPage = SharedPropertiesUtils.getLastVisibleBookmarkCategoriesPage(context);
startForResult(context, initialPage, null, false, null);
startForResult(context, initialPage, null, null);
}
public static void startForResult(@NonNull Activity context, @Nullable BookmarkCategory category,
boolean openBookmarkList)
public static void startForResult(@NonNull Activity context, @Nullable BookmarkCategory category)
{
int initialPage = SharedPropertiesUtils.getLastVisibleBookmarkCategoriesPage(context);
startForResult(context, initialPage, null, true, category);
startForResult(context, initialPage, null, category);
}
}

3
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java
View file

@ -29,7 +29,6 @@ public class BookmarkCategoriesPagerFragment extends BaseMwmFragment
{
final static String ARG_CATEGORIES_PAGE = "arg_categories_page";
final static String ARG_CATALOG_DEEPLINK = "arg_catalog_deeplink";
final static String ARG_OPEN_BOOKMARK_LIST = "arg_open_bookmark_list";
@SuppressWarnings("NullableProblems")
@NonNull
@ -103,7 +102,7 @@ public class BookmarkCategoriesPagerFragment extends BaseMwmFragment
{
super.onViewCreated(view, savedInstanceState);
Bundle args = getArguments();
if (args != null && args.getBoolean(ARG_OPEN_BOOKMARK_LIST))
if (args != null)
{
BookmarkCategory category = args.getParcelable(BookmarksListFragment.EXTRA_CATEGORY);
if (category == null)