diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt
index f45b0645da3b03bb1a4e11d4ad1d39c68e2b10fe..4ca35e356fb61fa2a1d7999d0f3822b3cf6e6709 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt
@@ -30,7 +30,6 @@ class TracingViewModel : ViewModel() {
val TAG: String? = TracingViewModel::class.simpleName
}
- // TODO: comments for variables
// Values from RiskLevelRepository
val riskLevel: LiveData<Int> = RiskLevelRepository.riskLevelScore
val riskLevelScoreLastSuccessfulCalculated =
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ExternalActionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ExternalActionHelper.kt
index a44561a30670eb08f7ee4de1218ce5f7c20fd8da..390b8a9896856dd9650429b7de04afd85e6bfb8a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ExternalActionHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ExternalActionHelper.kt
@@ -110,7 +110,6 @@ object ExternalActionHelper {
*
* @param context
*/
- // todo has to be tested on API23 on a device
fun toNotifications(context: Context) {
try {
val intent = Intent()
@@ -155,5 +154,4 @@ object ExternalActionHelper {
)
}
}
- // todo navigate storage settings
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt
index c826961f01ce619e5081157b8670546bfe38b9a5..0d5ec67d285f3ea996339ad439fdaffa81c78f89 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt
@@ -138,7 +138,8 @@ fun formatStringAsHTMLFromLocal(path: String): Spanned {
}
/**
- * TODO
+ * Formats divider color depending on resource value
+ * Returns colorHairline as default
*
* @param color
* @return
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
index 9914230ef3223636adf1da25d48341860007b7a9..10004cdffc7d5f33c48d8507ab3e35a78c40de9c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
@@ -146,7 +146,6 @@ fun formatSubmissionStatusCardContentStatusTextVisible(uiState: DeviceUIState?):
fun formatSubmissionStatusCardContentIcon(uiState: DeviceUIState?): Drawable? {
val appContext = CoronaWarnApplication.getAppContext()
- // TODO Replace with real drawables when design is finished
return when (uiState) {
DeviceUIState.PAIRED_NO_RESULT -> appContext.getDrawable(R.drawable.ic_main_illustration_pending)
DeviceUIState.PAIRED_POSITIVE,
diff --git a/Corona-Warn-App/src/main/res/layout/include_main_overview_row.xml b/Corona-Warn-App/src/main/res/layout/include_main_overview_row.xml
index ee264f22662075c8d7791b0935986f153ddb15a8..15111ca19797157ffe7303882ca0aca139422a09 100644
--- a/Corona-Warn-App/src/main/res/layout/include_main_overview_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_main_overview_row.xml
@@ -46,8 +46,7 @@
android:tint="@{FormatterHelper.formatColorIcon(iconTint)}"
android:visibility="@{FormatterHelper.formatVisibilityIcon(icon)}"
app:layout_constraintBottom_toBottomOf="@+id/main_overview_row_subtitle"
- app:layout_constraintEnd_toStartOf="@+id/main_overview_row_subtitle"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/guideline_icon"
app:layout_constraintTop_toTopOf="@+id/main_overview_row_subtitle" />
<TextView
@@ -65,7 +64,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- app:layout_constraintGuide_begin="@dimen/guideline_body_title" />
+ app:layout_constraintGuide_begin="@dimen/guideline_start_divider" />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintGuide_begin="@dimen/guideline_back" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/include_main_overview_segment.xml b/Corona-Warn-App/src/main/res/layout/include_main_overview_segment.xml
index c388fa4aa046972da5d6b691c1499c6f90c8698b..892bb42344cbf24717eca59bdff3286b55b828d1 100644
--- a/Corona-Warn-App/src/main/res/layout/include_main_overview_segment.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_main_overview_segment.xml
@@ -23,7 +23,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/main_overview_segment"
- style="@style/row"
+ style="@style/rowSettings"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:focusable="true"
@@ -38,15 +38,15 @@
android:importantForAccessibility="no"
android:src="@{icon}"
app:layout_constraintBottom_toBottomOf="@id/main_overview_segment_subtitle"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/guideline_icon"
app:layout_constraintTop_toTopOf="@id/main_overview_segment_subtitle" />
<TextView
android:id="@+id/main_overview_segment_subtitle"
style="@style/headline5"
- android:accessibilityHeading="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:accessibilityHeading="true"
android:focusable="false"
android:text="@{subtitle}"
app:layout_constraintEnd_toEndOf="parent"
@@ -71,7 +71,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- app:layout_constraintGuide_begin="@dimen/guideline_body_title" />
+ app:layout_constraintGuide_begin="@dimen/guideline_start_divider" />
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintGuide_begin="@dimen/guideline_back" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml b/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
index fccd1ae0cfa564be9eca60de3f7930cff29e1adb..2d6f57a24961f13e48530f1cd51232507d94742b 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
@@ -13,7 +13,7 @@
<variable
name="tracingViewModel"
type="de.rki.coronawarnapp.ui.viewmodel.TracingViewModel" />
- <!-- todo include 'x' button? -->
+
<variable
name="showDetails"
type="Boolean" />
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index df41ed736eaabf4edade39cbce8c70fe7999a828..620420c5cd3f66c4e24155d6ffb14a3ab9a49bbc 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -499,7 +499,7 @@
<string name="settings_reset_button_negative">"Abbrechen"</string>
<!-- XACT: main (overview) - illustraction description, explanation image -->
<string name="settings_reset_illustration_description">"Eine Hand hält ein Smartphone, auf dem das Zurücksetzen der Anwendung symbolisiert wird."</string>
- <!-- XHED: settings(reset) - dialog headline todo finalize texts for dialog headline, body, cancel button, confirm button-->
+ <!-- XHED: settings(reset) - dialog headline -->
<string name="settings_reset_dialog_headline">"Anwendung zurücksetzen"</string>
<!-- XTXT: settings(reset) - dialog content -->
<string name="settings_reset_dialog_body">"Sie werden nicht mehr über Ihre Risiko-Begegnungen informiert und können andere Nutzerinnen und Nutzer nicht mehr warnen. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
@@ -550,7 +550,7 @@
<string name="information_contact_subtitle_phone">"Technische Hotline:"</string>
<!-- XLNK: Button / hyperlink to phone call for technical contact and hotline information page -->
<string name="information_contact_button_phone">"+49 800 7540001"</string>
- <!-- XBUT: CAUTION - ONLY UPDATE THE NUMBER IF NEEDED, ONLY NUMBERS AND NO SPECIAL CHARACTERS EXCEPT "+" and "space" ALLOWED IN THIS FIELD; todo phone number to be called replace in english file -->
+ <!-- XBUT: CAUTION - ONLY UPDATE THE NUMBER IF NEEDED, ONLY NUMBERS AND NO SPECIAL CHARACTERS EXCEPT "+" and "space" ALLOWED IN THIS FIELD; -->
<string name="information_contact_phone_call_number">"+49 800 7540001"</string>
<!-- XTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_phone">"Unser Kundenservice ist für Sie da."</string>
diff --git a/Corona-Warn-App/src/main/res/values-en/strings.xml b/Corona-Warn-App/src/main/res/values-en/strings.xml
index 214d160ca438cfcb0f7d658557300c298c064cf1..3d463b091ca815a6b20fc2b3067c923ab39b191b 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -185,7 +185,7 @@
<!-- XTXT: main, explains faq on card -->
<string name="main_about_body">"Here you can find answers to frequently asked questions about the Corona-Warn-App. You will be forwarded to an external website."</string>
<!-- NOTR -->
- <string name="main_about_link">"https://www.bundesregierung.de/corona-warn-app-faq"</string>
+ <string name="main_about_link">"http://www.bundesregierung.de/corona-warn-app-faq-englisch"</string>
<!-- XACT: Opens external webpage -->
<string name="hint_external_webpage">"Here you can find answers to frequently asked questions about the Corona-Warn-App. You will be forwarded to an external website."</string>
@@ -499,7 +499,7 @@
<string name="settings_reset_button_negative">"Cancel"</string>
<!-- XACT: main (overview) - illustraction description, explanation image -->
<string name="settings_reset_illustration_description">"One person is holding a device displaying a symbol indicating that the app is being reset."</string>
- <!-- XHED: settings(reset) - dialog headline todo finalize texts for dialog headline, body, cancel button, confirm button-->
+ <!-- XHED: settings(reset) - dialog headline -->
<string name="settings_reset_dialog_headline">"Reset App"</string>
<!-- XTXT: settings(reset) - dialog content -->
<string name="settings_reset_dialog_body">"You will no longer be notified of your exposures and you will no longer be able to warn other users. This procedure cannot be undone."</string>
@@ -535,7 +535,7 @@
<!-- XHED: Page title for terms of use information page, also menu item / button text -->
<string name="information_terms_title">"Terms of Use"</string>
<!-- XHED: Page headline for terms of use information page -->
- <string name="information_terms_headline">"Inhalt"</string>
+ <string name="information_terms_headline">"Content"</string>
<!-- XACT: describes illustration -->
<string name="information_terms_illustration_description">"One person is holding a device with a lot of text on the screen. Next to the text is a tick, which is the symbol for accepting the terms of use."</string>
<!-- XTXT: Path to the full blown terms html, to translate it exchange "_de" to "_en" and provide the corresponding html file -->
@@ -550,7 +550,7 @@
<string name="information_contact_subtitle_phone">"Technical hotline:"</string>
<!-- XLNK: Button / hyperlink to phone call for technical contact and hotline information page -->
<string name="information_contact_button_phone">"+49 800 7540001"</string>
- <!-- XBUT: CAUTION - ONLY UPDATE THE NUMBER IF NEEDED, ONLY NUMBERS AND NO SPECIAL CHARACTERS EXCEPT "+" and "space" ALLOWED IN THIS FIELD; todo phone number to be called replace in english file -->
+ <!-- XBUT: CAUTION - ONLY UPDATE THE NUMBER IF NEEDED, ONLY NUMBERS AND NO SPECIAL CHARACTERS EXCEPT "+" and "space" ALLOWED IN THIS FIELD; -->
<string name="information_contact_phone_call_number">"+49 800 7540001"</string>
<!-- XTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_phone">"Our customer service is here to help."</string>
diff --git a/Corona-Warn-App/src/main/res/values-night/colors.xml b/Corona-Warn-App/src/main/res/values-night/colors.xml
index d3440a0be4c68276e3f5028a33a7b7a4142f0135..2c817a97a12ff797869888da9e575d85f767dd63 100644
--- a/Corona-Warn-App/src/main/res/values-night/colors.xml
+++ b/Corona-Warn-App/src/main/res/values-night/colors.xml
@@ -42,4 +42,14 @@
<!-- Misc -->
<color name="colorTransparent">#00FFFFFF</color>
+ <!-- Tan Input -->
+ <color name="tanInputBackground">#1A17191A</color>
+
+ <!-- Stable Colors -->
+ <color name="colorStableDark">#000000</color>
+ <color name="colorStableMedium">#4D17191A</color>
+ <color name="colorStableLight">#FFFFFF</color>
+ <color name="colorStableHairlineLight">#33FFFFFF</color>
+ <color name="colorStableHairlineDark">#3317191A</color>
+
</resources>
diff --git a/Corona-Warn-App/src/main/res/values/colors.xml b/Corona-Warn-App/src/main/res/values/colors.xml
index afd984e0fc6493ede543e6d436393a13435bf960..d7364070c058a4664fe3e663e9c31171cafe8381 100644
--- a/Corona-Warn-App/src/main/res/values/colors.xml
+++ b/Corona-Warn-App/src/main/res/values/colors.xml
@@ -23,7 +23,6 @@
<color name="colorTextSemanticGreen">#2E854B</color>
<color name="colorTextSemanticNeutral">#5D6E80</color>
<color name="colorTextTint">#007FAD</color>
- <color name="colorTextLight">#FFFFFF</color>
<!-- Semantic -->
<color name="colorSemanticHighRisk">#C00F2D</color>
@@ -42,7 +41,7 @@
<!-- Misc -->
<color name="colorTransparent">#00FFFFFF</color>
- <!-- Todo move to night colors? -->
+
<!-- Tan Input -->
<color name="tanInputBackground">#1A17191A</color>
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 8ed0ea77191b19e599d55d817c0049d117846031..c446648351adcd6d296fb9ee6a206f2dc7662209 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -568,7 +568,7 @@
<string name="settings_reset_button_negative">Abbrechen</string>
<!-- XACT: main (overview) - illustraction description, explanation image -->
<string name="settings_reset_illustration_description">Eine Hand hält ein Smartphone, auf dem das Zurücksetzen der Anwendung symbolisiert wird.</string>
- <!-- XHED: settings(reset) - dialog headline todo finalize texts for dialog headline, body, cancel button, confirm button-->
+ <!-- XHED: settings(reset) - dialog headline -->
<string name="settings_reset_dialog_headline">Anwendung zurücksetzen</string>
<!-- XTXT: settings(reset) - dialog content -->
<string name="settings_reset_dialog_body">Sie werden nicht mehr über Ihre Risiko-Begegnungen informiert und können andere Nutzerinnen und Nutzer nicht mehr warnen. Dieser Vorgang kann nicht rückgängig gemacht werden.</string>
@@ -619,7 +619,7 @@
<string name="information_contact_subtitle_phone">Technische Hotline:</string>
<!-- XLNK: Button / hyperlink to phone call for technical contact and hotline information page -->
<string name="information_contact_button_phone">+49 (0)800 7540001</string>
- <!-- XBUT: CAUTION - ONLY UPDATE THE NUMBER IF NEEDED, ONLY NUMBERS AND NO SPECIAL CHARACTERS EXCEPT "+" and "space" ALLOWED IN THIS FIELD; todo phone number to be called replace in english file -->
+ <!-- XBUT: CAUTION - ONLY UPDATE THE NUMBER IF NEEDED, ONLY NUMBERS AND NO SPECIAL CHARACTERS EXCEPT "+" and "space" ALLOWED IN THIS FIELD; -->
<string name="information_contact_phone_call_number">+49 800 7540001</string>
<!-- XTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_phone">Unser Kundenservice ist für Sie da.</string>
diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml
index 835c0340cf3abbd8aea51895b1647b21c174344b..c479ad198c7a8c138f7673166268a3c89b4eb1e9 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -108,6 +108,7 @@
</style>
<style name="rowOverview" parent="@style/row">
+ <item name="android:paddingStart">@dimen/match_constraint</item>
<item name="android:paddingTop">@dimen/spacing_tiny</item>
<item name="android:paddingBottom">@dimen/spacing_tiny</item>
</style>
@@ -266,7 +267,7 @@
###################################### -->
<style name="registrationQRCodeScanBody">
<item name="android:textAlignment">center</item>
- <item name="android:textColor">@color/colorTextLight</item>
+ <item name="android:textColor">@color/colorStableLight</item>
<item name="android:textSize">14sp</item>
</style>
</resources>