platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsd…

…k/maps/MapView.java
mapbox · Jul 12, 2018 · 97fdde8 · 97fdde8
1 parent f7e2fe5
commit 97fdde8
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 0 deletions.
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.PointF;
+import android.graphics.drawable.ColorDrawable;
 import android.opengl.GLSurfaceView;
 import android.os.Build;
 import android.os.Bundle;
@@ -126,6 +127,11 @@ protected void initialize(@NonNull final Context context, @NonNull final MapboxM
       // in IDE layout editor, just return
       return;
     }
+
+    // hide surface until map is fully loaded #10990
+    setForeground(new ColorDrawable(options.getForegroundLoadColor()));
+    mapCallback.addOnMapReadyCallback(new InitialStyleLoadedCallback(this));
+
     mapboxMapOptions = options;
 
     // inflate view
@@ -981,6 +987,23 @@ public void onFocalPointChanged(PointF pointF) {
     }
   }
 
+  private static class InitialStyleLoadedCallback implements OnMapReadyCallback {
+
+    private WeakReference<MapView> weakReference;
+
+    InitialStyleLoadedCallback(MapView mapView) {
+      this.weakReference = new WeakReference<>(mapView);
+    }
+
+    @Override
+    public void onMapReady(MapboxMap mapboxMap) {
+      MapView mapView = weakReference.get();
+      if (mapView != null && !mapView.isDestroyed()) {
+        mapView.setForeground(null);
+      }
+    }
+  }
+
   private class GesturesManagerInteractionListener implements MapboxMap.OnGesturesManagerInteractionListener {
 
     @Override

diff --git a/.../android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/.../android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
@@ -73,6 +74,9 @@ public class MapboxMapOptions implements Parcelable {
   private boolean textureMode;
   private boolean translucentTextureSurface;
 
+  @ColorInt
+  private int foregroundLoadColor;
+
   private String style;
 
   private float pixelRatio;
@@ -124,6 +128,7 @@ private MapboxMapOptions(Parcel in) {
     zMediaOverlay = in.readByte() != 0;
     localIdeographFontFamily = in.readString();
     pixelRatio = in.readFloat();
+    foregroundLoadColor = in.readInt();
   }
 
   /**
@@ -222,6 +227,9 @@ public static MapboxMapOptions createFromAttributes(@NonNull Context context, @N
         typedArray.getString(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamily));
       mapboxMapOptions.pixelRatio(
         typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_pixelRatio, 0));
+      mapboxMapOptions.foregroundLoadColor(
+        typedArray.getInt(R.styleable.mapbox_MapView_mapbox_foregroundLoadColor, Color.WHITE)
+      );
     } finally {
       typedArray.recycle();
     }
@@ -521,6 +529,17 @@ public MapboxMapOptions translucentTextureSurface(boolean translucentTextureSurf
     return this;
   }
 
+  /**
+   * Set the MapView foreground color that is used when the map surface is being created.
+   *
+   * @param loadColor the color to show during map creation
+   * @return This
+   */
+  public MapboxMapOptions foregroundLoadColor(@ColorInt int loadColor) {
+    this.foregroundLoadColor =  loadColor;
+    return this;
+  }
+
   /**
    * Enable tile pre-fetching. Loads tiles at a lower zoom-level to pre-render
    * a low resolution preview while more detailed tiles are loaded.
@@ -819,6 +838,16 @@ public boolean getTranslucentTextureSurface() {
     return translucentTextureSurface;
   }
 
+  /**
+   * Returns the current configured foreground color that is used during map creation.
+   *
+   * @return the load color
+   */
+  @ColorInt
+  public int getForegroundLoadColor() {
+    return foregroundLoadColor;
+  }
+
   /**
    * Returns the font-family for locally overriding generation of glyphs in the
    * &#x27;CJK Unified Ideographs&#x27; and &#x27;Hangul Syllables&#x27; ranges.
@@ -892,6 +921,7 @@ public void writeToParcel(Parcel dest, int flags) {
     dest.writeByte((byte) (zMediaOverlay ? 1 : 0));
     dest.writeString(localIdeographFontFamily);
     dest.writeFloat(pixelRatio);
+    dest.writeInt(foregroundLoadColor);
   }
 
   @Override

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
@@ -65,6 +65,7 @@
     <!-- Use TextureView-->
     <public name="mapbox_renderTextureMode" type="attr" />
     <public name="mapbox_renderTextureTranslucentSurface" type="attr" />
+    <public name="mapbox_foregroundLoadColor" type="attr" />
 
     <public name="mapbox_enableTilePrefetch" type="attr" />
     <public name="mapbox_enableZMediaOverlay" type="attr" />

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
@@ -103,6 +103,7 @@
         <!-- Use TextureView-->
         <attr name="mapbox_renderTextureMode" format="boolean"/>
         <attr name="mapbox_renderTextureTranslucentSurface" format="boolean"/>
+        <attr name="mapbox_foregroundLoadColor" format="color"/>
 
         <attr name="mapbox_enableTilePrefetch" format="boolean"/>
         <attr name="mapbox_enableZMediaOverlay" format="boolean"/>