From d8dcc8798c37df56695dfa6b50220521947cf53e 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?= <az@mapswithme.com>
Date: Tue, 25 Feb 2020 15:16:16 +0300
Subject: [PATCH] [android] Renamed subway controller to defualt, since it's
 reused for isolines

---
 .../maplayer/MapLayerCompositeController.java |  6 ++--
 ...er.java => DefaultMapLayerController.java} | 28 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)
 rename android/src/com/mapswithme/maps/maplayer/subway/{SubwayMapLayerController.java => DefaultMapLayerController.java} (62%)

diff --git a/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java b/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java
index 4c68813ad8..3d2c8ae726 100644
--- a/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java
+++ b/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java
@@ -6,7 +6,7 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import com.mapswithme.maps.maplayer.subway.SubwayMapLayerController;
+import com.mapswithme.maps.maplayer.subway.DefaultMapLayerController;
 import com.mapswithme.maps.maplayer.traffic.widget.TrafficButton;
 import com.mapswithme.maps.maplayer.traffic.widget.TrafficButtonController;
 import com.mapswithme.maps.tips.Tutorial;
@@ -49,9 +49,9 @@ public class MapLayerCompositeController implements MapLayerController
     TrafficButtonController trafficButtonController = new TrafficButtonController(traffic,
                                                                                   activity);
     subway.setOnClickListener(dialogClickListener);
-    SubwayMapLayerController subwayMapLayerController = new SubwayMapLayerController(subway);
+    DefaultMapLayerController subwayMapLayerController = new DefaultMapLayerController(subway);
 
-    SubwayMapLayerController isoLinesController = new SubwayMapLayerController(isoLinesView);
+    DefaultMapLayerController isoLinesController = new DefaultMapLayerController(isoLinesView);
     isoLinesView.setOnClickListener(dialogClickListener);
     ControllerAndMode subwayEntry = new ControllerAndMode(Mode.SUBWAY, Tutorial.SUBWAY,
                                                           subwayMapLayerController);
diff --git a/android/src/com/mapswithme/maps/maplayer/subway/SubwayMapLayerController.java b/android/src/com/mapswithme/maps/maplayer/subway/DefaultMapLayerController.java
similarity index 62%
rename from android/src/com/mapswithme/maps/maplayer/subway/SubwayMapLayerController.java
rename to android/src/com/mapswithme/maps/maplayer/subway/DefaultMapLayerController.java
index 150fb77571..0d06c24aee 100644
--- a/android/src/com/mapswithme/maps/maplayer/subway/SubwayMapLayerController.java
+++ b/android/src/com/mapswithme/maps/maplayer/subway/DefaultMapLayerController.java
@@ -1,65 +1,65 @@
 package com.mapswithme.maps.maplayer.subway;
 
-import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import com.mapswithme.maps.maplayer.MapLayerController;
 import com.mapswithme.util.UiUtils;
 
-public class SubwayMapLayerController implements MapLayerController
+public class DefaultMapLayerController implements MapLayerController
 {
   @NonNull
-  private final View mSubwayBtn;
+  private final View mLayerView;
 
-  public SubwayMapLayerController(@NonNull View subwayBtn)
+  public DefaultMapLayerController(@NonNull View subwayBtn)
   {
-    mSubwayBtn = subwayBtn;
-    UiUtils.addStatusBarOffset(mSubwayBtn);
+    mLayerView = subwayBtn;
+    UiUtils.addStatusBarOffset(mLayerView);
   }
 
   @Override
   public void turnOn()
   {
-    mSubwayBtn.setSelected(true);
+    mLayerView.setSelected(true);
   }
 
   @Override
   public void turnOff()
   {
-    mSubwayBtn.setSelected(false);
+    mLayerView.setSelected(false);
   }
 
   @Override
   public void show()
   {
-    UiUtils.show(mSubwayBtn);
+    UiUtils.show(mLayerView);
   }
 
   @Override
   public void showImmediately()
   {
-    mSubwayBtn.setVisibility(View.VISIBLE);
+    mLayerView.setVisibility(View.VISIBLE);
   }
 
   @Override
   public void hide()
   {
-    UiUtils.hide(mSubwayBtn);
+    UiUtils.hide(mLayerView);
   }
 
   @Override
   public void hideImmediately()
   {
-    mSubwayBtn.setVisibility(View.GONE);
+    mLayerView.setVisibility(View.GONE);
   }
 
   @Override
   public void adjust(int offsetX, int offsetY)
   {
-    ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mSubwayBtn.getLayoutParams();
+    ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mLayerView.getLayoutParams();
     params.setMargins(offsetX, offsetY, 0, 0);
-    mSubwayBtn.setLayoutParams(params);
+    mLayerView.setLayoutParams(params);
   }
 
   @Override