Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #2929

Browse source
This commit is contained in:
Alexey Kulish 2016-11-08 17:54:09 +03:00
parent 3e9fe5c3ae
commit 9569b9e73f
6 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/drawable/btn_round_blue.xml
View file

@ -5,6 +5,10 @@
<solid android:color="@color/map_widget_blue_pressed" /> <solid android:color="@color/map_widget_blue_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" /> <corners android:radius="@dimen/map_button_rect_rad" />
</shape></item> </shape></item>
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/searchbar_tab_inactive_light" />
<corners android:radius="@dimen/map_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle"> <item><shape android:shape="rectangle">
<solid android:color="@color/map_widget_blue" /> <solid android:color="@color/map_widget_blue" />
<corners android:radius="@dimen/map_button_rect_rad" /> <corners android:radius="@dimen/map_button_rect_rad" />

15
OsmAnd/res/layout/move_marker_bottom_sheet.xml
View file

@ -41,7 +41,7 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
tools:text="Lat: 50.45375 Lon: 30.48693"/> tools:text="Lat: 50.45375\nLon: 30.48693"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -50,18 +50,15 @@
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"> android:layout_marginRight="12dp">
<android.support.v7.widget.AppCompatButton <Button
android:id="@+id/apply_button" android:id="@+id/apply_button"
style="@style/Widget.AppCompat.Button.Colored" style="@style/DialogActionButton"
android:layout_width="wrap_content" android:layout_marginRight="8dp"
android:layout_height="wrap_content"
android:text="@string/shared_string_apply"/> android:text="@string/shared_string_apply"/>
<android.support.v7.widget.AppCompatButton <Button
android:id="@+id/cancel_button" android:id="@+id/cancel_button"
style="@style/Widget.AppCompat.Button.Borderless.Colored" style="@style/DialogCancelButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/shared_string_cancel"/> android:text="@string/shared_string_cancel"/>
</LinearLayout> </LinearLayout>

1
OsmAnd/res/values/sizes.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="dialog_button_height">36dp</dimen>
<dimen name="undo_bottom_offset">15dp</dimen> <dimen name="undo_bottom_offset">15dp</dimen>
<dimen name="touch_slop">32dp</dimen> <dimen name="touch_slop">32dp</dimen>

2
OsmAnd/res/values/strings.xml
View file

@ -569,7 +569,7 @@
<string name="waypoint_visit_before">Visit before</string> <string name="waypoint_visit_before">Visit before</string>
<string name="simulate_your_location">Simulate your position</string> <string name="simulate_your_location">Simulate your position</string>
<string name="drawer">Flat list</string> <string name="drawer">Flat list</string>
<string name="short_location_on_map">Lat %1$s\n Lon %2$s</string> <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
<string name="tips_and_tricks_descr">Frequently asked questions, recent changes, and others</string> <string name="tips_and_tricks_descr">Frequently asked questions, recent changes, and others</string>
<string name="routing_settings_2">Navigation settings</string> <string name="routing_settings_2">Navigation settings</string>
<string name="general_settings_2">General settings</string> <string name="general_settings_2">General settings</string>

24
OsmAnd/res/values/styles.xml
View file

@ -50,6 +50,30 @@
<item name="android:background">?attr/dashboard_button</item> <item name="android:background">?attr/dashboard_button</item>
</style> </style>
<style name="DialogActionButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:minHeight">@dimen/dialog_button_height</item>
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:textColor">@color/color_white</item>
<item name="android:background">@drawable/btn_round_blue</item>
</style>
<style name="DialogCancelButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:minHeight">@dimen/dialog_button_height</item>
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:textColor">?attr/contextMenuButtonColor</item>
<item name="android:background">?attr/selectableItemBackground</item>
</style>
<!-- Osmand themes styles --> <!-- Osmand themes styles -->
<style name="OsmandLightTheme" parent="Theme.AppCompat.Light"> <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
<item name="ctx_menu_info_divider">@color/ctx_menu_info_divider_light</item> <item name="ctx_menu_info_divider">@color/ctx_menu_info_divider_light</item>

1
OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
View file

@ -290,6 +290,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
menu.show(ll, pointDescription, newObject); menu.show(ll, pointDescription, newObject);
view.refreshMap(); view.refreshMap();
} }
selectedObjectContextMenuProvider = null;
applyingMarkerLatLon = null; applyingMarkerLatLon = null;
} }