Expose restricted ImageHolder.from(Image) (#3027)

Author: kiryldz

sdk-base/api/Release/metalava.txt

@@ -53,16 +53,20 @@ package com.mapbox.maps {
   @kotlinx.parcelize.Parcelize public final class ImageHolder implements android.os.Parcelable {
     method public static com.mapbox.maps.ImageHolder from(@DrawableRes int drawableId);
     method public static com.mapbox.maps.ImageHolder from(android.graphics.Bitmap bitmap);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static com.mapbox.maps.ImageHolder from(com.mapbox.maps.Image image);
     method public android.graphics.Bitmap? getBitmap();
     method public Integer? getDrawableId();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public com.mapbox.maps.Image? getImage();
     property public final android.graphics.Bitmap? bitmap;
     property public final Integer? drawableId;
+    property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final com.mapbox.maps.Image? image;
     field public static final com.mapbox.maps.ImageHolder.Companion Companion;
   }
 
   public static final class ImageHolder.Companion {
     method public com.mapbox.maps.ImageHolder from(@DrawableRes int drawableId);
     method public com.mapbox.maps.ImageHolder from(android.graphics.Bitmap bitmap);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public com.mapbox.maps.ImageHolder from(com.mapbox.maps.Image image);
   }
 
   @com.mapbox.maps.MapboxExperimental public final class LongClickInteraction<T extends com.mapbox.maps.interactions.FeaturesetFeature<?>> extends com.mapbox.maps.MapInteraction {

sdk-base/api/sdk-base.api

@@ -58,13 +58,15 @@ public final class com/mapbox/maps/ExtensionUtils {
 public final class com/mapbox/maps/ImageHolder : android/os/Parcelable {
 	public static final field CREATOR Landroid/os/Parcelable$Creator;
 	public static final field Companion Lcom/mapbox/maps/ImageHolder$Companion;
-	public synthetic fun <init> (Ljava/lang/Integer;Landroid/graphics/Bitmap;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/lang/Integer;Landroid/graphics/Bitmap;Lcom/mapbox/maps/Image;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun describeContents ()I
 	public fun equals (Ljava/lang/Object;)Z
 	public static final fun from (I)Lcom/mapbox/maps/ImageHolder;
 	public static final fun from (Landroid/graphics/Bitmap;)Lcom/mapbox/maps/ImageHolder;
+	public static final fun from (Lcom/mapbox/maps/Image;)Lcom/mapbox/maps/ImageHolder;
 	public final fun getBitmap ()Landroid/graphics/Bitmap;
 	public final fun getDrawableId ()Ljava/lang/Integer;
+	public final fun getImage ()Lcom/mapbox/maps/Image;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 	public fun writeToParcel (Landroid/os/Parcel;I)V
@@ -73,6 +75,7 @@ public final class com/mapbox/maps/ImageHolder : android/os/Parcelable {
 public final class com/mapbox/maps/ImageHolder$Companion {
 	public final fun from (I)Lcom/mapbox/maps/ImageHolder;
 	public final fun from (Landroid/graphics/Bitmap;)Lcom/mapbox/maps/ImageHolder;
+	public final fun from (Lcom/mapbox/maps/Image;)Lcom/mapbox/maps/ImageHolder;
 }
 
 public final class com/mapbox/maps/ImageHolder$Creator : android/os/Parcelable$Creator {

sdk-base/src/main/java/com/mapbox/maps/ImageHolder.kt

@@ -3,6 +3,7 @@ package com.mapbox.maps
 import android.graphics.Bitmap
 import android.os.Parcelable
 import androidx.annotation.DrawableRes
+import androidx.annotation.RestrictTo
 import kotlinx.parcelize.Parcelize
 import java.util.Objects
 
@@ -18,7 +19,12 @@ class ImageHolder private constructor(
   /**
    * Image represented as the bitmap.
    */
-  val bitmap: Bitmap?
+  val bitmap: Bitmap?,
+  /**
+   * Image represented as the internal Mapbox image.
+   */
+  @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
+  val image: Image?,
 ) : Parcelable {
 
   /**
@@ -28,21 +34,21 @@ class ImageHolder private constructor(
     if (this === other) return true
     if (javaClass != other?.javaClass) return false
     other as ImageHolder
-    return drawableId == other.drawableId && bitmap == other.bitmap
+    return drawableId == other.drawableId && bitmap == other.bitmap && image == other.image
   }
 
   /**
    * Overloaded hashCode function based on all class properties.
    */
   override fun hashCode(): Int {
-    return Objects.hash(drawableId, bitmap)
+    return Objects.hash(drawableId, bitmap, image)
   }
 
   /**
    * Overloaded toString function.
    */
   override fun toString(): String {
-    return "ImageHolder(bitmap=$bitmap, drawableId=$drawableId)"
+    return "ImageHolder(bitmap=$bitmap, drawableId=$drawableId, image=$image)"
   }
 
   /**
@@ -54,15 +60,24 @@ class ImageHolder private constructor(
      */
     @JvmStatic
     fun from(@DrawableRes drawableId: Int): ImageHolder {
-      return ImageHolder(drawableId, null)
+      return ImageHolder(drawableId, null, null)
     }
 
     /**
      * Create an instance of [ImageHolder] from given [Bitmap].
      */
     @JvmStatic
     fun from(bitmap: Bitmap): ImageHolder {
-      return ImageHolder(null, bitmap)
+      return ImageHolder(null, bitmap, null)
+    }
+
+    /**
+     * Create an instance of [ImageHolder] from given [Image].
+     */
+    @JvmStatic
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
+    fun from(image: Image): ImageHolder {
+      return ImageHolder(null, null, image)
     }
   }
 }