etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor vtm maps into seperate module, use version from maven

This commit is contained in:
Marvin W 2019-04-22 19:51:53 +02:00
parent 937e3422aa
commit 9f922b5a19
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
58 changed files with 228 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -10,9 +10,6 @@
[submodule "extern/GmsLib"]
path = extern/GmsLib
url = https://github.com/microg/android_external_GmsLib.git
[submodule "extern/vtm"]
path = extern/vtm
url = https://github.com/microg/android_external_vtm.git
[submodule "extern/RemoteDroidGuard"]
path = extern/RemoteDroidGuard
url = https://github.com/microg/android_packages_apps_RemoteDroidGuard.git

16
build.gradle
View File

@ -1,5 +1,5 @@
/*
* Copyright 2013-2017 microG Project Team
* Copyright 2013-2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -15,29 +15,31 @@
*/
buildscript {
ext.kotlin_version = '1.3.21'
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
apply plugin: 'idea'
ext.androidBuildVersionTools = "27.0.3"
ext.supportLibraryVersion = "27.1.0"
ext.androidBuildVersionTools = "28.0.3"
ext.supportLibraryVersion = "28.0.0"
ext.isReleaseVersion = false
ext.slf4jVersion = "1.7.25"
}
def androidCompileSdk() { return 27 }
def androidCompileSdk() { return 28 }
def androidTargetSdk() { return 27 }
def androidTargetSdk() { return 28 }
def androidMinSdk() { return 9 }
def androidMinSdk() { return 14 }
def versionCode() {
def stdout = new ByteArrayOutputStream()

1
extern/vtm vendored

@ -1 +0,0 @@
Subproject commit a47215d9848d5f0ebd1be7e281b48e531026a47f

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

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

@ -19,9 +19,18 @@ apply plugin: 'com.android.application'
dependencies {
implementation "com.android.support:support-v4:$supportLibraryVersion"
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
implementation "com.squareup.wire:wire-runtime:1.6.1"
implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0"
implementation "de.hdodenhof:circleimageview:1.3.0"
implementation "com.squareup.wire:wire-runtime:1.6.1"
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')
@ -30,13 +39,7 @@ dependencies {
implementation project(':wearable-lib')
implementation project(':remote-droid-guard-lib')
implementation project(':vtm-android')
implementation project(':vtm-extras')
implementation project(':vtm-jts')
implementation project(':vtm-microg-theme')
compile 'org.conscrypt:conscrypt-android:2.0.0'
implementation project(':play-services-maps-core-vtm')
}
def execResult(...args) {
@ -79,14 +82,11 @@ android {
sourceSets {
main {
java.srcDirs += 'src/main/protos-java'
file("${rootDir}/vtm-android/natives").eachDir() { dir ->
jniLibs.srcDirs += "${dir.path}/lib"
}
}
}
lintOptions {
disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity'
disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag'
}
buildTypes {

7
play-services-core/src/main/AndroidManifest.xml
View File

@ -259,13 +259,6 @@
</intent-filter>
</receiver>
<!-- Map -->
<provider
android:name="org.microg.gms.maps.data.SharedTileProvider"
android:authorities="org.microg.gms.map.tile"
android:enabled="true"
android:exported="true"/>
<!-- DroidGuard -->
<service android:name="org.microg.gms.droidguard.DroidGuardService">

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

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2013-2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -46,8 +46,8 @@ import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.LatLngBounds;
import org.microg.gms.location.LocationConstants;
import org.microg.gms.maps.BackendMapView;
import org.microg.gms.maps.GmsMapsTypeHelper;
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;
@ -61,7 +61,7 @@ import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
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.GmsMapsTypeHelper.fromLatLngBounds;
import static org.microg.gms.maps.vtm.GmsMapsTypeHelper.fromLatLngBounds;
public class PlacePickerActivity extends AppCompatActivity implements Map.UpdateListener {
private static final String TAG = "GmsPlacePicker";

2
play-services-core/src/main/res/layout/list_no_item.xml
View File

@ -37,7 +37,7 @@
android:layout_marginLeft="15dip"
android:layout_marginRight="6dip">
<TextView android:id="@+android:id/title"
<TextView android:id="@android:id/title"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
play-services-core/src/main/res/layout/pick_place.xml
View File

@ -27,7 +27,7 @@
android:layout_height="0dip"
android:layout_weight="1">
<org.microg.gms.maps.BackendMapView
<org.microg.gms.maps.vtm.BackendMapView
android:id="@+id/map"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
@ -130,4 +130,4 @@
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

73
play-services-maps-core-vtm/build.gradle Normal file
View File

@ -0,0 +1,73 @@
/*
* Copyright 2013-2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
apply plugin: 'com.android.library'
dependencies {
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')
}
def execResult(...args) {
def stdout = new ByteArrayOutputStream()
exec {
commandLine args
standardOutput = stdout
}
return stdout.toString().trim()
}
android {
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName "temp"
versionCode 1
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
ndk {
abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
}
}
lintOptions {
disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity'
}
buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
if (file('user.gradle').exists()) {
apply from: 'user.gradle'
}

40
play-services-maps-core-vtm/src/main/AndroidManifest.xml Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2013-2019 microG Project Team
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<manifest package="org.microg.gms.maps.vtm"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<application>
<provider
android:name=".data.SharedTileProvider"
android:authorities="org.microg.gms.maps.vtm.tile"
android:enabled="true"
android:exported="true"/>
</application>
</manifest>

12
play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java → play-services-maps-core-vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
View File

@ -21,6 +21,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.os.Parcel;
import android.os.RemoteException;
import android.support.annotation.Keep;
import android.util.Log;
import com.google.android.gms.dynamic.IObjectWrapper;
@ -28,12 +29,13 @@ import com.google.android.gms.dynamic.ObjectWrapper;
import com.google.android.gms.maps.GoogleMapOptions;
import com.google.android.gms.maps.model.internal.IBitmapDescriptorFactoryDelegate;
import org.microg.gms.maps.MapFragmentImpl;
import org.microg.gms.maps.MapViewImpl;
import org.microg.gms.maps.ResourcesContainer;
import org.microg.gms.maps.bitmap.BitmapDescriptorFactoryImpl;
import org.microg.gms.maps.camera.CameraUpdateFactoryImpl;
import org.microg.gms.maps.vtm.MapFragmentImpl;
import org.microg.gms.maps.vtm.MapViewImpl;
import org.microg.gms.maps.vtm.ResourcesContainer;
import org.microg.gms.maps.vtm.bitmap.BitmapDescriptorFactoryImpl;
import org.microg.gms.maps.vtm.camera.CameraUpdateFactoryImpl;
@Keep
public class CreatorImpl extends ICreator.Stub {
private static final String TAG = "GmsMapCreator";

4
play-services-core/src/main/java/org/microg/gms/maps/ApplicationContextWrapper.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.content.Context;
import android.content.ContextWrapper;

12
play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.content.Context;
import android.graphics.Bitmap;
@ -27,10 +27,10 @@ import android.view.View;
import com.google.android.gms.maps.internal.ISnapshotReadyCallback;
import com.google.android.gms.maps.model.CameraPosition;
import org.microg.gms.maps.camera.CameraUpdate;
import org.microg.gms.maps.markup.DrawableMarkup;
import org.microg.gms.maps.markup.MarkerItemMarkup;
import org.microg.gms.maps.markup.Markup;
import org.microg.gms.maps.vtm.camera.CameraUpdate;
import org.microg.gms.maps.vtm.markup.DrawableMarkup;
import org.microg.gms.maps.vtm.markup.MarkerItemMarkup;
import org.microg.gms.maps.vtm.markup.Markup;
import org.oscim.backend.GL;
import org.oscim.backend.GLAdapter;
import org.oscim.core.MapPosition;

12
play-services-core/src/main/java/org/microg/gms/maps/BackendMapView.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.content.Context;
import android.content.ContextWrapper;
@ -23,14 +23,12 @@ import android.graphics.BitmapFactory;
import android.util.AttributeSet;
import android.util.Log;
import com.google.android.gms.R;
import org.microg.gms.maps.data.SharedTileCache;
import org.microg.gms.maps.markup.ClearableVectorLayer;
import org.microg.gms.maps.vtm.data.SharedTileCache;
import org.microg.gms.maps.vtm.markup.ClearableVectorLayer;
import org.microg.gms.maps.vtm.R;
import org.oscim.android.AndroidAssets;
import org.oscim.android.MapView;
import org.oscim.android.canvas.AndroidBitmap;
import org.oscim.backend.AssetAdapter;
import org.oscim.layers.marker.ItemizedLayer;
import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerSymbol;

4
play-services-core/src/main/java/org/microg/gms/maps/ContainerLayout.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.content.Context;
import android.widget.FrameLayout;

4
play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.LatLng;

22
play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.content.Context;
import android.graphics.Bitmap;
@ -68,15 +68,15 @@ import com.google.android.gms.maps.model.internal.IPolygonDelegate;
import com.google.android.gms.maps.model.internal.IPolylineDelegate;
import com.google.android.gms.maps.model.internal.ITileOverlayDelegate;
import org.microg.gms.maps.camera.CameraUpdate;
import org.microg.gms.maps.camera.MapPositionCameraUpdate;
import org.microg.gms.maps.markup.CircleImpl;
import org.microg.gms.maps.markup.GroundOverlayImpl;
import org.microg.gms.maps.markup.MarkerImpl;
import org.microg.gms.maps.markup.Markup;
import org.microg.gms.maps.markup.PolygonImpl;
import org.microg.gms.maps.markup.PolylineImpl;
import org.microg.gms.maps.markup.TileOverlayImpl;
import org.microg.gms.maps.vtm.camera.CameraUpdate;
import org.microg.gms.maps.vtm.camera.MapPositionCameraUpdate;
import org.microg.gms.maps.vtm.markup.CircleImpl;
import org.microg.gms.maps.vtm.markup.GroundOverlayImpl;
import org.microg.gms.maps.vtm.markup.MarkerImpl;
import org.microg.gms.maps.vtm.markup.Markup;
import org.microg.gms.maps.vtm.markup.PolygonImpl;
import org.microg.gms.maps.vtm.markup.PolylineImpl;
import org.microg.gms.maps.vtm.markup.TileOverlayImpl;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;

5
play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,13 +14,12 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.Parcel;
import android.os.RemoteException;
import android.util.Log;

4
play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.content.Context;
import android.os.Bundle;

4
play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.os.RemoteException;

4
play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.content.res.Resources;

4
play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013-2017 microG Project Team
* Copyright (C) 2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps;
package org.microg.gms.maps.vtm;
import android.os.RemoteException;
import com.google.android.gms.maps.internal.IUiSettingsDelegate;

2
play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

2
play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

2
play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

2
play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
import android.graphics.Bitmap;
import android.os.Parcel;

2
play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

6
play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
import android.content.Context;
import android.graphics.Bitmap;
@ -25,10 +25,10 @@ import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.Paint;
import com.google.android.gms.R;
import com.google.android.gms.dynamic.ObjectWrapper;
import org.microg.gms.maps.ResourcesContainer;
import org.microg.gms.maps.vtm.ResourcesContainer;
import org.microg.gms.maps.vtm.R;
public class DefaultBitmapDescriptor extends AbstractBitmapDescriptor {
public static final DefaultBitmapDescriptor DEFAULT_DESCRIPTOR = new DefaultBitmapDescriptor(0);

2
play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

2
play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
public class PathBitmapDescriptor {
public PathBitmapDescriptor(String absolutePath) {

2
play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.bitmap;
package org.microg.gms.maps.vtm.bitmap;
import android.content.Context;
import android.graphics.Bitmap;

2
play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.camera;
package org.microg.gms.maps.vtm.camera;
import org.oscim.map.Map;

4
play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.camera;
package org.microg.gms.maps.vtm.camera;
import android.os.RemoteException;
import android.util.Log;
@ -26,7 +26,7 @@ import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.LatLngBounds;
import org.microg.gms.maps.GmsMapsTypeHelper;
import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
import org.oscim.core.MapPosition;
import org.oscim.map.Map;

2
play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.camera;
package org.microg.gms.maps.vtm.camera;
import org.oscim.core.MapPosition;
import org.oscim.map.Map;

2
play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.camera;
package org.microg.gms.maps.vtm.camera;
import org.oscim.map.Map;

3
play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileCache.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java
View File

@ -14,12 +14,11 @@
* limitations under the License.
*/
package org.microg.gms.maps.data;
package org.microg.gms.maps.vtm.data;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import org.oscim.core.Tile;
import org.oscim.tiling.ITileCache;

4
play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileProvider.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.data;
package org.microg.gms.maps.vtm.data;
import android.content.ContentProvider;
import android.content.ContentValues;
@ -29,7 +29,7 @@ import android.net.Uri;
*/
public class SharedTileProvider extends ContentProvider {
private static final String DB_NAME = "tilecache.db";
public static final String PROVIDER_NAME = "org.microg.gms.map.tile";
public static final String PROVIDER_NAME = "org.microg.gms.maps.vtm.tile";
public static final Uri PROVIDER_URI = Uri.parse("content://" + PROVIDER_NAME);
private SQLiteHelper sqLiteHelper;

4
play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import android.os.RemoteException;
@ -22,7 +22,7 @@ import com.google.android.gms.maps.model.CircleOptions;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.internal.ICircleDelegate;
import org.microg.gms.maps.GmsMapsTypeHelper;
import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
import org.oscim.layers.vector.geometries.CircleDrawable;
import org.oscim.layers.vector.geometries.Drawable;
import org.oscim.layers.vector.geometries.Style;

2
play-services-core/src/main/java/org/microg/gms/maps/markup/ClearableVectorLayer.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import org.oscim.layers.vector.VectorLayer;
import org.oscim.map.Map;

2
play-services-core/src/main/java/org/microg/gms/maps/markup/DrawableMarkup.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import org.oscim.layers.vector.geometries.Drawable;
import org.oscim.map.Map;

2
play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import android.os.RemoteException;
import com.google.android.gms.dynamic.IObjectWrapper;

9
play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java
View File

@ -14,18 +14,17 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import android.content.Context;
import android.os.Build;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.google.android.gms.R;
import com.google.android.gms.maps.model.internal.IMarkerDelegate;
import org.microg.gms.maps.GoogleMapImpl;
import org.microg.gms.maps.ResourcesContainer;
import org.microg.gms.maps.vtm.GoogleMapImpl;
import org.microg.gms.maps.vtm.ResourcesContainer;
import org.microg.gms.maps.vtm.R;
import static android.os.Build.VERSION.SDK_INT;
import static android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1;

8
play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import android.content.Context;
import android.graphics.Bitmap;
@ -27,9 +27,9 @@ import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MarkerOptions;
import com.google.android.gms.maps.model.internal.IMarkerDelegate;
import org.microg.gms.maps.GmsMapsTypeHelper;
import org.microg.gms.maps.bitmap.BitmapDescriptorImpl;
import org.microg.gms.maps.bitmap.DefaultBitmapDescriptor;
import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
import org.microg.gms.maps.vtm.bitmap.BitmapDescriptorImpl;
import org.microg.gms.maps.vtm.bitmap.DefaultBitmapDescriptor;
import org.oscim.android.canvas.AndroidBitmap;
import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerSymbol;

2
play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import android.content.Context;

2
play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
public interface Markup {
String getId();

4
play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import android.os.RemoteException;
@ -22,7 +22,7 @@ import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.PolygonOptions;
import com.google.android.gms.maps.model.internal.IPolygonDelegate;
import org.microg.gms.maps.GmsMapsTypeHelper;
import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
import org.oscim.core.GeoPoint;
import org.oscim.layers.vector.geometries.Drawable;
import org.oscim.layers.vector.geometries.PolygonDrawable;

4
play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import android.os.RemoteException;
import android.util.Log;
@ -23,7 +23,7 @@ import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.PolylineOptions;
import com.google.android.gms.maps.model.internal.IPolylineDelegate;
import org.microg.gms.maps.GmsMapsTypeHelper;
import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
import org.oscim.core.GeoPoint;
import org.oscim.layers.vector.geometries.Drawable;
import org.oscim.layers.vector.geometries.LineDrawable;

2
play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java → play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.microg.gms.maps.markup;
package org.microg.gms.maps.vtm.markup;
import com.google.android.gms.maps.model.internal.ITileOverlayDelegate;

0
play-services-core/src/main/res/drawable-xhdpi/maps_default_marker.png → play-services-maps-core-vtm/src/main/res/drawable/maps_default_marker.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

0
play-services-core/src/main/res/drawable-xhdpi/maps_default_window.9.png → play-services-maps-core-vtm/src/main/res/drawable/maps_default_window.9.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
play-services-core/src/main/res/drawable-nodpi/nop.png → play-services-maps-core-vtm/src/main/res/drawable/nop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 169 B

5
settings.gradle
View File

@ -17,14 +17,11 @@ include ':play-services-base'
include ':play-services-tasks'
include ':play-services-wearable'
include ':play-services-maps-core-vtm'
include ':play-services-core'
include ':microg-ui-tools'
include ':vtm'
include ':vtm-android'
include ':vtm-extras'
include ':vtm-jts'
include ':vtm-microg-theme'
include ':remote-droid-guard-lib'

1
vtm
View File

@ -1 +0,0 @@
extern/vtm/vtm

1
vtm-android
View File

@ -1 +0,0 @@
extern/vtm/vtm-android

1
vtm-extras
View File

@ -1 +0,0 @@
extern/vtm/vtm-extras

1
vtm-jts
View File

@ -1 +0,0 @@
extern/vtm/vtm-jts

2
vtm-microg-theme/build.gradle
View File

@ -2,7 +2,7 @@ apply plugin: 'java'
apply plugin: 'maven'
dependencies {
compile project(':vtm')
compile "org.microg:vtm:0.9.1-mod"
}
sourceSets {