Skip to content

Commit 2d7c708

Browse files
authored
chore: clean up unused imports and address lint warnings (#891)
- Remove unused and duplicate imports in multiple files. - Suppress unchecked cast in Clustering.kt. - Refactor loops and bitmap creation for better performance and style.
1 parent c7ffd04 commit 2d7c708

File tree

10 files changed

+6
-19
lines changed

10 files changed

+6
-19
lines changed

maps-compose-utils/src/main/java/com/google/maps/android/compose/clustering/ClusterRenderer.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import android.view.ViewGroup
2727
import androidx.compose.runtime.Composable
2828
import androidx.compose.ui.platform.AbstractComposeView
2929
import androidx.core.graphics.applyCanvas
30+
import androidx.core.graphics.createBitmap
3031
import androidx.core.view.doOnAttach
3132
import androidx.core.view.doOnDetach
3233
import androidx.compose.ui.geometry.Offset
@@ -37,7 +38,6 @@ import com.google.android.gms.maps.model.MarkerOptions
3738
import com.google.maps.android.clustering.Cluster
3839
import com.google.maps.android.clustering.ClusterItem
3940
import com.google.maps.android.clustering.ClusterManager
40-
import com.google.maps.android.clustering.view.ClusterRenderer
4141
import com.google.maps.android.clustering.view.DefaultClusterRenderer
4242
import com.google.maps.android.compose.ComposeUiViewRenderer
4343
import kotlinx.coroutines.CoroutineScope
@@ -250,17 +250,16 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
250250
so trigger a draw to an empty canvas to force that */
251251
view.draw(fakeCanvas)
252252
val viewParent =
253-
view.parent as? ViewGroup ?: return Bitmap.createBitmap(20, 20, Bitmap.Config.ARGB_8888)
253+
view.parent as? ViewGroup ?: return createBitmap(20, 20)
254254
.let(BitmapDescriptorFactory::fromBitmap)
255255
view.measure(
256256
View.MeasureSpec.makeMeasureSpec(viewParent.width, View.MeasureSpec.AT_MOST),
257257
View.MeasureSpec.makeMeasureSpec(viewParent.height, View.MeasureSpec.AT_MOST),
258258
)
259259
view.layout(0, 0, view.measuredWidth, view.measuredHeight)
260-
val bitmap = Bitmap.createBitmap(
260+
val bitmap = createBitmap(
261261
view.measuredWidth.takeIf { it > 0 } ?: 1,
262-
view.measuredHeight.takeIf { it > 0 } ?: 1,
263-
Bitmap.Config.ARGB_8888
262+
view.measuredHeight.takeIf { it > 0 } ?: 1
264263
)
265264
bitmap.applyCanvas {
266265
view.draw(this)

maps-compose-utils/src/main/java/com/google/maps/android/compose/clustering/Clustering.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ import androidx.compose.runtime.mutableStateOf
2828
import androidx.compose.runtime.remember
2929
import androidx.compose.runtime.rememberUpdatedState
3030
import androidx.compose.runtime.snapshotFlow
31-
import androidx.compose.runtime.CompositionLocalProvider
3231
import androidx.compose.runtime.getValue
33-
import androidx.compose.runtime.mutableStateOf
34-
import androidx.compose.runtime.remember
3532
import androidx.compose.runtime.setValue
3633
import androidx.compose.runtime.staticCompositionLocalOf
3734
import androidx.compose.ui.UiComposable
@@ -43,7 +40,6 @@ import com.google.maps.android.clustering.ClusterItem
4340
import com.google.maps.android.clustering.ClusterManager
4441
import com.google.maps.android.clustering.view.ClusterRenderer
4542
import com.google.maps.android.clustering.view.DefaultClusterRenderer
46-
import com.google.maps.android.collections.MarkerManager
4743
import com.google.maps.android.compose.GoogleMapComposable
4844
import com.google.maps.android.compose.InputHandler
4945
import com.google.maps.android.compose.MapEffect
@@ -372,9 +368,10 @@ internal fun <T : ClusterItem> Clustering(
372368
}
373369

374370
val actualRenderer = renderer ?: clusterManager.renderer
371+
@Suppress("UNCHECKED_CAST")
375372
val unclusteredItems by (actualRenderer as? ClusterRendererItemState<T>)?.unclusteredItems
376373
?: remember { mutableStateOf(emptySet()) }
377-
unclusteredItems.forEach { item ->
374+
for (item in unclusteredItems) {
378375
clusterItemDecoration(item)
379376
}
380377
}

maps-compose-utils/src/main/java/com/google/maps/android/compose/wms/WmsUrlTileProvider.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import com.google.android.gms.maps.model.UrlTileProvider
2020
import java.net.MalformedURLException
2121
import java.net.URL
2222
import kotlin.math.PI
23-
import kotlin.math.pow
2423

2524
/**
2625
* A [UrlTileProvider] for Web Map Service (WMS) layers that use the EPSG:3857 (Web Mercator)

maps-compose/src/main/java/com/google/maps/android/compose/CameraPositionState.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import com.google.android.gms.maps.model.LatLng
3333
import kotlinx.coroutines.CancellableContinuation
3434
import kotlinx.coroutines.CancellationException
3535
import kotlinx.coroutines.Job
36-
import kotlinx.coroutines.cancel
3736
import kotlinx.coroutines.currentCoroutineContext
3837
import kotlinx.coroutines.suspendCancellableCoroutine
3938
import java.lang.Integer.MAX_VALUE

maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import androidx.compose.runtime.Composable
2727
import androidx.compose.runtime.Composition
2828
import androidx.compose.runtime.CompositionContext
2929
import androidx.compose.runtime.CompositionLocalProvider
30-
import androidx.compose.runtime.LaunchedEffect
3130
import androidx.compose.runtime.Stable
3231
import androidx.compose.runtime.getValue
3332
import androidx.compose.runtime.mutableStateOf
@@ -37,7 +36,6 @@ import androidx.compose.runtime.rememberCoroutineScope
3736
import androidx.compose.runtime.rememberUpdatedState
3837
import androidx.compose.runtime.setValue
3938
import androidx.compose.ui.Modifier
40-
import androidx.compose.ui.platform.LocalContext
4139
import androidx.compose.ui.platform.LocalInspectionMode
4240
import androidx.compose.ui.viewinterop.AndroidView
4341
import androidx.lifecycle.Lifecycle

maps-compose/src/main/java/com/google/maps/android/compose/InputHandler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import com.google.android.gms.maps.model.Circle
2626
import com.google.android.gms.maps.model.GroundOverlay
2727
import com.google.android.gms.maps.model.Marker
2828
import com.google.android.gms.maps.model.Polygon
29-
import com.google.android.gms.maps.GoogleMap.OnMarkerClickListener
3029
import com.google.android.gms.maps.model.Polyline
3130

3231
/**

maps-compose/src/main/java/com/google/maps/android/compose/MapComposeViewRender.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import androidx.compose.runtime.currentComposer
2727
import androidx.compose.runtime.remember
2828
import androidx.compose.runtime.rememberCompositionContext
2929
import androidx.compose.ui.platform.AbstractComposeView
30-
import androidx.compose.ui.platform.ComposeView
3130
import com.google.android.gms.maps.MapView
3231
import java.io.Closeable
3332

maps-compose/src/main/java/com/google/maps/android/compose/MapEffect.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.google.maps.android.compose
1818

1919
import androidx.compose.runtime.Composable
20-
import androidx.compose.runtime.ExperimentalComposeApi
2120
import androidx.compose.runtime.LaunchedEffect
2221
import androidx.compose.runtime.currentComposer
2322
import com.google.android.gms.maps.GoogleMap

maps-compose/src/main/java/com/google/maps/android/compose/ReattachClickListeners.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.annotation.RestrictTo
2020
import androidx.compose.runtime.Composable
2121
import androidx.compose.runtime.currentComposer
2222
import androidx.compose.runtime.remember
23-
import com.google.android.gms.maps.GoogleMap
2423

2524
/**
2625
* Returns a lambda that, when invoked, will reattach click listeners set by the [MapApplier] on

maps-compose/src/main/java/com/google/maps/android/compose/streetview/StreetViewPanoramaEventListeners.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package com.google.maps.android.compose.streetview
1919
import androidx.compose.runtime.getValue
2020
import androidx.compose.runtime.mutableStateOf
2121
import androidx.compose.runtime.setValue
22-
import com.google.android.gms.maps.model.StreetViewPanoramaCamera
2322
import com.google.android.gms.maps.model.StreetViewPanoramaOrientation
2423

2524
/**

0 commit comments

Comments
 (0)