From 718fcec2e896c988285027be1d0b291f13c209a9 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Thu, 17 Mar 2016 15:34:08 +0300
Subject: [PATCH] Fixes: live updates + select storage

---
 OsmAnd/res/drawable/btn_round_shade.xml       | 10 ++------
 OsmAnd/res/drawable/btn_round_shade_n.xml     | 13 +++++++++++
 OsmAnd/res/drawable/btn_round_shade_p.xml     | 13 +++++++++++
 OsmAnd/res/layout/live_updates_header.xml     | 23 +++++++++++--------
 .../plus/download/DownloadActivity.java       |  4 +---
 5 files changed, 43 insertions(+), 20 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_round_shade_n.xml
 create mode 100644 OsmAnd/res/drawable/btn_round_shade_p.xml

diff --git a/OsmAnd/res/drawable/btn_round_shade.xml b/OsmAnd/res/drawable/btn_round_shade.xml
index 24d01d3f77..16fdbcac22 100644
--- a/OsmAnd/res/drawable/btn_round_shade.xml
+++ b/OsmAnd/res/drawable/btn_round_shade.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"><shape android:shape="rectangle">
-        <solid android:color="@color/map_widget_dark_pressed" />
-        <corners android:radius="@dimen/map_button_rect_rad" />
-    </shape></item>
-    <item><shape android:shape="rectangle">
-        <solid android:color="@color/fab_color_pressed" />
-        <corners android:radius="@dimen/map_button_rect_rad" />
-    </shape></item>
+    <item android:drawable="@drawable/btn_round_shade_p" android:state_pressed="true"/>
+    <item android:drawable="@drawable/btn_round_shade_n"/>
 
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_shade_n.xml b/OsmAnd/res/drawable/btn_round_shade_n.xml
new file mode 100644
index 0000000000..e3c8fd8f59
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_shade_n.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_card_shadow"/>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/fab_color_pressed"/>
+            <corners android:radius="@dimen/map_button_rect_rad"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_shade_p.xml b/OsmAnd/res/drawable/btn_round_shade_p.xml
new file mode 100644
index 0000000000..7e1773b37a
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_shade_p.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <nine-patch android:src="@drawable/bg_card_shadow"/>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark_pressed"/>
+            <corners android:radius="@dimen/map_button_rect_rad"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/live_updates_header.xml b/OsmAnd/res/layout/live_updates_header.xml
index 0f7be308ec..45802be778 100644
--- a/OsmAnd/res/layout/live_updates_header.xml
+++ b/OsmAnd/res/layout/live_updates_header.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
+    android:paddingLeft="6dp"
+    android:paddingRight="6dp"
     android:paddingTop="16dp">
 
     <LinearLayout
@@ -15,9 +15,9 @@
         android:layout_height="wrap_content"
         android:background="@drawable/bg_card_orange"
         android:orientation="vertical"
-        android:paddingBottom="8dp"
+        android:paddingBottom="12dp"
         android:paddingLeft="24dp"
-        android:paddingRight="8dp"
+        android:paddingRight="12dp"
         android:paddingTop="16dp">
 
         <LinearLayout
@@ -63,6 +63,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/btn_round_shade"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
                 android:text="@string/shared_string_read_more"
                 android:textColor="@color/color_white"/>
 
@@ -70,7 +72,9 @@
                 android:id="@+id/subscription_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:layout_marginLeft="12dp"
                 android:background="@drawable/btn_round_shade"
                 android:text="@string/osm_live_subscribe_btn"
                 android:textColor="@color/color_white"/>
@@ -146,13 +150,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
+            android:gravity="center_vertical"
             android:minHeight="48dp">
 
 
             <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="120dp"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="0.5"
                 android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
                 android:text="@string/osm_live_support_region"
@@ -162,10 +167,10 @@
 
             <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/regionTextView"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="0.5"
                 android:layout_marginBottom="4dp"
-                android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="4dp"
                 android:gravity="right"
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 6f8727b48e..de2839b60d 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -614,9 +614,7 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
 	}
 
 	private void chooseDataStorage() {
-		if (getMyApplication().getSettings().getSecondaryStorage() != null) {
-			DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), false);
-		}
+		DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), false);
 	}
 
 	public static boolean hasPermissionToWriteExternalStorage(Context ctx) {