From 6cfbf8be6f0fbf75fb2eb7b016e55988751fb8b8 Mon Sep 17 00:00:00 2001
From: Dmitry Kunin <dkunin@mapswith.me>
Date: Thu, 4 Jul 2013 19:35:07 +0300
Subject: [PATCH] [android] new resources.

---
 .../lib/res/drawable/background_pattern.xml   |  4 +-
 .../lib/res/drawable/btn_back_gray.xml        | 29 +++++++++
 .../lib/res/drawable/btn_back_gray_active.xml | 40 ++++++++++++
 .../lib/res/drawable/btn_back_green.xml       | 29 +++++++++
 .../res/drawable/btn_back_green_active.xml    | 35 +++++++++++
 .../lib/res/drawable/btn_gray_selector.xml    |  7 +++
 .../lib/res/drawable/btn_green_selector.xml   |  7 +++
 .../lib/res/layout/dlg_install_mwm.xml        | 63 +++++++++----------
 api/android/lib/res/values/strings.xml        | 12 ++--
 .../maps/api/DownloadMapsWithMeDialog.java    | 25 +++++---
 10 files changed, 202 insertions(+), 49 deletions(-)
 create mode 100644 api/android/lib/res/drawable/btn_back_gray.xml
 create mode 100644 api/android/lib/res/drawable/btn_back_gray_active.xml
 create mode 100644 api/android/lib/res/drawable/btn_back_green.xml
 create mode 100644 api/android/lib/res/drawable/btn_back_green_active.xml
 create mode 100644 api/android/lib/res/drawable/btn_gray_selector.xml
 create mode 100644 api/android/lib/res/drawable/btn_green_selector.xml

diff --git a/api/android/lib/res/drawable/background_pattern.xml b/api/android/lib/res/drawable/background_pattern.xml
index 88af2b7dd1..2293a5123b 100644
--- a/api/android/lib/res/drawable/background_pattern.xml
+++ b/api/android/lib/res/drawable/background_pattern.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:dither="true"
     android:src="@drawable/pattern"
-    android:tileMode="repeat"
-    android:dither="true"/>
+    android:tileMode="repeat" />
diff --git a/api/android/lib/res/drawable/btn_back_gray.xml b/api/android/lib/res/drawable/btn_back_gray.xml
new file mode 100644
index 0000000000..605891ffc5
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_back_gray.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- "background shadow" -->
+    <item>
+        <shape android:shape="rectangle" >
+            <gradient
+                android:angle="270"
+                android:startColor="#44000000"
+                android:endColor="#66000000"
+                android:type="linear" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="2dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="#333" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_gray_active.xml b/api/android/lib/res/drawable/btn_back_gray_active.xml
new file mode 100644
index 0000000000..17460d286c
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_back_gray_active.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- "background shadow" -->
+    <item>
+        <shape android:shape="rectangle" >
+            <gradient android:angle="270"
+                android:startColor="#44000000"
+                android:endColor="#66000000"
+                android:type="linear"
+                />
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+   <item
+        android:bottom="2dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="#333" />
+
+            <stroke
+                android:width="1dp"
+                android:color="#40040404" />
+
+            <corners android:radius="3dp"/>
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="#80FFFFFF" />
+
+            <corners android:radius="3dp"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_green.xml b/api/android/lib/res/drawable/btn_back_green.xml
new file mode 100644
index 0000000000..88ea2992e6
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_back_green.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- "background shadow" -->
+    <item>
+        <shape android:shape="rectangle" >
+            <gradient
+                android:angle="270"
+                android:startColor="#44000000"
+                android:endColor="#66000000"
+                android:type="linear" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="2dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="#66CC33" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_green_active.xml b/api/android/lib/res/drawable/btn_back_green_active.xml
new file mode 100644
index 0000000000..260760fa29
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_back_green_active.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- "background shadow" -->
+    <item>
+        <shape android:shape="rectangle" >
+            <gradient
+                android:angle="270"
+                android:startColor="#44000000"
+                android:endColor="#66000000"
+                android:type="linear" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="2dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="#66CC33" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="#80FFFFFF" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_gray_selector.xml b/api/android/lib/res/drawable/btn_gray_selector.xml
new file mode 100644
index 0000000000..3876bb0761
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_gray_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/btn_back_gray_active" android:state_pressed="true"/>
+    <item android:drawable="@drawable/btn_back_gray"/>
+
+</selector>
\ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_green_selector.xml b/api/android/lib/res/drawable/btn_green_selector.xml
new file mode 100644
index 0000000000..61b78df322
--- /dev/null
+++ b/api/android/lib/res/drawable/btn_green_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/btn_back_green_active" android:state_pressed="true"/>
+    <item android:drawable="@drawable/btn_back_green"/>
+
+</selector>
\ No newline at end of file
diff --git a/api/android/lib/res/layout/dlg_install_mwm.xml b/api/android/lib/res/layout/dlg_install_mwm.xml
index f1e569ec27..e2c71cca71 100644
--- a/api/android/lib/res/layout/dlg_install_mwm.xml
+++ b/api/android/lib/res/layout/dlg_install_mwm.xml
@@ -27,50 +27,47 @@
     android:layout_height="match_parent" >
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/background_pattern"
-        android:gravity="center_horizontal"
+        android:gravity="center"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/margin_mid"
-        android:paddingRight="@dimen/margin_mid" >
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp" >
 
         <TextView
             style="@android:style/TextAppearance.Medium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_large"
+            android:layout_marginTop="10dp"
+            android:layout_weight="0"
             android:gravity="center"
-            android:text="@string/dlg_title"
-            android:textColor="@android:color/black" />
+            android:text="@string/mwm_should_be_installed"
+            android:textColor="@android:color/black"/>
 
-        <TextView
-            style="@android:style/TextAppearance.Large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_large"
-            android:gravity="center"
-            android:text="@string/download_please"
-            android:textColor="@android:color/black" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_mid"
-            android:src="@drawable/logo"
-            tools:ignore="ContentDescription" />
-
-        <ImageButton
-            android:id="@+id/download"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_mid"
-            android:layout_marginTop="@dimen/margin_mid"
-            android:background="@null"
-            android:scaleType="centerInside"
-            android:src="@drawable/download_btn_selector"
-            tools:ignore="ContentDescription" />
+        <Button
+            android:id="@+id/btn_lite"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/btn_gray_selector"
+            android:padding="6dp"
+            android:text="@string/down_lite"
+            android:textColor="@android:color/white" />
 
+        <Button
+            android:id="@+id/btn_pro"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/btn_green_selector"
+            android:padding="6dp"
+            android:text="@string/down_pro"
+            android:textColor="@android:color/white" />
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/api/android/lib/res/values/strings.xml b/api/android/lib/res/values/strings.xml
index d3981d2203..b8f51e508a 100644
--- a/api/android/lib/res/values/strings.xml
+++ b/api/android/lib/res/values/strings.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string  name="downolad_url">http://www.mapswithme.com/get/</string>
-    <string  name="mapswithme">MapsWithMe</string>
-    <string  name="dlg_title">We have partnered with <b><font fgcolor="#ff70B82A">MapsWithMe</font></b> to provide you with offline maps of the entire world.</string>
-    <string  name="download_please">To continue please\ndownload the app</string>
-</resources>
+    <string  name="mwm_should_be_installed"><b><font fgcolor="#FF66CC33">MapsWithMe</font></b> app should be installed to view the map.</string>
+    <string  name="down_lite">Download MapsWithMe Lite (free)</string>
+    <string  name="down_pro">Download MapsWithMe Pro</string>
+
+    <string  name="url_pro">http://mapswith.me/download</string>
+    <string  name="url_lite">http://mapswith.me/download?lite</string>
+</resources>
\ No newline at end of file
diff --git a/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java b/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
index 2fe80bf7d7..ae9570f1be 100644
--- a/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
+++ b/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
@@ -22,30 +22,35 @@
 ******************************************************************************/
 package com.mapswithme.maps.api;
 
+import android.app.Activity;
 import android.app.Dialog;
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.view.View;
+import android.view.Window;
 
 import com.mapwithme.maps.api.R;
 
 public class DownloadMapsWithMeDialog extends Dialog implements android.view.View.OnClickListener
 {
 
-  public DownloadMapsWithMeDialog(Context context)
+  public DownloadMapsWithMeDialog(Activity activity)
   {
-    super(context);
+    super(activity);
 
-    setTitle(R.string.mapswithme);
+    requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(R.layout.dlg_install_mwm);
-    findViewById(R.id.download).setOnClickListener(this);
+
+    findViewById(R.id.btn_lite).setOnClickListener(this);
+    findViewById(R.id.btn_pro).setOnClickListener(this);
+
+    setOwnerActivity(activity);
   }
 
 
-  public void onDownloadButtonClicked()
+  public void onDownloadButtonClicked(String url)
   {
-    Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(getContext().getString(R.string.downolad_url)));
+    Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
     getContext().startActivity(i);
     dismiss();
   }
@@ -54,7 +59,9 @@ public class DownloadMapsWithMeDialog extends Dialog implements android.view.Vie
   @Override
   public void onClick(View v)
   {
-    if (v.getId() == R.id.download)
-      onDownloadButtonClicked();
+    String url = getContext().getString(R.string.url_lite);
+    if (v.getId() == R.id.btn_pro) url = getContext().getString(R.string.url_pro);
+
+    onDownloadButtonClicked(url);
   }
 }