Skip to content

Commit

Permalink
fix: location tracking activity to component activity (#617)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
# Conflicts:
#	app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt

---------

Co-authored-by: Zongle Wang <[email protected]>
  • Loading branch information
dkhawk and Goooler authored Aug 28, 2024
1 parent e43b938 commit a9d2fb5
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package com.google.maps.android.compose
import android.location.Location
import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.EnterTransition
import androidx.compose.animation.fadeOut
Expand Down Expand Up @@ -52,7 +52,7 @@ private const val zoom = 8f
* This shows how to use a custom location source to show a blue dot on the map based on your own
* locations.
*/
class LocationTrackingActivity : AppCompatActivity() {
class LocationTrackingActivity : ComponentActivity() {

private val locationSource = MyLocationSource()
private var counter = 0
Expand Down Expand Up @@ -115,7 +115,7 @@ class LocationTrackingActivity : AppCompatActivity() {
.systemBarsPadding(),
) {
GoogleMap(
modifier = Modifier.matchParentSize(),
modifier = Modifier.fillMaxSize(),
cameraPositionState = cameraPositionState,
onMapLoaded = {
isMapLoaded = true
Expand Down

0 comments on commit a9d2fb5

Please sign in to comment.