Update examples for view annotation priority (#2904)

* Update examples for view annotation priority

* lint

* Update mapbox-maps-android/CHANGELOG.md

Co-authored-by: Kiryl Dzehtsiarenka <[email protected]>

* Add comment

---------

Co-authored-by: Kiryl Dzehtsiarenka <[email protected]>

Author: evil159

CHANGELOG.md

@@ -5,6 +5,7 @@ Mapbox welcomes participation and contributions from everyone.
 # main
 ## Features ✨ and improvements 🏁
 * Localize geofencing attribution dialog.
+* Introduce `ViewAnnotationOptions.priority`, deprecate `ViewAnnotationOptions.selected`. Use this property to define view annotation sort order.
 
 
 # 11.9.0 December 18, 2024

app/src/main/java/com/mapbox/maps/testapp/examples/markersandcallouts/viewannotation/ViewAnnotationBasicAddActivity.kt

@@ -30,6 +30,11 @@ class ViewAnnotationBasicAddActivity : AppCompatActivity(), OnMapClickListener {
   private lateinit var viewAnnotationManager: ViewAnnotationManager
   private val viewAnnotationViews = mutableListOf<View>()
 
+  // Increase-on-access priority assigned to the most recent selected annotation,
+  // keeping it on top of other selected annotation.
+  private var topPriority: Long = 0
+    get() = ++field
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     val binding = ActivityViewAnnotationShowcaseBinding.inflate(layoutInflater)
@@ -112,7 +117,8 @@ class ViewAnnotationBasicAddActivity : AppCompatActivity(), OnMapClickListener {
         viewAnnotationManager.updateViewAnnotation(
           viewAnnotation,
           viewAnnotationOptions {
-            selected(isSelected)
+            allowOverlap(true)
+            priority(if (isSelected) topPriority else 0)
           }
         )
         (button.layoutParams as ViewGroup.MarginLayoutParams).apply {

app/src/main/java/com/mapbox/maps/testapp/examples/markersandcallouts/viewannotation/ViewAnnotationShowcaseActivity.kt

@@ -219,7 +219,7 @@ class ViewAnnotationShowcaseActivity :
         viewAnnotationManager.updateViewAnnotation(
           viewAnnotation,
           viewAnnotationOptions {
-            selected(isSelected)
+            priority(if (isSelected) 1 else 0)
           }
         )
         (button.layoutParams as ViewGroup.MarginLayoutParams).apply {

app/src/main/java/com/mapbox/maps/testapp/examples/markersandcallouts/viewannotation/ViewAnnotationWithPointAnnotationActivity.kt

@@ -175,12 +175,6 @@ class ViewAnnotationWithPointAnnotationActivity : AppCompatActivity() {
         val isSelected = button.text.toString().equals("SELECT", true)
         val pxDelta = if (isSelected) SELECTED_ADD_COEF_PX else -SELECTED_ADD_COEF_PX
         button.text = if (isSelected) "DESELECT" else "SELECT"
-        viewAnnotationManager.updateViewAnnotation(
-          viewAnnotation,
-          viewAnnotationOptions {
-            selected(isSelected)
-          }
-        )
         (button.layoutParams as ViewGroup.MarginLayoutParams).apply {
           bottomMargin += pxDelta
           rightMargin += pxDelta

gradle/libs.versions.toml

@@ -35,8 +35,8 @@ japicmp = "0.4.1"
 # Dependencies
 
 # GlNative and Common are used by the convention plugin
-mapboxGlNative = "11.9.0"
-mapboxCommon = "24.9.0"
+mapboxGlNative = "11.10.0-SNAPSHOT-01-03--04-28.git-f26a6d7"
+mapboxCommon = "24.10.0-SNAPSHOT-01-03--04-28.git-f26a6d7"
 
 mapboxBase = "0.11.0"
 mapboxGestures = "0.8.0"

maps-sdk/src/androidTest/java/com/mapbox/maps/ViewAnnotationTest.kt

@@ -349,7 +349,7 @@ class ViewAnnotationTest(
   }
 
   @Test
-  fun addTwoViewAnnotationsOneSelectedAllowOverlapTrue() {
+  fun addTwoViewAnnotationsOneWithPriorityAllowOverlapTrue() {
     viewAnnotationTestHelper(
       performAction = {
         firstView = viewAnnotationManager.addViewAnnotation(
@@ -360,7 +360,7 @@ class ViewAnnotationTest(
               anchor(ViewAnnotationAnchor.TOP_LEFT)
             }
             allowOverlap(true)
-            selected(true)
+            priority(32)
           }
         )
         secondView = viewAnnotationManager.addViewAnnotation(
@@ -485,7 +485,7 @@ class ViewAnnotationTest(
   }
 
   @Test
-  fun addTwoViewAnnotationsOneSelectedAllowOverlapFalse() {
+  fun addTwoViewAnnotationsOneWithPriorityAllowOverlapFalse() {
     viewAnnotationTestHelper(
       performAction = {
         firstView = viewAnnotationManager.addViewAnnotation(
@@ -496,7 +496,7 @@ class ViewAnnotationTest(
               anchor(ViewAnnotationAnchor.TOP_LEFT)
             }
             allowOverlap(false)
-            selected(true)
+            priority(22)
           }
         )
         secondView = viewAnnotationManager.addViewAnnotation(
@@ -526,7 +526,7 @@ class ViewAnnotationTest(
   }
 
   @Test
-  fun addTwoViewAnnotationsTwoSelectedAllowOverlapFalse() {
+  fun addTwoViewAnnotationsTwoWithPriorityAllowOverlapFalse() {
     viewAnnotationTestHelper(
       performAction = {
         firstView = viewAnnotationManager.addViewAnnotation(
@@ -537,7 +537,7 @@ class ViewAnnotationTest(
               anchor(ViewAnnotationAnchor.TOP_LEFT)
             }
             allowOverlap(false)
-            selected(true)
+            priority(1)
           }
         )
         secondView = viewAnnotationManager.addViewAnnotation(
@@ -548,7 +548,7 @@ class ViewAnnotationTest(
               anchor(ViewAnnotationAnchor.TOP_LEFT)
             }
             allowOverlap(false)
-            selected(true)
+            priority(34)
           }
         )
       },