From 116d9e9d7eb57bdc608813bc41ddc46679646c83 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Thu, 24 Dec 2015 15:16:52 +0200
Subject: [PATCH] Fixed problem with big text.

---
 .../dialog_live_updates_item_settings.xml     | 138 ++++++++++--------
 1 file changed, 77 insertions(+), 61 deletions(-)

diff --git a/OsmAnd/res/layout/dialog_live_updates_item_settings.xml b/OsmAnd/res/layout/dialog_live_updates_item_settings.xml
index 4a6b9356d9..facafd82b2 100644
--- a/OsmAnd/res/layout/dialog_live_updates_item_settings.xml
+++ b/OsmAnd/res/layout/dialog_live_updates_item_settings.xml
@@ -49,109 +49,125 @@
             tools:text="Update: 4 Dec 2015, 14:41"/>
     </LinearLayout>
 
-    <GridLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:columnCount='2'
-        android:paddingLeft="24dp">
+        android:layout_height="54dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp">
 
         <TextView
-            android:textSize="16sp"
-            android:layout_width="wrap_content"
-            android:layout_height="54dp"
-            android:layout_column="0"
-            android:layout_row="1"
-            android:gravity="center"
-            android:text="@string/live_update"/>
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:text="@string/live_update"
+            android:textSize="16sp"/>
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/liveUpdatesSwitch"
-            android:layout_gravity="right"
-            android:checked="true"
-            android:layout_marginRight="24dp"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:checked="true"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp">
 
         <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:text="@string/only_download_over_wifi"
             android:textSize="16sp"
-            android:layout_width="wrap_content"
-            android:layout_height="54dp"
-            android:layout_column="0"
-            android:layout_row="2"
-            android:gravity="center"
-            android:text="@string/only_download_over_wifi"/>
+            tools:text="Only download over WiFi long text like really long"/>
 
         <CheckBox
             android:id="@+id/downloadOverWiFiSwitch"
-            android:textSize="16sp"
-            android:layout_gravity="right"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="right|center_vertical"
             android:checked="true"
-            android:layout_marginRight="24dp"/>
+            android:textSize="16sp"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="16dp">
 
         <TextView
-            android:textSize="16sp"
-            android:layout_width="wrap_content"
-            android:layout_height="54dp"
-            android:layout_column="0"
-            android:layout_row="3"
-            android:gravity="center"
-            android:text="@string/update_every"/>
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:text="@string/update_every"
+            android:textSize="16sp"/>
 
+        <!--android:id="@+id/updateFrequencySpinner"-->
         <Spinner
-            android:id="@+id/updateFrequencySpinner"
             style="@style/OsmandLightTheme.Spinner"
             android:layout_width="wrap_content"
-            android:layout_height="54dp"
-            android:layout_column="1"
-            android:layout_gravity="right"
-            android:layout_marginRight="16dp"
+            android:layout_height="match_parent"
             android:entries="@array/update_frequencies_array"
-            android:gravity="right"
             android:paddingLeft="0dp"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="16dp">
 
         <TextView
-            android:textSize="16sp"
             android:id="@+id/updateTimesOfDayLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="54dp"
-            android:layout_column="0"
-            android:layout_row="4"
-            android:gravity="center"
-            android:text="@string/update_time"/>
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:text="@string/update_time"
+            android:textSize="16sp"/>
 
+        <!--android:id="@+id/updateTimesOfDaySpinner"-->
         <Spinner
-            android:id="@+id/updateTimesOfDaySpinner"
             style="@style/OsmandLightTheme.Spinner"
             android:layout_width="wrap_content"
-            android:layout_height="54dp"
-            android:layout_column="1"
-            android:layout_gravity="right"
-            android:layout_marginRight="16dp"
-            android:layout_row="4"
+            android:layout_height="match_parent"
             android:entries="@array/update_times_of_day"
             android:gravity="right"
             android:paddingLeft="0dp"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="16dp">
 
         <TextView
-            android:textSize="16sp"
             android:id="@+id/sizeTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="54dp"
-            android:layout_column="0"
-            android:layout_row="5"
-            android:gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:textSize="16sp"
             tools:text="Updates: 65NB"/>
 
         <Button
             android:id="@+id/removeUpdatesButton"
             style="?android:attr/borderlessButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_column="1"
-            android:layout_gravity="right"
-            android:layout_marginRight="24dp"
-            android:layout_row="5"
-            android:gravity="right|center_vertical"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|center_vertical"
+            android:gravity="center_vertical|right"
             android:text="@string/shared_string_clear"/>
+    </LinearLayout>
 
-    </GridLayout>
 
     <View
         android:layout_width="match_parent"