From 7206805f4c3f77778c977bf4805131c43d695300 Mon Sep 17 00:00:00 2001
From: marcmuschko <marc.muschko@sap.com>
Date: Mon, 8 Jun 2020 18:59:12 +0200
Subject: [PATCH] Small illustration fixes, settings adjustment, onboarding
exception (#288)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* settings icon tracing resized, missing grey color added
* fixed dark mode / light mode illustrations
* fixed small issue in strings
* OnBoardingTracingFragment: catch exceptions also for asyncIsEnabled() (#282)
Executing `InternalExposureNotificationClient.asyncIsEnabled()` may also result in an exception of `com.google.android.gms.common.api.ApiException` if connection to GMS isn't possible. Not catching this exception results in fatal crash.
```
2020-06-08 16:33:29.693 20904-20904/de.rki.coronawarnapp E/AndroidRuntime: FATAL EXCEPTION: main
Process: de.rki.coronawarnapp, PID: 20904
com.google.android.gms.common.api.ApiException: 17: API: Nearby.EXPOSURE_NOTIFICATION_API is not available on this device. Connection failed with: ConnectionResult{statusCode=UNKNOWN_ERROR_CODE(39507), resolution=null, message=null}
at com.google.android.gms.common.internal.ApiExceptionUtil.fromStatus(com.google.android.gms:play-services-base@@17.3.0:4)
at com.google.android.gms.common.api.internal.ApiExceptionMapper.getException(com.google.android.gms:play-services-base@@17.3.0:2)
at com.google.android.gms.common.api.internal.zah.zaa(com.google.android.gms:play-services-base@@17.3.0:18)
at com.google.android.gms.common.api.internal.GoogleApiManager$zaa.zaa(com.google.android.gms:play-services-base@@17.3.0:211)
at com.google.android.gms.common.api.internal.GoogleApiManager$zaa.zaa(com.google.android.gms:play-services-base@@17.3.0:217)
at com.google.android.gms.common.api.internal.GoogleApiManager$zaa.zaa(com.google.android.gms:play-services-base@@17.3.0:115)
at com.google.android.gms.common.api.internal.GoogleApiManager$zaa.onConnectionFailed(com.google.android.gms:play-services-base@@17.3.0:79)
at com.google.android.gms.common.internal.zag.onConnectionFailed(com.google.android.gms:play-services-base@@17.3.0:2)
at com.google.android.gms.common.internal.BaseGmsClient$zzf.zza(com.google.android.gms:play-services-basement@@17.3.0:6)
at com.google.android.gms.common.internal.BaseGmsClient$zza.zza(com.google.android.gms:play-services-basement@@17.3.0:25)
at com.google.android.gms.common.internal.BaseGmsClient$zzc.zzc(com.google.android.gms:play-services-basement@@17.3.0:11)
at com.google.android.gms.common.internal.BaseGmsClient$zzb.handleMessage(com.google.android.gms:play-services-basement@@17.3.0:49)
at android.os.Handler.dispatchMessage(Handler.java:106)
at com.google.android.gms.internal.common.zzi.dispatchMessage(com.google.android.gms:play-services-basement@@17.3.0:8)
at android.os.Looper.loop(Looper.java:223)
at android.os.HandlerThread.run(HandlerThread.java:67)
```
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: marcmuschko <marc.muschko@sap.com>
* build fixes in tests
Co-authored-by: lenke182 <jan_lenke@freenet.de>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
.../onboarding/OnboardingTracingFragment.kt | 16 +-
.../util/formatter/FormatterSettingsHelper.kt | 8 +-
...bmission_illustration_tan_hotline_card.xml | 160 ++++++------------
.../ic_settings_tracing_active_small.xml | 28 +++
.../ic_settings_tracing_inactive_small.xml | 28 +++
..._submission_illustration_tan_code_card.xml | 118 ++++++-------
.../res/layout/fragment_main_overview.xml | 13 +-
.../layout/include_information_details.xml | 2 +-
.../main/res/layout/include_setting_row.xml | 1 -
.../src/main/res/values-de/strings.xml | 6 +-
.../src/main/res/values-en/strings.xml | 8 +-
.../src/main/res/values/strings.xml | 4 +-
.../src/main/res/values/styles.xml | 1 -
.../http/WebRequestBuilderTest.kt | 5 +-
.../transaction/RiskLevelTransactionTest.kt | 1 -
.../submission/SubmissionTanViewModelTest.kt | 26 +--
...atorTest.kt => VerificationServiceTest.kt} | 0
.../rki/coronawarnapp/util/TanHelperTest.kt | 11 +-
.../util/formatter/FormatterHelperTest.kt | 30 ++--
.../formatter/FormatterSettingsHelperTest.kt | 5 -
20 files changed, 211 insertions(+), 260 deletions(-)
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_active_small.xml
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive_small.xml
rename Corona-Warn-App/src/test/java/de/rki/coronawarnapp/update/{VersionComparatorTest.kt => VerificationServiceTest.kt} (100%)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt
index 3ff6a0f5d..a8335464d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt
@@ -111,18 +111,18 @@ class OnboardingTracingFragment : BaseFragment(),
private fun resetTracing() {
// Reset tracing state in onboarding
lifecycleScope.launch {
- if (InternalExposureNotificationClient.asyncIsEnabled()) {
- try {
+ try {
+ if (InternalExposureNotificationClient.asyncIsEnabled()) {
InternalExposureNotificationClient.asyncStop()
// Reset initial activation timestamp
LocalData.initialTracingActivationTimestamp(0L)
- } catch (exception: Exception) {
- exception.report(
- ExceptionCategory.EXPOSURENOTIFICATION,
- OnboardingTracingFragment.TAG,
- null
- )
}
+ } catch (exception: Exception) {
+ exception.report(
+ ExceptionCategory.EXPOSURENOTIFICATION,
+ OnboardingTracingFragment.TAG,
+ null
+ )
}
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt
index 1c936b039..c37cd7004 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt
@@ -230,7 +230,7 @@ fun formatSettingsTracingIconColor(tracing: Boolean, bluetooth: Boolean, connect
val appContext = CoronaWarnApplication.getAppContext()
return when (tracingStatusHelper(tracing, bluetooth, connection)) {
TracingStatusHelper.CONNECTION, TracingStatusHelper.BLUETOOTH ->
- appContext.getColor(R.color.colorTextSemanticRed)
+ appContext.getColor(R.color.colorTextPrimary3)
TracingStatusHelper.TRACING_ACTIVE ->
appContext.getColor(R.color.colorAccentTintIcon)
TracingStatusHelper.TRACING_INACTIVE ->
@@ -257,10 +257,10 @@ fun formatSettingsTracingIcon(
TracingStatusHelper.CONNECTION,
TracingStatusHelper.BLUETOOTH,
TracingStatusHelper.TRACING_ACTIVE ->
- appContext.getDrawable(R.drawable.ic_settings_tracing_active)
+ appContext.getDrawable(R.drawable.ic_settings_tracing_active_small)
TracingStatusHelper.TRACING_INACTIVE ->
- appContext.getDrawable(R.drawable.ic_settings_tracing_inactive)
- else -> appContext.getDrawable(R.drawable.ic_settings_tracing_inactive)
+ appContext.getDrawable(R.drawable.ic_settings_tracing_inactive_small)
+ else -> appContext.getDrawable(R.drawable.ic_settings_tracing_inactive_small)
}
}
diff --git a/Corona-Warn-App/src/main/res/drawable-night/ic_submission_illustration_tan_hotline_card.xml b/Corona-Warn-App/src/main/res/drawable-night/ic_submission_illustration_tan_hotline_card.xml
index 39c3cb3ba..5109f8f9e 100644
--- a/Corona-Warn-App/src/main/res/drawable-night/ic_submission_illustration_tan_hotline_card.xml
+++ b/Corona-Warn-App/src/main/res/drawable-night/ic_submission_illustration_tan_hotline_card.xml
@@ -1,177 +1,115 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="100dp"
+ android:width="101dp"
android:height="104dp"
- android:viewportWidth="100"
+ android:viewportWidth="101"
android:viewportHeight="104">
<group>
<path
- android:pathData="M50.594,52.187L49.267,52.181L50.594,52.187Z"
- android:strokeWidth="1"
- android:fillColor="#FF395A"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <path
- android:pathData="M85.139,30.653C85.139,30.653 81.369,31.639 75.974,33.112L75.974,33.112C75.861,44.244 75.527,55.355 75.687,66.476L75.687,66.476C75.762,71.819 76.145,77.131 76.388,82.46L76.388,82.46L76.373,82.462C76.694,84.926 76.888,87.39 76.562,89.88L76.562,89.88L84.283,88.945C84.283,88.945 89.592,90.285 90.919,87.604L90.919,87.604C92.867,83.669 86.274,76.879 86.274,76.879L86.274,76.879C86.274,76.879 90.573,78.98 92.247,76.879L92.247,76.879C95.757,72.474 87.602,63.473 87.602,63.473L87.602,63.473C87.602,63.473 93.669,64.824 94.889,61.303L94.889,61.303C96.229,57.44 84.669,47.946 84.669,47.946L84.669,47.946L84.567,41.021L85.492,40.894C85.492,40.894 96.58,36.946 95.809,32.284L95.809,32.284C95.475,30.257 93.415,29.684 91.193,29.684L91.193,29.684C88.303,29.685 85.139,30.653 85.139,30.653L85.139,30.653Z"
+ android:pathData="M85.639,30.653C85.639,30.653 81.869,31.639 76.474,33.112L76.474,33.112C76.361,44.244 76.027,55.355 76.187,66.476L76.187,66.476C76.262,71.819 76.645,77.131 76.888,82.46L76.888,82.46L76.873,82.462C77.194,84.926 77.388,87.39 77.062,89.88L77.062,89.88L84.783,88.945C84.783,88.945 90.092,90.285 91.419,87.604L91.419,87.604C93.367,83.669 86.774,76.879 86.774,76.879L86.774,76.879C86.774,76.879 91.073,78.98 92.747,76.879L92.747,76.879C96.257,72.474 88.102,63.473 88.102,63.473L88.102,63.473C88.102,63.473 94.169,64.824 95.389,61.303L95.389,61.303C96.729,57.44 85.169,47.946 85.169,47.946L85.169,47.946L85.067,41.021L85.992,40.894C85.992,40.894 97.08,36.946 96.309,32.284L96.309,32.284C95.975,30.257 93.915,29.684 91.693,29.684L91.693,29.684C88.803,29.685 85.639,30.653 85.639,30.653L85.639,30.653Z"
android:strokeWidth="1"
android:fillColor="#F7B994"
- android:fillType="evenOdd"
+ android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M44.641,13.936C41.27,13.936 38.529,16.688 38.512,20.096L38.512,20.096L38.144,103.872C38.131,107.29 40.862,110.071 44.246,110.086L44.246,110.086L77.502,110.236C80.887,110.249 83.643,107.49 83.659,104.07L83.659,104.07L84.018,20.295C84.028,16.879 81.298,14.1 77.915,14.084L77.915,14.084L44.659,13.936C44.653,13.936 44.646,13.936 44.641,13.936L44.641,13.936Z"
+ android:pathData="M45.141,13.936C41.77,13.936 39.029,16.688 39.012,20.096L39.012,20.096L38.644,103.872C38.631,107.29 41.362,110.071 44.746,110.086L44.746,110.086L78.002,110.236C81.387,110.249 84.143,107.49 84.159,104.07L84.159,104.07L84.518,20.295C84.528,16.879 81.798,14.1 78.415,14.084L78.415,14.084L45.159,13.936C45.153,13.936 45.146,13.936 45.141,13.936L45.141,13.936Z"
android:strokeWidth="1"
android:fillColor="#1E1E1F"
- android:fillType="evenOdd"
+ android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M44.245,110.087L77.502,110.236C80.887,110.249 83.643,107.489 83.659,104.07L84.018,20.296C84.029,16.879 81.298,14.1 77.915,14.084L44.658,13.935C41.279,13.927 38.529,16.683 38.513,20.096L38.145,103.872C38.131,107.29 40.862,110.072 44.245,110.087Z"
+ android:pathData="M44.745,110.087L78.002,110.236C81.387,110.249 84.143,107.489 84.159,104.07L84.518,20.296C84.529,16.879 81.798,14.1 78.415,14.084L45.158,13.935C41.779,13.927 39.029,16.683 39.013,20.096L38.645,103.872C38.631,107.29 41.362,110.072 44.745,110.087Z"
android:strokeWidth="2.32617"
android:fillColor="#00000000"
android:strokeColor="#4A4A4A"
android:fillType="evenOdd"/>
- </group>
- <group>
- </group>
- <group>
<path
- android:pathData="M77.807,72.39C77.807,75.677 75.169,78.343 71.914,78.343C68.66,78.343 66.022,75.677 66.022,72.39C66.022,69.103 68.66,66.438 71.914,66.438C75.169,66.438 77.807,69.103 77.807,72.39"
+ android:pathData="M33.374,30.811C32.79,30.907 32.118,36.973 31.831,39.859L31.831,39.859C31.744,40.729 31.397,41.542 30.847,42.217L30.847,42.217C27.375,46.48 25.598,57.507 25.598,57.507L25.598,57.507C23.483,67.696 22.346,67.169 21.069,72.857L21.069,72.857C19.819,78.432 19.428,80.019 19.078,82.912L19.078,82.912C17.888,92.763 19.53,98.221 19.743,104.362L19.743,104.362C19.943,110.173 17.087,117.098 12.442,127.823L12.442,127.823L1.16,153.965C3.761,158.926 34.348,164.681 40.317,152.625L40.317,152.625C43.635,145.922 45.339,128.319 50.271,119.78L50.271,119.78C54.918,111.735 57.796,112.747 57.518,111.698L57.518,111.698C57.499,111.688 56.46,111.702 54.927,111.716L54.927,111.716C52.31,111.738 48.255,111.761 45.382,111.668L45.382,111.668C39.923,111.492 37.136,108.589 37.418,102.614L37.418,102.614C37.427,102.436 37.662,52.078 37.662,52.078L37.662,52.078C41.946,48.812 41.634,39.593 39.809,34.827L39.809,34.827C38.445,31.269 35.959,30.714 34.467,30.714L34.467,30.714C33.96,30.714 33.569,30.778 33.374,30.811L33.374,30.811Z"
android:strokeWidth="1"
- android:fillColor="#2F854B"
- android:fillType="nonZero"
+ android:fillColor="#FFB78E"
+ android:fillType="evenOdd"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M47.228,66.321L75.487,66.321A2.66,2.66 0,0 1,78.147 68.981L78.147,75.631A2.66,2.66 0,0 1,75.487 78.291L47.228,78.291A2.66,2.66 0,0 1,44.568 75.631L44.568,68.981A2.66,2.66 0,0 1,47.228 66.321z"
+ android:pathData="M47.728,66.321L75.987,66.321A2.66,2.66 0,0 1,78.647 68.981L78.647,75.631A2.66,2.66 0,0 1,75.987 78.291L47.728,78.291A2.66,2.66 0,0 1,45.068 75.631L45.068,68.981A2.66,2.66 0,0 1,47.728 66.321z"
android:strokeWidth="1"
android:fillColor="#409CC8"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M63.505,75.517L63.499,75.517C62.441,75.482 61.202,74.447 60.349,73.584C59.494,72.721 58.468,71.47 58.436,70.407C58.423,70.033 59.33,69.369 59.34,69.363C59.575,69.198 59.836,69.257 59.943,69.406C60.015,69.508 60.702,70.559 60.778,70.679C60.855,70.802 60.843,70.987 60.747,71.172C60.694,71.274 60.517,71.589 60.434,71.736C60.523,71.864 60.76,72.18 61.249,72.674C61.738,73.168 62.05,73.408 62.179,73.498C62.324,73.414 62.635,73.235 62.737,73.182C62.917,73.085 63.098,73.073 63.222,73.15C63.349,73.227 64.387,73.925 64.482,73.992C64.563,74.049 64.614,74.147 64.625,74.261C64.635,74.376 64.599,74.498 64.527,74.604C64.52,74.613 63.871,75.517 63.505,75.517"
+ android:pathData="M64.005,75.517L63.999,75.517C62.941,75.482 61.702,74.447 60.849,73.584C59.994,72.721 58.968,71.469 58.936,70.407C58.923,70.033 59.83,69.369 59.84,69.363C60.075,69.198 60.336,69.257 60.443,69.406C60.515,69.508 61.202,70.559 61.278,70.679C61.355,70.802 61.343,70.987 61.247,71.172C61.194,71.274 61.017,71.589 60.934,71.736C61.023,71.864 61.26,72.18 61.749,72.674C62.238,73.168 62.55,73.408 62.679,73.498C62.825,73.414 63.135,73.235 63.237,73.182C63.417,73.085 63.598,73.073 63.722,73.15C63.849,73.227 64.887,73.925 64.982,73.992C65.063,74.049 65.114,74.147 65.125,74.261C65.135,74.376 65.099,74.498 65.027,74.604C65.02,74.613 64.371,75.517 64.005,75.517"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M143.36,129.682C143.226,127.781 143.208,124.291 142.395,118.918C142.353,118.641 142.31,118.367 142.266,118.097C141.825,115.431 141.228,112.962 140.134,108.439C138.515,101.748 137.873,100.332 136.716,98.9C135.38,97.245 127.688,88.538 120.921,88.656C119.441,88.682 118.327,89.227 117.172,90.168C116.44,90.763 112.778,87.107 111.643,86.583C108.625,85.189 107.358,88.586 106.85,89.384C106.145,90.492 109.435,96.789 106.85,98.9C104.265,101.011 101.167,97.697 98.163,96.477C95.158,95.256 92.535,92.504 91.982,91.85L75.265,72.037C75.232,71.984 72.806,69.269 71.255,69.404C69.482,69.559 68.488,71.11 68.296,71.427C68.296,71.427 67.436,72.851 67.706,74.988C68.076,77.916 77.802,91.353 87.226,104.749C88.894,107.121 89.955,114.269 90.427,117.323C91.076,121.512 97.603,141.127 106.656,145.309C106.656,145.309 111.24,146.923 116.358,149.348C119.223,150.705 123.055,153.15 127.008,157.921C127.026,157.94 127.043,157.958 127.06,157.976C128.948,159.724 132.616,164.113 133.094,163.872C137.076,161.862 154.332,160.521 157.271,147.984C157.301,147.857 157.395,147.755 157.311,147.656"
+ android:pathData="M143.86,129.682C143.726,127.781 143.708,124.291 142.895,118.918C142.853,118.641 142.81,118.367 142.766,118.097C142.325,115.431 141.728,112.962 140.634,108.439C139.015,101.748 138.373,100.332 137.216,98.9C135.88,97.245 128.188,88.538 121.421,88.656C119.941,88.682 118.827,89.227 117.672,90.168C116.94,90.763 113.278,87.107 112.143,86.583C109.125,85.189 107.858,88.586 107.35,89.384C106.645,90.492 109.935,96.789 107.35,98.9C104.765,101.011 101.667,97.697 98.663,96.477C95.658,95.256 93.035,92.504 92.482,91.85L75.765,72.037C75.732,71.984 73.306,69.269 71.755,69.404C69.982,69.559 68.988,71.11 68.796,71.427C68.796,71.427 67.935,72.851 68.206,74.988C68.576,77.916 78.302,91.353 87.726,104.749C89.394,107.121 90.455,114.269 90.927,117.323C91.576,121.512 98.103,141.127 107.156,145.309C107.156,145.309 111.74,146.923 116.858,149.348C119.723,150.705 123.555,153.15 127.508,157.921C127.526,157.94 127.543,157.958 127.56,157.976C129.448,159.724 133.116,164.113 133.594,163.872C137.576,161.862 154.832,160.521 157.771,147.984C157.801,147.857 157.895,147.755 157.811,147.656"
android:strokeWidth="1"
android:fillColor="#F7B994"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
- <path
- android:pathData="M129.705,56.497C129.705,56.497 125.935,57.483 120.54,58.956L120.54,58.956C120.427,70.088 120.093,81.199 120.253,92.32L120.253,92.32C120.328,97.663 120.711,102.975 120.954,108.304L120.954,108.304L120.939,108.306C121.26,110.77 121.454,113.234 121.128,115.724L121.128,115.724L128.849,114.789C128.849,114.789 134.158,116.129 135.485,113.448L135.485,113.448C137.433,109.513 130.84,102.723 130.84,102.723L130.84,102.723C130.84,102.723 135.139,104.824 136.813,102.723L136.813,102.723C140.323,98.318 132.168,89.317 132.168,89.317L132.168,89.317C132.168,89.317 138.235,90.668 139.455,87.147L139.455,87.147C140.795,83.284 129.235,73.79 129.235,73.79L129.235,73.79L129.133,66.865L130.058,66.738C130.058,66.738 141.146,62.79 140.375,58.128L140.375,58.128C140.041,56.101 137.981,55.528 135.759,55.528L135.759,55.528C132.869,55.529 129.705,56.497 129.705,56.497L129.705,56.497Z"
- android:strokeWidth="1"
- android:fillColor="#4A4A4A"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
<group>
- <clip-path
- android:pathData="M129.705,56.497C129.705,56.497 125.935,57.483 120.54,58.956L120.54,58.956C120.427,70.088 120.093,81.199 120.253,92.32L120.253,92.32C120.328,97.663 120.711,102.975 120.954,108.304L120.954,108.304L120.939,108.306C121.26,110.77 121.454,113.234 121.128,115.724L121.128,115.724L128.849,114.789C128.849,114.789 134.158,116.129 135.485,113.448L135.485,113.448C137.433,109.513 130.84,102.723 130.84,102.723L130.84,102.723C130.84,102.723 135.139,104.824 136.813,102.723L136.813,102.723C140.323,98.318 132.168,89.317 132.168,89.317L132.168,89.317C132.168,89.317 138.235,90.668 139.455,87.147L139.455,87.147C140.795,83.284 129.235,73.79 129.235,73.79L129.235,73.79L129.133,66.865L130.058,66.738C130.058,66.738 141.146,62.79 140.375,58.128L140.375,58.128C140.041,56.101 137.981,55.528 135.759,55.528L135.759,55.528C132.869,55.529 129.705,56.497 129.705,56.497L129.705,56.497Z"/>
<path
- android:pathData="M64.614,46.928C64.614,46.928 64.61,47.086 64.613,47.352C65.237,46.62 65.652,45.67 65.927,44.766C65.988,44.559 66.072,44.251 66.175,43.812C66.176,43.806 66.177,43.802 66.178,43.797C66.205,43.668 66.422,42.024 66.454,41.879C66.515,41.604 66.607,41.408 66.71,41.253C66.622,41.242 66.569,41.231 66.569,41.231C64.055,44.607 61.377,45.418 61.377,45.418C61.064,45.946 59.281,46.561 59.333,45.717C59.385,44.872 61.11,44.877 61.11,44.877C61.492,44.908 63.519,43.795 64.59,42.714C65.661,41.632 66.309,40.756 66.309,40.756C66.11,40.378 65.97,40.035 65.876,39.722C65.194,39.811 64.451,39.599 64.055,39.198C63.456,38.593 63.594,37.921 62.984,37.305C60.574,34.871 57.25,37.731 55.487,37.846C55.402,37.851 55.321,37.846 55.241,37.839C55.214,38.007 55.19,38.177 55.174,38.349C54.683,43.525 56.501,45.746 57.736,46.92C58.351,47.504 59.025,47.788 59.616,48.035C59.653,47.947 59.69,47.867 59.726,47.803L64.614,46.928Z"
- android:strokeWidth="1"
- android:fillColor="#F3B590"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M129.705,56.497C129.705,56.497 125.935,57.483 120.54,58.956L120.54,58.956C120.427,70.088 120.093,81.199 120.253,92.32L120.253,92.32C120.328,97.663 120.711,102.975 120.954,108.304L120.954,108.304L120.939,108.306C121.26,110.77 121.454,113.234 121.128,115.724L121.128,115.724L128.849,114.789C128.849,114.789 134.158,116.129 135.485,113.448L135.485,113.448C137.433,109.513 130.84,102.723 130.84,102.723L130.84,102.723C130.84,102.723 135.139,104.824 136.813,102.723L136.813,102.723C140.323,98.318 132.168,89.317 132.168,89.317L132.168,89.317C132.168,89.317 138.235,90.668 139.455,87.147L139.455,87.147C140.795,83.284 129.235,73.79 129.235,73.79L129.235,73.79L129.133,66.865L130.058,66.738C130.058,66.738 141.146,62.79 140.375,58.128L140.375,58.128C140.041,56.101 137.981,55.528 135.759,55.528L135.759,55.528C132.869,55.529 129.705,56.497 129.705,56.497L129.705,56.497Z"/>
- <path
- android:pathData="M63.787,52.99C64.695,52.44 65.075,51.565 65.15,51.37C65.139,51.326 65.13,51.28 65.115,51.235C64.692,49.857 64.621,48.134 64.613,47.352C64.609,47.086 64.614,46.928 64.614,46.928L59.726,47.803C59.69,47.867 59.653,47.947 59.616,48.035C59.279,48.832 58.906,50.483 58.616,50.857C58.602,50.876 58.599,50.895 58.597,50.912L58.727,51.651C58.967,52.719 61.11,54.612 63.787,52.99"
- android:strokeWidth="1"
- android:fillColor="#F3B590"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M129.705,56.497C129.705,56.497 125.935,57.483 120.54,58.956L120.54,58.956C120.427,70.088 120.093,81.199 120.253,92.32L120.253,92.32C120.328,97.663 120.711,102.975 120.954,108.304L120.954,108.304L120.939,108.306C121.26,110.77 121.454,113.234 121.128,115.724L121.128,115.724L128.849,114.789C128.849,114.789 134.158,116.129 135.485,113.448L135.485,113.448C137.433,109.513 130.84,102.723 130.84,102.723L130.84,102.723C130.84,102.723 135.139,104.824 136.813,102.723L136.813,102.723C140.323,98.318 132.168,89.317 132.168,89.317L132.168,89.317C132.168,89.317 138.235,90.668 139.455,87.147L139.455,87.147C140.795,83.284 129.235,73.79 129.235,73.79L129.235,73.79L129.133,66.865L130.058,66.738C130.058,66.738 141.146,62.79 140.375,58.128L140.375,58.128C140.041,56.101 137.981,55.528 135.759,55.528L135.759,55.528C132.869,55.529 129.705,56.497 129.705,56.497L129.705,56.497Z"/>
- <path
- android:pathData="M74.809,55.383C72.43,53.39 65.165,51.33 65.165,51.33C65.165,51.33 65.16,51.345 65.15,51.37C65.074,51.566 64.695,52.439 63.787,52.99C61.109,54.613 58.967,52.72 58.727,51.651L58.597,50.913L58.591,50.879C58.591,50.879 51.179,52.624 49.017,55.256C48.137,56.327 47.618,57.08 46.982,62.203L76.657,62.203L76.657,60.64C76.355,58.393 75.806,56.218 74.809,55.383"
+ android:pathData="M75.309,55.383C72.93,53.39 65.665,51.33 65.665,51.33C65.665,51.33 65.66,51.345 65.65,51.37C65.574,51.566 65.195,52.439 64.287,52.99C61.609,54.613 59.467,52.72 59.227,51.651L59.097,50.913L59.091,50.879C59.091,50.879 51.679,52.624 49.517,55.256C48.637,56.327 48.118,57.08 47.482,62.203L77.157,62.203L77.157,60.64C76.855,58.393 76.306,56.218 75.309,55.383"
android:strokeWidth="1"
android:fillColor="#898995"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</group>
- <group>
- <clip-path
- android:pathData="M129.705,56.497C129.705,56.497 125.935,57.483 120.54,58.956L120.54,58.956C120.427,70.088 120.093,81.199 120.253,92.32L120.253,92.32C120.328,97.663 120.711,102.975 120.954,108.304L120.954,108.304L120.939,108.306C121.26,110.77 121.454,113.234 121.128,115.724L121.128,115.724L128.849,114.789C128.849,114.789 134.158,116.129 135.485,113.448L135.485,113.448C137.433,109.513 130.84,102.723 130.84,102.723L130.84,102.723C130.84,102.723 135.139,104.824 136.813,102.723L136.813,102.723C140.323,98.318 132.168,89.317 132.168,89.317L132.168,89.317C132.168,89.317 138.235,90.668 139.455,87.147L139.455,87.147C140.795,83.284 129.235,73.79 129.235,73.79L129.235,73.79L129.133,66.865L130.058,66.738C130.058,66.738 141.146,62.79 140.375,58.128L140.375,58.128C140.041,56.101 137.981,55.528 135.759,55.528L135.759,55.528C132.869,55.529 129.705,56.497 129.705,56.497L129.705,56.497Z"/>
- <path
- android:pathData="M68.947,39.278C69.016,41.401 67.228,41.321 66.71,41.253C66.607,41.407 66.515,41.604 66.454,41.878C66.423,42.025 66.205,43.667 66.178,43.798C66.178,43.799 66.177,43.802 66.177,43.803C66.176,43.806 66.176,43.809 66.175,43.811C66.072,44.252 65.988,44.56 65.927,44.767C65.857,45.002 65.818,45.106 65.818,45.106C66.858,44.911 70.508,39.598 69.423,36.587C68.392,33.725 66.169,32.062 64.908,31.416C66.741,33.578 67.268,36.764 67.268,36.764C68.071,36.764 68.874,37.034 68.947,39.278"
- android:strokeWidth="1"
- android:fillColor="#352525"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M129.705,56.497C129.705,56.497 125.935,57.483 120.54,58.956L120.54,58.956C120.427,70.088 120.093,81.199 120.253,92.32L120.253,92.32C120.328,97.663 120.711,102.975 120.954,108.304L120.954,108.304L120.939,108.306C121.26,110.77 121.454,113.234 121.128,115.724L121.128,115.724L128.849,114.789C128.849,114.789 134.158,116.129 135.485,113.448L135.485,113.448C137.433,109.513 130.84,102.723 130.84,102.723L130.84,102.723C130.84,102.723 135.139,104.824 136.813,102.723L136.813,102.723C140.323,98.318 132.168,89.317 132.168,89.317L132.168,89.317C132.168,89.317 138.235,90.668 139.455,87.147L139.455,87.147C140.795,83.284 129.235,73.79 129.235,73.79L129.235,73.79L129.133,66.865L130.058,66.738C130.058,66.738 141.146,62.79 140.375,58.128L140.375,58.128C140.041,56.101 137.981,55.528 135.759,55.528L135.759,55.528C132.869,55.529 129.705,56.497 129.705,56.497L129.705,56.497Z"/>
- <path
- android:pathData="M62.984,37.305C63.594,37.922 63.456,38.593 64.055,39.198C64.452,39.599 65.194,39.811 65.876,39.722C65.265,37.696 66.596,36.983 66.596,36.983C66.197,34.871 64.858,32.708 63.961,31.843C63.489,31.387 62.896,30.889 61.175,30.735C60.316,30.659 59.794,30.91 59.321,31.043C58.968,31.142 58.446,31.249 58.142,31.309C58.113,31.326 58.082,31.339 58.049,31.345C57.643,31.42 56.086,31.682 55.336,31.468C55.156,31.417 54.981,31.559 55.006,31.746C55.031,31.947 55.07,32.169 55.129,32.342C55.184,32.503 55.066,32.671 54.898,32.676C54.106,32.704 52.534,32.669 52.309,32.669C52.066,32.669 52.459,33.395 53.002,33.876C53.185,34.038 53.068,34.337 52.825,34.328C52.819,34.327 52.813,34.327 52.807,34.327C52.606,34.317 52.474,34.533 52.573,34.709C53.085,35.616 53.843,37.701 55.241,37.839C55.32,37.847 55.403,37.851 55.487,37.846C57.249,37.731 60.574,34.871 62.984,37.305"
- android:strokeWidth="1"
- android:fillColor="#352525"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M129.705,56.497C129.705,56.497 125.935,57.483 120.54,58.956L120.54,58.956C120.427,70.088 120.093,81.199 120.253,92.32L120.253,92.32C120.328,97.663 120.711,102.975 120.954,108.304L120.954,108.304L120.939,108.306C121.26,110.77 121.454,113.234 121.128,115.724L121.128,115.724L128.849,114.789C128.849,114.789 134.158,116.129 135.485,113.448L135.485,113.448C137.433,109.513 130.84,102.723 130.84,102.723L130.84,102.723C130.84,102.723 135.139,104.824 136.813,102.723L136.813,102.723C140.323,98.318 132.168,89.317 132.168,89.317L132.168,89.317C132.168,89.317 138.235,90.668 139.455,87.147L139.455,87.147C140.795,83.284 129.235,73.79 129.235,73.79L129.235,73.79L129.133,66.865L130.058,66.738C130.058,66.738 141.146,62.79 140.375,58.128L140.375,58.128C140.041,56.101 137.981,55.528 135.759,55.528L135.759,55.528C132.869,55.529 129.705,56.497 129.705,56.497L129.705,56.497Z"/>
- <path
- android:pathData="M61.175,30.735C62.896,30.889 63.488,31.387 63.962,31.843C64.858,32.708 66.196,34.871 66.596,36.983C66.596,36.983 65.265,37.696 65.875,39.722C65.97,40.035 66.11,40.378 66.309,40.756C66.309,40.756 65.661,41.632 64.59,42.714C63.519,43.796 61.491,44.909 61.109,44.877C61.109,44.877 59.386,44.872 59.333,45.716C59.28,46.561 61.064,45.946 61.377,45.418C61.377,45.418 64.054,44.607 66.57,41.231C66.57,41.231 66.623,41.242 66.71,41.253C67.229,41.321 69.017,41.401 68.948,39.278C68.874,37.035 68.071,36.764 67.267,36.764C67.267,36.764 66.741,33.579 64.908,31.415C64.891,31.395 64.875,31.375 64.858,31.355C63.611,29.916 61.666,29.227 60.038,29.733C58.955,30.07 57.896,31.355 57.896,31.355C57.896,31.355 57.994,31.337 58.142,31.309C58.446,31.249 58.967,31.142 59.321,31.043C59.793,30.91 60.316,30.659 61.175,30.735"
- android:strokeWidth="1"
- android:fillColor="#C36A61"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- </group>
- <group>
<path
- android:pathData="M46.307,29.97L44.256,23.691C44.162,23.405 44.191,23.096 44.336,22.834C45.175,21.321 47.456,15.955 46.509,11.496C45.483,6.663 39.987,-0.341 27.041,1.094C14.095,2.531 13.045,14.22 13.045,14.22C13.045,14.22 12.281,20.041 17.429,24.51C22.482,28.896 30.699,29.646 36.704,28.081C36.927,28.023 37.16,28.038 37.373,28.127L44.891,31.295C45.73,31.649 46.592,30.842 46.307,29.97"
+ android:pathData="M65.114,46.928C65.114,46.928 65.11,47.086 65.113,47.352C65.737,46.62 66.152,45.67 66.427,44.766C66.488,44.559 66.572,44.251 66.675,43.812C66.676,43.806 66.677,43.802 66.678,43.797C66.705,43.668 66.922,42.024 66.954,41.879C67.015,41.604 67.107,41.408 67.21,41.253C67.122,41.242 67.069,41.231 67.069,41.231C64.555,44.607 61.877,45.418 61.877,45.418C61.564,45.946 59.781,46.561 59.833,45.717C59.885,44.872 61.61,44.877 61.61,44.877C61.992,44.908 64.019,43.795 65.09,42.714C66.161,41.632 66.809,40.756 66.809,40.756C66.61,40.378 66.47,40.035 66.376,39.722C65.694,39.811 64.951,39.599 64.555,39.198C63.956,38.593 64.094,37.921 63.484,37.305C61.074,34.871 57.75,37.731 55.987,37.846C55.902,37.851 55.821,37.846 55.741,37.839C55.714,38.007 55.69,38.177 55.674,38.349C55.183,43.525 57.001,45.746 58.236,46.92C58.851,47.504 59.525,47.788 60.116,48.035C60.153,47.947 60.19,47.867 60.226,47.803L65.114,46.928Z"
+ android:strokeWidth="1"
+ android:fillColor="#F3B590"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M64.287,52.99C65.195,52.44 65.575,51.565 65.65,51.37C65.639,51.326 65.63,51.28 65.615,51.235C65.192,49.857 65.121,48.134 65.113,47.352C65.109,47.086 65.114,46.928 65.114,46.928L60.226,47.803C60.19,47.867 60.153,47.947 60.116,48.035C59.779,48.832 59.406,50.483 59.116,50.857C59.102,50.876 59.099,50.895 59.097,50.912L59.227,51.651C59.467,52.719 61.61,54.612 64.287,52.99"
+ android:strokeWidth="1"
+ android:fillColor="#F3B590"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M69.447,39.278C69.516,41.401 67.728,41.321 67.21,41.253C67.107,41.407 67.015,41.604 66.954,41.878C66.923,42.025 66.705,43.667 66.678,43.798C66.678,43.799 66.677,43.802 66.677,43.803C66.676,43.806 66.676,43.809 66.675,43.811C66.572,44.252 66.488,44.56 66.427,44.767C66.357,45.002 66.318,45.106 66.318,45.106C67.358,44.911 71.008,39.598 69.923,36.587C68.892,33.725 66.669,32.062 65.408,31.416C67.241,33.578 67.768,36.764 67.768,36.764C68.571,36.764 69.374,37.034 69.447,39.278"
+ android:strokeWidth="1"
+ android:fillColor="#352525"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M63.484,37.305C64.094,37.922 63.956,38.593 64.555,39.198C64.952,39.599 65.694,39.811 66.376,39.722C65.765,37.696 67.096,36.983 67.096,36.983C66.697,34.871 65.358,32.708 64.461,31.843C63.989,31.387 63.396,30.889 61.675,30.735C60.816,30.659 60.294,30.91 59.821,31.043C59.468,31.142 58.946,31.249 58.642,31.309C58.613,31.326 58.582,31.339 58.549,31.345C58.143,31.42 56.586,31.682 55.836,31.468C55.656,31.417 55.481,31.559 55.506,31.746C55.531,31.947 55.57,32.169 55.629,32.342C55.684,32.503 55.566,32.671 55.398,32.676C54.606,32.704 53.034,32.669 52.809,32.669C52.566,32.669 52.959,33.395 53.502,33.876C53.685,34.038 53.568,34.337 53.325,34.328C53.319,34.327 53.313,34.327 53.307,34.327C53.106,34.317 52.974,34.533 53.073,34.709C53.585,35.616 54.343,37.701 55.741,37.839C55.82,37.847 55.903,37.851 55.987,37.846C57.749,37.731 61.074,34.871 63.484,37.305"
+ android:strokeWidth="1"
+ android:fillColor="#352525"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M61.675,30.735C63.396,30.889 63.988,31.387 64.462,31.843C65.358,32.708 66.696,34.871 67.096,36.983C67.096,36.983 65.765,37.696 66.375,39.722C66.47,40.035 66.61,40.378 66.809,40.756C66.809,40.756 66.161,41.632 65.09,42.714C64.019,43.796 61.991,44.909 61.609,44.877C61.609,44.877 59.886,44.872 59.833,45.716C59.78,46.561 61.564,45.946 61.877,45.418C61.877,45.418 64.554,44.607 67.07,41.231C67.07,41.231 67.123,41.242 67.21,41.253C67.729,41.321 69.517,41.401 69.448,39.278C69.374,37.035 68.571,36.764 67.767,36.764C67.767,36.764 67.241,33.579 65.408,31.415C65.391,31.395 65.375,31.375 65.358,31.355C64.111,29.916 62.166,29.227 60.538,29.733C59.455,30.07 58.396,31.355 58.396,31.355C58.396,31.355 58.494,31.337 58.642,31.309C58.946,31.249 59.467,31.142 59.821,31.043C60.293,30.91 60.816,30.659 61.675,30.735"
+ android:strokeWidth="1"
+ android:fillColor="#C36A61"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M46.807,29.97L44.756,23.691C44.662,23.405 44.691,23.096 44.836,22.834C45.675,21.321 47.956,15.955 47.009,11.496C45.983,6.663 40.487,-0.341 27.541,1.094C14.595,2.531 13.545,14.22 13.545,14.22C13.545,14.22 12.781,20.041 17.929,24.51C22.982,28.896 31.199,29.646 37.204,28.081C37.427,28.023 37.66,28.038 37.873,28.127L45.391,31.295C46.23,31.649 47.092,30.842 46.807,29.97"
android:strokeWidth="1"
android:fillColor="#68696A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M41.722,11.508L37.717,11.508C37.418,11.508 37.175,11.735 37.175,12.016L37.175,18.374C37.175,18.655 37.418,18.883 37.717,18.883L41.722,18.883C42.022,18.883 42.265,18.655 42.265,18.374L42.265,12.016C42.265,11.735 42.022,11.508 41.722,11.508"
+ android:pathData="M42.222,11.508L38.217,11.508C37.918,11.508 37.675,11.735 37.675,12.016L37.675,18.374C37.675,18.655 37.918,18.883 38.217,18.883L42.222,18.883C42.522,18.883 42.765,18.655 42.765,18.374L42.765,12.016C42.765,11.735 42.522,11.508 42.222,11.508"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M35.236,11.508L31.231,11.508C30.932,11.508 30.689,11.735 30.689,12.016L30.689,18.374C30.689,18.655 30.932,18.883 31.231,18.883L35.236,18.883C35.535,18.883 35.778,18.655 35.778,18.374L35.778,12.016C35.778,11.735 35.535,11.508 35.236,11.508"
+ android:pathData="M35.736,11.508L31.731,11.508C31.432,11.508 31.189,11.735 31.189,12.016L31.189,18.374C31.189,18.655 31.432,18.883 31.731,18.883L35.736,18.883C36.035,18.883 36.278,18.655 36.278,18.374L36.278,12.016C36.278,11.735 36.035,11.508 35.736,11.508"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M28.749,11.508L24.744,11.508C24.445,11.508 24.202,11.735 24.202,12.016L24.202,18.374C24.202,18.655 24.445,18.883 24.744,18.883L28.749,18.883C29.049,18.883 29.292,18.655 29.292,18.374L29.292,12.016C29.292,11.735 29.049,11.508 28.749,11.508"
+ android:pathData="M29.249,11.508L25.244,11.508C24.945,11.508 24.702,11.735 24.702,12.016L24.702,18.374C24.702,18.655 24.945,18.883 25.244,18.883L29.249,18.883C29.549,18.883 29.792,18.655 29.792,18.374L29.792,12.016C29.792,11.735 29.549,11.508 29.249,11.508"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
- </group>
- <group>
<path
- android:pathData="M22.263,11.508L18.258,11.508C17.959,11.508 17.716,11.735 17.716,12.016L17.716,18.374C17.716,18.655 17.959,18.883 18.258,18.883L22.263,18.883C22.562,18.883 22.805,18.655 22.805,18.374L22.805,12.016C22.805,11.735 22.562,11.508 22.263,11.508"
+ android:pathData="M22.763,11.508L18.758,11.508C18.459,11.508 18.216,11.735 18.216,12.016L18.216,18.374C18.216,18.655 18.459,18.883 18.758,18.883L22.763,18.883C23.062,18.883 23.305,18.655 23.305,18.374L23.305,12.016C23.305,11.735 23.062,11.508 22.763,11.508"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_active_small.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_active_small.xml
new file mode 100644
index 000000000..1950c1734
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_active_small.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M11.5147,11.5007L12.513,12.499C10.5969,14.4151 9.4118,17.0622 9.4118,19.9861C9.4118,22.7197 10.4506,25.2854 12.2799,27.2326L12.5127,27.4727L11.5143,28.4709C9.343,26.2994 8,23.2995 8,19.986C8,16.6723 9.3431,13.6723 11.5147,11.5007ZM28.4853,11.5007C30.6569,13.6723 32,16.6723 32,19.986C32,23.2994 30.6571,26.2992 28.4858,28.4708L27.487,27.4731C29.4031,25.557 30.5882,22.9099 30.5882,19.9861C30.5882,17.0622 29.4031,14.4151 27.487,12.499Z"
+ android:strokeAlpha="0.24"
+ android:strokeWidth="1"
+ android:fillColor="#95B9CB"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.24"/>
+ <path
+ android:pathData="M26.4882,13.4968C28.1492,15.1575 29.1765,17.4518 29.1765,19.9861C29.1765,22.5203 28.1492,24.8146 26.4882,26.4753L25.4905,25.4765C26.8956,24.0714 27.7647,22.1302 27.7647,19.9861C27.7647,17.8419 26.8956,15.9007 25.4905,14.4956ZM13.5118,13.4968L14.5095,14.4956C13.1044,15.9007 12.2353,17.8419 12.2353,19.9861C12.2353,21.9699 12.9813,23.833 14.2969,25.2554L14.5093,25.4763L13.511,26.4745C11.8505,24.8139 10.8235,22.5199 10.8235,19.9861C10.8235,17.4518 11.8508,15.1575 13.5118,13.4968Z"
+ android:strokeAlpha="0.6"
+ android:strokeWidth="1"
+ android:fillColor="#95B9CB"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.6"/>
+ <path
+ android:pathData="M20,13.6331C16.4914,13.6331 13.6471,16.4774 13.6471,19.9861C13.6471,21.6932 14.3245,23.2948 15.5076,24.4781C16.6909,25.6614 18.2927,26.339 20,26.339C23.5086,26.339 26.3529,23.4947 26.3529,19.9861C26.3529,16.4774 23.5086,13.6331 20,13.6331ZM20,15.4379C22.5118,15.4379 24.5481,17.4742 24.5481,19.9861C24.5481,22.4979 22.5118,24.5342 20,24.5342C18.7767,24.5342 17.6317,24.0498 16.7839,23.2019C15.9361,22.3541 15.4519,21.2092 15.4519,19.9861C15.4519,17.4742 17.4882,15.4379 20,15.4379Z"
+ android:strokeWidth="1"
+ android:fillColor="#007FAD"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive_small.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive_small.xml
new file mode 100644
index 000000000..42ab5c67d
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive_small.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M11.5147,11.5007L12.513,12.499C10.5969,14.4151 9.4118,17.0622 9.4118,19.9861C9.4118,22.7197 10.4506,25.2854 12.2799,27.2326L12.5127,27.4727L11.5143,28.4709C9.343,26.2994 8,23.2995 8,19.986C8,16.6723 9.3431,13.6723 11.5147,11.5007ZM28.4853,11.5007C30.6569,13.6723 32,16.6723 32,19.986C32,23.2994 30.6571,26.2992 28.4858,28.4708L27.487,27.4731C29.4031,25.557 30.5882,22.9099 30.5882,19.9861C30.5882,17.0622 29.4031,14.4151 27.487,12.499Z"
+ android:strokeAlpha="0.12"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.12"/>
+ <path
+ android:pathData="M12.3013,14.9904L13.3265,16.0145C12.6334,17.1765 12.2353,18.5348 12.2353,19.9861C12.2353,21.9699 12.9813,23.833 14.2969,25.2554L14.5093,25.4763L13.511,26.4745C11.8505,24.8139 10.8235,22.5199 10.8235,19.9861C10.8235,18.1436 11.3665,16.4279 12.3013,14.9904ZM26.4882,13.4968C28.1492,15.1575 29.1765,17.4518 29.1765,19.9861C29.1765,21.829 28.6332,23.545 27.6981,24.9827L26.6738,23.9571C27.3667,22.7952 27.7647,21.4371 27.7647,19.9861C27.7647,17.8419 26.8956,15.9007 25.4905,14.4956Z"
+ android:strokeAlpha="0.28"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.28"/>
+ <path
+ android:pathData="M14.7415,13.737L14.808,13.7957L26.1021,25.0899C26.3777,25.3655 26.3777,25.8125 26.1021,26.0881C25.8476,26.3426 25.4472,26.3622 25.1703,26.1469L25.1038,26.0881L23.9649,24.9502C22.8781,25.8193 21.4998,26.339 20,26.339C18.2927,26.339 16.6909,25.6614 15.5076,24.4781C14.3245,23.2948 13.6471,21.6932 13.6471,19.9861C13.6471,18.4861 14.1669,17.1076 15.0361,16.0208L13.8097,14.794C13.534,14.5183 13.534,14.0714 13.8097,13.7957C14.0641,13.5413 14.4645,13.5217 14.7415,13.737ZM16.318,17.3037C15.7689,18.0561 15.4448,18.9832 15.4448,19.9861C15.4448,21.2111 15.9298,22.3577 16.7789,23.2069C17.628,24.0562 18.7748,24.5412 20,24.5412C21.0028,24.5412 21.9299,24.2172 22.6823,23.6681ZM20,13.6331C23.5086,13.6331 26.3529,16.4774 26.3529,19.9861C26.3529,21.0443 26.0942,22.0421 25.6365,22.9197L24.2762,21.5592C24.4567,21.0689 24.5552,20.539 24.5552,19.9861C24.5552,17.4703 22.5158,15.4309 20,15.4309C19.4471,15.4309 18.9171,15.5294 18.4268,15.7098L17.0663,14.3496C17.9439,13.8919 18.9417,13.6331 20,13.6331Z"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml
index c89aac841..3ec0fc008 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_submission_illustration_tan_code_card.xml
@@ -10,88 +10,66 @@
android:fillColor="#E7E7E7"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M18.473,41.233C18.323,40.496 18.171,39.501 18.073,38.456C18.241,38.342 18.39,38.242 18.529,38.191C18.755,38.097 18.791,38.001 18.71,37.925C18.507,37.773 18.287,37.661 18.002,37.666C17.899,36.422 17.813,35.224 17.805,34.464C17.793,33.996 17.753,33.936 17.453,33.792L16.877,33.516C16.601,33.385 16.413,33.598 16.318,33.821C15.62,35.461 14.745,38.275 14.574,39.776C14.558,39.946 14.612,40.112 14.769,40.194C14.948,40.289 15.222,40.437 15.498,40.525C15.7,40.59 15.839,40.497 16.001,40.33C16.318,39.986 16.701,39.612 17.091,39.248C17.183,39.792 17.258,40.117 17.34,40.452C17.411,40.75 17.508,40.959 17.602,41.098C17.749,41.316 17.953,41.425 18.159,41.517C18.368,41.592 18.521,41.475 18.473,41.233ZM15.465,39.493C15.714,38.213 16.237,36.633 16.747,35.293C16.756,36.226 16.834,37.241 16.952,38.143C16.436,38.535 15.911,39.019 15.465,39.493ZM22.029,38.82C22.634,38.411 23.018,37.633 22.919,36.501C22.865,35.801 22.677,35.264 22.429,34.897C22.068,34.361 21.542,34.138 20.987,34.151C20.675,34.159 20.387,34.267 20.139,34.434C19.951,34.562 19.805,34.689 19.683,34.872C19.583,32.86 20.174,31.682 20.545,31.504C20.611,31.474 20.733,31.998 20.852,32.495C20.93,32.76 21.024,32.985 21.125,33.134C21.305,33.402 21.562,33.547 21.827,33.555C22.076,33.561 22.159,33.447 22.148,33.238C22.085,32.717 21.855,31.948 21.514,31.399C21.283,31.035 20.96,30.878 20.581,30.873C20.372,30.884 20.117,30.955 19.859,31.129C19.283,31.518 18.364,32.744 18.561,35.456C18.65,36.594 18.954,37.515 19.382,38.15C19.831,38.815 20.45,39.177 21.097,39.13C21.403,39.112 21.771,38.994 22.029,38.82ZM21.194,38.502C21.018,38.52 20.735,38.335 20.487,37.968C20.393,37.829 20.306,37.657 20.228,37.435C19.756,36.007 20.394,34.941 20.855,34.789C21.014,34.768 21.221,34.903 21.388,35.151C21.589,35.449 21.744,35.936 21.837,36.523C21.979,37.568 21.632,38.467 21.194,38.502ZM25.452,36.424C25.481,34.542 25.555,32.211 25.663,30.68C25.804,28.534 25.555,27.865 25.195,27.674C25.032,27.582 24.916,27.646 24.874,27.862C24.63,29.341 24.416,32.834 24.459,35.102C23.827,33.651 23.359,32.465 22.918,31.319C22.78,30.964 22.642,30.696 22.501,30.488C22.307,30.2 22.038,30.035 21.835,29.97C21.542,29.879 21.426,29.985 21.491,30.317C21.777,31.511 22.83,34.121 23.679,35.743C23.749,35.869 23.813,35.985 23.88,36.084C24.208,36.57 24.577,36.754 25.072,36.781C25.381,36.79 25.45,36.657 25.452,36.424ZM31.138,32.589C31.131,32.449 31.09,32.304 31.01,32.184C30.903,32.026 30.726,31.871 30.523,31.762C30.086,31.522 29.428,31.273 28.783,31.088C29.677,30.08 30.291,28.785 30.335,27.759C30.361,27.006 30.188,26.299 29.471,25.815C28.801,25.357 28.168,25.467 27.655,25.842C27.302,26.109 27.021,26.443 26.724,26.816C26.448,27.176 26.144,27.54 25.787,27.867C25.599,28.037 25.603,28.15 25.776,28.235C26.036,28.364 26.268,28.409 26.636,28.247C26.68,30.196 27.025,32.591 27.359,33.622C27.43,33.834 27.53,34.026 27.624,34.165C27.791,34.413 27.978,34.518 28.167,34.564C28.417,34.612 28.512,34.519 28.455,34.283C28.257,33.348 28.134,32.608 28.054,31.955C28.752,32.134 29.657,32.447 30.821,32.846C31.047,32.925 31.143,32.831 31.138,32.589ZM27.917,30.661C27.888,30.233 27.855,29.648 27.789,28.972C27.722,28.338 27.607,27.91 27.429,27.626L27.729,27.236C27.973,26.912 28.263,26.529 28.492,26.375C28.64,26.275 28.783,26.251 28.95,26.369C29.649,26.85 29.561,28.816 27.917,30.661ZM33.048,31.503C32.733,29.881 32.544,27.93 32.273,25.153C32.224,24.652 32.122,24.287 31.968,24.059C31.834,23.86 31.638,23.762 31.369,23.727C31.136,23.681 31.027,23.798 30.956,24.077C30.882,24.589 30.769,25.084 30.675,25.566C30.63,25.756 30.667,26.005 31.16,25.687C31.33,27.522 31.675,30.003 31.881,30.716C31.969,31.017 32.09,31.239 32.197,31.398C32.365,31.646 32.541,31.758 32.721,31.81C32.943,31.862 33.082,31.682 33.048,31.503ZM36.044,29.352C36.729,28.89 37.242,27.981 37.189,26.789C37.144,25.953 36.955,25.33 36.701,24.953C36.393,24.496 35.92,24.31 35.489,24.269C35.223,24.26 34.842,24.359 34.504,24.586C34.375,24.673 34.273,24.757 34.174,24.867C34.16,24.14 34.141,23.662 34.144,22.981C34.193,22.948 34.193,22.948 34.246,22.898C34.405,22.747 34.613,22.564 34.794,22.383C35.168,22.016 35.637,21.556 36.162,21.201C36.371,21.06 36.37,20.974 36.227,20.868C35.85,20.588 35.432,20.567 34.962,20.899C34.734,21.053 34.516,21.286 34.252,21.537C33.823,21.927 33.32,22.381 32.794,22.736C32.526,22.917 32.598,23.172 33.063,23.263C33.101,24.219 33.152,25.022 33.231,25.589C33.266,25.898 33.367,26.133 33.474,26.292C33.648,26.55 33.861,26.651 34.041,26.703C34.28,26.759 34.373,26.725 34.401,26.446C34.437,25.642 34.815,24.983 35.21,24.948C35.343,24.93 35.499,25.056 35.66,25.294C35.874,25.611 36.07,26.201 36.11,26.838C36.165,27.711 35.878,28.699 35.441,28.993C35.203,29.154 34.83,29.03 34.576,28.653C34.348,28.315 34.19,27.845 34.18,27.317C34.173,27.134 34.02,27.079 33.878,27.189C33.57,27.44 33.31,27.889 33.44,28.466C33.487,28.665 33.571,28.897 33.692,29.076C33.96,29.473 34.443,29.782 35.113,29.706C35.428,29.681 35.746,29.553 36.044,29.352ZM40.15,26.856C40.686,26.495 41.164,25.898 41.264,25.297C41.407,24.609 41.274,24.091 41,23.685C40.766,23.337 40.442,23.05 39.19,22.35C39.615,21.182 40.111,20.097 40.498,19.345C40.567,19.212 40.474,19.073 40.337,19.063C40.211,19.048 40.079,19.108 39.92,19.215C39.87,19.249 39.778,19.325 39.735,19.369C39.286,18.704 38.582,18.688 37.957,19.11C37.719,19.27 37.475,19.507 37.313,19.76C36.898,20.387 36.751,21.41 37.044,22.079C37.178,22.364 37.542,22.667 37.925,22.914C37.638,23.859 37.467,24.826 37.53,25.519C37.569,25.898 37.677,26.315 37.885,26.623C38.166,27.04 38.642,27.296 39.332,27.206C39.598,27.171 39.883,27.037 40.15,26.856ZM38.34,21.797C38.214,21.694 38.093,21.559 38.013,21.44C37.678,20.944 37.733,20.083 38.123,19.719C38.417,19.449 38.857,19.759 39.122,20.215C38.832,20.685 38.553,21.234 38.34,21.797ZM39.654,26.441C39.376,26.628 39.063,26.593 38.856,26.286C38.742,26.117 38.681,25.898 38.633,25.656C38.52,25.039 38.626,24.275 38.841,23.48C39.327,23.773 39.79,24.053 40.004,24.37C40.279,24.777 40.241,25.149 40.193,25.528C40.122,25.937 39.912,26.267 39.654,26.441Z"
+ android:strokeWidth="1"
+ android:fillColor="#5D6E80"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
<path
android:pathData="M75.011,46.094L76.297,46.088L75.011,46.094Z"
android:strokeWidth="1"
android:fillColor="#FF395A"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
- <group>
- <clip-path
- android:pathData="M41.549,25.442C41.549,25.442 45.201,26.387 50.427,27.799L50.427,27.799C50.536,38.476 50.86,49.132 50.706,59.798L50.706,59.798C50.632,64.923 50.262,70.017 50.026,75.128L50.026,75.128L50.04,75.129C49.73,77.493 49.541,79.857 49.857,82.245L49.857,82.245L42.38,81.347C42.38,81.347 37.236,82.633 35.95,80.061L35.95,80.061C34.064,76.289 40.45,69.776 40.45,69.776L40.45,69.776C40.45,69.776 36.286,71.79 34.664,69.776L34.664,69.776C31.264,65.551 39.164,56.918 39.164,56.918L39.164,56.918C39.164,56.918 33.287,58.213 32.104,54.836L32.104,54.836C30.807,51.132 42.004,42.026 42.004,42.026L42.004,42.026L42.104,35.385L41.208,35.264C41.208,35.264 30.467,31.477 31.212,27.005L31.212,27.005C31.537,25.061 33.532,24.512 35.684,24.512L35.684,24.512C38.483,24.512 41.549,25.442 41.549,25.442L41.549,25.442Z"/>
- <path
- android:pathData="M28.892,20.204l32.054,4.36l-8.374,61.566l-32.054,-4.361z"
- android:strokeWidth="1"
- android:fillColor="#F7B994"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M80.778,9.408C84.045,9.408 86.7,12.049 86.715,15.318L86.715,15.318L87.072,95.665C87.085,98.943 84.439,101.611 81.162,101.625L81.162,101.625L48.948,101.768C45.668,101.78 42.999,99.134 42.983,95.854L42.983,95.854L42.636,15.507C42.625,12.231 45.271,9.565 48.548,9.55L48.548,9.55L80.761,9.408L80.778,9.408Z"/>
- <path
- android:pathData="M41.341,0.744l60.82,8.273l-13.795,101.414l-60.82,-8.273z"
- android:strokeWidth="1"
- android:fillColor="#FFFFFF"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
+ <path
+ android:pathData="M41.549,25.442C41.549,25.442 45.201,26.387 50.427,27.8L50.427,27.8C50.536,38.476 50.86,49.132 50.705,59.798L50.705,59.798C50.632,64.923 50.262,70.018 50.026,75.128L50.026,75.128L50.04,75.13C49.73,77.493 49.54,79.857 49.856,82.246L49.856,82.246L42.379,81.348C42.379,81.348 37.235,82.634 35.95,80.062L35.95,80.062C34.063,76.289 40.45,69.776 40.45,69.776L40.45,69.776C40.45,69.776 36.285,71.79 34.664,69.776L34.664,69.776C31.263,65.551 39.164,56.918 39.164,56.918L39.164,56.918C39.164,56.918 33.286,58.213 32.104,54.836L32.104,54.836C30.807,51.132 42.004,42.026 42.004,42.026L42.004,42.026L42.103,35.386L41.208,35.264C41.208,35.264 30.467,31.478 31.212,27.006L31.212,27.006C31.537,25.062 33.531,24.513 35.683,24.513L35.683,24.513C38.483,24.513 41.549,25.442 41.549,25.442L41.549,25.442Z"
+ android:strokeWidth="1"
+ android:fillColor="#FFB486"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M80.778,9.408C84.045,9.408 86.7,12.048 86.715,15.318L86.715,15.318L87.072,95.665C87.085,98.943 84.439,101.61 81.162,101.625L81.162,101.625L48.947,101.767C45.668,101.78 42.998,99.134 42.982,95.853L42.982,95.853L42.635,15.507C42.625,12.231 45.27,9.565 48.547,9.55L48.547,9.55L80.761,9.408L80.778,9.408Z"
+ android:strokeWidth="1"
+ android:fillColor="#FFFFFF"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
<path
android:pathData="M81.161,101.625L48.947,101.768C45.667,101.781 42.998,99.133 42.983,95.854L42.635,15.508C42.624,12.231 45.27,9.565 48.547,9.55L80.76,9.408C84.035,9.399 86.699,12.043 86.714,15.317L87.071,95.665C87.085,98.942 84.439,101.61 81.161,101.625Z"
android:strokeWidth="2.1147"
android:fillColor="#00000000"
android:strokeColor="#4A4A4A"
android:fillType="evenOdd"/>
- <group>
- <clip-path
- android:pathData="M91.992,25.592C92.558,25.684 93.209,31.502 93.487,34.27L93.487,34.27C93.571,35.105 93.908,35.884 94.441,36.532L94.441,36.532C97.803,40.62 99.525,51.196 99.525,51.196L99.525,51.196C101.574,60.969 102.675,60.462 103.912,65.918L103.912,65.918C105.123,71.266 105.501,72.787 105.84,75.562L105.84,75.562C106.994,85.01 105.403,90.245 105.198,96.134L105.198,96.134C105.002,101.707 107.769,108.349 112.269,118.635L112.269,118.635L123.198,143.709C120.678,148.466 91.05,153.986 85.267,142.422L85.267,142.422C82.053,135.993 80.402,119.111 75.624,110.921L75.624,110.921C71.124,103.206 68.283,103.569 68.552,102.563L68.552,102.563C68.603,102.538 74.982,102.563 79.363,102.797L79.363,102.797C84.633,103.077 88.28,100.497 88.075,94.458L88.075,94.458C88.069,94.286 87.839,45.989 87.839,45.989L87.839,45.989C83.689,42.858 83.991,34.015 85.76,29.444L85.76,29.444C87.079,26.031 89.488,25.5 90.934,25.5L90.934,25.5C91.424,25.5 91.805,25.561 91.992,25.592L91.992,25.592Z"/>
- <path
- android:pathData="M75.433,10.872l76.221,14.117l-13.216,132.71l-76.221,-14.117z"
- android:strokeWidth="1"
- android:fillColor="#F7B994"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M82.385,45.291C82.831,45.291 83.194,45.661 83.194,46.117L83.194,46.117L83.194,56.434C83.194,56.891 82.831,57.261 82.385,57.261L82.385,57.261L76.406,57.261C75.96,57.261 75.597,56.891 75.597,56.434L75.597,56.434L75.597,46.117C75.597,45.661 75.96,45.291 76.406,45.291L76.406,45.291L82.385,45.291Z"/>
- <path
- android:pathData="M84.206,58.591l-9.62,0l-0,-14.63l9.62,0z"
- android:strokeWidth="1"
- android:fillColor="#657887"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M72.702,45.291C73.15,45.291 73.512,45.661 73.512,46.117L73.512,46.117L73.512,56.434C73.512,56.891 73.15,57.261 72.702,57.261L72.702,57.261L66.723,57.261C66.276,57.261 65.914,56.891 65.914,56.434L65.914,56.434L65.914,46.117C65.914,45.661 66.276,45.291 66.723,45.291L66.723,45.291L72.702,45.291Z"/>
- <path
- android:pathData="M74.523,58.591l-9.62,0l-0,-14.63l9.62,0z"
- android:strokeWidth="1"
- android:fillColor="#657887"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M63.021,45.291C63.468,45.291 63.83,45.661 63.83,46.117L63.83,46.117L63.83,56.434C63.83,56.891 63.468,57.261 63.021,57.261L63.021,57.261L57.042,57.261C56.595,57.261 56.233,56.891 56.233,56.434L56.233,56.434L56.233,46.117C56.233,45.661 56.595,45.291 57.042,45.291L57.042,45.291L63.021,45.291Z"/>
- <path
- android:pathData="M64.841,58.591l-9.62,0l-0,-14.63l9.62,0z"
- android:strokeWidth="1"
- android:fillColor="#657887"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
- <group>
- <clip-path
- android:pathData="M53.338,45.291C53.785,45.291 54.146,45.661 54.146,46.117L54.146,46.117L54.146,56.434C54.146,56.891 53.785,57.261 53.338,57.261L53.338,57.261L47.36,57.261C46.912,57.261 46.55,56.891 46.55,56.434L46.55,56.434L46.55,46.117C46.55,45.661 46.912,45.291 47.36,45.291L47.36,45.291L53.338,45.291Z"/>
- <path
- android:pathData="M55.158,58.591l-9.62,0l-0,-14.63l9.62,0z"
- android:strokeWidth="1"
- android:fillColor="#657887"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
+ <path
+ android:pathData="M91.993,25.592C92.558,25.685 93.209,31.502 93.488,34.27L93.488,34.27C93.572,35.105 93.908,35.884 94.441,36.532L94.441,36.532C97.804,40.62 99.525,51.196 99.525,51.196L99.525,51.196C101.574,60.969 102.676,60.462 103.912,65.919L103.912,65.919C105.123,71.266 105.501,72.787 105.84,75.562L105.84,75.562C106.994,85.01 105.403,90.245 105.198,96.134L105.198,96.134C105.002,101.707 107.769,108.349 112.269,118.635L112.269,118.635L123.198,143.709C120.678,148.466 91.05,153.986 85.268,142.422L85.268,142.422C82.053,135.993 80.402,119.111 75.625,110.921L75.625,110.921C71.124,103.206 68.283,103.569 68.552,102.563L68.552,102.563C68.603,102.538 74.982,102.563 79.363,102.797L79.363,102.797C84.634,103.077 88.281,100.497 88.075,94.458L88.075,94.458C88.069,94.287 87.839,45.989 87.839,45.989L87.839,45.989C83.689,42.858 83.991,34.015 85.76,29.444L85.76,29.444C87.079,26.031 89.488,25.5 90.934,25.5L90.934,25.5C91.425,25.5 91.805,25.561 91.993,25.592L91.993,25.592Z"
+ android:strokeWidth="1"
+ android:fillColor="#FFB78E"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M82.385,45.291C82.832,45.291 83.194,45.66 83.194,46.116L83.194,46.116L83.194,56.434C83.194,56.891 82.832,57.261 82.385,57.261L82.385,57.261L76.406,57.261C75.96,57.261 75.598,56.891 75.598,56.434L75.598,56.434L75.598,46.116C75.598,45.66 75.96,45.291 76.406,45.291L76.406,45.291L82.385,45.291Z"
+ android:strokeWidth="1"
+ android:fillColor="#5D6E80"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M72.703,45.291C73.15,45.291 73.512,45.66 73.512,46.116L73.512,46.116L73.512,56.434C73.512,56.891 73.15,57.261 72.703,57.261L72.703,57.261L66.724,57.261C66.277,57.261 65.914,56.891 65.914,56.434L65.914,56.434L65.914,46.116C65.914,45.66 66.277,45.291 66.724,45.291L66.724,45.291L72.703,45.291Z"
+ android:strokeWidth="1"
+ android:fillColor="#5D6E80"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M63.021,45.291C63.468,45.291 63.83,45.66 63.83,46.116L63.83,46.116L63.83,56.434C63.83,56.891 63.468,57.261 63.021,57.261L63.021,57.261L57.041,57.261C56.595,57.261 56.233,56.891 56.233,56.434L56.233,56.434L56.233,46.116C56.233,45.66 56.595,45.291 57.041,45.291L57.041,45.291L63.021,45.291Z"
+ android:strokeWidth="1"
+ android:fillColor="#5D6E80"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M53.338,45.291C53.785,45.291 54.147,45.66 54.147,46.116L54.147,46.116L54.147,56.434C54.147,56.891 53.785,57.261 53.338,57.261L53.338,57.261L47.36,57.261C46.913,57.261 46.55,56.891 46.55,56.434L46.55,56.434L46.55,46.116C46.55,45.66 46.913,45.291 47.36,45.291L47.36,45.291L53.338,45.291Z"
+ android:strokeWidth="1"
+ android:fillColor="#5D6E80"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
<path
android:pathData="M1.724,122.663C1.503,120.848 0.882,117.559 0.671,112.35C0.66,112.082 0.651,111.816 0.644,111.553C0.576,108.962 0.691,106.527 0.904,102.067C1.218,95.468 1.57,94.017 2.407,92.455C3.375,90.649 9.096,81.031 15.553,79.891C16.964,79.642 18.124,79.949 19.394,80.621C20.199,81.047 23.012,76.928 23.995,76.224C26.61,74.354 30.422,76.37 31.051,77.027C31.924,77.94 32.803,75.734 34.308,75.171C37.551,73.959 41.378,75.331 41.977,77.274C41.98,77.285 41.983,77.296 41.986,77.306C42.216,78.1 43.248,78.267 43.654,77.549L55.924,55.806C55.946,55.75 57.756,52.746 59.255,52.586C60.97,52.404 62.199,53.681 62.439,53.944C62.439,53.944 63.518,55.125 63.652,57.187C63.836,60.012 57.047,74.46 50.537,88.814C49.385,91.355 49.684,98.281 49.794,101.244C49.944,105.307 47.328,124.981 39.484,130.591C39.484,130.591 35.421,132.958 30.998,136.187C28.522,137.994 25.326,141.004 22.44,146.227C22.427,146.248 22.414,146.268 22.4,146.288C20.926,148.282 18.241,153.093 17.742,152.954C13.588,151.797 -3.066,153.724 -8.155,142.465C-8.206,142.351 -8.314,142.272 -8.252,142.163C-2.687,132.25 2.285,127.274 1.724,122.663"
android:strokeWidth="1"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml b/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
index a2d3826e6..94628acb7 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
@@ -140,21 +140,12 @@
app:layout_constraintTop_toBottomOf="@+id/main_overview_risk_unknown_risk"
app:subtitle="@{@string/main_overview_headline_test}" />
- <include
- android:id="@+id/main_overview_divider"
- layout="@layout/include_divider"
- android:layout_width="0dp"
- android:layout_height="@dimen/card_divider"
- android:layout_marginTop="@dimen/spacing_small"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/main_overview_test" />
-
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_small"
android:background="@color/colorSurface2"
- app:layout_constraintTop_toBottomOf="@+id/main_overview_divider">
+ app:layout_constraintTop_toBottomOf="@+id/main_overview_test">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/main_overview_glossary_headline"
diff --git a/Corona-Warn-App/src/main/res/layout/include_information_details.xml b/Corona-Warn-App/src/main/res/layout/include_information_details.xml
index d7d78c3bc..d3d5515fe 100644
--- a/Corona-Warn-App/src/main/res/layout/include_information_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_information_details.xml
@@ -41,7 +41,7 @@
<TextView
android:id="@+id/information_details_header_headline"
- style="@style/headline6"
+ style="@style/headline5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{headline}"
diff --git a/Corona-Warn-App/src/main/res/layout/include_setting_row.xml b/Corona-Warn-App/src/main/res/layout/include_setting_row.xml
index 42d3408f1..5399abbc7 100644
--- a/Corona-Warn-App/src/main/res/layout/include_setting_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_setting_row.xml
@@ -52,7 +52,6 @@
<ImageView
android:id="@+id/settings_row_icon"
- style="@style/icon"
android:layout_width="@dimen/icon_size_settings"
android:layout_height="@dimen/icon_size_settings"
android:importantForAccessibility="no"
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 9555649d9..f1afe8029 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -143,7 +143,7 @@
<string name="main_about_headline">"Häufige Fragen"</string>
<!-- XTXT: main, explains faq on card -->
<string name="main_about_body">"Hier finden Sie Antworten auf häufig gestellte Fragen rund um die Corona-Warn-App."</string>
- <!-- NOTR todo insert english link in translation file http://www.bundesregierung.de/corona-warn-app-faq-englisch -->
+ <!-- NOTR -->
<string name="main_about_link">"https://www.bundesregierung.de/corona-warn-app-faq"</string>
<!-- ####################################
@@ -457,8 +457,8 @@
<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>
- <!-- MOTR todo phone number to be called replace in english file-->
- <string name="information_contact_phone_call_number">"Tel:+49 800 7540001"</string>
+ <!-- MOTR DO NOT TOUCH THE "tel:" DURING TRANSLATION, ONLY UPDATE THE NUMBER todo phone number to be called replace in english file -->
+ <string name="information_contact_phone_call_number">"tel:+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>
<!-- YTXT: Body text for technical contact and hotline information page -->
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 139deb406..dc3c2d000 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -143,8 +143,8 @@
<string name="main_about_headline">"FAQ"</string>
<!-- 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."</string>
- <!-- NOTR todo insert english link in translation file http://www.bundesregierung.de/corona-warn-app-faq-englisch -->
- <string name="main_about_link">"https://www.bundesregierung.de/corona-warn-app-faq"</string>
+ <!-- NOTR -->
+ <string name="main_about_link">"http://www.bundesregierung.de/corona-warn-app-faq-englisch"</string>
<!-- ####################################
Main - Share
@@ -459,8 +459,8 @@
<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 (0)800 7540001"</string>
- <!-- MOTR todo phone number to be called replace in english file-->
- <string name="information_contact_phone_call_number">"Phone: +49 800 7540001"</string>
+ <!-- MOTR DO NOT TOUCH THE "tel:" DURING TRANSLATION, ONLY UPDATE THE NUMBER todo phone number to be called replace in english file -->
+ <string name="information_contact_phone_call_number">"tel:+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>
<!-- YTXT: Body text for technical contact and hotline information page -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index ead09a21a..91f7ef82d 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -224,7 +224,7 @@
<string name="main_about_headline">Häufige Fragen</string>
<!-- XTXT: main, explains faq on card -->
<string name="main_about_body">Hier finden Sie Antworten auf häufig gestellte Fragen rund um die Corona-Warn-App.</string>
- <!-- NOTR todo insert english link in translation file https://www.bundesregierung.de/corona-warn-app-faq-englisch -->
+ <!-- NOTR -->
<string name="main_about_link">https://www.bundesregierung.de/corona-warn-app-faq</string>
<!-- ####################################
@@ -2144,7 +2144,7 @@ Das RKI behält sich ferner vor, die im Rahmen der Risikobewertung ( <em>risk
<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>
- <!-- MOTR todo phone number to be called replace in english file-->
+ <!-- MOTR DO NOT TOUCH THE "tel:" DURING TRANSLATION, ONLY UPDATE THE NUMBER todo phone number to be called replace in english file -->
<string name="information_contact_phone_call_number">tel:+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 403916355..6d201e604 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -144,7 +144,6 @@
<style name="headline6" parent="@style/TextAppearance.MaterialComponents.Headline6">
<item name="android:textColor">@color/colorTextPrimary1</item>
- <item name="android:textStyle">bold</item>
</style>
<style name="subtitle" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/WebRequestBuilderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/WebRequestBuilderTest.kt
index 305daf8a9..cf2d0564a 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/WebRequestBuilderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/http/WebRequestBuilderTest.kt
@@ -7,12 +7,9 @@ import de.rki.coronawarnapp.service.diagnosiskey.DiagnosisKeyConstants
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toServerFormat
import de.rki.coronawarnapp.util.security.VerificationKeys
import io.mockk.MockKAnnotations
-import io.mockk.clearAllMocks
import io.mockk.coEvery
import io.mockk.coVerify
-import io.mockk.every
import io.mockk.impl.annotations.MockK
-import io.mockk.mockkObject
import io.mockk.unmockkAll
import kotlinx.coroutines.runBlocking
import org.junit.After
@@ -75,4 +72,4 @@ class WebRequestBuilderTest {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
index 550851bd0..4e13ce280 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
@@ -51,7 +51,6 @@ class RiskLevelTransactionTest {
mockkObject(ExposureSummaryRepository.Companion)
mockkObject(RiskLevel.Companion)
-
every { ExposureSummaryRepository.getExposureSummaryRepository() } returns esRepositoryMock
every { RiskLevelRepository.getLastCalculatedScore() } returns UNDETERMINED
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/SubmissionTanViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/SubmissionTanViewModelTest.kt
index fe08e5de2..96973d9dc 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/SubmissionTanViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/SubmissionTanViewModelTest.kt
@@ -1,10 +1,14 @@
package de.rki.coronawarnapp.ui.submission
-import com.google.android.gms.nearby.exposurenotification.ExposureSummary
import de.rki.coronawarnapp.storage.SubmissionRepository
-import de.rki.coronawarnapp.util.TanHelper
-import io.mockk.*
-import org.junit.Assert.*
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.verify
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
import org.junit.Test
class SubmissionTanViewModelTest {
@@ -17,7 +21,6 @@ class SubmissionTanViewModelTest {
viewModel.tan.postValue("ABCD0")
viewModel.tanCharactersValid.value?.let { assertFalse(it) }
-
}
@Test
@@ -49,13 +52,14 @@ class SubmissionTanViewModelTest {
val sr = mockk<SubmissionRepository> {
every { setTeletan(any()) } just Runs
}
- val tan = "ZWFPC7NG47";
+ val tan = "ZWFPC7NG47"
sr.setTeletan(tan)
- verify (exactly = 1) { sr.setTeletan(
- withArg {
- assertEquals(it, tan)
- })
+ verify(exactly = 1) {
+ sr.setTeletan(
+ withArg {
+ assertEquals(it, tan)
+ })
}
}
-}
\ No newline at end of file
+}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/update/VersionComparatorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/update/VerificationServiceTest.kt
similarity index 100%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/update/VersionComparatorTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/update/VerificationServiceTest.kt
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/TanHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/TanHelperTest.kt
index d3c4a1120..ce222d579 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/TanHelperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/TanHelperTest.kt
@@ -1,6 +1,5 @@
package de.rki.coronawarnapp.util
-import de.rki.coronawarnapp.service.submission.SubmissionService
import org.hamcrest.CoreMatchers
import org.hamcrest.MatcherAssert
import org.junit.Test
@@ -11,8 +10,8 @@ class TanHelperTest {
fun isValidCharacter() {
// valid
val validCharacters = arrayOf(
- "2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H",
- "J","K","M","N","P","Q","R","S","T","U","V","W","X","Y","Z"
+ "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H",
+ "J", "K", "M", "N", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"
)
for (character in validCharacters) {
MatcherAssert.assertThat(
@@ -23,8 +22,8 @@ class TanHelperTest {
// invalid
val invalidCharacters = arrayOf(
- "0","1","O","L","I","Ö","*","&","-","a","b",
- "c","ö","ß","é","."," ","€","(",")",";",","
+ "0", "1", "O", "L", "I", "Ö", "*", "&", "-", "a", "b",
+ "c", "ö", "ß", "é", ".", " ", "€", "(", ")", ";", ","
)
for (character in invalidCharacters) {
MatcherAssert.assertThat(
@@ -85,4 +84,4 @@ class TanHelperTest {
)
}
}
-}
\ No newline at end of file
+}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterHelperTest.kt
index adc407f7a..4bf0c3059 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterHelperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterHelperTest.kt
@@ -16,7 +16,6 @@ import org.junit.After
import org.junit.Before
import org.junit.Test
-
class FormatterHelperTest {
@MockK
@@ -31,10 +30,9 @@ class FormatterHelperTest {
mockkObject(CoronaWarnApplication.Companion)
every { CoronaWarnApplication.getAppContext() } returns context
-
}
- private fun formatVisibilityBase(bValue: Boolean, iResult: Int){
+ private fun formatVisibilityBase(bValue: Boolean, iResult: Int) {
val result = formatVisibility(value = bValue)
assertThat(result, `is`((iResult)))
}
@@ -44,12 +42,12 @@ class FormatterHelperTest {
assertThat(result, `is`((iResult)))
}
- private fun formatVisibilityInvertedBase(bValue: Boolean){
+ private fun formatVisibilityInvertedBase(bValue: Boolean) {
val result = formatVisibilityInverted(value = bValue)
assertThat(result, `is`((formatVisibility(!bValue))))
}
- private fun formatVisibilityTextBase(bValue: Boolean, sText: String?){
+ private fun formatVisibilityTextBase(bValue: Boolean, sText: String?) {
val result = formatVisibilityText(text = sText)
assertThat(result, `is`((formatVisibility(bValue))))
}
@@ -62,7 +60,7 @@ class FormatterHelperTest {
assertThat(result, `is`((CoronaWarnApplication.getAppContext().getString(iResult))))
}
- private fun formatDrawableBase(bValue: Boolean) {
+ private fun formatDrawableBase(bValue: Boolean) {
every { context.getDrawable(1) } returns drawable
every { context.getDrawable(2) } returns drawable
@@ -70,7 +68,7 @@ class FormatterHelperTest {
assertThat(result, `is`((equalTo(drawable))))
}
- private fun formatColorBase(bValue: Boolean, iColor: Int) {
+ private fun formatColorBase(bValue: Boolean, iColor: Int) {
every { context.getColor(1) } returns 1
every { context.getColor(2) } returns 2
@@ -78,13 +76,13 @@ class FormatterHelperTest {
assertThat(result, `is`((context.getColor(iColor))))
}
- @Test
+ @Test
fun formatVisibility() {
- // Check visibility when value true
- formatVisibilityBase(bValue = true, iResult = View.VISIBLE)
+ // Check visibility when value true
+ formatVisibilityBase(bValue = true, iResult = View.VISIBLE)
- // Check visibility when value false
- formatVisibilityBase(bValue = false, iResult = View.GONE)
+ // Check visibility when value false
+ formatVisibilityBase(bValue = false, iResult = View.GONE)
}
@Test
@@ -97,7 +95,7 @@ class FormatterHelperTest {
}
@Test
- fun formatVisibilityInverted(){
+ fun formatVisibilityInverted() {
// Check visibilityIcon when value true
formatVisibilityInvertedBase(bValue = true)
@@ -106,7 +104,7 @@ class FormatterHelperTest {
}
@Test
- fun formatVisibilityText(){
+ fun formatVisibilityText() {
// Check visibilityText when value true and text is not empty
formatVisibilityTextBase(bValue = true, sText = "NOT_NULL_STRING")
@@ -118,7 +116,7 @@ class FormatterHelperTest {
}
@Test
- fun formatText(){
+ fun formatText() {
// Check formatText when value true
formatTextBase(bValue = true, iResult = 1)
@@ -129,7 +127,6 @@ class FormatterHelperTest {
formatTextBase(bValue = null, iResult = 2)
}
-
@Test
fun formatDrawable() {
// Check formatDrawable when value true
@@ -152,5 +149,4 @@ class FormatterHelperTest {
fun cleanUp() {
unmockkAll()
}
-
}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelperTest.kt
index 8b757701a..3c5a44b44 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelperTest.kt
@@ -38,7 +38,6 @@ class FormatterSettingsHelperTest {
every { context.getString(R.string.settings_notifications_body_inactive) } returns "settings_notifications_body_inactive"
every { context.getColor(R.color.colorAccentTintIcon) } returns R.color.colorAccentTintIcon
every { context.getColor(R.color.colorTextPrimary3) } returns R.color.colorTextPrimary3
-
}
private fun formatStatusBase(bValue: Boolean) {
@@ -223,7 +222,6 @@ class FormatterSettingsHelperTest {
)
}
-
@Test
fun formatStatus() {
// When status true
@@ -297,7 +295,6 @@ class FormatterSettingsHelperTest {
bNotificationsTest = true,
bValue = false
)
-
}
@Test
@@ -365,7 +362,6 @@ class FormatterSettingsHelperTest {
bConnection = true,
iValue = R.string.settings_tracing_status_inactive
)
-
}
@Test
@@ -433,7 +429,6 @@ class FormatterSettingsHelperTest {
bConnection = true,
iValue = R.string.settings_tracing_body_inactive
)
-
}
@Test
--
GitLab