Skip to content

Commit a9d2fb5

Browse files
dkhawkGoooler
andauthored
fix: location tracking activity to component activity (#617)
* fix: change LocationTrackingActivity to be a ComponentActivity to be consistent * fix: enable edge-to-edge in sample (#614) * fix: enable edge-to-edge in sample https://developer.android.com/develop/ui/views/layout/edge-to-edge * fix: changes MarkerClusteringActivity to use a Box vs a Surface which interfaces with map touch events --------- Co-authored-by: dkhawk <107309+dkhawk@users.noreply.github.com> # Conflicts: # app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt --------- Co-authored-by: Zongle Wang <wangzongler@gmail.com>
1 parent e43b938 commit a9d2fb5

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package com.google.maps.android.compose
1818
import android.location.Location
1919
import android.os.Bundle
2020
import android.util.Log
21+
import androidx.activity.ComponentActivity
2122
import androidx.activity.compose.setContent
2223
import androidx.activity.enableEdgeToEdge
23-
import androidx.appcompat.app.AppCompatActivity
2424
import androidx.compose.animation.AnimatedVisibility
2525
import androidx.compose.animation.EnterTransition
2626
import androidx.compose.animation.fadeOut
@@ -52,7 +52,7 @@ private const val zoom = 8f
5252
* This shows how to use a custom location source to show a blue dot on the map based on your own
5353
* locations.
5454
*/
55-
class LocationTrackingActivity : AppCompatActivity() {
55+
class LocationTrackingActivity : ComponentActivity() {
5656

5757
private val locationSource = MyLocationSource()
5858
private var counter = 0
@@ -115,7 +115,7 @@ class LocationTrackingActivity : AppCompatActivity() {
115115
.systemBarsPadding(),
116116
) {
117117
GoogleMap(
118-
modifier = Modifier.matchParentSize(),
118+
modifier = Modifier.fillMaxSize(),
119119
cameraPositionState = cameraPositionState,
120120
onMapLoaded = {
121121
isMapLoaded = true

0 commit comments

Comments
 (0)