Fix only last widget being rendered (#2194)

* Fix only last widget being rendered

* changelog

Author: kiryldz

CHANGELOG.md

@@ -6,6 +6,9 @@ Mapbox welcomes participation and contributions from everyone.
 ## ## Features ✨ and improvements 🏁
 * Improve performance of `StyleInterface.localizeLabels` method.
 
+## Bug fixes 🐞
+* Fix regression introduced in v10.16.3 when only last added widget was rendered.
+
 # 10.16.3 December 08, 2023
 ## Bug fixes 🐞
 * Downgrade minimum required `compileSDK` from 31 to 30.

app/src/main/java/com/mapbox/maps/testapp/examples/SurfaceActivity.kt

@@ -9,7 +9,6 @@ import android.view.SurfaceHolder
 import androidx.appcompat.app.AppCompatActivity
 import com.mapbox.maps.*
 import com.mapbox.maps.renderer.widget.BitmapWidget
-import com.mapbox.maps.renderer.widget.Widget
 import com.mapbox.maps.renderer.widget.WidgetPosition
 import com.mapbox.maps.testapp.databinding.ActivitySurfaceBinding
 
@@ -20,7 +19,6 @@ class SurfaceActivity : AppCompatActivity(), SurfaceHolder.Callback {
 
   private lateinit var surfaceHolder: SurfaceHolder
   private lateinit var mapSurface: MapSurface
-  private lateinit var widget: Widget
   private val animator = ValueAnimator.ofFloat(0f, 1f).also {
     it.duration = ANIMATION_DURATION
     it.repeatCount = ValueAnimator.INFINITE
@@ -63,13 +61,23 @@ class SurfaceActivity : AppCompatActivity(), SurfaceHolder.Callback {
       .setHorizontalAlignment(WidgetPosition.Horizontal.CENTER)
       .setVerticalAlignment(WidgetPosition.Vertical.CENTER)
       .build()
-    widget = LogoWidget(this, widgetPosition)
-    mapSurface.addWidget(widget)
+    val rotatingWidget = LogoWidget(this, widgetPosition)
+    mapSurface.addWidget(rotatingWidget)
     animator.addUpdateListener {
       val angle = (it.animatedFraction * 360f) % 360f
-      widget.setRotation(angle)
+      rotatingWidget.setRotation(angle)
     }
     animator.start()
+
+    // add second widget to make sure both are rendered
+    val staticWidgetPosition = WidgetPosition
+      .Builder()
+      .setHorizontalAlignment(WidgetPosition.Horizontal.LEFT)
+      .setVerticalAlignment(WidgetPosition.Vertical.BOTTOM)
+      .setOffsetX(20f)
+      .setOffsetY(-20f)
+      .build()
+    mapSurface.addWidget(LogoWidget(this, staticWidgetPosition))
   }
 
   override fun surfaceCreated(holder: SurfaceHolder) {

sdk/src/main/java/com/mapbox/maps/renderer/widget/BitmapWidgetRenderer.kt

@@ -157,7 +157,6 @@ internal class BitmapWidgetRenderer(
 
   override fun render() {
     lock.withLock {
-      GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT)
       if (program == 0) {
         prepare()
       }
@@ -185,6 +184,8 @@ internal class BitmapWidgetRenderer(
 
       GLES20.glUniform1i(uniformTexture, 0)
 
+      GLES20.glClearColor(1f, 1f, 1f, 1f)
+
       GLES20.glEnableVertexAttribArray(attributeVertexPosition)
       GlUtils.checkError("glEnableVertexAttribArray")