Skip to content

chore: export all demo activities and group the activities in main screen #768

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

Merged
dkhawk merged 8 commits into from
Sep 17, 2025
Merged

chore: export all demo activities and group the activities in main screen #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f2be1b2
chore(demo): Export all sample activities
dkhawk Sep 16, 2025
efb996f
feat(maps-app): Group demo activities on main screen
dkhawk Sep 16, 2025
5eb468f
feat(maps-app): Use Material 3 Scaffold
dkhawk Sep 16, 2025
db43b9c
refactor(demo): Extract strings and refactor list composables
dkhawk Sep 16, 2025
e01e2ed
chore(demo): Add copyright header to Demo.kt and clean up unused import
dkhawk Sep 16, 2025
2d3d25d
docs: Improve comment for expanded group state in DemoList
dkhawk Sep 16, 2025
c1b2d6a
Merge branch 'main' into chore/export-activities
dkhawk Sep 16, 2025
ac6980b
Merge branch 'main' into chore/export-activities
dkhawk Sep 16, 2025
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
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ kotlinxCoroutines = "1.10.2"
leakcanaryAndroid = "2.14"
mapsecrets = "2.0.1"
mapsktx = "5.2.0"
material3 = "1.3.2"
org-jacoco-core = "0.8.13"
screenshot = "0.0.1-alpha11"
constraintlayout = "2.2.1"
Expand All @@ -29,6 +30,7 @@ androidx-compose-activity = { module = "androidx.activity:activity-compose", ver
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
androidx-compose-material = { module = "androidx.compose.material:material" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
androidx-compose-ui-preview-tooling = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
Expand Down
2 changes: 1 addition & 1 deletion maps-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ dependencies {
implementation(libs.androidx.compose.activity)
implementation(libs.androidx.compose.foundation)
implementation(libs.androidx.compose.material)
implementation(libs.androidx.compose.material3)
implementation(libs.kotlin)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.androidx.compose.ui.preview.tooling)
Expand All @@ -71,7 +72,6 @@ dependencies {
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.leakcanary.android)


androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.test.core)
androidTestImplementation(libs.androidx.test.rules)
Expand Down
44 changes: 27 additions & 17 deletions maps-app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,57 +39,67 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<!--
All activities in this sample are exported. This is for demonstration
purposes, to make it easy to launch each sample activity directly.

In a real-world application, you should carefully consider which activities
to export. In most cases, only the main launcher activity should be exported.
Exporting an activity means that any other app on the device can launch it.
-->

<activity
android:name=".BasicMapActivity"
android:exported="false" />
android:exported="true" />
<activity
android:name=".markerexamples.AdvancedMarkersActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".MapInColumnActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".MapsInLazyColumnActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".markerexamples.MarkerClusteringActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".LocationTrackingActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".ScaleBarActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".StreetViewActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".CustomControlsActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".AccessibilityActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".RecompositionActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".FragmentDemoActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".markerexamples.markerdragevents.MarkerDragEventsActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".markerexamples.markerscollection.MarkersCollectionActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".markerexamples.syncingdraggablemarkerwithdatamodel.SyncingDraggableMarkerWithDataModelActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".markerexamples.updatingnodragmarkerwithdatamodel.UpdatingNoDragMarkerWithDataModelActivity"
android:exported="false"/>
android:exported="true"/>
<activity
android:name=".markerexamples.draggablemarkerscollectionwithpolygon.DraggableMarkersCollectionWithPolygonActivity"
android:exported="false"/>
android:exported="true"/>

<!-- Used by createComponentActivity() for unit testing -->
<activity android:name="androidx.activity.ComponentActivity" />
Expand Down
Loading