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

Format xml code; revert margin change

Browse source
This commit is contained in:
Alex 2017-10-14 22:52:52 +03:00
parent 54c4d136ff
commit 39086e9edb
2 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widget_bg" android:id="@+id/widget_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -18,8 +19,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:gravity="center"
android:textColor="@color/color_black" android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" android:textSize="@dimen/map_widget_text_size"
android:visibility="gone"/> android:visibility="gone"/>
@ -28,18 +29,17 @@
android:id="@+id/widget_top_icon" android:id="@+id/widget_top_icon"
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_marginTop="2dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="2dp"
android:gravity="center" android:gravity="center"
android:src="@drawable/ic_action_test_light" android:src="@drawable/ic_action_test_light"
android:visibility="gone"/> android:visibility="gone"/>
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/widget_bottom_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/map_widget_height" android:layout_height="@dimen/map_widget_height"
android:id="@+id/widget_bottom_layout"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
@ -67,11 +67,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:maxLines="1" android:maxLines="1"
android:singleLine="true"
android:minWidth="10dp" android:minWidth="10dp"
tools:text="1048"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/map_widget_text_size" /> android:textSize="@dimen/map_widget_text_size"
tools:text="1048"/>
<TextView <TextView
android:id="@+id/widget_text" android:id="@+id/widget_text"
@ -79,11 +78,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:maxLines="1" android:maxLines="1"
android:singleLine="true"
android:minWidth="10dp" android:minWidth="10dp"
tools:text="1048"
android:textColor="@color/color_black" android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" /> android:textSize="@dimen/map_widget_text_size"
tools:text="1048"/>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
@ -99,21 +97,20 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1" android:maxLines="1"
android:singleLine="true"
tools:text="km"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/map_widget_text_size_small" /> android:textSize="@dimen/map_widget_text_size_small"
tools:text="km"/>
<TextView <TextView
android:id="@+id/widget_text_small" android:id="@+id/widget_text_small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1" android:maxLines="1"
android:singleLine="true"
tools:text="km"
android:textColor="@color/color_black" android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" /> android:textSize="@dimen/map_widget_text_size_small"
tools:text="km"/>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -104,7 +104,7 @@
<dimen name="map_button_text_size">18sp</dimen> <dimen name="map_button_text_size">18sp</dimen>
<dimen name="map_alarm_text_size">25sp</dimen> <dimen name="map_alarm_text_size">25sp</dimen>
<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">2sp</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="dash_margin">2dp</dimen> <dimen name="dash_margin">2dp</dimen>