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

Verified Commit 0480bbbb authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Only include vtm with the vtm maps implementation

parent 1c965f31

play-services-core/build.gradle

+0 −8
Original line number Diff line number Diff line
@@ -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')

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

+9 −5
Original line number Diff line number Diff line
@@ -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)) {

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

+16 −11
Original line number Diff line number Diff line
@@ -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"

}