Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: location tracking activity to component activity #617

Merged
merged 3 commits into from
Aug 28, 2024
Merged

fix: location tracking activity to component activity #617

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a70804
fix: change LocationTrackingActivity to be a ComponentActivity to be …
dkhawk Aug 27, 2024
0b63039
fix: enable edge-to-edge in sample (#614)
Goooler Aug 27, 2024
eda1b33
Merge branch 'main' into fix/location-tracking-activity-to-component-…
dkhawk Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt
View file
Open in desktop
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
Loading