From d78cd76116505daee7c3cdb0e3c556a47be087e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Tue, 21 Jan 2020 15:00:38 +0300 Subject: [PATCH] [android] Replaced subway tip&trick by isolines --- .../maps/tips/ClickInterceptorFactory.java | 13 ++++++------- android/src/com/mapswithme/maps/tips/Tutorial.java | 8 ++++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java b/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java index 144662b04f..db9ec35238 100644 --- a/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java +++ b/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java @@ -1,7 +1,6 @@ package com.mapswithme.maps.tips; import androidx.annotation.NonNull; - import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; @@ -13,9 +12,9 @@ import com.mapswithme.util.UTM; class ClickInterceptorFactory { @NonNull - static ClickInterceptor createActivateSubwayLayerListener() + static ClickInterceptor createActivateIsolinesLayerListener() { - return new ActivateSubwayLayer(); + return new ActivateIsolinesLayer(); } @NonNull @@ -53,9 +52,9 @@ class ClickInterceptorFactory } } - static class ActivateSubwayLayer extends AbstractClickInterceptor + static class ActivateIsolinesLayer extends AbstractClickInterceptor { - ActivateSubwayLayer() + ActivateIsolinesLayer() { super(Tutorial.MAP_LAYERS); } @@ -63,8 +62,8 @@ class ClickInterceptorFactory @Override public void onInterceptClickInternal(@NonNull MwmActivity activity) { - Mode.SUBWAY.setEnabled(activity, true); - activity.onSubwayLayerSelected(); + Mode.ISOLINES.setEnabled(activity, true); + activity.onIsolinesLayerSelected(); } } diff --git a/android/src/com/mapswithme/maps/tips/Tutorial.java b/android/src/com/mapswithme/maps/tips/Tutorial.java index 19c1f871e7..7c0e6d3cb0 100644 --- a/android/src/com/mapswithme/maps/tips/Tutorial.java +++ b/android/src/com/mapswithme/maps/tips/Tutorial.java @@ -61,16 +61,16 @@ public enum Tutorial } }, - MAP_LAYERS(R.string.tips_map_layers_title, - R.string.tips_map_layers_message, - R.id.subway, null, MwmActivity.class) + MAP_LAYERS(R.string.tips_map_layers_title_countour, + R.string.tips_map_layers_message_countour, + R.id.isolines, null, MwmActivity.class) { @NonNull @Override public ClickInterceptor createClickInterceptor() { - return ClickInterceptorFactory.createActivateSubwayLayerListener(); + return ClickInterceptorFactory.createActivateIsolinesLayerListener(); } },