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

[android] Renamed subway controller to defualt, since it's reused for isolines

Browse source
This commit is contained in:
Александр Зацепин 2020-02-25 15:16:16 +03:00 • committed by yoksnod
parent bc449bdaa3
commit d8dcc8798c
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java
View file

@ -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);

28
android/src/com/mapswithme/maps/maplayer/subway/SubwayMapLayerController.java → android/src/com/mapswithme/maps/maplayer/subway/DefaultMapLayerController.java
View file

@ -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