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.

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

Add activity embedding snippets. #472

Merged
merged 52 commits into from
Mar 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
cb5f6c5
Created activity_main.xml for activity embedding snippets.
JonEckenrode Mar 14, 2025
433dd0f
Added contents of activity_main.xml.
JonEckenrode Mar 14, 2025
54dc670
Update build.gradle.kts with dependencies for activity embedding snip…
JonEckenrode Mar 14, 2025
443df89
Update libs.versions.toml with libraries for activity embedding.
JonEckenrode Mar 14, 2025
bf205b1
Update libs.versions.toml with names for androidx-window, androidx-wi…
JonEckenrode Mar 14, 2025
d6ebf05
Update libs.versions.toml with names for androidx-window, androidx-wi…
JonEckenrode Mar 14, 2025
aa12646
Update libs.versions.toml with appcompat library.
JonEckenrode Mar 14, 2025
bb6bd77
Update build.gradle.kts removed libs.material.
JonEckenrode Mar 14, 2025
4c9750c
Update libs.versions.toml added androidx.constraintlayout library.
JonEckenrode Mar 14, 2025
798f380
Update libs.versions.toml
JonEckenrode Mar 14, 2025
136410f
Update libs.versions.toml
JonEckenrode Mar 14, 2025
6f20f36
Update libs.versions.toml
JonEckenrode Mar 14, 2025
13d7a03
Update libs.versions.toml
JonEckenrode Mar 14, 2025
33cd098
Update libs.versions.toml
JonEckenrode Mar 14, 2025
1dd1fbd
Update libs.versions.toml
JonEckenrode Mar 14, 2025
034935e
Update libs.versions.toml
JonEckenrode Mar 14, 2025
ae4cd36
Update build.gradle.kts
JonEckenrode Mar 15, 2025
4779971
Update activity_main.xml
JonEckenrode Mar 15, 2025
dcc267a
Update libs.versions.toml
JonEckenrode Mar 17, 2025
b54beca
Add files via upload
JonEckenrode Mar 18, 2025
583cdce
Apply Spotless
JonEckenrode Mar 18, 2025
0090228
Add files via upload
JonEckenrode Mar 18, 2025
4be04ab
Add activity embedding snippet files.
JonEckenrode Mar 18, 2025
887ae05
Apply Spotless
JonEckenrode Mar 18, 2025
85c20a7
Add activity embedding snippet files.
JonEckenrode Mar 18, 2025
455e814
Apply Spotless
JonEckenrode Mar 18, 2025
f477466
Add activity embedding snippet files.
JonEckenrode Mar 18, 2025
d84beb4
Apply Spotless
JonEckenrode Mar 18, 2025
a5f2fd5
Update colors.xml
JonEckenrode Mar 18, 2025
c844aea
Create main_split_config.xml
JonEckenrode Mar 18, 2025
61d1fb4
Add files via upload
JonEckenrode Mar 18, 2025
4ca2ae4
Merge branch 'main' into JonEckenrode-patch-2
JonEckenrode Mar 18, 2025
dbf6caf
Update libs.versions.toml to minSdk = "24"
JonEckenrode Mar 19, 2025
6b0271c
Add files via upload
JonEckenrode Mar 19, 2025
d541404
Update colors.xml with comment for color used by activity embedding s…
JonEckenrode Mar 19, 2025
e7bfcdb
Update AndroidManifest.xml with initialization provider.
JonEckenrode Mar 19, 2025
b0dae45
Update AndroidManifest.xml removed comment to fix parsing error.
JonEckenrode Mar 19, 2025
8abbf00
Update AndroidManifest.xml
JonEckenrode Mar 19, 2025
926761c
Update AndroidManifest.xml
JonEckenrode Mar 19, 2025
56ad034
Update AndroidManifest.xml removed comment.
JonEckenrode Mar 19, 2025
1d3ff66
Update AndroidManifest.xml
JonEckenrode Mar 19, 2025
5d0d2b8
Update AndroidManifest.xml
JonEckenrode Mar 19, 2025
c80847d
Update AndroidManifest.xml
JonEckenrode Mar 19, 2025
dc0fb94
Update AndroidManifest.xml
JonEckenrode Mar 19, 2025
23ad664
Merge branch 'main' into JonEckenrode-patch-2
JonEckenrode Mar 19, 2025
77b07ec
Add files via upload
JonEckenrode Mar 19, 2025
ef916dc
Update libs.versions.toml restored minSdk to 21.
JonEckenrode Mar 20, 2025
98f7a68
Added @RequiresApi to enable SDK 24 features.
JonEckenrode Mar 20, 2025
7812bfe
Apply Spotless
JonEckenrode Mar 20, 2025
39fd083
Update AndroidManifest.xml with ${applicationid}
JonEckenrode Mar 20, 2025
ac60261
Update AndroidManifest.xml removed ${applicationId}
JonEckenrode Mar 20, 2025
5c2aac4
Merge branch 'main' into JonEckenrode-patch-2
JonEckenrode Mar 24, 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
16 changes: 12 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ androidx-activity-compose = "1.10.0"
androidx-appcompat = "1.7.0"
androidx-compose-bom = "2025.02.00"
androidx-compose-ui-test = "1.7.0-alpha08"
androidx-constraintlayout = "2.2.0"
androidx-constraintlayout = "2.2.1"
androidx-constraintlayout-compose = "1.1.0"
androidx-coordinator-layout = "1.2.0"
androidx-corektx = "1.16.0-beta01"
Expand All @@ -18,10 +18,14 @@ androidx-lifecycle-compose = "2.8.7"
androidx-lifecycle-runtime-compose = "2.8.7"
androidx-navigation = "2.8.7"
androidx-paging = "3.3.6"
androidx-startup-runtime = "1.2.0"
androidx-test = "1.6.1"
androidx-test-espresso = "3.6.1"
androidx-window = "1.4.0-beta02"
androidx-window = "1.4.0-rc01"
androidx-window-core = "1.4.0-beta02"
androidx-window-java = "1.3.0"
androidxHiltNavigationCompose = "1.2.0"
appcompat = "1.7.0"
coil = "2.7.0"
# @keep
compileSdk = "35"
Expand Down Expand Up @@ -90,7 +94,7 @@ androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" }
androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" }
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
androidx-constraintlayout = {module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" }
androidx-coordinator-layout = { module = "androidx.coordinatorlayout:coordinatorlayout", version.ref = "androidx-coordinator-layout" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
Expand All @@ -116,6 +120,7 @@ androidx-protolayout = { module = "androidx.wear.protolayout:protolayout", versi
androidx-protolayout-expression = { module = "androidx.wear.protolayout:protolayout-expression", version.ref = "protolayout" }
androidx-protolayout-material = { module = "androidx.wear.protolayout:protolayout-material", version.ref = "protolayout" }
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
androidx-startup-runtime = {module = "androidx.startup:startup-runtime", version.ref = "androidx-startup-runtime" }
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
androidx-test-runner = "androidx.test:runner:1.6.2"
Expand All @@ -126,8 +131,11 @@ androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version
androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles" }
androidx-wear = { module = "androidx.wear:wear", version.ref = "wear" }
androidx-wear-tooling-preview = { module = "androidx.wear:wear-tooling-preview", version.ref = "wearToolingPreview" }
androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" }
androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window-core" }
androidx-window-java = {module = "androidx.window:window-java", version.ref = "androidx-window-java" }
androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.0"
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "wearComposeFoundation" }
compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
Expand Down
5 changes: 5 additions & 0 deletions misc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@ dependencies {
implementation(libs.kotlinx.serialization.json)
ksp(libs.hilt.compiler)

implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.lifecycle.runtime)
implementation(libs.androidx.window)
implementation(libs.androidx.startup.runtime)
implementation(libs.androidx.window.java)
implementation(libs.appcompat)
testImplementation(libs.junit)
androidTestImplementation(libs.junit)
androidTestImplementation(libs.androidx.test.core)
Expand Down
13 changes: 12 additions & 1 deletion misc/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<provider
android:name="androidx.startup.InitializationProvider"
android:authorities="com.example.snippets.androidx-startup"
android:exported="false">
<meta-data
android:name="com.example.snippets.ActivityEmbeddingKotlinSnippets.SplitInitializer"
android:value="androidx.startup" />
<meta-data
android:name="com.example.snippets.ActivityEmbeddingJavaSnippets.SplitInitializer"
android:value="androidx.startup" />
</provider>
</application>

</manifest>
</manifest>
Loading