From f4508bffbce2eb7bd1299aa9c68ec1e5c2f6c972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?=
 <eenriquelopez@gmail.com>
Date: Mon, 1 Sep 2025 15:55:12 +0200
Subject: [PATCH 1/2] chore: fixed algorithm samples

---
 .../demo/ClusterAlgorithmsDemoActivity.kt     | 34 +++++++++++++---
 .../src/main/res/layout/multi_profile_two.xml | 39 +++++++++++++++++++
 2 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 demo/src/main/res/layout/multi_profile_two.xml

diff --git a/demo/src/main/java/com/google/maps/android/utils/demo/ClusterAlgorithmsDemoActivity.kt b/demo/src/main/java/com/google/maps/android/utils/demo/ClusterAlgorithmsDemoActivity.kt
index 93e275907..d1f27fbe5 100644
--- a/demo/src/main/java/com/google/maps/android/utils/demo/ClusterAlgorithmsDemoActivity.kt
+++ b/demo/src/main/java/com/google/maps/android/utils/demo/ClusterAlgorithmsDemoActivity.kt
@@ -16,15 +16,16 @@
 
 package com.google.maps.android.utils.demo
 
+import android.os.Build
+import android.util.DisplayMetrics
 import android.view.View
+import android.view.WindowManager
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Spinner
 import com.google.android.gms.maps.CameraUpdateFactory
-import com.google.android.gms.maps.MapView
 import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.clustering.ClusterManager
-import com.google.maps.android.clustering.algo.AbstractAlgorithm
 import com.google.maps.android.clustering.algo.CentroidNonHierarchicalDistanceBasedAlgorithm
 import com.google.maps.android.clustering.algo.ContinuousZoomEuclideanCentroidAlgorithm
 import com.google.maps.android.clustering.algo.GridBasedAlgorithm
@@ -40,7 +41,6 @@ import kotlin.random.Random
 class ClusterAlgorithmsDemoActivity : BaseDemoActivity() {
 
     private var clusterManager: ClusterManager<MyItem>? = null
-    private lateinit var mapView: MapView
 
     override fun getLayoutId(): Int {
         return R.layout.activity_cluster_algorithms_demo
@@ -85,6 +85,28 @@ class ClusterAlgorithmsDemoActivity : BaseDemoActivity() {
      * Sets up the ClusterManager with the chosen algorithm and populates it with items.
      */
     private fun setupClusterer(algorithmPosition: Int) {
+
+        val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+        val metrics = DisplayMetrics()
+        val width: Int
+        val height: Int
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            // For devices with Android 11 (API 30) and above
+            val windowMetrics = windowManager.currentWindowMetrics
+            width = windowMetrics.bounds.width()
+            height = windowMetrics.bounds.height()
+            metrics.density = resources.displayMetrics.density
+        } else {
+            // For devices below Android 11
+            windowManager.defaultDisplay.getMetrics(metrics)
+            width = metrics.widthPixels
+            height = metrics.heightPixels
+        }
+
+        val widthDp = (width / metrics.density).toInt()
+        val heightDp = (height / metrics.density).toInt()
+
         // 1. Clear the map and previous cluster manager
         map.clear()
 
@@ -96,9 +118,11 @@ class ClusterAlgorithmsDemoActivity : BaseDemoActivity() {
             1 -> GridBasedAlgorithm()
             2 -> NonHierarchicalDistanceBasedAlgorithm()
             3 -> CentroidNonHierarchicalDistanceBasedAlgorithm()
-            4 -> NonHierarchicalViewBasedAlgorithm(mapView.width, mapView.height)
+            4 -> NonHierarchicalViewBasedAlgorithm(widthDp, heightDp)
             5 -> ContinuousZoomEuclideanCentroidAlgorithm()
-            else -> error("Unsupported algorithm position: $algorithmPosition")
+            else -> {
+                GridBasedAlgorithm()
+            }
         }
 
         // 4. Point the map's listeners to the ClusterManager
diff --git a/demo/src/main/res/layout/multi_profile_two.xml b/demo/src/main/res/layout/multi_profile_two.xml
new file mode 100644
index 000000000..f90804dc0
--- /dev/null
+++ b/demo/src/main/res/layout/multi_profile_two.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2020 Google Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:padding="2dp"
+             android:layout_width="@dimen/custom_profile_image"
+             android:layout_height="@dimen/custom_profile_image">
+
+    <ImageView
+            android:id="@+id/image"
+            android:layout_width="130dp"
+            android:layout_height="@dimen/custom_profile_image"/>
+
+    <TextView
+            android:id="@id/amu_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/amu_Bubble.TextAppearance.Light"
+            android:background="@android:color/black"
+            android:paddingLeft="@dimen/custom_profile_padding"
+            android:paddingRight="@dimen/custom_profile_padding"
+            android:layout_gravity="center"
+            android:alpha=".8"/>
+
+</FrameLayout>

From 060c0d922decb9c144185231f7f543dc0c8c3094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?=
 <eenriquelopez@gmail.com>
Date: Mon, 1 Sep 2025 16:21:00 +0200
Subject: [PATCH 2/2] Removed

---
 .../src/main/res/layout/multi_profile_two.xml | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 demo/src/main/res/layout/multi_profile_two.xml

diff --git a/demo/src/main/res/layout/multi_profile_two.xml b/demo/src/main/res/layout/multi_profile_two.xml
deleted file mode 100644
index f90804dc0..000000000
--- a/demo/src/main/res/layout/multi_profile_two.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2020 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:padding="2dp"
-             android:layout_width="@dimen/custom_profile_image"
-             android:layout_height="@dimen/custom_profile_image">
-
-    <ImageView
-            android:id="@+id/image"
-            android:layout_width="130dp"
-            android:layout_height="@dimen/custom_profile_image"/>
-
-    <TextView
-            android:id="@id/amu_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/amu_Bubble.TextAppearance.Light"
-            android:background="@android:color/black"
-            android:paddingLeft="@dimen/custom_profile_padding"
-            android:paddingRight="@dimen/custom_profile_padding"
-            android:layout_gravity="center"
-            android:alpha=".8"/>
-
-</FrameLayout>