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

[android] Added isolines dark mode

Browse source
This commit is contained in:
Dmitry Donskoy 2020-01-13 11:29:17 +03:00 • committed by Daria Volvenkova
parent f65a4620f3
commit c47f604782
13 changed files with 60 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/res/drawable/bg_iso_lines_night.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_iso_lines_night_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/bg_iso_lines_night_selected" android:state_selected="true"/>
<item android:drawable="@drawable/bg_iso_lines_night_default"/>
</selector>

11
android/res/drawable/bg_iso_lines_night_default.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle_night"/>
<item
android:drawable="@drawable/ic_planning_route_isomaps_dark_on"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

11
android/res/drawable/bg_iso_lines_night_pressed.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle_pressed_night"/>
<item
android:drawable="@drawable/ic_planning_route_isomaps_dark_on"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

12
android/res/drawable/bg_iso_lines_night_selected.xml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/bg_circle_night"/>
<item
android:drawable="@drawable/ic_planning_route_isomaps_off_dark_off"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

4
android/res/layout-land/map_navigation_buttons.xml
View file

@ -25,12 +25,12 @@
android:visibility="invisible"/>
<ImageButton
android:id="@+id/iso_line"
android:id="@+id/isolines"
style="@style/MwmWidget.MapButton.Traffic"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@drawable/bg_iso_lines_light"
android:background="?nav_bg_isolines"
android:visibility="invisible"/>
<ImageButton

4
android/res/layout/layout_nav_bottom.xml
View file

@ -81,13 +81,13 @@
android:background="?attr/nav_bg_subway"/>
<ImageView
android:id="@+id/iso_line"
android:id="@+id/isolines"
android:layout_weight="0.2"
android:layout_width="0dp"
android:layout_height="@dimen/nav_icon_size"
android:scaleType="center"
android:visibility="gone"
android:background="@drawable/bg_iso_lines_light"/>
android:background="?nav_bg_isolines"/>
<ImageView
android:id="@+id/settings"

4
android/res/layout/map_navigation_buttons.xml
View file

@ -27,13 +27,13 @@
tools:src="@drawable/anim_traffic_loading"/>
<ImageButton
android:id="@+id/iso_line"
android:id="@+id/isolines"
style="@style/MwmWidget.MapButton.Traffic"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:visibility="invisible"
android:background="@drawable/bg_iso_lines_light"/>
android:background="?nav_bg_isolines"/>
<ImageButton
android:id="@+id/my_position"

1
android/res/values/themes-attrs.xml
View file

@ -117,6 +117,7 @@
<declare-styleable name="ThemeAttrs.NavButtons">
<attr name="nav_background" format="reference"/>
<attr name="nav_bg_subway" format="reference"/>
<attr name="nav_bg_isolines" format="reference"/>
</declare-styleable>
<declare-styleable name="ThemeAttrs.Downloader">

2
android/res/values/themes-base.xml
View file

@ -130,6 +130,7 @@
<item name="adChoicesIcon">@drawable/ic_ad_light</item>
<item name="saleIcon">@drawable/ic_deal_light</item>
<item name="nav_bg_subway">@drawable/bg_subway_light</item>
<item name="nav_bg_isolines">@drawable/bg_iso_lines_light</item>
<item name="trafficMenuDisabled">@drawable/ic_traffic_menu_light_off</item>
<item name="subwayMenuDisabled">@drawable/ic_subway_menu_light_off</item>
<item name="isoLinesMenuDisabled">@drawable/ic_planning_route_isomaps_off_light_off</item>
@ -294,6 +295,7 @@
<item name="adChoicesIcon">@drawable/ic_ad_dark</item>
<item name="saleIcon">@drawable/ic_deal_dark</item>
<item name="nav_bg_subway">@drawable/bg_subway_night</item>
<item name="nav_bg_isolines">@drawable/bg_iso_lines_night</item>
<item name="trafficMenuDisabled">@drawable/ic_traffic_menu_dark_off</item>
<item name="subwayMenuDisabled">@drawable/ic_subway_menu_dark_off</item>
<item name="isoLinesMenuDisabled">@drawable/ic_planning_route_isomaps_off_dark_off</item>

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

@ -772,8 +772,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
ImageButton trafficBtn = frame.findViewById(R.id.traffic);
TrafficButton traffic = new TrafficButton(trafficBtn);
View subway = frame.findViewById(R.id.subway);
View isoLineView = frame.findViewById(R.id.iso_line);
mToggleMapLayerController = new MapLayerCompositeController(traffic, subway, isoLineView,this);
View isoLines = frame.findViewById(R.id.isolines);
mToggleMapLayerController = new MapLayerCompositeController(traffic, subway, isoLines,this);
mToggleMapLayerController.attachCore();
}
@ -1215,7 +1215,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onIsoLinesLayerSelected()
{
mToggleMapLayerController.toggleMode(Mode.ISO_LINE);
mToggleMapLayerController.toggleMode(Mode.ISOLINES);
}
@Override

2
android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java
View file

@ -87,7 +87,7 @@ public abstract class BottomSheetItem
{
private IsoLines(int drawableResId, int disabledStateDrawableResId)
{
super(drawableResId, disabledStateDrawableResId, R.string.button_layer_traffic, Mode.ISO_LINE);
super(drawableResId, disabledStateDrawableResId, R.string.button_layer_traffic, Mode.ISOLINES);
}
public static BottomSheetItem makeInstance(@NonNull Context mContext)

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

@ -27,11 +27,11 @@ public class MapLayerCompositeController implements MapLayerController
private ControllerAndMode mMasterEntry;
public MapLayerCompositeController(@NonNull TrafficButton traffic, @NonNull View subway,
View isoLineView, @NonNull AppCompatActivity activity)
@NonNull View isoLines, @NonNull AppCompatActivity activity)
{
View.OnClickListener listener = new OpenBottomDialogClickListener(activity, Tutorial.MAP_LAYERS);
mActivity = activity;
mChildrenEntries = createEntries(traffic, subway, isoLineView, activity, listener);
mChildrenEntries = createEntries(traffic, subway, isoLines, activity, listener);
mMasterEntry = getCurrentLayer();
toggleMode(mMasterEntry.getMode());
}
@ -39,7 +39,7 @@ public class MapLayerCompositeController implements MapLayerController
@NonNull
private static Collection<ControllerAndMode> createEntries(@NonNull TrafficButton traffic,
@NonNull View subway,
View isoLineView,
@NonNull View isoLinesView,
@NonNull AppCompatActivity activity,
@NonNull View.OnClickListener dialogClickListener)
{
@ -49,11 +49,11 @@ public class MapLayerCompositeController implements MapLayerController
subway.setOnClickListener(dialogClickListener);
SubwayMapLayerController subwayMapLayerController = new SubwayMapLayerController(subway);
SubwayMapLayerController isoLineController = new SubwayMapLayerController(isoLineView);
isoLineView.setOnClickListener(dialogClickListener);
SubwayMapLayerController isoLinesController = new SubwayMapLayerController(isoLinesView);
isoLinesView.setOnClickListener(dialogClickListener);
ControllerAndMode subwayEntry = new ControllerAndMode(Mode.SUBWAY, subwayMapLayerController);
ControllerAndMode trafficEntry = new ControllerAndMode(Mode.TRAFFIC, trafficButtonController);
ControllerAndMode isoLineEntry = new ControllerAndMode(Mode.ISO_LINE, isoLineController);
ControllerAndMode isoLineEntry = new ControllerAndMode(Mode.ISOLINES, isoLinesController);
Set<ControllerAndMode> entries = new LinkedHashSet<>();
entries.add(subwayEntry);

2
android/src/com/mapswithme/maps/maplayer/Mode.java
View file

@ -53,7 +53,7 @@ public enum Mode
}
},
ISO_LINE
ISOLINES
{
boolean isEnabled;
@Override