From aa83dcd6ac060c967c83615fce3f64c65c388c98 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 10 Jan 2015 09:09:42 +0100
Subject: update MapsWithMe integration

As they removed the light version, some wording changed.
---
 mapswithme-api/build.gradle                        | 39 +++++++---------------
 mapswithme-api/project.properties                  |  2 +-
 mapswithme-api/res/layout/dlg_install_mwm.xml      | 10 ------
 mapswithme-api/res/values/strings.xml              |  9 ++---
 .../maps/api/DownloadMapsWithMeDialog.java         |  3 +-
 5 files changed, 17 insertions(+), 46 deletions(-)

(limited to 'mapswithme-api')

diff --git a/mapswithme-api/build.gradle b/mapswithme-api/build.gradle
index 86d5c77..94cd14f 100644
--- a/mapswithme-api/build.gradle
+++ b/mapswithme-api/build.gradle
@@ -1,34 +1,19 @@
 apply plugin: 'android-library'
 
-dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
-}
-
 android {
-    compileSdkVersion 19
-    buildToolsVersion "21.1.2"
 
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
+  // Define these properties in the gradle.properties file in the root project folder
+  compileSdkVersion propTargetSdkVersion.toInteger()
+  buildToolsVersion propBuildToolsVersion
 
-        // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+  defaultConfig {
+    minSdkVersion propMinSdkVersion.toInteger()
+    targetSdkVersion propTargetSdkVersion.toInteger()
+  }
 
-        // Move the build types to build-types/<type>
-        // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
-        // This moves them out of them default location under src/<type>/... which would
-        // conflict with src/ being used by the main source set.
-        // Adding new build types or product flavors should be accompanied
-        // by a similar customization.
-        debug.setRoot('build-types/debug')
-        release.setRoot('build-types/release')
-    }
+  sourceSets.main {
+    manifest.srcFile 'AndroidManifest.xml'
+    java.srcDirs = ['src']
+    res.srcDirs = ['res']
+  }
 }
diff --git a/mapswithme-api/project.properties b/mapswithme-api/project.properties
index 91d2b02..93c8c3c 100644
--- a/mapswithme-api/project.properties
+++ b/mapswithme-api/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21
 android.library=true
diff --git a/mapswithme-api/res/layout/dlg_install_mwm.xml b/mapswithme-api/res/layout/dlg_install_mwm.xml
index 0d174a8..1858369 100644
--- a/mapswithme-api/res/layout/dlg_install_mwm.xml
+++ b/mapswithme-api/res/layout/dlg_install_mwm.xml
@@ -54,16 +54,6 @@
             android:background="@drawable/btn_green_selector"
             android:text="@string/down_pro" />
 
-        <Button
-            android:id="@+id/btn_lite"
-            style="@style/promoButton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@drawable/btn_gray_selector"
-            android:padding="6dp"
-            android:text="@string/down_lite" />
-
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/mapswithme-api/res/values/strings.xml b/mapswithme-api/res/values/strings.xml
index 1955847..d9e3f27 100644
--- a/mapswithme-api/res/values/strings.xml
+++ b/mapswithme-api/res/values/strings.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string  name="mwm_should_be_installed">Offline maps are required to proceed. We have partnered with MapsWithMe to provide you with offline maps of the entire world.\nTo continue please download the app:</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/get</string>
-    <string  name="url_lite">http://mapswith.me/app</string>
+    <string  name="mwm_should_be_installed">Offline maps are required to proceed. We have partnered with MAPS.ME to provide you with offline maps of the entire world.\nTo continue please download the app:</string>
+    <string  name="down_pro">Download MAPS.ME</string>
+    <string  name="url_pro">http://maps.me/get</string>
 </resources>
\ No newline at end of file
diff --git a/mapswithme-api/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java b/mapswithme-api/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
index 5670a5f..480bbe1 100644
--- a/mapswithme-api/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
+++ b/mapswithme-api/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
@@ -41,7 +41,6 @@ public class DownloadMapsWithMeDialog extends Dialog implements android.view.Vie
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(R.layout.dlg_install_mwm);
 
-    findViewById(R.id.btn_lite).setOnClickListener(this);
     findViewById(R.id.btn_pro).setOnClickListener(this);
 
     setOwnerActivity(activity);
@@ -59,7 +58,7 @@ public class DownloadMapsWithMeDialog extends Dialog implements android.view.Vie
   @Override
   public void onClick(View v)
   {
-    String url = getContext().getString(v.getId() == R.id.btn_lite ? R.string.url_lite : R.string.url_pro);
+    String url = getContext().getString(R.string.url_pro);
     onDownloadButtonClicked(url);
   }
 }
-- 
cgit v1.1