Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 6174997c authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Initial mapbox based maps implementation

parent 2a01e6cb

README.md

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ microG GmsCore is a FLOSS (Free/Libre Open Source Software) framework to allow a 


License

-------

    Copyright 2014-2016 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.

play-services-core/build.gradle

+12 −2
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


apply plugin: 'com.android.application'



def useMapbox() {

    Properties properties = new Properties()

    properties.load(project.rootProject.file('local.properties').newDataInputStream())

    return properties.getProperty("mapbox.enabled", "false") == "true"

}



dependencies {

    implementation "com.android.support:support-v4:$supportLibraryVersion"

    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
@@ -39,8 +45,12 @@ dependencies { 
    implementation project(':wearable-lib')



    implementation project(':remote-droid-guard-lib')

    if (useMapbox()) {

        implementation project(':play-services-maps-core-mapbox')

    } else {

        implementation project(':play-services-maps-core-vtm')

    }

}



def execResult(...args) {

    def stdout = new ByteArrayOutputStream()
@@ -60,7 +70,7 @@ def gitDirty = execResult('git', 'status', '--porcelain').size() > 0 
def ourVersionBase = gitVersionBase.substring(0, gitVersionBase.lastIndexOf('.'))

def ourVersionMinor = Integer.parseInt(ourVersionBase.substring(ourVersionBase.lastIndexOf('.') + 1))

def ourVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2  + (gitCommitCount > 0 || gitDirty ? 1 : 0)

def ourVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")

def ourVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (useMapbox() ? "-mapbox" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")

logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode)



android {

play-services-maps-core-mapbox/build.gradle

0 → 100644
+83 −0
Original line number Diff line number Diff line 
/*

 * 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'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'kotlin-android'



dependencies {

    implementation project(':play-services-api')

    implementation "com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0"

    implementation "com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v7:0.6.0"

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

}



def execResult(...args) {

    def stdout = new ByteArrayOutputStream()

    exec {

        commandLine args

        standardOutput = stdout

    }

    return stdout.toString().trim()

}



def mapboxKey() {

    Properties properties = new Properties()

    properties.load(project.rootProject.file('local.properties').newDataInputStream())

    return properties.getProperty("mapbox.key", "invalid")

}



android {

    compileSdkVersion androidCompileSdk()

    buildToolsVersion "$androidBuildVersionTools"



    defaultConfig {

        versionName "temp"

        versionCode 1



        minSdkVersion androidMinSdk()

        targetSdkVersion androidTargetSdk()

        buildConfigField "String", "MAPBOX_KEY", "\"${mapboxKey()}\""



        ndk {

            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"

        }

    }



    sourceSets {

        main.java.srcDirs += 'src/main/kotlin'

    }



    lintOptions {

        disable 'GradleCompatible'

    }



    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'

}

play-services-maps-core-mapbox/src/main/AndroidManifest.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?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.mapbox"

          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 />



</manifest>

play-services-maps-core-mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java

0 → 100644
+79 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2017 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.

 */



package com.google.android.gms.maps.internal;



import android.app.Activity;

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;

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.mapbox.CameraUpdateFactoryImpl;

import org.microg.gms.maps.mapbox.MapFragmentImpl;

import org.microg.gms.maps.mapbox.MapViewImpl;

import org.microg.gms.maps.mapbox.model.BitmapDescriptorFactoryImpl;



@Keep

public class CreatorImpl extends ICreator.Stub {

    private static final String TAG = "GmsMapCreator";



    @Override

    public void init(IObjectWrapper resources) {

        initV2(resources, 0);

    }



    @Override

    public IMapFragmentDelegate newMapFragmentDelegate(IObjectWrapper activity) {

        return new MapFragmentImpl(ObjectWrapper.unwrapTyped(activity, Activity.class));

    }



    @Override

    public IMapViewDelegate newMapViewDelegate(IObjectWrapper context, GoogleMapOptions options) {

        return new MapViewImpl(ObjectWrapper.unwrapTyped(context, Context.class), options);

    }



    @Override

    public ICameraUpdateFactoryDelegate newCameraUpdateFactoryDelegate() {

        return new CameraUpdateFactoryImpl();

    }



    @Override

    public IBitmapDescriptorFactoryDelegate newBitmapDescriptorFactoryDelegate() {

        return BitmapDescriptorFactoryImpl.INSTANCE;

    }



    @Override

    public void initV2(IObjectWrapper resources, int flags) {

        BitmapDescriptorFactoryImpl.INSTANCE.initialize(ObjectWrapper.unwrapTyped(resources, Resources.class));

        //ResourcesContainer.set((Resources) ObjectWrapper.unwrap(resources));

        Log.d(TAG, "initV2");

    }



    @Override

    public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {

        if (super.onTransact(code, data, reply, flags)) return true;

        Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags);

        return false;

    }

}