# Conflicts:
#	Corona-Warn-App/src/main/res/values-de/legal_strings.xml
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values/legal_strings.xml

Change-Id: Ieadbf121c1838bbb893ed91f4f87e03d46407a04

* update legal datadonation strings

* removing dot from title

Co-authored-by: I502720 <axel.herbstreith@sap.com>

* data privacy update

* fixing typo in de

* data donation to share data

* share data feature to data sharing feature

* data privacy - donate to share

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

Co-authored-by: I502720 <axel.herbstreith@sap.com>

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* Show active tracing history in low risk detail screen

* Move isGone logic from xml layout into state object and add tests

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* show link for German only
simplify layout and fragment

* remove view model

* add unit tests

* use AppCompatImageView

* comments

Co-authored-by: Mohamed Metwalli <Mohamed.Metwalli@sap.com>

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* data privacy update

* fixing typo in de

* data donation to share data

* share data feature to data sharing feature

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Create SurveyUrlProvider.kt and SurveyHighRiskUrlProviderTest.kt

* Call SurveyUrlProvider in Surveys.kt

* Adapt SurveyUrlProvider.kt so that now the otp has to be passed directly

* Add @Reusable annotation to SurveyUrlProvider.kt

Co-authored-by: BMItter <46747780+BMItter@users.noreply.github.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* Updated settings icons

* added navigation to analytics more information fragment

* linting

* fixed max length

* removed unneeded marging at botton of scrollview

* added dimens

* aligned fonts

* added row click

* updated doc

* aligned fonts

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* refactor for better preview
change font

* clean up

* resolve includes to simplify layout

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* Clean up log spam for CancellationExceptions.

* Clean up log spam for CancellationExceptions.

* Adjust log level to `error` for flows that completed due to an exception being bubbled up.

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* Set offset to zero instead of 90 when 'fakeCorrectDeviceTime' is active

* Add a description of the 'Fake correct device time' feature in the Test Menu

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

* added settings entry

* added basic layout for the settings screen

* updated fragment layout and navigation

* linting

* adapted settings entry icon

* linting

* fixed strings and nav_graph

* added analytics disabled icon for settings entry

* fixed settings entry icon and text

* added layout to new navgraph items

* updated the layout and addressed the comments

* removed blank lines from layout

* survey error code preparation

* added dialog stuff

* removed numbers

* Created internal state flow

* Map error codes

* Refactoring

* Open url in browser and auto close

* Added awesome loading spinner (might be improved later by spinner button)

* merge conflict (double entry)

* adjust survey to use surveyConfig Link & Param (DEMO Survey)

* adjusted strings to newest version

* replaced Umfrage with Befragung

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* Fixed condition that displays dialog.

* Changed strings to represent what they actually mean.

* Interchanged title and body string for consent given.

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Instead of faking the "disable-device-time-check" which won't work for SafetyNet,
we now fake the time offset to be within the acceptable delta.

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Update survey consent screen according to the new designs

* Refactor bullet points list in survey_consent_fragment.xml

* Create Survey Consent Detail Screen

* ktlint & detekt clean

* Fix ktlint issues

* Fix linting issues regarding translations in legal_strings.xml

Co-authored-by: BMItter <46747780+BMItter@users.noreply.github.com>
Co-authored-by: BMItter <berndus@gmx.de>

* Strings for onboarding

* view and image

* View attached to onboarding process

* Complete onboarding screen

* Tests and screen capture

* Accessibility

* Reformatting

* New screen with additional info

* New screen with routing

* Small change in legal text

* Missing sentence in description of contact journal (EXPOSUREAPP-4941) #2309

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Change statistics overview header to 'bundesweite' Statistiken (EXPOSUREAPP-4975) #2305

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Show normal behavior box when tracing disabled (EXPOSUREAPP-4768) #2306

use toolbar

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Delta onboarding analytics screen

* Delta onboarding navigation

* Strings fix

* Comment for Kolya

* Layout, nav grav and fragments refactoring

* Merge conflicts and formatting

* Add missing tools:layout and format the file

Co-authored-by: janetback <68653277+janetback@users.noreply.github.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: Chilja Gossow <49635654+chiljamgossow@users.noreply.github.com>
Co-authored-by: Mohamed Metwalli <Mohamed.Metwalli@sap.com>

First and last item of statistic cards was not reachable on some devices (EXPOSUREAPP-4945) (closes #2259) #2260

* Fix issue that first and last item of statistics recycler view was not reachable on some devices (#2259)

* Disable PagerSnapHelper for devices with at least 600dp width (EXPOSUREAPP-4945) (closes #2259)

* Fix issue that first and last item of statistics recycler view was not reachable on some devices (#2259)

* Disable PagerSnapHelper for devices with at least 600dp width (EXPOSUREAPP-4945) (closes #2259)

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* Fixed circle progress text and color.

* Changed default color for setter.

* Added circle progress color in the rest of the app.

* Changed progress color when bluetooth or location is disabled.

* Adjusted progress color one last time.

* Fix lint issues.

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: Mohamed Metwalli <Mohamed.Metwalli@sap.com>

* Update LocalData implementation

* Fix BackgroundWorkScheduler comment

* Fix typo in SubmissionData

* Skip risk calculation if user got a positive test result

* Skip deadman notifications if user got a positive test result

* Refresh diagnosis keys when test is removed

* Update tests

* End of life behaviour UI (EXPOSUREAPP-4641) (#2230)

* Added strings.

* Added card.

* Added missing layout from main.

* Removed duplicate layout and switched to different home icon.

* Added test registration date.

* Prepare UI for End of Life behaviour

* Removed unused import.

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Juraj Kusnier <jurajkusnier@gmail.com>

* Add ReactivateRiskCheckDialog

* Fix comment

* Update strings

* Not nullable date in SubmissionDone

* Fix merge

* Fix instrumentation test crash

* Increased font size in card layout.

* Keep DiagnosisKeyBackgroundWork alive

Co-authored-by: Alex Paulescu <alex.paulescu@gmail.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

use toolbar

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

* remove redundant district prefixes

proposal from UA after reviewing the rather technical names of the initial version

* Adjust unit test to new districts JSON.

* add missing spaces to district names

* remove trailing whitespace from distict names

Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>

* Switched protobuf container to builder to allow for instantiation
added UserMetadataDonor

Signed-off-by: Kolya Opahle <k.opahle@sap.com>

* Update UserMetadataDonor.kt

Add additional test menu options to test requirement validation.

* Implemented survey mapping

* Disable/enable high risk survey by app config

* ktlint & detekt

* Create available surveys lazily, run flow on coroutine context

* Use default params

* Added test für survey mapping

* adjusted TracingDetailsItemProviderTest

* Reworked survey config mapping

* Map safety net requirements

* lint, detekt

* Adjusted tests

* Changed url string to http url