From 0480bbbba601f5766d8609bed71d951289867864 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Sun, 26 May 2019 23:04:13 +0200
Subject: [PATCH] Only include vtm with the vtm maps implementation

---
 play-services-core/build.gradle               |  8 ------
 .../microg/gms/ui/PlacePickerActivity.java    | 14 ++++++----
 play-services-maps-core-vtm/build.gradle      | 27 +++++++++++--------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index cc0bb4b5..14ad88de 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -29,14 +29,6 @@ dependencies {
     implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0"
     implementation "de.hdodenhof:circleimageview:1.3.0"
     implementation "org.conscrypt:conscrypt-android:2.0.0"
-    implementation "org.microg:vtm-android:0.9.1-mod"
-    implementation 'org.microg:vtm-android:0.9.1-mod:natives-armeabi'
-    implementation 'org.microg:vtm-android:0.9.1-mod:natives-armeabi-v7a'
-    implementation 'org.microg:vtm-android:0.9.1-mod:natives-arm64-v8a'
-    implementation 'org.microg:vtm-android:0.9.1-mod:natives-x86'
-    implementation 'org.microg:vtm-android:0.9.1-mod:natives-x86_64'
-    implementation "org.microg:vtm-extras:0.9.1-mod"
-    implementation "org.microg:vtm-jts:0.9.1-mod"
 
     implementation project(':microg-ui-tools')
     implementation project(':play-services-api')
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
index d1ad9f18..fd79639b 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
@@ -49,9 +49,9 @@ import org.microg.gms.location.LocationConstants;
 //import org.microg.gms.maps.vtm.BackendMapView;
 //import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
 import org.microg.safeparcel.SafeParcelUtil;
-import org.oscim.core.MapPosition;
-import org.oscim.event.Event;
-import org.oscim.map.Map;
+//import org.oscim.core.MapPosition;
+//import org.oscim.event.Event;
+//import org.oscim.map.Map;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -63,7 +63,10 @@ import static org.microg.gms.location.LocationConstants.EXTRA_PRIMARY_COLOR;
 import static org.microg.gms.location.LocationConstants.EXTRA_PRIMARY_COLOR_DARK;
 //import static org.microg.gms.maps.vtm.GmsMapsTypeHelper.fromLatLngBounds;
 
-public class PlacePickerActivity extends AppCompatActivity implements Map.UpdateListener {
+public class
+
+
+PlacePickerActivity extends AppCompatActivity /*implements Map.UpdateListener*/ {
     private static final String TAG = "GmsPlacePicker";
 
     private PlaceImpl place;
@@ -186,6 +189,7 @@ public class PlacePickerActivity extends AppCompatActivity implements Map.Update
         super.onDestroy();
     }
 
+    /*
     @Override
     public void onMapEvent(Event event, MapPosition position) {
 //        place.viewport = GmsMapsTypeHelper.toLatLngBounds(mapView.map().viewport().getBBox(null, 0));
@@ -235,7 +239,7 @@ public class PlacePickerActivity extends AppCompatActivity implements Map.Update
                 }
             }).start();
         }
-    }
+    }*/
 
     private void updateInfoText() {
         if (TextUtils.isEmpty(place.address)) {
diff --git a/play-services-maps-core-vtm/build.gradle b/play-services-maps-core-vtm/build.gradle
index 217e1106..222be961 100644
--- a/play-services-maps-core-vtm/build.gradle
+++ b/play-services-maps-core-vtm/build.gradle
@@ -14,16 +14,21 @@
  * limitations under the License.
  */
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
 
 dependencies {
-    implementation project(':microg-ui-tools')
-    implementation project(':play-services-api')
+    implementation project(":microg-ui-tools")
+    implementation project(":play-services-api")
 
-    api "org.microg:vtm-android:0.9.1-mod"
-    api "org.microg:vtm-extras:0.9.1-mod"
-    api "org.microg:vtm-jts:0.9.1-mod"
-    implementation project(':vtm-microg-theme')
+    implementation "org.microg:vtm-android:0.9.1-mod"
+    implementation "org.microg:vtm-android:0.9.1-mod:natives-armeabi"
+    implementation "org.microg:vtm-android:0.9.1-mod:natives-armeabi-v7a"
+    implementation "org.microg:vtm-android:0.9.1-mod:natives-arm64-v8a"
+    implementation "org.microg:vtm-android:0.9.1-mod:natives-x86"
+    implementation "org.microg:vtm-android:0.9.1-mod:natives-x86_64"
+    implementation "org.microg:vtm-extras:0.9.1-mod"
+    implementation "org.microg:vtm-jts:0.9.1-mod"
+    implementation project(":vtm-microg-theme")
 }
 
 def execResult(...args) {
@@ -52,13 +57,13 @@ android {
     }
 
     lintOptions {
-        disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity'
+        disable "MissingTranslation", "InvalidPackage", "BatteryLife", "ImpliedQuantity", "MissingQuantity"
     }
 
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 
@@ -68,6 +73,6 @@ android {
     }
 }
 
-if (file('user.gradle').exists()) {
-    apply from: 'user.gradle'
+if (file("user.gradle").exists()) {
+    apply from: "user.gradle"
 }