-
Notifications
You must be signed in to change notification settings - Fork 295
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
Update the Material 3 theme in the demo app #2211
Merged
santosh-pingle
merged 9 commits into
google:master
from
santosh-pingle:sp/issue-2188-m3-theme
Oct 10, 2023
Merged
Update the Material 3 theme in the demo app #2211
santosh-pingle
merged 9 commits into
google:master
from
santosh-pingle:sp/issue-2188-m3-theme
Oct 10, 2023
Conversation
This file contains 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
jingtang10
approved these changes
Sep 27, 2023
jingtang10
approved these changes
Oct 4, 2023
santosh-pingle
changed the title
Update material3 theme in demo app.
Update the Material 3 theme in the demo app
Oct 10, 2023
santosh-pingle
pushed a commit
to santosh-pingle/android-fhir
that referenced
this pull request
Oct 18, 2023
* Update material3 theme. * Support m3 night mode. * Address review comments. * Address review comments. * Change the color order. --------- Co-authored-by: Santosh Pingle <[email protected]>
jingtang10
added a commit
that referenced
this pull request
Oct 19, 2023
* Update material3 theme. * Support m3 night mode. * Address review comments. * Address review comments. * Apply m3 default style to survey button. * Use default typography. * Fix broken dependabot.yaml syntax (fixes #2195) (#2234) * Moves commons to Hapi 6.8, removes caffeine and forces guava-android (#2241) * Bump up common library version to 0.1.0-alpha05 (#2243) * Update material3 theme in demo app. (#2211) * Update material3 theme. * Support m3 night mode. * Address review comments. * Address review comments. * Change the color order. --------- Co-authored-by: Santosh Pingle <[email protected]> * Fix broken dependabot.yaml syntax again (re. #2195) (#2242) * SdkSuppress FhirSyncWorkerBenchmark oneTimeSync_50patients (re. #2235) (#2236) * Allow custom package server in Knowledge Manager (#2244) * Allow custom package server in Knowledge Manager * Fix downloader test * Fix workflow library * Update knowledge/src/main/java/com/google/android/fhir/knowledge/files/NpmFileManager.kt Co-authored-by: aditya-07 <[email protected]> * Fix build * Add try catch for package download --------- Co-authored-by: aditya-07 <[email protected]> * Bump up the version of knowledge manager (#2258) * Migrates engine to HAPI 6.8 while forcing Workflow to stay on 6.0 (#2245) * Migrates engine to HAPI 6.8 while forcing Workflow to stay on 6.0 * comment * Migrates Workflow to CQL Evaluator 3.0.0-PRE9-SNAPSHOT (#2259) * Updates dependencies * Updates test cases * Removes moxy and antlr from dependencies. * Migrates the workflow to the new API * Migrates workflow testing to the new API * Fixes workflow benchmark module * Fixes workflow benchmark module * Adds contents.txt file to all test repos so it can be loaded on androidTest * Normalizes path before trying to open files * Uses contents.txt when running tests on Android * Spotless * Updating Json and XML comparisons to pass when elements are just out of order. * Ignores testANCDT17 for now * LaunchContext for initialExpression (#2025) * Use launchContext for initialExpression * Test ResourceMapper * Fix test * Fix launchContexts for demo app when editing patient * spotlessApply * WIP * Revert "WIP" This reverts commit d2d53a2. * spotlessApply * Fix test * Refactor validateLaunchContextExtension * Remove QuestionnaireLaunchContextSet enum class * Rename vars and functions * Add code comment for MoreResourceTypes.kt * Unit testing * Fix post-merge-conflict * spotlessApply * Address review * spotlessApply * Revert un-intended changes * Fix failing checks * Remove check of must contain 2 sub-extensions * Update Kdoc * Revert * validate launch context when using populate public API * Renames patientId param to subject to: (#2263) 1. clarify the need to send a full reference "type/id" instead of just the ID 2. match the evaluator's name * Follow up PR of 2025 (#2265) * Use launchContext for initialExpression * Test ResourceMapper * Fix test * Fix launchContexts for demo app when editing patient * spotlessApply * WIP * Revert "WIP" This reverts commit d2d53a2. * spotlessApply * Fix test * Refactor validateLaunchContextExtension * Remove QuestionnaireLaunchContextSet enum class * Rename vars and functions * Add code comment for MoreResourceTypes.kt * Unit testing * Fix post-merge-conflict * spotlessApply * Address review * spotlessApply * Revert un-intended changes * Fix failing checks * Remove check of must contain 2 sub-extensions * Update Kdoc * Revert * validate launch context when using populate public API * Address Jing's Review - #2025 (comment) - #2025 (comment) * Bump com.squareup:kotlinpoet from 1.12.0 to 1.14.2 (#2255) Bumps [com.squareup:kotlinpoet](https://github.com/square/kotlinpoet) from 1.12.0 to 1.14.2. - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](square/kotlinpoet@1.12.0...1.14.2) --- updated-dependencies: - dependency-name: com.squareup:kotlinpoet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jing Tang <[email protected]> * Bump androidx.build.gradle.gcpbuildcache (#2266) Bumps androidx.build.gradle.gcpbuildcache from 1.0.0-beta01 to 1.0.0-beta05. --- updated-dependencies: - dependency-name: androidx.build.gradle.gcpbuildcache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Omar Ismail <[email protected]> * Bump com.spotify.ruler:ruler-gradle-plugin from 1.2.1 to 1.4.0 (#2253) Bumps [com.spotify.ruler:ruler-gradle-plugin](https://github.com/spotify/ruler) from 1.2.1 to 1.4.0. - [Release notes](https://github.com/spotify/ruler/releases) - [Changelog](https://github.com/spotify/ruler/blob/main/changelog.md) - [Commits](spotify/ruler@v1.2.1...v1.4.0) --- updated-dependencies: - dependency-name: com.spotify.ruler:ruler-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.diffplug.spotless:spotless-plugin-gradle from 6.21.0 to 6.22.0 (#2252) Bumps [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.21.0 to 6.22.0. - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](diffplug/spotless@gradle/6.21.0...gradle/6.22.0) --- updated-dependencies: - dependency-name: com.diffplug.spotless:spotless-plugin-gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/checkout from 3 to 4 (#2248) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jing Tang <[email protected]> * Update dependencies in engine colab (#2268) * Update dependencies in engine colab * update datacapture * Bump styfle/cancel-workflow-action from 0.7.0 to 0.12.0 (#2250) Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.7.0 to 0.12.0. - [Release notes](https://github.com/styfle/cancel-workflow-action/releases) - [Commits](styfle/cancel-workflow-action@0.7.0...0.12.0) --- updated-dependencies: - dependency-name: styfle/cancel-workflow-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/upload-artifact from 2 to 3 (#2249) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update the version of resource after updates are downloaded from the server (#2272) * Update the version of resource after updates are downloaded from the server * Review changes: Added tests and refactored code * Review comments updates --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Santosh Pingle <[email protected]> Co-authored-by: Michael Vorburger ⛑️ <[email protected]> Co-authored-by: Vitor Pamplona <[email protected]> Co-authored-by: Jing Tang <[email protected]> Co-authored-by: aditya-07 <[email protected]> Co-authored-by: aditya-07 <[email protected]> Co-authored-by: Fikri Milano <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Omar Ismail <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).
Fixes
Description
#2188
In the context of the demo app reskinning, we are now extending support for the Material Design 3 (M3) theme in the demo app. This pull request (PR) primarily involves transitioning from the Material Design 2 (M2) theme to the Material Design 3 theme. Additionally, we are updating the M3 theme-based color schemes to align with the primary color. If necessary, the color palette can be further adjusted without affecting the existing implementation.
Alternative(s) considered
Have you considered any alternatives? And if so, why have you chosen the approach in this PR?
Type
Choose one: Feature
Screenshots (if applicable)
Checklist
./gradlew spotlessApply
and./gradlew spotlessCheck
to check my code follows the style guide of this project../gradlew check
and./gradlew connectedCheck
to test my changes locally.