From 634e3f1b125c3d30c2aef4d437d7bca579884823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Tue, 3 Nov 2026 05:39:21 +0100 Subject: [PATCH] refactor(demo): move maps-app to its own namespace maps-app used com.google.maps.android.compose, the same namespace and root package as maps-compose, which AGP 9 only allows with android.uniquePackageNames=false. Move the demo app, its tests and screenshot references to com.google.maps.android.compose.demo, add the explicit imports of the library classes it used implicitly through the shared package, and remove the flag. The applicationId stays com.google.maps.android.compose. --- .github/workflows/demo-smoke-test.yml | 4 ++-- .github/workflows/instrumentation-test.yml | 2 +- AGENTS.md | 4 ++-- README.md | 6 +++--- build.gradle.kts | 2 +- docs/lite-mode-dark-theme.md | 2 +- gradle.properties | 3 --- maps-app/build.gradle.kts | 4 +++- .../GoogleMapFocusTraversalTests.kt | 3 ++- .../GoogleMapViewClusteringTests.kt | 7 ++++-- .../compose/{ => demo}/GoogleMapViewTests.kt | 16 ++++++++++++-- .../compose/{ => demo}/LatLngSubject.kt | 2 +- .../compose/{ => demo}/MapInColumnTests.kt | 3 ++- .../{ => demo}/MapsInLazyColumnTest.kt | 3 ++- .../{ => demo}/RecompositionActivityTests.kt | 3 ++- .../ScaleBarDeviceRenderingTests.kt | 3 ++- .../compose/{ => demo}/ScaleBarTests.kt | 4 +++- .../compose/{ => demo}/StreetViewTests.kt | 2 +- .../android/compose/{ => demo}/TestUtils.kt | 3 ++- .../{ => demo}/smoke/DemoAppSmokeTest.kt | 6 +++--- .../smoke/DemoMenuNavigationTest.kt | 18 ++++++++-------- .../{ => demo}/smoke/DemoRegistryTest.kt | 6 +++--- .../{ => demo}/AccessibilityActivity.kt | 9 +++++++- .../compose/{ => demo}/BasicMapActivity.kt | 20 ++++++++++++++++-- .../{ => demo}/CustomControlsActivity.kt | 5 ++++- .../maps/android/compose/{ => demo}/Demo.kt | 18 ++++++++-------- .../{ => demo}/FragmentDemoActivity.kt | 2 +- .../{ => demo}/GoogleMapComposeFragment.kt | 7 +++++- .../{ => demo}/GroundOverlayActivity.kt | 8 +++++-- .../compose/{ => demo}/LiteModeActivity.kt | 8 +++++-- .../{ => demo}/LocationTrackingActivity.kt | 5 ++++- .../compose/{ => demo}/MainActivity.kt | 4 ++-- .../{ => demo}/MapFragmentPagerAdapter.kt | 2 +- .../compose/{ => demo}/MapInColumnActivity.kt | 10 ++++++++- .../{ => demo}/MapsInLazyColumnActivity.kt | 9 +++++++- .../{ => demo}/RecompositionActivity.kt | 12 +++++++++-- .../compose/{ => demo}/ScaleBarActivity.kt | 6 ++++-- .../compose/{ => demo}/StreetViewActivity.kt | 2 +- .../compose/{ => demo}/TileOverlayActivity.kt | 5 ++++- .../{ => demo}/WmsTileOverlayActivity.kt | 6 +++++- .../markerexamples/AdvancedMarkersActivity.kt | 2 +- .../MarkerClusteringActivity.kt | 6 +++--- .../MarkerClusteringRotationActivity.kt | 4 ++-- ...bleMarkersCollectionWithPolygonActivity.kt | 6 +++--- .../MarkerDragEventsActivity.kt | 8 +++---- .../MarkersCollectionActivity.kt | 8 +++---- ...ingDraggableMarkerWithDataModelActivity.kt | 8 +++---- ...datingNoDragMarkerWithDataModelActivity.kt | 12 +++++------ .../android/compose/{ => demo}/theme/Theme.kt | 2 +- .../src/screenshotTest/AndroidManifest.xml | 2 +- .../compose/{ => demo}/ScaleBarTest.kt | 5 +++-- ...PreviewDisappearingScaleBar_748aa731_0.png | Bin .../PreviewScaleBar_748aa731_0.png | Bin .../{ => demo}/BasicMapActivityTest.kt | 3 ++- .../{ => demo}/ScaleBarRenderingTests.kt | 3 ++- 55 files changed, 206 insertions(+), 107 deletions(-) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/GoogleMapFocusTraversalTests.kt (98%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/GoogleMapViewClusteringTests.kt (98%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/GoogleMapViewTests.kt (96%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/LatLngSubject.kt (97%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/MapInColumnTests.kt (98%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/MapsInLazyColumnTest.kt (97%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/RecompositionActivityTests.kt (95%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/ScaleBarDeviceRenderingTests.kt (95%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/ScaleBarTests.kt (97%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/StreetViewTests.kt (98%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/TestUtils.kt (94%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/smoke/DemoAppSmokeTest.kt (98%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/smoke/DemoMenuNavigationTest.kt (93%) rename maps-app/src/androidTest/java/com/google/maps/android/compose/{ => demo}/smoke/DemoRegistryTest.kt (95%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/AccessibilityActivity.kt (88%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/BasicMapActivity.kt (94%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/CustomControlsActivity.kt (96%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/Demo.kt (93%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/FragmentDemoActivity.kt (96%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/GoogleMapComposeFragment.kt (94%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/GroundOverlayActivity.kt (94%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/LiteModeActivity.kt (96%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/LocationTrackingActivity.kt (97%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/MainActivity.kt (95%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/MapFragmentPagerAdapter.kt (97%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/MapInColumnActivity.kt (94%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/MapsInLazyColumnActivity.kt (96%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/RecompositionActivity.kt (89%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/ScaleBarActivity.kt (95%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/StreetViewActivity.kt (99%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/TileOverlayActivity.kt (95%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/WmsTileOverlayActivity.kt (94%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/markerexamples/AdvancedMarkersActivity.kt (99%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/markerexamples/MarkerClusteringActivity.kt (98%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/markerexamples/MarkerClusteringRotationActivity.kt (99%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt (96%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/markerexamples/markerdragevents/MarkerDragEventsActivity.kt (94%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/markerexamples/markerscollection/MarkersCollectionActivity.kt (93%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/markerexamples/syncingdraggablemarkerwithdatamodel/SyncingDraggableMarkerWithDataModelActivity.kt (95%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/markerexamples/updatingnodragmarkerwithdatamodel/UpdatingNoDragMarkerWithDataModelActivity.kt (90%) rename maps-app/src/main/java/com/google/maps/android/compose/{ => demo}/theme/Theme.kt (95%) rename maps-app/src/screenshotTest/java/com/google/maps/android/compose/{ => demo}/ScaleBarTest.kt (92%) rename maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/{ => demo}/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png (100%) rename maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/{ => demo}/ScaleBarTestKt/PreviewScaleBar_748aa731_0.png (100%) rename maps-app/src/test/java/com/google/maps/android/compose/{ => demo}/BasicMapActivityTest.kt (94%) rename maps-app/src/test/java/com/google/maps/android/compose/{ => demo}/ScaleBarRenderingTests.kt (97%) diff --git a/.github/workflows/demo-smoke-test.yml b/.github/workflows/demo-smoke-test.yml index 5d3f8d78a..4d256f806 100644 --- a/.github/workflows/demo-smoke-test.yml +++ b/.github/workflows/demo-smoke-test.yml @@ -14,7 +14,7 @@ # Opens every demo in maps-app on an emulator, directly and through the menu, and checks that it # starts, its map loads, and it survives a zoom and a configuration change. The tests live in -# maps-app/src/androidTest/.../compose/smoke and are excluded from the instrumentation workflow. +# maps-app/src/androidTest/.../compose/demo/smoke and are excluded from the instrumentation workflow. name: Demo smoke test on: @@ -86,7 +86,7 @@ jobs: disable-animations: true script: >- ./gradlew :maps-app:connectedDebugAndroidTest --stacktrace - -Pandroid.testInstrumentationRunnerArguments.package=com.google.maps.android.compose.smoke + -Pandroid.testInstrumentationRunnerArguments.package=com.google.maps.android.compose.demo.smoke -Pandroid.testInstrumentationRunnerArguments.requireMapLoaded=true - name: Upload test reports diff --git a/.github/workflows/instrumentation-test.yml b/.github/workflows/instrumentation-test.yml index 246e46385..c64a17d51 100644 --- a/.github/workflows/instrumentation-test.yml +++ b/.github/workflows/instrumentation-test.yml @@ -87,7 +87,7 @@ jobs: arch: x86_64 disable-animations: true # The demo smoke tests run in their own workflow, see demo-smoke-test.yml. - script: ./gradlew createDebugCoverageReport :maps-app:createLibraryCoverageReports --stacktrace -Pandroid.testInstrumentationRunnerArguments.notPackage=com.google.maps.android.compose.smoke + script: ./gradlew createDebugCoverageReport :maps-app:createLibraryCoverageReports --stacktrace -Pandroid.testInstrumentationRunnerArguments.notPackage=com.google.maps.android.compose.demo.smoke # Stage the coverage reports flat, named after their module, and publish # them so the post-merge "Record coverage history" workflow can read them diff --git a/AGENTS.md b/AGENTS.md index a9346413a..9d2e4fd88 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -60,7 +60,7 @@ Note that the library modules currently have almost no unit tests. The bulk of the suite is instrumentation tests under `maps-app/src/androidTest`, so the `unit` numbers are near zero by nature rather than by regression. -The demo smoke tests in `maps-app/src/androidTest/.../compose/smoke` run in +The demo smoke tests in `maps-app/src/androidTest/.../compose/demo/smoke` run in their own `Demo smoke test` workflow on API 36, and are excluded from the instrumentation workflow above, so they do not count towards instrumentation coverage. `DemoAppSmokeTest` launches every demo directly, `DemoMenuNavigationTest` @@ -70,7 +70,7 @@ and they are covered automatically. To run them with a device or emulator attach ```bash ./gradlew :maps-app:connectedDebugAndroidTest \ - -Pandroid.testInstrumentationRunnerArguments.package=com.google.maps.android.compose.smoke + -Pandroid.testInstrumentationRunnerArguments.package=com.google.maps.android.compose.demo.smoke ``` Add `-Pandroid.testInstrumentationRunnerArguments.requireMapLoaded=true` to also diff --git a/README.md b/README.md index 7593542d9..14d9b4669 100644 --- a/README.md +++ b/README.md @@ -424,7 +424,7 @@ This library provides optional utilities in the `maps-compose-utils` library fro The marker clustering utility helps you manage multiple markers at different zoom levels. When a user views the map at a high zoom level, the individual markers show on the map. When the user zooms out, the markers gather together into clusters, to make viewing the map easier. -The [MarkerClusteringActivity](maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt) demonstrates usage. +The [MarkerClusteringActivity](maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/MarkerClusteringActivity.kt) demonstrates usage. ```kotlin Clustering( @@ -448,7 +448,7 @@ The `fetchStreetViewData` method provides functionality to check whether a locat > Be sure to [enable Street View Static API](https://goo.gle/enable-sv-static-api) on the project associated with your API key. You can see example usage -in the [`StreetViewActivity`](https://github.com/googlemaps/android-maps-compose/blob/main/maps-app/src/main/java/com/google/maps/android/compose/StreetViewActivity.kt) of the demo app: +in the [`StreetViewActivity`](https://github.com/googlemaps/android-maps-compose/blob/main/maps-app/src/main/java/com/google/maps/android/compose/demo/StreetViewActivity.kt) of the demo app: ```kotlin streetViewResult = @@ -463,7 +463,7 @@ This library also provides optional composable widgets in the `maps-compose-widg This widget shows the current scale of the map in feet and meters when zoomed into the map, changing to miles and kilometers, respectively, when zooming out. A `DisappearingScaleBar` is also included, which appears when the zoom level of the map changes, and then disappears after a configurable timeout period. -The [ScaleBarActivity](maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt) demonstrates both of these, with the `DisappearingScaleBar` in the upper left corner and the normal base `ScaleBar` in the upper right: +The [ScaleBarActivity](maps-app/src/main/java/com/google/maps/android/compose/demo/ScaleBarActivity.kt) demonstrates both of these, with the `DisappearingScaleBar` in the upper left corner and the normal base `ScaleBar` in the upper right: ![maps-compose-scale-bar-cropped](https://user-images.githubusercontent.com/928045/175665891-a0635004-2201-4392-83b3-0c6553b96926.gif) diff --git a/build.gradle.kts b/build.gradle.kts index 2a51842d9..0a692f57a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -77,5 +77,5 @@ tasks.register("installAndLaunch") { description = "Installs and launches the demo app." group = "install" dependsOn(":maps-app:installDebug") - commandLine("adb", "shell", "am", "start", "-n", "com.google.maps.android.compose/.MainActivity") + commandLine("adb", "shell", "am", "start", "-n", "com.google.maps.android.compose/.demo.MainActivity") } \ No newline at end of file diff --git a/docs/lite-mode-dark-theme.md b/docs/lite-mode-dark-theme.md index 5b13a09d3..a509ffca7 100644 --- a/docs/lite-mode-dark-theme.md +++ b/docs/lite-mode-dark-theme.md @@ -163,4 +163,4 @@ fun ThemedLiteMapScreen() { ## Sample Code A complete, runnable demonstration of this pattern is available in the sample application: -* [LiteModeActivity.kt](../maps-app/src/main/java/com/google/maps/android/compose/LiteModeActivity.kt) +* [LiteModeActivity.kt](../maps-app/src/main/java/com/google/maps/android/compose/demo/LiteModeActivity.kt) diff --git a/gradle.properties b/gradle.properties index ab25f78d0..00196fd79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,7 +31,4 @@ signing.password= signing.secretKeyRingFile= android.experimental.enableScreenshotTest=true -# maps-app shares the com.google.maps.android.compose namespace with maps-compose. Remove this -# once the demo app has its own namespace. -android.uniquePackageNames=false diff --git a/maps-app/build.gradle.kts b/maps-app/build.gradle.kts index 1462a24bb..457a918bf 100644 --- a/maps-app/build.gradle.kts +++ b/maps-app/build.gradle.kts @@ -38,12 +38,14 @@ android { } } - namespace = "com.google.maps.android.compose" + namespace = "com.google.maps.android.compose.demo" compileSdk = libs.versions.androidCompileSdk.get().toInt() useLibrary("org.apache.http.legacy") defaultConfig { + // Kept from before the demo moved to its own namespace, so installs and CI keep working. + applicationId = "com.google.maps.android.compose" minSdk = libs.versions.androidMinSdk.get().toInt() targetSdk = libs.versions.androidTargetSdk.get().toInt() versionCode = 1 diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapFocusTraversalTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapFocusTraversalTests.kt similarity index 98% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapFocusTraversalTests.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapFocusTraversalTests.kt index 61cd6edef..231bf4c82 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapFocusTraversalTests.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapFocusTraversalTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.compose.foundation.focusable import androidx.compose.foundation.layout.Box @@ -34,6 +34,7 @@ import androidx.compose.ui.test.pressKey import androidx.compose.ui.test.requestFocus import androidx.compose.ui.unit.dp import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.GoogleMap import org.junit.Rule import org.junit.Test diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewClusteringTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapViewClusteringTests.kt similarity index 98% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewClusteringTests.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapViewClusteringTests.kt index 2075bfef9..d0d1d5152 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewClusteringTests.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapViewClusteringTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -35,9 +35,12 @@ import com.google.android.gms.maps.model.MarkerOptions import com.google.common.truth.Truth.assertThat import com.google.maps.android.clustering.ClusterItem import com.google.maps.android.clustering.ClusterManager +import com.google.maps.android.compose.CameraPositionState +import com.google.maps.android.compose.MapsComposeExperimentalApi import com.google.maps.android.compose.clustering.Clustering import com.google.maps.android.compose.clustering.ClusteringMarkerProperties -import com.google.maps.android.compose.markerexamples.MyItem +import com.google.maps.android.compose.demo.markerexamples.MyItem +import com.google.maps.android.compose.rememberComposeBitmapDescriptor import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapViewTests.kt similarity index 96% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapViewTests.kt index d680c70e3..a9ea0f60e 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/GoogleMapViewTests.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/GoogleMapViewTests.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.content.Context import androidx.compose.foundation.layout.Box @@ -37,7 +37,19 @@ import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng import com.google.android.gms.maps.model.MapColorScheme import com.google.common.truth.Truth.assertThat -import com.google.maps.android.compose.LatLngSubject.Companion.assertThat +import com.google.maps.android.compose.AdvancedMarkerInfoWindow +import com.google.maps.android.compose.AdvancedMarkerInfoWindowContent +import com.google.maps.android.compose.CameraMoveStartedReason +import com.google.maps.android.compose.CameraPositionState +import com.google.maps.android.compose.ComposeMapColorScheme +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.Marker +import com.google.maps.android.compose.MarkerComposable +import com.google.maps.android.compose.MarkerInfoWindowComposable +import com.google.maps.android.compose.MarkerInfoWindowContent +import com.google.maps.android.compose.MarkerState +import com.google.maps.android.compose.demo.LatLngSubject.Companion.assertThat +import com.google.maps.android.compose.rememberUpdatedMarkerState import kotlinx.coroutines.runBlocking import org.junit.Before import org.junit.Rule diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/LatLngSubject.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/LatLngSubject.kt similarity index 97% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/LatLngSubject.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/LatLngSubject.kt index e34c2eb86..1b2b7edc0 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/LatLngSubject.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/LatLngSubject.kt @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import com.google.android.gms.maps.model.LatLng import com.google.common.truth.FailureMetadata diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/MapInColumnTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/MapInColumnTests.kt similarity index 98% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/MapInColumnTests.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/MapInColumnTests.kt index fd3eec09a..08cc22b5b 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/MapInColumnTests.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/MapInColumnTests.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.util.Log import androidx.compose.foundation.layout.fillMaxSize @@ -32,6 +32,7 @@ import androidx.compose.ui.test.performTouchInput import androidx.compose.ui.test.swipeUp import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.CameraPositionState import org.junit.Assert.assertFalse import org.junit.Assert.assertNotEquals import org.junit.Assert.assertNotNull diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/MapsInLazyColumnTest.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/MapsInLazyColumnTest.kt similarity index 97% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/MapsInLazyColumnTest.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/MapsInLazyColumnTest.kt index e4179715a..49f01537c 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/MapsInLazyColumnTest.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/MapsInLazyColumnTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.runtime.LaunchedEffect @@ -30,6 +30,7 @@ import androidx.compose.ui.test.performTouchInput import androidx.compose.ui.test.swipeUp import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.CameraPositionState import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Rule diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/RecompositionActivityTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/RecompositionActivityTests.kt similarity index 95% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/RecompositionActivityTests.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/RecompositionActivityTests.kt index b4d755ea8..7bb2a7d34 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/RecompositionActivityTests.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/RecompositionActivityTests.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.ui.Modifier @@ -21,6 +21,7 @@ import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import com.google.android.gms.maps.model.CameraPosition +import com.google.maps.android.compose.CameraPositionState import org.junit.Assert.assertNotEquals import org.junit.Rule import org.junit.Test diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/ScaleBarDeviceRenderingTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/ScaleBarDeviceRenderingTests.kt similarity index 95% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/ScaleBarDeviceRenderingTests.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/ScaleBarDeviceRenderingTests.kt index d380d510e..9b2f7538a 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/ScaleBarDeviceRenderingTests.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/ScaleBarDeviceRenderingTests.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -24,6 +24,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.v2.createComposeRule import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.unit.dp +import com.google.maps.android.compose.CameraPositionState import com.google.maps.android.compose.widgets.ScaleBar import org.junit.Rule import org.junit.Test diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/ScaleBarTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/ScaleBarTests.kt similarity index 97% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/ScaleBarTests.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/ScaleBarTests.kt index 3be093128..d445e08d4 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/ScaleBarTests.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/ScaleBarTests.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.graphics.Point import androidx.compose.foundation.layout.Box @@ -23,6 +23,8 @@ import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.dp import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.CameraPositionState +import com.google.maps.android.compose.GoogleMap import com.google.maps.android.compose.widgets.ScaleBar import com.google.maps.android.sphericalDistance import org.junit.Assert.assertTrue diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/StreetViewTests.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/StreetViewTests.kt similarity index 98% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/StreetViewTests.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/StreetViewTests.kt index 10c0c1e9f..f443cd962 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/StreetViewTests.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/StreetViewTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.contentDescription diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/TestUtils.kt similarity index 94% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/TestUtils.kt index 06c919152..76e89fbd4 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/TestUtils.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/TestUtils.kt @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.ComposeMapColorScheme import org.junit.Assert.assertEquals import org.junit.Assume.assumeTrue const val timeout2 = 2_000L diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoAppSmokeTest.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoAppSmokeTest.kt similarity index 98% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoAppSmokeTest.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoAppSmokeTest.kt index 7e01bb86e..bcadf4f57 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoAppSmokeTest.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoAppSmokeTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose.smoke +package com.google.maps.android.compose.demo.smoke import android.graphics.Rect import android.view.View @@ -29,8 +29,8 @@ import com.google.android.gms.maps.MapView import com.google.android.gms.maps.StreetViewPanoramaView import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage -import com.google.maps.android.compose.allActivityGroups -import com.google.maps.android.compose.hasValidApiKey +import com.google.maps.android.compose.demo.allActivityGroups +import com.google.maps.android.compose.demo.hasValidApiKey import org.junit.After import org.junit.Assume.assumeTrue import org.junit.Before diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoMenuNavigationTest.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoMenuNavigationTest.kt similarity index 93% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoMenuNavigationTest.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoMenuNavigationTest.kt index 165c79554..07960899e 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoMenuNavigationTest.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoMenuNavigationTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose.smoke +package com.google.maps.android.compose.demo.smoke import android.app.Activity import android.os.SystemClock @@ -33,13 +33,13 @@ import androidx.test.runner.lifecycle.Stage import com.google.android.gms.maps.MapView import com.google.android.gms.maps.StreetViewPanoramaView import com.google.common.truth.Truth.assertWithMessage -import com.google.maps.android.compose.ActivityGroup -import com.google.maps.android.compose.MainActivity -import com.google.maps.android.compose.StreetViewActivity -import com.google.maps.android.compose.allActivityGroups -import com.google.maps.android.compose.demoTestTag -import com.google.maps.android.compose.groupTestTag -import com.google.maps.android.compose.hasValidApiKey +import com.google.maps.android.compose.demo.ActivityGroup +import com.google.maps.android.compose.demo.MainActivity +import com.google.maps.android.compose.demo.StreetViewActivity +import com.google.maps.android.compose.demo.allActivityGroups +import com.google.maps.android.compose.demo.demoTestTag +import com.google.maps.android.compose.demo.groupTestTag +import com.google.maps.android.compose.demo.hasValidApiKey import org.junit.After import org.junit.Before import org.junit.Rule @@ -49,7 +49,7 @@ import org.junit.runners.Parameterized import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -import com.google.maps.android.compose.Activity as Demo +import com.google.maps.android.compose.demo.Activity as Demo /** * Walks the sample app the way a user does: starts [MainActivity], expands the demo's group, diff --git a/maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoRegistryTest.kt b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoRegistryTest.kt similarity index 95% rename from maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoRegistryTest.kt rename to maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoRegistryTest.kt index 6970a3af9..515afe65c 100644 --- a/maps-app/src/androidTest/java/com/google/maps/android/compose/smoke/DemoRegistryTest.kt +++ b/maps-app/src/androidTest/java/com/google/maps/android/compose/demo/smoke/DemoRegistryTest.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.google.maps.android.compose.smoke +package com.google.maps.android.compose.demo.smoke import android.content.ComponentName import android.content.pm.PackageManager import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat -import com.google.maps.android.compose.MainActivity -import com.google.maps.android.compose.allActivityGroups +import com.google.maps.android.compose.demo.MainActivity +import com.google.maps.android.compose.demo.allActivityGroups import org.junit.Test /** diff --git a/maps-app/src/main/java/com/google/maps/android/compose/AccessibilityActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/AccessibilityActivity.kt similarity index 88% rename from maps-app/src/main/java/com/google/maps/android/compose/AccessibilityActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/AccessibilityActivity.kt index a487eaab4..f45f2742d 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/AccessibilityActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/AccessibilityActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import android.util.Log @@ -27,6 +27,13 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import com.google.android.gms.maps.model.Marker +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.MapProperties +import com.google.maps.android.compose.MapType +import com.google.maps.android.compose.MapUiSettings +import com.google.maps.android.compose.Marker +import com.google.maps.android.compose.rememberCameraPositionState +import com.google.maps.android.compose.rememberUpdatedMarkerState private const val TAG = "AccessibilityActivity" diff --git a/maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/BasicMapActivity.kt similarity index 94% rename from maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/BasicMapActivity.kt index 4f4482d74..2bb11dcee 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/BasicMapActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import android.util.Log @@ -67,7 +67,23 @@ import com.google.android.gms.maps.model.LatLng import com.google.android.gms.maps.model.Marker import com.google.android.gms.maps.model.StrokeStyle import com.google.android.gms.maps.model.StyleSpan -import com.google.maps.android.compose.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.CameraPositionState +import com.google.maps.android.compose.Circle +import com.google.maps.android.compose.ComposeMapColorScheme +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.MapProperties +import com.google.maps.android.compose.MapType +import com.google.maps.android.compose.MapUiSettings +import com.google.maps.android.compose.Marker +import com.google.maps.android.compose.MarkerComposable +import com.google.maps.android.compose.MarkerInfoWindowComposable +import com.google.maps.android.compose.MarkerInfoWindowContent +import com.google.maps.android.compose.MarkerState +import com.google.maps.android.compose.Polygon +import com.google.maps.android.compose.Polyline +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.rememberCameraPositionState +import com.google.maps.android.compose.rememberUpdatedMarkerState import kotlinx.coroutines.launch private const val TAG = "BasicMapActivity" diff --git a/maps-app/src/main/java/com/google/maps/android/compose/CustomControlsActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/CustomControlsActivity.kt similarity index 96% rename from maps-app/src/main/java/com/google/maps/android/compose/CustomControlsActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/CustomControlsActivity.kt index f8c3956fb..e9af52179 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/CustomControlsActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/CustomControlsActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import android.widget.Toast @@ -44,6 +44,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.google.android.gms.maps.CameraUpdateFactory +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.MapUiSettings +import com.google.maps.android.compose.rememberCameraPositionState import kotlinx.coroutines.launch class CustomControlsActivity : ComponentActivity() { diff --git a/maps-app/src/main/java/com/google/maps/android/compose/Demo.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/Demo.kt similarity index 93% rename from maps-app/src/main/java/com/google/maps/android/compose/Demo.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/Demo.kt index ba640f109..78dd3caf1 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/Demo.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/Demo.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.activity.ComponentActivity import androidx.annotation.StringRes @@ -43,14 +43,14 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import com.google.maps.android.compose.markerexamples.AdvancedMarkersActivity -import com.google.maps.android.compose.markerexamples.MarkerClusteringActivity -import com.google.maps.android.compose.markerexamples.MarkerClusteringRotationActivity -import com.google.maps.android.compose.markerexamples.draggablemarkerscollectionwithpolygon.DraggableMarkersCollectionWithPolygonActivity -import com.google.maps.android.compose.markerexamples.markerdragevents.MarkerDragEventsActivity -import com.google.maps.android.compose.markerexamples.markerscollection.MarkersCollectionActivity -import com.google.maps.android.compose.markerexamples.syncingdraggablemarkerwithdatamodel.SyncingDraggableMarkerWithDataModelActivity -import com.google.maps.android.compose.markerexamples.updatingnodragmarkerwithdatamodel.UpdatingNoDragMarkerWithDataModelActivity +import com.google.maps.android.compose.demo.markerexamples.AdvancedMarkersActivity +import com.google.maps.android.compose.demo.markerexamples.MarkerClusteringActivity +import com.google.maps.android.compose.demo.markerexamples.MarkerClusteringRotationActivity +import com.google.maps.android.compose.demo.markerexamples.draggablemarkerscollectionwithpolygon.DraggableMarkersCollectionWithPolygonActivity +import com.google.maps.android.compose.demo.markerexamples.markerdragevents.MarkerDragEventsActivity +import com.google.maps.android.compose.demo.markerexamples.markerscollection.MarkersCollectionActivity +import com.google.maps.android.compose.demo.markerexamples.syncingdraggablemarkerwithdatamodel.SyncingDraggableMarkerWithDataModelActivity +import com.google.maps.android.compose.demo.markerexamples.updatingnodragmarkerwithdatamodel.UpdatingNoDragMarkerWithDataModelActivity import kotlin.reflect.KClass // This file defines the data structures and composable functions used to display the list of diff --git a/maps-app/src/main/java/com/google/maps/android/compose/FragmentDemoActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/FragmentDemoActivity.kt similarity index 96% rename from maps-app/src/main/java/com/google/maps/android/compose/FragmentDemoActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/FragmentDemoActivity.kt index 974721caf..12db55225 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/FragmentDemoActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/FragmentDemoActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import androidx.fragment.app.FragmentActivity diff --git a/maps-app/src/main/java/com/google/maps/android/compose/GoogleMapComposeFragment.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/GoogleMapComposeFragment.kt similarity index 94% rename from maps-app/src/main/java/com/google/maps/android/compose/GoogleMapComposeFragment.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/GoogleMapComposeFragment.kt index 37b7e12be..159852bd7 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/GoogleMapComposeFragment.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/GoogleMapComposeFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import android.view.LayoutInflater @@ -29,6 +29,11 @@ import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.fragment.app.Fragment import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.Marker +import com.google.maps.android.compose.MarkerComposable +import com.google.maps.android.compose.rememberCameraPositionState +import com.google.maps.android.compose.rememberUpdatedMarkerState enum class MarkerType { CUSTOM_CONTENT_MARKER, // To use com.google.maps.android.compose.MarkerComposable with your Text diff --git a/maps-app/src/main/java/com/google/maps/android/compose/GroundOverlayActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/GroundOverlayActivity.kt similarity index 94% rename from maps-app/src/main/java/com/google/maps/android/compose/GroundOverlayActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/GroundOverlayActivity.kt index 9a462bfb5..576ab8bae 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/GroundOverlayActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/GroundOverlayActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import androidx.activity.ComponentActivity @@ -44,7 +44,11 @@ import androidx.core.graphics.createBitmap import com.google.android.gms.maps.model.BitmapDescriptorFactory import com.google.android.gms.maps.model.LatLng import com.google.android.gms.maps.model.LatLngBounds -import com.google.maps.android.compose.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.GroundOverlay +import com.google.maps.android.compose.GroundOverlayPosition +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.rememberCameraPositionState class GroundOverlayActivity : ComponentActivity() { diff --git a/maps-app/src/main/java/com/google/maps/android/compose/LiteModeActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/LiteModeActivity.kt similarity index 96% rename from maps-app/src/main/java/com/google/maps/android/compose/LiteModeActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/LiteModeActivity.kt index c528844f8..5b83d9c4d 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/LiteModeActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/LiteModeActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import androidx.activity.ComponentActivity @@ -49,7 +49,11 @@ import com.google.android.gms.maps.GoogleMapOptions import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng import com.google.android.gms.maps.model.MapStyleOptions -import com.google.maps.android.compose.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.MapProperties +import com.google.maps.android.compose.MapType +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.rememberCameraPositionState import kotlinx.coroutines.launch /** diff --git a/maps-app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/LocationTrackingActivity.kt similarity index 97% rename from maps-app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/LocationTrackingActivity.kt index df7ab48ba..bd0df94e8 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/LocationTrackingActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/LocationTrackingActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.location.Location import android.os.Bundle @@ -43,6 +43,9 @@ import com.google.android.gms.maps.LocationSource import com.google.android.gms.maps.LocationSource.OnLocationChangedListener import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.MapProperties +import com.google.maps.android.compose.rememberCameraPositionState import kotlinx.coroutines.delay import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.callbackFlow diff --git a/maps-app/src/main/java/com/google/maps/android/compose/MainActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/MainActivity.kt similarity index 95% rename from maps-app/src/main/java/com/google/maps/android/compose/MainActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/MainActivity.kt index a11eaba8c..acb2ebd19 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/MainActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/MainActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.content.Intent import android.os.Bundle @@ -31,7 +31,7 @@ import androidx.compose.material3.Text import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import com.google.maps.android.compose.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme class MainActivity : ComponentActivity() { diff --git a/maps-app/src/main/java/com/google/maps/android/compose/MapFragmentPagerAdapter.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/MapFragmentPagerAdapter.kt similarity index 97% rename from maps-app/src/main/java/com/google/maps/android/compose/MapFragmentPagerAdapter.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/MapFragmentPagerAdapter.kt index 99eb8e0d9..52bdc8641 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/MapFragmentPagerAdapter.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/MapFragmentPagerAdapter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity diff --git a/maps-app/src/main/java/com/google/maps/android/compose/MapInColumnActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/MapInColumnActivity.kt similarity index 94% rename from maps-app/src/main/java/com/google/maps/android/compose/MapInColumnActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/MapInColumnActivity.kt index a15dc655a..deb31f2a5 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/MapInColumnActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/MapInColumnActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import android.util.Log @@ -54,6 +54,14 @@ import androidx.compose.ui.unit.dp import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng import com.google.android.gms.maps.model.Marker +import com.google.maps.android.compose.CameraPositionState +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.MapProperties +import com.google.maps.android.compose.MapType +import com.google.maps.android.compose.MapUiSettings +import com.google.maps.android.compose.MarkerInfoWindowContent +import com.google.maps.android.compose.rememberCameraPositionState +import com.google.maps.android.compose.rememberUpdatedMarkerState private const val TAG = "ScrollingMapActivity" diff --git a/maps-app/src/main/java/com/google/maps/android/compose/MapsInLazyColumnActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/MapsInLazyColumnActivity.kt similarity index 96% rename from maps-app/src/main/java/com/google/maps/android/compose/MapsInLazyColumnActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/MapsInLazyColumnActivity.kt index 4ddd53aa2..047de716d 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/MapsInLazyColumnActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/MapsInLazyColumnActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import androidx.activity.ComponentActivity @@ -65,6 +65,13 @@ import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.IndoorBuilding import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.CameraPositionState +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.IndoorStateChangeListener +import com.google.maps.android.compose.MapEffect +import com.google.maps.android.compose.MapProperties +import com.google.maps.android.compose.MapsComposeExperimentalApi +import com.google.maps.android.compose.rememberCameraPositionState private data class CountryLocation(val name: String, val latLng: LatLng, val zoom: Float) diff --git a/maps-app/src/main/java/com/google/maps/android/compose/RecompositionActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/RecompositionActivity.kt similarity index 89% rename from maps-app/src/main/java/com/google/maps/android/compose/RecompositionActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/RecompositionActivity.kt index 5cbb3b67b..b39a02d22 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/RecompositionActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/RecompositionActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import android.util.Log @@ -34,7 +34,15 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import com.google.android.gms.maps.CameraUpdateFactory import com.google.android.gms.maps.model.Marker -import com.google.maps.android.compose.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.CameraPositionState +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.MapProperties +import com.google.maps.android.compose.MapType +import com.google.maps.android.compose.MapUiSettings +import com.google.maps.android.compose.Marker +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.rememberCameraPositionState +import com.google.maps.android.compose.rememberUpdatedMarkerState import kotlinx.coroutines.Job import kotlinx.coroutines.launch diff --git a/maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/ScaleBarActivity.kt similarity index 95% rename from maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/ScaleBarActivity.kt index 5ed9a8a4e..3883b0850 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/ScaleBarActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/ScaleBarActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import androidx.activity.ComponentActivity @@ -41,7 +41,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng -import com.google.maps.android.compose.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.rememberCameraPositionState import com.google.maps.android.compose.widgets.DarkGray import com.google.maps.android.compose.widgets.DisappearingScaleBar import com.google.maps.android.compose.widgets.ScaleBar diff --git a/maps-app/src/main/java/com/google/maps/android/compose/StreetViewActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/StreetViewActivity.kt similarity index 99% rename from maps-app/src/main/java/com/google/maps/android/compose/StreetViewActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/StreetViewActivity.kt index e57d1dbfd..63677612a 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/StreetViewActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/StreetViewActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import android.util.Log diff --git a/maps-app/src/main/java/com/google/maps/android/compose/TileOverlayActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/TileOverlayActivity.kt similarity index 95% rename from maps-app/src/main/java/com/google/maps/android/compose/TileOverlayActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/TileOverlayActivity.kt index d64d74825..5426c52d6 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/TileOverlayActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/TileOverlayActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.graphics.Bitmap import android.graphics.Canvas @@ -38,6 +38,9 @@ import androidx.compose.ui.unit.dp import androidx.core.graphics.createBitmap import com.google.android.gms.maps.model.Tile import com.google.android.gms.maps.model.TileProvider +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.TileOverlay +import com.google.maps.android.compose.rememberTileOverlayState import kotlinx.coroutines.delay import java.io.ByteArrayOutputStream diff --git a/maps-app/src/main/java/com/google/maps/android/compose/WmsTileOverlayActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/WmsTileOverlayActivity.kt similarity index 94% rename from maps-app/src/main/java/com/google/maps/android/compose/WmsTileOverlayActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/WmsTileOverlayActivity.kt index dc36b3d65..8d3d89084 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/WmsTileOverlayActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/WmsTileOverlayActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.os.Bundle import androidx.activity.ComponentActivity @@ -36,6 +36,10 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.GoogleMap +import com.google.maps.android.compose.MapProperties +import com.google.maps.android.compose.MapType +import com.google.maps.android.compose.rememberCameraPositionState import com.google.maps.android.compose.wms.WmsTileOverlay /** diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/AdvancedMarkersActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/AdvancedMarkersActivity.kt similarity index 99% rename from maps-app/src/main/java/com/google/maps/android/compose/markerexamples/AdvancedMarkersActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/AdvancedMarkersActivity.kt index 0a610dae1..717526ac8 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/AdvancedMarkersActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/AdvancedMarkersActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose.markerexamples +package com.google.maps.android.compose.demo.markerexamples import android.R.drawable.ic_menu_myplaces import android.annotation.SuppressLint diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/MarkerClusteringActivity.kt similarity index 98% rename from maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/MarkerClusteringActivity.kt index 1c68ec1e8..fd8916754 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/MarkerClusteringActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose.markerexamples +package com.google.maps.android.compose.demo.markerexamples import android.os.Bundle import android.util.Log @@ -73,10 +73,10 @@ import com.google.maps.android.compose.clustering.Clustering import com.google.maps.android.compose.clustering.ClusteringMarkerProperties import com.google.maps.android.compose.clustering.rememberClusterManager import com.google.maps.android.compose.clustering.rememberClusterRenderer +import com.google.maps.android.compose.demo.singapore +import com.google.maps.android.compose.demo.singapore2 import com.google.maps.android.compose.rememberCameraPositionState import com.google.maps.android.compose.rememberUpdatedMarkerState -import com.google.maps.android.compose.singapore -import com.google.maps.android.compose.singapore2 import kotlinx.coroutines.delay import kotlin.random.Random diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringRotationActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/MarkerClusteringRotationActivity.kt similarity index 99% rename from maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringRotationActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/MarkerClusteringRotationActivity.kt index 73d68e86f..d189a296e 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringRotationActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/MarkerClusteringRotationActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose.markerexamples +package com.google.maps.android.compose.demo.markerexamples import android.os.Bundle import androidx.activity.ComponentActivity @@ -61,8 +61,8 @@ import com.google.maps.android.compose.GoogleMap import com.google.maps.android.compose.MapsComposeExperimentalApi import com.google.maps.android.compose.clustering.Clustering import com.google.maps.android.compose.clustering.ClusteringMarkerProperties +import com.google.maps.android.compose.demo.singapore2 import com.google.maps.android.compose.rememberCameraPositionState -import com.google.maps.android.compose.singapore2 import kotlin.random.Random /** diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt similarity index 96% rename from maps-app/src/main/java/com/google/maps/android/compose/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt index ba2ba7f7d..19fb21a31 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/draggablemarkerscollectionwithpolygon/DraggableMarkersCollectionWithPolygonActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose.markerexamples.draggablemarkerscollectionwithpolygon +package com.google.maps.android.compose.demo.markerexamples.draggablemarkerscollectionwithpolygon import android.os.Bundle import androidx.activity.ComponentActivity @@ -35,9 +35,9 @@ import com.google.maps.android.compose.GoogleMap import com.google.maps.android.compose.Marker import com.google.maps.android.compose.MarkerState import com.google.maps.android.compose.Polygon -import com.google.maps.android.compose.defaultCameraPosition +import com.google.maps.android.compose.demo.defaultCameraPosition +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme import com.google.maps.android.compose.rememberCameraPositionState -import com.google.maps.android.compose.theme.MapsComposeSampleTheme /** * Data type representing a location. diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/markerdragevents/MarkerDragEventsActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/markerdragevents/MarkerDragEventsActivity.kt similarity index 94% rename from maps-app/src/main/java/com/google/maps/android/compose/markerexamples/markerdragevents/MarkerDragEventsActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/markerdragevents/MarkerDragEventsActivity.kt index 0f1b642e6..78a110b30 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/markerdragevents/MarkerDragEventsActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/markerdragevents/MarkerDragEventsActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose.markerexamples.markerdragevents +package com.google.maps.android.compose.demo.markerexamples.markerdragevents import android.os.Bundle import android.util.Log @@ -28,11 +28,11 @@ import androidx.compose.ui.Modifier import com.google.android.gms.maps.model.LatLng import com.google.maps.android.compose.GoogleMap import com.google.maps.android.compose.Marker -import com.google.maps.android.compose.defaultCameraPosition +import com.google.maps.android.compose.demo.defaultCameraPosition +import com.google.maps.android.compose.demo.singapore +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme import com.google.maps.android.compose.rememberCameraPositionState import com.google.maps.android.compose.rememberUpdatedMarkerState -import com.google.maps.android.compose.singapore -import com.google.maps.android.compose.theme.MapsComposeSampleTheme import kotlinx.coroutines.flow.dropWhile private val TAG = MarkerDragEventsActivity::class.simpleName diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/markerscollection/MarkersCollectionActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/markerscollection/MarkersCollectionActivity.kt similarity index 93% rename from maps-app/src/main/java/com/google/maps/android/compose/markerexamples/markerscollection/MarkersCollectionActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/markerscollection/MarkersCollectionActivity.kt index c601e3ce3..b2c530b73 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/markerscollection/MarkersCollectionActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/markerscollection/MarkersCollectionActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose.markerexamples.markerscollection +package com.google.maps.android.compose.demo.markerexamples.markerscollection import android.os.Bundle import androidx.activity.ComponentActivity @@ -28,10 +28,10 @@ import androidx.compose.ui.Modifier import com.google.android.gms.maps.model.LatLng import com.google.maps.android.compose.GoogleMap import com.google.maps.android.compose.MarkerState -import com.google.maps.android.compose.defaultCameraPosition -import com.google.maps.android.compose.markerexamples.updatingnodragmarkerwithdatamodel.Marker +import com.google.maps.android.compose.demo.defaultCameraPosition +import com.google.maps.android.compose.demo.markerexamples.updatingnodragmarkerwithdatamodel.Marker +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme import com.google.maps.android.compose.rememberCameraPositionState -import com.google.maps.android.compose.theme.MapsComposeSampleTheme /** * Simplistic app data model intended for persistent storage. diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/syncingdraggablemarkerwithdatamodel/SyncingDraggableMarkerWithDataModelActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/syncingdraggablemarkerwithdatamodel/SyncingDraggableMarkerWithDataModelActivity.kt similarity index 95% rename from maps-app/src/main/java/com/google/maps/android/compose/markerexamples/syncingdraggablemarkerwithdatamodel/SyncingDraggableMarkerWithDataModelActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/syncingdraggablemarkerwithdatamodel/SyncingDraggableMarkerWithDataModelActivity.kt index 8b9c060c5..eebadc949 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/syncingdraggablemarkerwithdatamodel/SyncingDraggableMarkerWithDataModelActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/syncingdraggablemarkerwithdatamodel/SyncingDraggableMarkerWithDataModelActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose.markerexamples.syncingdraggablemarkerwithdatamodel +package com.google.maps.android.compose.demo.markerexamples.syncingdraggablemarkerwithdatamodel import android.os.Bundle import androidx.activity.ComponentActivity @@ -33,10 +33,10 @@ import com.google.android.gms.maps.model.LatLng import com.google.maps.android.compose.GoogleMap import com.google.maps.android.compose.Marker import com.google.maps.android.compose.MarkerState -import com.google.maps.android.compose.defaultCameraPosition +import com.google.maps.android.compose.demo.defaultCameraPosition +import com.google.maps.android.compose.demo.singapore +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme import com.google.maps.android.compose.rememberCameraPositionState -import com.google.maps.android.compose.singapore -import com.google.maps.android.compose.theme.MapsComposeSampleTheme /** * Simplistic app data model intended for persistent storage. diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/updatingnodragmarkerwithdatamodel/UpdatingNoDragMarkerWithDataModelActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/updatingnodragmarkerwithdatamodel/UpdatingNoDragMarkerWithDataModelActivity.kt similarity index 90% rename from maps-app/src/main/java/com/google/maps/android/compose/markerexamples/updatingnodragmarkerwithdatamodel/UpdatingNoDragMarkerWithDataModelActivity.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/updatingnodragmarkerwithdatamodel/UpdatingNoDragMarkerWithDataModelActivity.kt index d346c9201..ba837b975 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/updatingnodragmarkerwithdatamodel/UpdatingNoDragMarkerWithDataModelActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/markerexamples/updatingnodragmarkerwithdatamodel/UpdatingNoDragMarkerWithDataModelActivity.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose.markerexamples.updatingnodragmarkerwithdatamodel +package com.google.maps.android.compose.demo.markerexamples.updatingnodragmarkerwithdatamodel import android.os.Bundle import androidx.activity.ComponentActivity @@ -30,13 +30,13 @@ import androidx.lifecycle.lifecycleScope import com.google.android.gms.maps.model.LatLng import com.google.maps.android.compose.GoogleMap import com.google.maps.android.compose.Marker -import com.google.maps.android.compose.defaultCameraPosition +import com.google.maps.android.compose.demo.defaultCameraPosition +import com.google.maps.android.compose.demo.singapore +import com.google.maps.android.compose.demo.singapore2 +import com.google.maps.android.compose.demo.singapore3 +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme import com.google.maps.android.compose.rememberCameraPositionState import com.google.maps.android.compose.rememberUpdatedMarkerState -import com.google.maps.android.compose.singapore -import com.google.maps.android.compose.singapore2 -import com.google.maps.android.compose.singapore3 -import com.google.maps.android.compose.theme.MapsComposeSampleTheme import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlin.random.Random diff --git a/maps-app/src/main/java/com/google/maps/android/compose/theme/Theme.kt b/maps-app/src/main/java/com/google/maps/android/compose/demo/theme/Theme.kt similarity index 95% rename from maps-app/src/main/java/com/google/maps/android/compose/theme/Theme.kt rename to maps-app/src/main/java/com/google/maps/android/compose/demo/theme/Theme.kt index 8179e48e4..764394829 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/theme/Theme.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/demo/theme/Theme.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose.theme +package com.google.maps.android.compose.demo.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/maps-app/src/screenshotTest/AndroidManifest.xml b/maps-app/src/screenshotTest/AndroidManifest.xml index 43c44f092..f263fbe4c 100644 --- a/maps-app/src/screenshotTest/AndroidManifest.xml +++ b/maps-app/src/screenshotTest/AndroidManifest.xml @@ -16,7 +16,7 @@ --> diff --git a/maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt b/maps-app/src/screenshotTest/java/com/google/maps/android/compose/demo/ScaleBarTest.kt similarity index 92% rename from maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt rename to maps-app/src/screenshotTest/java/com/google/maps/android/compose/demo/ScaleBarTest.kt index 6320f3a72..93b664a1a 100644 --- a/maps-app/src/screenshotTest/java/com/google/maps/android/compose/ScaleBarTest.kt +++ b/maps-app/src/screenshotTest/java/com/google/maps/android/compose/demo/ScaleBarTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable @@ -25,7 +25,8 @@ import androidx.compose.ui.unit.dp import com.android.tools.screenshot.PreviewTest import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng -import com.google.maps.android.compose.theme.MapsComposeSampleTheme +import com.google.maps.android.compose.CameraPositionState +import com.google.maps.android.compose.demo.theme.MapsComposeSampleTheme import com.google.maps.android.compose.widgets.DisappearingScaleBar import com.google.maps.android.compose.widgets.ScaleBar diff --git a/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png b/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/demo/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png similarity index 100% rename from maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png rename to maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/demo/ScaleBarTestKt/PreviewDisappearingScaleBar_748aa731_0.png diff --git a/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewScaleBar_748aa731_0.png b/maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/demo/ScaleBarTestKt/PreviewScaleBar_748aa731_0.png similarity index 100% rename from maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/ScaleBarTestKt/PreviewScaleBar_748aa731_0.png rename to maps-app/src/screenshotTestDebug/reference/com/google/maps/android/compose/demo/ScaleBarTestKt/PreviewScaleBar_748aa731_0.png diff --git a/maps-app/src/test/java/com/google/maps/android/compose/BasicMapActivityTest.kt b/maps-app/src/test/java/com/google/maps/android/compose/demo/BasicMapActivityTest.kt similarity index 94% rename from maps-app/src/test/java/com/google/maps/android/compose/BasicMapActivityTest.kt rename to maps-app/src/test/java/com/google/maps/android/compose/demo/BasicMapActivityTest.kt index 5ebd76215..048a943c6 100644 --- a/maps-app/src/test/java/com/google/maps/android/compose/BasicMapActivityTest.kt +++ b/maps-app/src/test/java/com/google/maps/android/compose/demo/BasicMapActivityTest.kt @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import com.google.common.truth.Truth.assertThat +import com.google.maps.android.compose.ComposeMapColorScheme import org.junit.Test class BasicMapActivityTest { diff --git a/maps-app/src/test/java/com/google/maps/android/compose/ScaleBarRenderingTests.kt b/maps-app/src/test/java/com/google/maps/android/compose/demo/ScaleBarRenderingTests.kt similarity index 97% rename from maps-app/src/test/java/com/google/maps/android/compose/ScaleBarRenderingTests.kt rename to maps-app/src/test/java/com/google/maps/android/compose/demo/ScaleBarRenderingTests.kt index b560f79bc..e6d99bbec 100644 --- a/maps-app/src/test/java/com/google/maps/android/compose/ScaleBarRenderingTests.kt +++ b/maps-app/src/test/java/com/google/maps/android/compose/demo/ScaleBarRenderingTests.kt @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.maps.android.compose +package com.google.maps.android.compose.demo import android.graphics.Point import androidx.compose.foundation.background @@ -28,6 +28,7 @@ import androidx.compose.ui.unit.dp import com.google.android.gms.maps.Projection import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng +import com.google.maps.android.compose.CameraPositionState import com.google.maps.android.compose.widgets.ScaleBar import io.mockk.every import io.mockk.mockk