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

[android] simplify layers button

Browse source 
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2022-07-03 00:02:25 +02:00 • committed by Roman Tsisyk
parent e7377224f6
commit 8617a3f473
17 changed files with 19 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/res/drawable/bg_toggle_map_layer_btn.xml
View file

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

6
android/res/drawable/bg_toggle_map_layer_btn_dark.xml
View file

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

11
android/res/drawable/bg_toggle_map_layer_btn_default.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle"/>
<item
android:drawable="@drawable/ic_layers_light_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_toggle_map_layer_btn_default_dark.xml
View file

@ -1,11 +0,0 @@
<?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_layers_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_toggle_map_layer_btn_pressed.xml
View file

@ -1,12 +0,0 @@
<?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"/>
<item
android:drawable="@drawable/ic_layers_light_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_toggle_map_layer_btn_pressed_dark.xml
View file

@ -1,11 +0,0 @@
<?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_layers_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_toggle_map_layer_btn_selected.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle"/>
<item
android:drawable="@drawable/ic_layers_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>

12
android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml
View file

@ -1,12 +0,0 @@
<?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_layers_off_night"
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>

5
android/res/drawable/ic_layers.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
</vector>

5
android/res/drawable/ic_layers_clear.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M19.81,14.99l1.19,-0.92 -1.43,-1.43 -1.19,0.92 1.43,1.43zM19.36,10.27L21,9l-9,-7 -2.91,2.27 7.87,7.88 2.4,-1.88zM3.27,1L2,2.27l4.22,4.22L3,9l1.63,1.27L12,16l2.1,-1.63 1.43,1.43L12,18.54l-7.37,-5.73L3,14.07l9,7 4.95,-3.85L20.73,21 22,19.73 3.27,1z"/>
</vector>

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

@ -11,10 +11,11 @@
<ImageButton
android:id="@+id/layers_button"
style="@style/MwmWidget.MapButton.Layers"
style="@style/MwmWidget.MapButton"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="?toggleMapLayerBtnBg"
android:background="?nav_background"
android:src="@drawable/ic_layers"
android:visibility="invisible"
tools:visibility="visible" />

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

@ -10,10 +10,11 @@
<ImageButton
android:id="@+id/layers_button"
style="@style/MwmWidget.MapButton.Layers"
style="@style/MwmWidget.MapButton"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="?toggleMapLayerBtnBg"
android:background="?nav_background"
android:src="@drawable/ic_layers"
android:visibility="invisible"
tools:visibility="visible" />

4
android/res/values/styles.xml
View file

@ -17,10 +17,6 @@
<item name="android:tint">?iconTint</item>
</style>
<style name="MwmWidget.MapButton.Layers">
<item name="android:tint">@null</item>
</style>
<style name="MwmWidget.Button">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>

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

@ -70,7 +70,6 @@
<attr name="filterPropertyBackground" format="reference" />
<attr name="adChoicesIcon" format="reference" />
<attr name="saleIcon" format="reference" />
<attr name="toggleMapLayerBtnBg" format="reference" />
<attr name="tipsBgColor" format="color" />
<attr name="tipsPrimaryTextColor" format="color" />
<attr name="tipsSecondaryTextColor" format="color" />

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

@ -120,7 +120,6 @@
<item name="trafficMenuDisabled">@drawable/ic_layers_traffic_inactive</item>
<item name="subwayMenuDisabled">@drawable/ic_layers_subway_inactive</item>
<item name="isoLinesMenuDisabled">@drawable/ic_layers_isoline_inactive</item>
<item name="toggleMapLayerBtnBg">@drawable/bg_toggle_map_layer_btn</item>
<item name="accentColorSelector">@color/accent_color_selector</item>
<item name="tipsBgColor">@color/tips_and_triks_bg_night</item>
<item name="tipsPrimaryTextColor">@color/tips_and_triks_primary_text</item>
@ -295,7 +294,6 @@
<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="toggleMapLayerBtnBg">@drawable/bg_toggle_map_layer_btn_dark</item>
<item name="accentColorSelector">@color/accent_color_selector_night</item>
<item name="tipsBgColor">@color/tips_and_triks_bg</item>
<item name="tipsPrimaryTextColor">@color/tips_and_triks_primary_text_night</item>

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

@ -926,7 +926,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (!PermissionsUtils.isLocationGranted(this))
{
Utils.showSnackbar(getActivity(), findViewById(R.id.coordinator), findViewById(R.id.menu_frame),
R.string.location_is_disabled_long_text);
R.string.location_is_disabled_long_text);
return;
}

4
android/src/com/mapswithme/maps/maplayer/LayerBottomSheetItem.java
View file

@ -39,8 +39,8 @@ public class LayerBottomSheetItem
public static LayerBottomSheetItem create(@NonNull Context mContext, Mode mode, @NonNull OnItemClickListener<LayerBottomSheetItem> layerItemClickListener)
{
int disabledResource = R.attr.toggleMapLayerBtnBg;
int enabledResource = R.attr.toggleMapLayerBtnBg;
int disabledResource = 0;
int enabledResource = 0;
int buttonTextResource = R.string.layers_title;
switch (mode)
{