ReVanced-Mirror/VancedMicroG
1
0
Fork 0
mirror of https://github.com/TeamVanced/VancedMicroG synced 2024-12-05 02:12:54 +01:00
Code Issues Projects Releases Wiki Activity

Only include vtm with the vtm maps implementation

Browse Source
This commit is contained in:
Marvin W 2019-05-26 23:04:13 +02:00
parent 1c965f3133
commit 0480bbbba6
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
play-services-core/build.gradle
View File

@ -29,14 +29,6 @@ dependencies {
implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0" implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0"
implementation "de.hdodenhof:circleimageview:1.3.0" implementation "de.hdodenhof:circleimageview:1.3.0"
implementation "org.conscrypt:conscrypt-android:2.0.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(':microg-ui-tools')
implementation project(':play-services-api') implementation project(':play-services-api')

14
play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
View File

@ -49,9 +49,9 @@ import org.microg.gms.location.LocationConstants;
//import org.microg.gms.maps.vtm.BackendMapView; //import org.microg.gms.maps.vtm.BackendMapView;
//import org.microg.gms.maps.vtm.GmsMapsTypeHelper; //import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
import org.microg.safeparcel.SafeParcelUtil; import org.microg.safeparcel.SafeParcelUtil;
import org.oscim.core.MapPosition; //import org.oscim.core.MapPosition;
import org.oscim.event.Event; //import org.oscim.event.Event;
import org.oscim.map.Map; //import org.oscim.map.Map;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean; 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.location.LocationConstants.EXTRA_PRIMARY_COLOR_DARK;
//import static org.microg.gms.maps.vtm.GmsMapsTypeHelper.fromLatLngBounds; //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 static final String TAG = "GmsPlacePicker";
private PlaceImpl place; private PlaceImpl place;
@ -186,6 +189,7 @@ public class PlacePickerActivity extends AppCompatActivity implements Map.Update
super.onDestroy(); super.onDestroy();
} }
/*
@Override @Override
public void onMapEvent(Event event, MapPosition position) { public void onMapEvent(Event event, MapPosition position) {
// place.viewport = GmsMapsTypeHelper.toLatLngBounds(mapView.map().viewport().getBBox(null, 0)); // place.viewport = GmsMapsTypeHelper.toLatLngBounds(mapView.map().viewport().getBBox(null, 0));
@ -235,7 +239,7 @@ public class PlacePickerActivity extends AppCompatActivity implements Map.Update
} }
}).start(); }).start();
} }
} }*/
private void updateInfoText() { private void updateInfoText() {
if (TextUtils.isEmpty(place.address)) { if (TextUtils.isEmpty(place.address)) {

27
play-services-maps-core-vtm/build.gradle
View File

@ -14,16 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
apply plugin: 'com.android.library' apply plugin: "com.android.library"
dependencies { dependencies {
implementation project(':microg-ui-tools') implementation project(":microg-ui-tools")
implementation project(':play-services-api') implementation project(":play-services-api")
api "org.microg:vtm-android:0.9.1-mod" implementation "org.microg:vtm-android:0.9.1-mod"
api "org.microg:vtm-extras:0.9.1-mod" implementation "org.microg:vtm-android:0.9.1-mod:natives-armeabi"
api "org.microg:vtm-jts:0.9.1-mod" implementation "org.microg:vtm-android:0.9.1-mod:natives-armeabi-v7a"
implementation project(':vtm-microg-theme') 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) { def execResult(...args) {
@ -52,13 +57,13 @@ android {
} }
lintOptions { lintOptions {
disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity' disable "MissingTranslation", "InvalidPackage", "BatteryLife", "ImpliedQuantity", "MissingQuantity"
} }
buildTypes { buildTypes {
release { release {
minifyEnabled true 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()) { if (file("user.gradle").exists()) {
apply from: 'user.gradle' apply from: "user.gradle"
} }