Feat: Merge sample apps and update dependencies#109
Merged
jacob-derynk merged 1 commit intoOct 1, 2025
Merged
Conversation
This commit removes the legacy Android-only `sample` module and integrates its functionality into the `sample-cmp` (Compose Multiplatform) module. The `sample-cmp` module now offers a chooser screen to navigate between the Compose Multiplatform and the legacy Android Views implementations of the Donut component. Key changes: - Deleted the `sample` module and all its contents. - Moved relevant resources (layouts, drawables, strings, colors, styles) and Kotlin utility files from `sample` to `sample-cmp/src/androidMain`. - Created `ViewsSampleActivity.kt` in `sample-cmp` to host the legacy Views sample. - Created `CmpSampleActivity.kt` in `sample-cmp` to host the Compose Multiplatform sample. - Updated `MainActivity.kt` in `sample-cmp` to display a chooser screen for selecting between the CMP and Views samples. - Updated `AndroidManifest.xml` in `sample-cmp` to declare the new activities and set `MainActivity` as the launcher. - Updated `sample-cmp/build.gradle.kts` to include dependencies for the legacy Views implementation (appcompat, constraintlayout, material) and the main library. - Updated `settings.gradle.kts` to remove the `sample` module. - Updated `README.md` to reflect the consolidated sample app structure. - Updated `Dangerfile` to point to the new location of ktlint reports for the sample app. - Updated Android Gradle Plugin version in `gradle/libs.versions.toml`.
matejsemancik
approved these changes
Oct 1, 2025
jacob-derynk
merged commit Oct 1, 2025
095a746
into
feature/cmp-library-migrate-compose-to-cmp
1 check passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🔄 Merge Sample Modules: Combine Legacy Views into Compose Multiplatform Sample
📋 Summary
This PR combines the project's sample applications by removing the standalone legacy Android-only
samplemodule and integrating its functionality into the existingsample-cmp(Compose Multiplatform) module. The unified sample app now provides Android users with a choice between modern Compose Multiplatform and legacy Android Views implementations through an intuitive chooser interface. IOS part behavior is unchanged.🔧 Changes Made
Module Structure
sample/module (legacy Android-only)sample-cmp/module (now supports both implementations)New Architecture
MainActivity: Chooser screen allowing users to select between implementationsCmpSampleActivity: Compose Multiplatform implementation showcaseViewsSampleActivity: Legacy Android Views implementation showcaseResource Migration
sampletosample-cmp/src/androidMainDependencies & Configuration
sample-cmp/build.gradle.ktsto include legacy Views dependenciessamplemodule fromsettings.gradle.ktsAndroidManifest.xmlwith proper activity declarations and themestools:contextreferences in layout filesDocumentation & CI
README.mdto reflect new unified structureDangerfilefor correct ktlint reporting paths