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

Remove round edges and strokes form map hud

Browse source
This commit is contained in:
Johannes Hoppe 2019-11-04 22:09:01 +09:00
parent 997c2d00b1
commit 437cadfcbc
16 changed files with 113 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/res/drawable/btn_flat.xml
View file

@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_light_pressed" /> <solid android:color="@color/map_widget_light_pressed" />
<stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" /> </shape>
</shape></item> </item>
<item><shape android:shape="rectangle"> <item>
<solid android:color="@color/map_widget_light" /> <shape android:shape="rectangle">
<stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" /> <solid android:color="@color/map_widget_light_trans" />
</shape></item> </shape>
</item>
</selector> </selector>

14
OsmAnd/res/drawable/btn_flat_night.xml
View file

@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" /> <solid android:color="@color/map_widget_dark_pressed" />
<stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" /> </shape>
</shape></item> </item>
<item><shape android:shape="rectangle"> <item>
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark" /> <solid android:color="@color/map_widget_dark" />
<stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" /> </shape>
</shape></item> </item>
</selector> </selector>

14
OsmAnd/res/drawable/btn_flat_transparent.xml
View file

@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" /> <solid android:color="@color/map_widget_dark_pressed" />
<stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" /> </shape>
</shape></item> </item>
<item><shape android:shape="rectangle"> <item>
<shape android:shape="rectangle">
<solid android:color="@color/color_transparent" /> <solid android:color="@color/color_transparent" />
<stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" /> </shape>
</shape></item> </item>
</selector> </selector>

18
OsmAnd/res/drawable/btn_left_round.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_light_pressed" /> <solid android:color="@color/map_widget_light_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/> </item>
</shape></item> <item>
<item><shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/map_widget_light" /> <solid android:color="@color/map_widget_light_trans" />
<corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/> </item>
</shape></item>
</selector> </selector>

16
OsmAnd/res/drawable/btn_left_round_night.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" /> <solid android:color="@color/map_widget_dark_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" /> </item>
</shape></item> <item>
<item><shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark" /> <solid android:color="@color/map_widget_dark" />
<corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" /> </item>
</shape></item>
</selector> </selector>

16
OsmAnd/res/drawable/btn_left_round_transparent.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" /> <solid android:color="@color/map_widget_dark_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/> </item>
</shape></item> <item>
<item><shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_transparent" /> <solid android:color="@color/color_transparent" />
<corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/> </item>
</shape></item>
</selector> </selector>

21
OsmAnd/res/drawable/btn_right_round.xml
View file

@ -1,18 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_light_pressed" /> <solid android:color="@color/map_widget_light_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/> </item>
</shape></item> <item>
<item><shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/map_widget_light" /> <solid android:color="@color/map_widget_light_trans" />
<corners </shape>
android:topRightRadius="@dimen/map_button_rect_rad" </item>
android:bottomRightRadius="@dimen/map_button_rect_rad"
/>
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
</shape></item>
</selector> </selector>

19
OsmAnd/res/drawable/btn_right_round_night.xml
View file

@ -1,18 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" /> <solid android:color="@color/map_widget_dark_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" /> </item>
</shape></item> <item>
<item><shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark" /> <solid android:color="@color/map_widget_dark" />
<corners </shape>
android:topRightRadius="@dimen/map_button_rect_rad" </item>
android:bottomRightRadius="@dimen/map_button_rect_rad"
/>
<stroke android:width="@dimen/map_button_stroke_dark" android:color="@color/map_widget_dark_stroke" />
</shape></item>
</selector> </selector>

19
OsmAnd/res/drawable/btn_right_round_transparent.xml
View file

@ -1,18 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" /> <solid android:color="@color/map_widget_dark_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/> </item>
</shape></item> <item>
<item><shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_transparent" /> <solid android:color="@color/color_transparent" />
<corners </shape>
android:topRightRadius="@dimen/map_button_rect_rad" </item>
android:bottomRightRadius="@dimen/map_button_rect_rad"
/>
<stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
</shape></item>
</selector> </selector>

12
OsmAnd/res/drawable/btn_round.xml
View file

@ -1,7 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/btn_round_p" android:state_pressed="true"/> <item android:state_pressed="true">
<item android:drawable="@drawable/btn_round_n"/> <shape android:shape="rectangle">
<solid android:color="@color/map_widget_light_pressed" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_light_trans" />
</shape>
</item>
</selector> </selector>

13
OsmAnd/res/drawable/btn_round_night.xml
View file

@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/btn_round_night_p"/> <item android:state_pressed="true">
<item android:drawable="@drawable/btn_round_night_n"/> <shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark" />
</shape>
</item>
</selector> </selector>

16
OsmAnd/res/drawable/btn_round_transparent.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle"> <item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/map_widget_dark_pressed" /> <solid android:color="@color/map_widget_dark_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" /> </item>
</shape></item> <item>
<item><shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_transparent" /> <solid android:color="@color/color_transparent" />
<corners android:radius="@dimen/map_button_rect_rad" /> </shape>
<stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" /> </item>
</shape></item>
</selector> </selector>

7
OsmAnd/res/layout/map_hud_widget.xml
View file

@ -31,7 +31,9 @@
android:layout_width="@dimen/map_widget_image" android:layout_width="@dimen/map_widget_image"
android:layout_height="@dimen/map_widget_image" android:layout_height="@dimen/map_widget_image"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="2dp" android:layout_marginStart="@dimen/map_widget_icon_margin_left"
android:layout_marginLeft="@dimen/map_widget_icon_margin_left"
android:layout_marginTop="@dimen/map_widget_icon_margin"
android:gravity="center" android:gravity="center"
osmand:srcCompat="@drawable/ic_action_remove_dark" osmand:srcCompat="@drawable/ic_action_remove_dark"
android:visibility="gone"/> android:visibility="gone"/>
@ -49,7 +51,8 @@
android:layout_width="@dimen/map_widget_icon" android:layout_width="@dimen/map_widget_icon"
android:layout_height="@dimen/map_widget_icon" android:layout_height="@dimen/map_widget_icon"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:layout_marginLeft="@dimen/map_widget_icon_margin" android:layout_marginStart="@dimen/map_widget_icon_margin_left"
android:layout_marginLeft="@dimen/map_widget_icon_margin_left"
android:layout_marginRight="@dimen/map_widget_icon_margin" android:layout_marginRight="@dimen/map_widget_icon_margin"
android:gravity="center" android:gravity="center"
osmand:srcCompat="@drawable/ic_action_remove_dark" osmand:srcCompat="@drawable/ic_action_remove_dark"

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

@ -45,6 +45,7 @@
<dimen name="map_button_rect_rad">3dp</dimen> <dimen name="map_button_rect_rad">3dp</dimen>
<dimen name="map_widget_icon_margin">3dp</dimen> <dimen name="map_widget_icon_margin">3dp</dimen>
<dimen name="map_widget_icon_margin_left">9dp</dimen>
<dimen name="widget_turn_lane_size">54dp</dimen> <dimen name="widget_turn_lane_size">54dp</dimen>
<dimen name="widget_turn_lane_border">9dp</dimen> <dimen name="widget_turn_lane_border">9dp</dimen>

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

@ -128,7 +128,7 @@
<color name="map_widget_dark_stroke">#80ffffff</color> <color name="map_widget_dark_stroke">#80ffffff</color>
<color name="map_widget_dark_pressed">#80aaaaaa</color> <color name="map_widget_dark_pressed">#80aaaaaa</color>
<color name="map_widget_light_trans">#80ffffff</color> <color name="map_widget_light_trans">#80ffffff</color>
<color name="map_widget_light_pressed">#e5e5e5</color> <color name="map_widget_light_pressed">#80aaaaaa</color>
<color name="map_widget_blue">#536dfe</color> <color name="map_widget_blue">#536dfe</color>
<color name="map_widget_blue_pressed">#485dd9</color> <color name="map_widget_blue_pressed">#485dd9</color>
<color name="map_button_icon_color_light">#727272</color> <color name="map_button_icon_color_light">#727272</color>

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

@ -153,6 +153,7 @@
<dimen name="map_widget_text_bottom_margin">1sp</dimen> <dimen name="map_widget_text_bottom_margin">1sp</dimen>
<dimen name="map_widget_text_small_bottom_margin">3sp</dimen> <dimen name="map_widget_text_small_bottom_margin">3sp</dimen>
<dimen name="map_widget_icon_margin">2dp</dimen> <dimen name="map_widget_icon_margin">2dp</dimen>
<dimen name="map_widget_icon_margin_left">6dp</dimen>
<dimen name="bottom_sheet_title_big">20sp</dimen> <dimen name="bottom_sheet_title_big">20sp</dimen>
<dimen name="dash_margin">2dp</dimen> <dimen name="dash_margin">2dp</dimen>