diff --git a/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java index 81c81a5d10..27b38f883c 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java @@ -30,7 +30,7 @@ public abstract class BaseMwmListFragment extends ListFragment mToolbar = view.findViewById(R.id.toolbar); if (mToolbar != null) { - UiUtils.setupNavigationUpListener(mToolbar, v -> Utils.navigateToParent(getActivity())); + UiUtils.setupNavigationIcon(mToolbar, v -> Utils.navigateToParent(getActivity())); } } diff --git a/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java index f8f2e701b2..2e0b1aee37 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java @@ -74,7 +74,7 @@ public abstract class BaseMwmRecyclerFragment ex mToolbar = view.findViewById(R.id.toolbar); if (mToolbar != null) - UiUtils.setupNavigationUpListener(mToolbar, mNavigationClickListener); + UiUtils.setupNavigationIcon(mToolbar, mNavigationClickListener); mRecycler = view.findViewById(R.id.recycler); if (mRecycler == null) diff --git a/android/src/com/mapswithme/maps/widget/ToolbarController.java b/android/src/com/mapswithme/maps/widget/ToolbarController.java index d895b64e1b..3bcc339bde 100644 --- a/android/src/com/mapswithme/maps/widget/ToolbarController.java +++ b/android/src/com/mapswithme/maps/widget/ToolbarController.java @@ -29,7 +29,7 @@ public class ToolbarController if (useExtendedToolbar()) UiUtils.extendViewWithStatusBar(getToolbar()); - UiUtils.setupNavigationUpListener(mToolbar, mNavigationClickListener); + UiUtils.setupNavigationIcon(mToolbar, mNavigationClickListener); setSupportActionBar(); } diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index 1eae908ee6..51b0db5fda 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -476,8 +476,8 @@ public final class UiUtils window.setStatusBarColor(ContextCompat.getColor(activity, statusBarColor)); } - public static void setupNavigationUpListener(@NonNull Toolbar toolbar, - @NonNull View.OnClickListener listener) + public static void setupNavigationIcon(@NonNull Toolbar toolbar, + @NonNull View.OnClickListener listener) { View customNavigationButton = toolbar.findViewById(R.id.back); if (customNavigationButton != null)