This repository has been archived by the owner on Jun 20, 2023. It is now read-only.
Translation Sync To Dev #154
Merged
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
Change-Id: Ic0905f66e03544c549ee6bf0edde3707c528215c
* Implement submission done fragment (#20) * Added submission done fragment (currently dangling in nav graph) * fixed leftover javadoc * Moved QR code scan and registration fragment to submission package (#21) * Dependency Updates and Gradle Fixes (#34) * Bump up Gradle to 4.0.0 / 6.1.1 * Bump up NDK * Bump Up SQLite * adapt circle config * Fix #23: Typo in onboarding screen (#31) Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Submission UI Additions (#25) * Moved camera permission check to dispatcher fragment * Added illustrations for test result screen * Updated result fragment to match new design * Added constraints to status card * Integrated submission result positive other warning fragment in ui flow * Added submission done fragment to nav graph Signed-off-by: Kolya Opahle <k.opahle@sap.com> * Added ability to dialog helper to create dialog without negative button * Switched from AlertDialog.Builder to DIalogHelper * Enable diagnosis key upload to backend (#35) * Moved camera permission check to dispatcher fragment * Added illustrations for test result screen * Updated result fragment to match new design * Added constraints to status card * Integrated submission result positive other warning fragment in ui flow * add TAN fetching to the key submission transaction * remove unneeded function * Fix log message for fetching TAN * Added submission done fragment to nav graph Signed-off-by: Kolya Opahle <k.opahle@sap.com> * Added ability to dialog helper to create dialog without negative button * Switched from AlertDialog.Builder to DIalogHelper * use actual TAN (authCode) for key submission set the TAN in the corresponding header field fixes #8 * request permission to retrieve diagnosis keys * permission needs to be requested again after dialog has been presented to the users * trigger transaction to retrieve TAN and upload keys Co-authored-by: Kolya Opahle <k.opahle@sap.com> * Removed ExposureNotificationIntentService, the functionality is handled by NotificationHelper (#40) * Fixing tele tan registration (#45) * Fixed teleTAN based device registration Signed-off-by: Kolya Opahle <k.opahle@sap.com> * allowed excluded tan chars for testing Signed-off-by: Kolya Opahle <k.opahle@sap.com> * Revert "allowed excluded tan chars for testing" This reverts commit 253ede4. * Release/0.5.5 (#48) * Release/0.5.5 * Hotfix for resetting Gradle Version (internal pipeline confirmation) (#52) * Gradle Reset to 0.5.4 (#53) * Release/0.5.5 (#48) * Hotfix for resetting Gradle Version (internal pipeline confirmation) (#52) * Minify and Shrink Disabled (#56) * Release/0.5.5 * Gradle Reset to 0.5.4 (#53) * Release/0.5.5 (#48) * Hotfix for resetting Gradle Version (internal pipeline confirmation) (#52) * Disable minify / shrink * Dont obfuscate * 0.5.6 * Update known issues and fixing typo in readme (#44) * added strings wip to known issues * updated readme Co-authored-by: Muschko <marc.muschko@sap.com> * Updated strings, introduced more details on app-information screens (#88) * updated strings for risk card and risk card details; plural strings are todo when finalized * updated more strings on main / details * added comments * added strings for information about, information technical hotline; changed technical hotline layout * removed hotline test icon * fixed build issues * Cleanup pull_request_template.md (#54) * Update pull_request_template.md * Removed Link to Contribution Guidelines (added by Github on the right hand side, anyhow) * Removed Link to issue #41 from title example (this has been linked quite a lot...) * 0.5.6 * Fix typo Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com> Co-authored-by: marcmuschko <marc.muschko@sap.com> * Add Support for lower case characters in the teleTAN screen (#66) * added support for lower case input in teleTan fragment Signed-off-by: Kolya Opahle <k.opahle@sap.com> * Removed notice of case insensitivity from temporary strings.xml Signed-off-by: Kolya Opahle <k.opahle@sap.com> Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com> * Correct typos in architecture overview (#67) Co-authored-by: marcmuschko <marc.muschko@sap.com> * Bluetooth & connection card (#97) * introduced settings navigation helper * added connection and bluetooth stati to main and tracing settings * moved strings * removed unnecessary backgroundTint Co-authored-by: marcmuschko <marc.muschko@sap.com> * Fix typo in class documentation (#71) * 0.5.6 * fix typo Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: marcmuschko <marc.muschko@sap.com> * spelling fixes (#87) * 0.5.6 * spelling fixes Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: klemens <ka7@github.com> Co-authored-by: marcmuschko <marc.muschko@sap.com> * Moves creation of notification channel to app startup (#32) Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Tracing start/stop fix due to missing handling inside tracing (#99) Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Switch the DB Password to use the KeyStore MasterKey (#98) Signed-off-by: d067928 <jakob.moeller@sap.com> * Shared prefs ktx shorthand (#38) * closes #33 * Add Commit Flag to ensure synchronous consistent Updates to Disk Signed-off-by: d067928 <jakob.moeller@sap.com> * Add persistance of timestamp and whether user is allowed to submit keys (#74) * Store timestamp of receiving registration token * also reset this timestamp when deleting the registration token * use correct timestamp for display of test time * replace tracing activation time by test result reception time * rename TAN request to match context * set isAllowedToSubmitDiagnosisKeys properly Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * set "enabled" for include_settings_switch_row in notifications settings, fixes wrong binding and removed clickable rows (#101) Co-authored-by: marcmuschko <marc.muschko@sap.com> * fix #82 (#94) * fix #82 Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Add ShareHelper (#85) * Add ShareHelper * Use ShareHelper in MainShareFragment * Replace the current exposure status with a positive result card when test result is positive (#79) * Made submission status card style more cross device friendly Signed-off-by: Kolya Opahle <k.opahle@sap.com> * Added the positive result submission status card Signed-off-by: Kolya Opahle <k.opahle@sap.com> * lint fix * Updated main fragment documentation * Added icon for sharing risk status Signed-off-by: Kolya Opahle <k.opahle@sap.com> * Updated positive result home screen card text and icons Signed-off-by: Kolya Opahle <k.opahle@sap.com> * Added loading indicator to test result fragment (#100) Co-authored-by: marcmuschko <marc.muschko@sap.com> Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com> * Adjusted onboarding flow, adjusted contribution file, small fixes in settings (#106) * changed permission dialog logic for onboarding tracing fragment and onboarding notification fragment * adjusted contributing file * added settings notification handling to display value in settings overview * fixed app crash during bluetooth settings navigation * corrected wrong value from view model in tracing settings text * Submission Contact Fragment & StepView Custom View (#102) * - submission-contact fragment added - StepEntry custom view added to unify various step entry views - SimpleStepEntry as a simple implementation of a StepEntry with title and text added * - apply naming conventions for ids - use CallHelper to trigger a call - access views using kotlinx.android.synthetic Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com> * Notifications when risk value has changed between low and high. (#76) * Notifications when risk value has changed between low and high. * Notifications when risk value has changed between low and high. Fixed wildcard imports. * Fixed formatting, ktlint issue. * app foreground/background checking. Notifications are not sent when app is in background * update comments * initialize foreground flag as false(valid for background threads before ui starts) * comments * included UNDERTERMINED as a low, for initialisation * fixed icon * fixed tests Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * added onboarding strings (#109) * disable colored output for ktlint (#105) Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Limit number of keys to be uploaded to server (#107) * limit the number of keys to be uploaded to 14 * fix spaces Co-authored-by: Jakob Möller <jakob.moeller@sap.com> * Fix white space, informal language and spelling of Docker in Readme (#78) * 0.5.6 * Fix spelling gonna and docker * Add missing "to" Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: marcmuschko <marc.muschko@sap.com> * Update build.gradle (#111) * Build.Gradle Conflict Resolving (0.8.0) (#112) * Minify and proguard fix (#113) Commented out -dontobfuscate * Circle progress bar (#96) * circle progress bar impl * ktlint format * added new ui * added circle to contact tracing without binding * added binding and final icon * added circle progress to risk card * added comments * changed default value for disableText * adapted views order to designs * removed testing value Co-authored-by: Kirill <kirill.sergeev@sap.com> * TracingStatusHelper unit test (#114) * TracingStatusHelper unit test * removed duplicate * Prevent screenshot of the app for all activities (#108) * Prevent screenshot of the app for all activities * fix ktlint * code smell fix Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com> * Feature: Bluetooth callback (#115) * bluetooth callback added * bound bluetooth callback to the ui Co-authored-by: Kirill <kirill.sergeev@sap.com> * Added main overview page to main menu (#120) * added overview fragment baseline * main overview draft version completed with build fixes * checked some final strings again * Fixed screen orientation to portrait (#121) * added restriction to portrait and reversed portrait orientation only * suppress SourceLockedOrientationActivity lint error * changed local config that a high match can be generated via QR code, integrated it with the UI (#125) * Feature: Translation preparation (#126) * renamed old strings and reordered * app information strings translation tags * updated translation tags for long texts * added translation comments to strings * fixed naming error * removed empty comment Co-authored-by: Muschko <marc.muschko@sap.com> Co-authored-by: Kolya Opahle <k.opahle@sap.com> Co-authored-by: Jakob Möller <jakob.moeller@sap.com> Co-authored-by: Michael Keppler <bananeweizen@gmx.de> Co-authored-by: Thomas Klingbeil <64434904+tklingbeil@users.noreply.github.com> Co-authored-by: Hee Tatt Ooi <64406309+HeeTattSap@users.noreply.github.com> Co-authored-by: Muschko <marc.muschko@sap.com> Co-authored-by: Thomas Kowark <thomas.kowark@sap.com> Co-authored-by: Robert Scheck <robert-scheck@users.noreply.github.com> Co-authored-by: Volkmar Vogel <volkmar@vogel.app> Co-authored-by: ka7 <ka7@la-evento.com> Co-authored-by: klemens <ka7@github.com> Co-authored-by: Tim Brüggenthies <tim.brueggenthies@outlook.de> Co-authored-by: mseele <mseele@gmail.com> Co-authored-by: Janik Steegmüller <janik.steegmueller@gmail.com> Co-authored-by: Fabian-K <fabian.kajzar@sap.com> Co-authored-by: Hee Tatt Ooi <hee.tatt.ooi@sap.com> Co-authored-by: Matthias Küch <mail@matthias-kuech.de> Co-authored-by: oemerb <66002424+oemerb@users.noreply.github.com> Co-authored-by: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com> Co-authored-by: Kirill <kirill.sergeev@sap.com> Co-authored-by: Philipp Woessner <64482866+pwoessner@users.noreply.github.com>
Change-Id: Ic0905f66e03544c549ee6bf0edde3707c528215c
Signed-off-by: d067928 <jakob.moeller@sap.com>
…based # Conflicts: # .circleci/config.yml # Corona-Warn-App/build.gradle # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/submission/SubmissionService.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/SubmitDiagnosisKeysTransaction.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionQRCodeScanFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionResultPositiveOtherWarningFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CircleProgress.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DialogHelper.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ProtoFormatConverterExtensions.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/SecurityHelper.kt # Corona-Warn-App/src/main/res/drawable/ic_risk_card_saved_days_14.xml # Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml # Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml # Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml # Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml # Corona-Warn-App/src/main/res/layout/include_risk_card.xml # Corona-Warn-App/src/main/res/layout/include_row.xml # Corona-Warn-App/src/main/res/layout/include_test_result_step.xml # Corona-Warn-App/src/main/res/layout/include_tracing_status_card.xml # Corona-Warn-App/src/main/res/values/attrs.xml # Corona-Warn-App/src/main/res/values/strings.xml # Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/TracingStatusHelperTest.kt
Translation Rebase
Change-Id: Idf52dece137fdc6e314ed752a8ef6b79b08683b0
harambasicluka
previously approved these changes
Jun 4, 2020
harambasicluka
previously approved these changes
Jun 4, 2020
Change-Id: I63afce1d7307c912b034728d8b78d437974f818d
|
Kudos, SonarCloud Quality Gate passed!
|
harambasicluka
approved these changes
Jun 7, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.