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

Commit 3e72859a authored by Fynn Godau's avatar Fynn Godau
Browse files

Circles (part 1)

parent dd4e7961

play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import com.google.android.gms.maps.internal.IOnCameraIdleListener; 
import com.google.android.gms.maps.internal.IOnCameraMoveCanceledListener;

import com.google.android.gms.maps.internal.IOnCameraMoveListener;

import com.google.android.gms.maps.internal.IOnCameraMoveStartedListener;

import com.google.android.gms.maps.internal.IOnCircleClickListener;

import com.google.android.gms.maps.internal.IOnMapClickListener;

import com.google.android.gms.maps.internal.IOnMapLongClickListener;

import com.google.android.gms.maps.internal.IOnMarkerClickListener;
@@ -126,7 +127,7 @@ interface IGoogleMapDelegate { 
    //void setPolygonClickListener(IOnPolygonClickListener listener) = 84;

    void setInfoWindowCloseListener(IOnInfoWindowCloseListener listener) = 85;

    //void setPolylineClickListener(IOnPolylineClickListener listener) = 86;

    //void setCircleClickListener(IOnCircleClickListener listener) = 88;

    void setCircleClickListener(IOnCircleClickListener listener) = 88;



    boolean setMapStyle(in MapStyleOptions options) = 90;

    void setMinZoomPreference(float minZoom) = 91;

play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCircleClickListener.aidl

0 → 100644
+7 −0
Original line number Diff line number Diff line 
package com.google.android.gms.maps.internal;



import com.google.android.gms.maps.model.internal.ICircleDelegate;



interface IOnCircleClickListener {

    void onCircleClick(ICircleDelegate circle);

}

play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl

+7 −0
Original line number Diff line number Diff line 
package com.google.android.gms.maps.model.internal;



import com.google.android.gms.dynamic.IObjectWrapper;

import com.google.android.gms.maps.model.LatLng;



interface ICircleDelegate {
@@ -21,4 +22,10 @@ interface ICircleDelegate { 
    boolean isVisible();

	boolean equalsRemote(ICircleDelegate other);

	int hashCodeRemote();

	void setClickable(boolean clickable);

	boolean isClickable();

    void setStrokePattern(IObjectWrapper object);

    IObjectWrapper getStrokePattern();

    void setTag(IObjectWrapper object);

    IObjectWrapper getTag();

}

play-services-api/src/main/java/com/google/android/gms/maps/model/CircleOptions.java

+22 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ public class CircleOptions extends AutoSafeParcelable { 
    private float zIndex = 0;

    @SafeParceled(8)

    private boolean visible = true;

    @SafeParceled(9)

    private boolean clickable = false;



    /**

     * Creates circle options.
@@ -144,6 +146,15 @@ public class CircleOptions extends AutoSafeParcelable { 
        return visible;

    }



    /**

     * Gets the clickability setting for the circle.

     *

     * @return {@code true} if the circle is clickable; {@code false} if it is not.

     */

    public boolean isClickable() {

        return clickable;

    }



    /**

     * Sets the radius in meters.

     * <p/>
@@ -217,5 +228,16 @@ public class CircleOptions extends AutoSafeParcelable { 
        return this;

    }



    /**

     * Specifies whether this circle is clickable. The default setting is {@code false}.

     *

     * @param clickable

     * @return this {@code CircleOptions} object with a new clickability setting.

     */

    public CircleOptions clickable(boolean clickable) {

        this.clickable = clickable;

        return this;

    }



    public static Creator<CircleOptions> CREATOR = new AutoCreator<CircleOptions>(CircleOptions.class);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ dependencies { 
    implementation("org.maplibre.gl:android-plugin-annotation-v9:1.0.0") {

        exclude group: 'com.google.android.gms'

    }

    implementation 'org.maplibre.gl:android-sdk-turf:5.9.0'



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

}