[MS 450] Merge Landscape Support epic with the main branch#719
Merged
alexandr-simprints merged 331 commits intoMay 15, 2024
Merged
Conversation
…erax_version-1.3.2 Bump androidx_camerax_version from 1.3.1 to 1.3.2
…ndroid.gms-play-services-location-21.2.0 Bump com.google.android.gms:play-services-location from 21.1.0 to 21.2.0
…on-1.9.23 Bump kotlin_version from 1.9.22 to 1.9.23
…n-1.14.0 Bump realm_version from 1.13.0 to 1.14.0
Fix missing module selection button
# Conflicts: # feature/dashboard/build.gradle.kts # feature/dashboard/src/main/java/com/simprints/feature/dashboard/main/sync/SyncViewModel.kt # feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoFragment.kt # feature/dashboard/src/main/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModel.kt # feature/dashboard/src/main/res/layout/fragment_sync_info.xml # feature/dashboard/src/test/java/com/simprints/feature/dashboard/main/sync/SyncViewModelTest.kt # feature/dashboard/src/test/java/com/simprints/feature/dashboard/settings/syncinfo/SyncInfoViewModelTest.kt # feature/dashboard/src/test/java/com/simprints/feature/dashboard/tools/di/FakeCoreModule.kt # feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/steps/Step.kt # infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/tasks/EventDownSyncTask.kt # infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/workers/EventDownSyncCountWorker.kt # infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/down/workers/EventDownSyncDownloaderWorker.kt # infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTask.kt # infra/event-sync/src/main/java/com/simprints/infra/eventsync/sync/up/workers/EventUpSyncUploaderWorker.kt # infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/workers/EventDownSyncCountWorkerTest.kt # infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/down/workers/EventDownSyncDownloaderWorkerTest.kt # infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/up/tasks/EventUpSyncTaskTest.kt # infra/event-sync/src/test/java/com/simprints/infra/eventsync/sync/up/workers/EventUpSyncUploaderWorkerTest.kt
…ions fix android.app.InvalidForegroundServiceTypeException in android 14
MS-259 Do not open serial entry when finishing NFC connection
…matched-templates
Add event version to top-level in ApiEvent request body
[MS-266] Refactor fingerprint progress bars
…matched-templates
…ity was killed and restored
…-Data-Set-GG-WLDS-Collection-Investigation Save & restore OrchestratorViewModel's data in case of Activity kill & restore
…nd restored multiple times without being visible
…-Data-Set-GG-WLDS-Collection-Investigation2 [MS-437] Prevent saving of empty VM data when Fragment is destroyed and restored multiple times without being visible
Bumps `firebase_crashlyticsPlugin_version` from 2.9.9 to 3.0.0. Updates `com.google.firebase:firebase-crashlytics-gradle` from 2.9.9 to 3.0.0 Updates `com.google.firebase.crashlytics` from 2.9.9 to 3.0.0 --- updated-dependencies: - dependency-name: com.google.firebase:firebase-crashlytics-gradle dependency-type: direct:production update-type: version-update:semver-major - dependency-name: com.google.firebase.crashlytics dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps `kotlin_coroutine_version` from 1.8.0 to 1.8.1. Updates `org.jetbrains.kotlinx:kotlinx-coroutines-android` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](Kotlin/kotlinx.coroutines@1.8.0...1.8.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-play-services` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](Kotlin/kotlinx.coroutines@1.8.0...1.8.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-test` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](Kotlin/kotlinx.coroutines@1.8.0...1.8.1) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-play-services dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [com.google.android.material:material](https://github.com/material-components/material-components-android) from 1.11.0 to 1.12.0. - [Release notes](https://github.com/material-components/material-components-android/releases) - [Commits](material-components/material-components-android@1.11.0...1.12.0) --- updated-dependencies: - dependency-name: com.google.android.material:material dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Merge/main/2024.1.0
…tine_version-1.8.1 Bump kotlin_coroutine_version from 1.8.0 to 1.8.1
…shlyticsPlugin_version-3.0.0 Bump firebase_crashlyticsPlugin_version from 2.9.9 to 3.0.0
Bumps [com.google.firebase:firebase-perf](https://github.com/firebase/firebase-android-sdk) from 20.5.2 to 21.0.0. - [Changelog](https://github.com/firebase/firebase-android-sdk/blob/master/docs/make_release_notes.py) - [Commits](https://github.com/firebase/firebase-android-sdk/commits) --- updated-dependencies: - dependency-name: com.google.firebase:firebase-perf dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ndroid.material-material-1.12.0 Bump com.google.android.material:material from 1.11.0 to 1.12.0
…irebase-firebase-perf-21.0.0 Bump com.google.firebase:firebase-perf from 20.5.2 to 21.0.0
…s the build due to circular dependencies
…rease Reverting `firebase_perf_version` from 21.0.0 to 20.5.2. 21.0.0 breaks the build due to circular dependencies
…2024 # Conflicts: # feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/ConsentFragment.kt # feature/dashboard/src/main/res/layout/fragment_sync_info.xml # feature/login/src/main/java/com/simprints/feature/login/screens/form/LoginFormViewModel.kt # feature/login/src/main/res/layout/fragment_login_form.xml # feature/matcher/src/main/java/com/simprints/matcher/screen/MatchFragment.kt # feature/matcher/src/test/java/com/simprints/matcher/screen/MatchViewModelTest.kt # feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorActivity.kt # feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorFragment.kt # feature/orchestrator/src/main/java/com/simprints/feature/orchestrator/OrchestratorViewModel.kt # fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/controller/ConnectScannerControllerFragment.kt
alexandr-simprints
requested review from
BurningAXE,
alex-vt,
luhmirin-s,
meladRaouf and
ybourgery
|
alexandr-simprints
deleted the
MS-450-merge-ms-2-epic-with-main-branch-may-2024
branch
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
5 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.
Even though this is a big PR, I would like you to pay attention to the conflicted files and put the main focus on reviewing them. A couple of bugs were identified already, and they will be addressed shortly and move to their own tickets.
Conflicted files after merging with
mainbranch: