From 39086e9edb6c21d9716b4abb0244ebe1dd6fb08b Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Sat, 14 Oct 2017 22:52:52 +0300
Subject: [PATCH] Format xml code; revert margin change

---
 OsmAnd/res/layout/map_hud_widget.xml | 51 +++++++++++++---------------
 OsmAnd/res/values/sizes.xml          |  2 +-
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 22b7c90d05..3c18b0e783 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widget_bg"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/btn_left_round"
     android:minWidth="@dimen/map_minwidth_widget"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal" >
+        android:layout_gravity="center_horizontal">
 
         <TextView
             android:id="@+id/widget_top_icon_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:gravity="center"
             android:layout_marginTop="2dp"
+            android:gravity="center"
             android:textColor="@color/color_black"
             android:textSize="@dimen/map_widget_text_size"
-            android:visibility="gone" />
+            android:visibility="gone"/>
 
         <ImageView
             android:id="@+id/widget_top_icon"
             android:layout_width="@dimen/map_widget_image"
             android:layout_height="@dimen/map_widget_image"
-            android:layout_marginTop="2dp"
             android:layout_gravity="center"
+            android:layout_marginTop="2dp"
             android:gravity="center"
             android:src="@drawable/ic_action_test_light"
-            android:visibility="gone" />
+            android:visibility="gone"/>
     </FrameLayout>
 
     <LinearLayout
+        android:id="@+id/widget_bottom_layout"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/map_widget_height"
-        android:id="@+id/widget_bottom_layout"
-        
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/widget_icon"
@@ -50,7 +50,7 @@
             android:layout_marginLeft="@dimen/map_widget_icon_margin"
             android:layout_marginRight="@dimen/map_widget_icon_margin"
             android:gravity="center"
-            android:src="@drawable/ic_action_test_light" />
+            android:src="@drawable/ic_action_test_light"/>
 
         <FrameLayout
             android:layout_width="0dp"
@@ -59,7 +59,7 @@
             android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"
             android:layout_marginLeft="@dimen/map_widget_icon_margin"
             android:layout_marginRight="@dimen/map_widget_icon_margin"
-            android:layout_weight="1" >
+            android:layout_weight="1">
 
             <TextView
                 android:id="@+id/widget_text_shadow"
@@ -67,11 +67,10 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
                 android:maxLines="1"
-                android:singleLine="true" 
                 android:minWidth="10dp"
-                tools:text="1048"
                 android:textColor="@color/color_white"
-                android:textSize="@dimen/map_widget_text_size" />
+                android:textSize="@dimen/map_widget_text_size"
+                tools:text="1048"/>
 
             <TextView
                 android:id="@+id/widget_text"
@@ -79,11 +78,10 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
                 android:maxLines="1"
-                android:singleLine="true" 
                 android:minWidth="10dp"
-                tools:text="1048"
                 android:textColor="@color/color_black"
-                android:textSize="@dimen/map_widget_text_size" />
+                android:textSize="@dimen/map_widget_text_size"
+                tools:text="1048"/>
         </FrameLayout>
 
         <FrameLayout
@@ -92,28 +90,27 @@
             android:layout_gravity="bottom"
             android:layout_marginBottom="@dimen/map_widget_text_small_bottom_margin"
             android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp" >
+            android:layout_marginRight="4dp">
 
             <TextView
                 android:id="@+id/widget_text_small_shadow"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:maxLines="1"
-                android:singleLine="true" 
-                tools:text="km"
                 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
                 android:id="@+id/widget_text_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:maxLines="1"
-                android:singleLine="true" 
-                tools:text="km"
                 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>
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 68829e47ac..d43bf1466d 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -104,7 +104,7 @@
 	<dimen name="map_button_text_size">18sp</dimen>
 	<dimen name="map_alarm_text_size">25sp</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="dash_margin">2dp</dimen>