Skip to content
Snippets Groups Projects
Unverified Commit 1a3f3a78 authored by Mohamed's avatar Mohamed Committed by GitHub
Browse files

RAT profile onboarding (EXPOSUREAPP-6027) (#2996) 


* RAT Profile Onboarding

* Polishing

* Address PR comments

* Update rat_profile_onboarding_fragment.xml

* Update rat_profile_onboarding_fragment.xml

* Address more comments

* Add click listener

* Update content description

* Fix text

* Update Corona-Warn-App/src/main/res/values/legal_strings.xml

Co-authored-by: default avatarjanetback <68653277+janetback@users.noreply.github.com>

* Update legal text

Co-authored-by: default avatarharambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: default avatarI502720 <axel.herbstreith@sap.com>
Co-authored-by: default avatarjanetback <68653277+janetback@users.noreply.github.com>
Co-authored-by: default avatarchris-cwa <69595386+chris-cwa@users.noreply.github.com>
parent db497294
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 527 additions and 41 deletions
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/coronatest/rat/profile/onboarding/RATProfileOnboardingFragment.kt
+ 7
− 1
View file @ 1a3f3a78
...@@ -16,12 +16,18 @@ class RATProfileOnboardingFragment : Fragment(R.layout.rat_profile_onboarding_fr ...@@ -16,12 +16,18 @@ class RATProfileOnboardingFragment : Fragment(R.layout.rat_profile_onboarding_fr
override fun onViewCreated(view: View, savedInstanceState: Bundle?) = override fun onViewCreated(view: View, savedInstanceState: Bundle?) =
with(binding) { with(binding) {
toolbar.setNavigationOnClickListener { popBackStack() } toolbar.setNavigationOnClickListener { popBackStack() }
nextButton.setOnClickListener { nextButton.setOnClickListener {
doNavigate( doNavigate(
RATProfileOnboardingFragmentDirections RATProfileOnboardingFragmentDirections
.actionRatProfileOnboardingFragmentToRatProfileCreateFragment() .actionRatProfileOnboardingFragmentToRatProfileCreateFragment()
) )
} }
ratProfileOnboardingPrivacy.setOnClickListener {
doNavigate(
RATProfileOnboardingFragmentDirections
.actionRatProfileOnboardingFragmentToPrivacyFragment()
)
}
} }
} }
Corona-Warn-App/src/main/res/drawable/rat_profile_onboarding.xml 0 → 100644
+ 169
− 0
View file @ 1a3f3a78
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="245dp"
android:height="147dp"
android:viewportWidth="245"
android:viewportHeight="147">
<path
android:pathData="M25.795,29.373C15.224,62.399 55.133,61.993 40.105,87.512C25.556,112.161 46.814,115.021 46.814,115.021L220.769,115.842C220.769,115.842 243.618,78.526 237.666,50.321C233.056,26.31 202.712,10.3 186.965,18.435C146.079,39.432 123.939,12.474 103.543,6.609C64.133,-4.667 35.332,-0.406 25.795,29.373Z"
android:fillColor="#E9E9E9"
android:fillType="evenOdd"/>
<path
android:pathData="M87.052,29.985L86.368,36.867L84.976,37.978L83.584,38.811L85.532,42.975L96.39,43.252L94.998,38.811L95.276,36.59L94.427,36.218C93.745,35.918 93.266,35.288 93.166,34.549L92.545,29.982H87.052V29.985Z"
android:fillColor="#F6B893"/>
<path
android:pathData="M95.81,25.163C95.234,36.389 84,34.379 84.276,23.103C84.85,11.876 96.086,13.883 95.81,25.163Z"
android:fillColor="#F6B893"/>
<path
android:strokeWidth="1"
android:pathData="M95.053,26.312C92.406,27.158 89.381,27.898 83.71,26.312C82.922,27.193 82.576,29.8 85.6,31.068C88.625,32.336 92.217,31.597 93.635,31.068C95.21,29.131 97.699,25.467 95.053,26.312Z"
android:fillColor="#ffffff"
android:strokeColor="#ffffff"/>
<path
android:pathData="M81.356,68.237C76.623,87.115 81.166,114.241 82.631,136.011L86.066,136.122C86.066,136.122 88.037,100.718 88.872,92.667C89.126,90.222 89.955,84.994 90.379,82.72C90.412,82.548 90.777,81.796 90.821,82.673C91.1,88.226 93.605,94.333 94.162,100.441C95.462,114.713 95.176,124.649 95.741,136.428C95.741,136.428 99.725,138.776 99.73,138.751C100.563,135.465 102.793,108.386 102.793,104.327C102.793,103.494 103.879,86.152 99.452,68.515L81.356,68.237Z"
android:fillColor="#8C8C98"/>
<path
android:pathData="M104.068,69.506C101.454,79.058 115.366,81.685 105.956,67.604L104.068,69.506Z"
android:fillColor="#F6B893"/>
<path
android:pathData="M72.249,62.962C74.337,66.293 76.155,64.511 81.158,61.018C81.397,60.852 81.636,60.677 81.884,60.502C81.806,63.855 81.65,66.879 81.358,68.236C80.684,71.376 100.29,71.29 99.733,69.069C98.552,64.366 98.062,55.744 98.062,49.081C98.062,48.526 98.992,51.324 99.454,53.245C100.629,58.112 101.484,65.199 103.333,69.208C103.909,70.457 104.727,69.938 106.08,69.472C107.239,69.058 106.771,67.109 106.735,66.623C106.473,63.109 105.858,58.189 105.02,54.353C103.734,48.448 102.765,39.692 95.273,36.433C95.15,36.38 95.008,36.472 95.011,36.608C95.084,39.098 92.436,42.693 91.1,42.693C88.594,42.693 84.418,39.084 83.839,36.169C77.878,37.904 76.107,44.656 74.952,48.8C73.56,53.8 71.174,61.249 72.249,62.962ZM79.045,56.449C79.239,55.968 79.601,54.927 80.244,52.69L81.567,48.079C81.625,47.873 81.929,47.912 81.932,48.126C81.948,49.725 82.255,51.188 82.232,54.353C80.834,55.486 79.757,56.515 79.281,56.69C79.128,56.749 78.983,56.599 79.045,56.449Z"
android:fillColor="#C66A61"/>
<path
android:pathData="M86.163,134.455L82.469,134.033C82.363,134.982 81.077,136.531 81.787,140.215C81.843,140.509 81.912,143.311 82.007,143.613C82.093,143.894 83.304,144.302 83.304,144.024C83.304,143.744 82.959,140.285 83.583,141.526C83.861,142.081 83.861,144.024 85.253,145.135C86.843,146.403 91.851,146.811 89.986,144.579C87.202,141.248 86.369,135.965 86.152,134.799"
android:fillColor="#4A4A4A"/>
<path
android:pathData="M95.699,134.638C95.699,134.638 95.64,136.47 95.275,137.919C94.997,139.03 94.719,142.361 95.832,145.137H97.503C97.503,145.137 96.946,142.083 97.224,140.418C97.299,139.973 97.503,142.361 99.173,144.304C99.941,145.198 100.632,145.32 100.958,145.356C101.556,145.423 105.109,145.415 105.298,145.415C105.855,145.415 106.412,144.304 104.176,143.319C103.577,143.055 102.831,142.55 102.236,141.806C101.222,140.543 100.757,138.405 100.2,135.351L95.699,134.638Z"
android:fillColor="#4A4A4A"/>
<path
android:pathData="M86.632,53.348L87.768,54.193C92.674,52.461 95.459,43.756 88.739,47.374C87.199,48.846 86.425,50.864 85.557,52.429"
android:fillColor="#F6B893"/>
<path
android:pathData="M97.823,37.919C97.43,37.622 97.107,37.405 96.667,37.147C96.158,36.847 95.799,36.683 95.236,36.447C95.192,36.428 95.089,36.447 95.058,36.506C94.585,36.389 94.209,36.178 93.816,35.814C92.99,35.048 92.461,33.688 92.739,32.3C92.889,31.55 93.179,31.239 93.338,31.048C96.915,26.748 94.56,19.904 94.56,19.904C94.56,19.904 92.55,24.13 84.966,27.022C84.966,27.022 85.281,28.988 86.394,30.376C86.475,30.479 87.31,31.231 87.341,32.411C87.369,33.569 87.371,34.74 86.578,36.514C85.612,38.679 83.154,39.201 81.288,38.457C79.896,37.902 79.339,36.514 79.275,35.145C79.275,35.145 83.07,35.368 82.176,31.142C81.508,27.966 80.712,21.029 83.855,17.017C83.9,16.962 83.944,16.906 83.989,16.851C84.019,16.809 84.056,16.767 84.092,16.728C84.156,16.653 84.223,16.579 84.289,16.506C84.354,16.44 84.418,16.373 84.482,16.306C85.467,15.31 86.765,14.56 88.46,14.194C88.46,14.194 94.93,13.305 96.044,17.087C96.044,17.087 97.828,17.978 98.054,21.315C98.277,24.652 97.717,25.873 97.606,28.433C97.472,31.545 97.383,34.662 100.729,35.329C100.735,35.323 100.852,37.022 97.823,37.919Z"
android:fillColor="#4A4A4A"/>
<group>
<clip-path
android:pathData="M141,14.116h103.79v104.24h-103.79z"/>
<path
android:pathData="M239.57,29.976H182.35V118.356H239.57V29.976Z"
android:fillColor="#94A1AB"/>
<path
android:strokeWidth="1"
android:pathData="M206.2,63.406H192.67C191.991,63.406 191.44,63.957 191.44,64.636V76.166C191.44,76.846 191.991,77.396 192.67,77.396H206.2C206.879,77.396 207.43,76.846 207.43,76.166V64.636C207.43,63.957 206.879,63.406 206.2,63.406Z"
android:fillColor="#E3F0FF"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M199.44,63.586V77.296"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M206.98,70.296H191.72"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M229.08,63.306H215.55C214.871,63.306 214.32,63.857 214.32,64.536V76.066C214.32,76.746 214.871,77.296 215.55,77.296H229.08C229.759,77.296 230.31,76.746 230.31,76.066V64.536C230.31,63.857 229.759,63.306 229.08,63.306Z"
android:fillColor="#E3F0FF"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M222.32,63.486V77.186"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M229.86,70.196H214.6"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M206.28,39.776H192.75C192.071,39.776 191.52,40.327 191.52,41.006V52.536C191.52,53.216 192.071,53.766 192.75,53.766H206.28C206.959,53.766 207.51,53.216 207.51,52.536V41.006C207.51,40.327 206.959,39.776 206.28,39.776Z"
android:fillColor="#E3F0FF"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M199.51,39.956V53.666"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M207.06,46.666H191.79"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M229.16,39.666H215.63C214.951,39.666 214.4,40.217 214.4,40.896V52.426C214.4,53.106 214.951,53.656 215.63,53.656H229.16C229.839,53.656 230.39,53.106 230.39,52.426V40.896C230.39,40.217 229.839,39.666 229.16,39.666Z"
android:fillColor="#E3F0FF"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M222.4,39.846V53.556"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:strokeWidth="1"
android:pathData="M229.94,46.556H214.68"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:pathData="M186.63,117.116C188.29,115.266 189.47,112.376 188.52,106.366C187.57,100.356 186.79,98.986 185.29,98.746C183.79,98.506 182.84,99.466 182.45,101.556C182.06,103.646 182.13,105.726 181.45,106.556C180.77,107.386 177.19,111.846 179.24,115.696C181.29,119.546 184.77,118.506 186.58,117.146"
android:fillColor="#B8E0FA"
android:fillType="evenOdd"/>
<path
android:pathData="M182.47,118.356C183.494,115.729 184.252,113.005 184.73,110.226C185.206,107.814 185.387,105.352 185.27,102.896H185.08C185.189,105.336 185.004,107.78 184.53,110.176C184.057,112.941 183.307,115.652 182.29,118.266L182.47,118.356Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M184.11,112.976C184,113.116 186.9,111.206 187.45,109.316L187.26,109.256C186.73,111.076 184.12,112.736 184.11,112.736V112.976Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M183.2,116.416C182.285,115.179 181.606,113.782 181.2,112.296H181.03C181.423,113.814 182.102,115.243 183.03,116.506L183.2,116.416Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M176.79,87.476C175.13,87.476 174.18,89.876 174.1,90.996C173.77,95.796 170.83,99.216 171.1,106.686C171.27,111.586 172.99,116.616 174.8,117.496C178.3,119.186 180.64,115.416 181.04,111.886C181.696,106.797 181.006,101.626 179.04,96.886C177.59,93.326 180.04,87.436 176.75,87.516"
android:fillColor="#B8E0FA"
android:fillType="evenOdd"/>
<path
android:pathData="M176.66,118.116C175.956,113.078 175.621,107.994 175.66,102.906C175.599,98.655 175.934,94.406 176.66,90.216H176.85C176.129,94.397 175.794,98.635 175.85,102.876C175.811,107.951 176.145,113.021 176.85,118.046L176.66,118.116Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M175.84,109.726C176.886,108.054 177.77,106.286 178.48,104.446H178.67C177.957,106.319 177.063,108.118 176,109.816L175.84,109.726Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M175.66,101.246C175.66,101.246 173.66,98.906 173.82,97.166H174C173.88,98.846 175.79,101.116 175.79,101.116L175.66,101.246Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M242.23,21.446H179.69C178.276,21.446 177.13,22.592 177.13,24.006V28.886C177.13,30.3 178.276,31.446 179.69,31.446H242.23C243.644,31.446 244.79,30.3 244.79,28.886V24.006C244.79,22.592 243.644,21.446 242.23,21.446Z"
android:fillColor="#C36A61"/>
<path
android:pathData="M194.22,118.356V90.396H210.95V118.356"
android:fillColor="#E3F0FF"/>
<path
android:strokeWidth="1"
android:pathData="M194.22,118.356V90.396H210.95V118.356"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:pathData="M210.95,118.356V90.396H227.69V118.356"
android:fillColor="#E3F0FF"/>
<path
android:strokeWidth="1"
android:pathData="M210.95,118.356V90.396H227.69V118.356"
android:fillColor="#00000000"
android:strokeColor="#0088B2"/>
<path
android:pathData="M207.43,107.106C208.093,107.106 208.63,106.569 208.63,105.906C208.63,105.244 208.093,104.706 207.43,104.706C206.767,104.706 206.23,105.244 206.23,105.906C206.23,106.569 206.767,107.106 207.43,107.106Z"
android:fillColor="#0088B2"/>
<path
android:pathData="M215.53,107.106C216.193,107.106 216.73,106.569 216.73,105.906C216.73,105.244 216.193,104.706 215.53,104.706C214.867,104.706 214.33,105.244 214.33,105.906C214.33,106.569 214.867,107.106 215.53,107.106Z"
android:fillColor="#0088B2"/>
</group>
<path
android:pathData="M54.133,57.126C55.479,57.126 56.189,56.364 56.189,55.044V48.823C56.189,43.593 53.523,40.978 48.217,40.978H41.996C40.676,40.978 39.939,41.688 39.939,43.009C39.939,44.329 40.676,45.065 41.996,45.065H48.141C50.654,45.065 52.102,46.411 52.102,49.052V55.044C52.102,56.364 52.838,57.126 54.133,57.126ZM8.506,57.126C9.852,57.126 10.563,56.364 10.563,55.044V49.052C10.563,46.411 11.959,45.065 14.498,45.065H20.643C21.988,45.065 22.725,44.329 22.725,43.009C22.725,41.688 21.988,40.978 20.643,40.978H14.447C9.141,40.978 6.475,43.593 6.475,48.823V55.044C6.475,56.364 7.211,57.126 8.506,57.126ZM20.262,64.718H29.098C29.732,64.718 30.215,64.235 30.215,63.626V54.765C30.215,54.155 29.732,53.647 29.098,53.647H20.262C19.627,53.647 19.145,54.155 19.145,54.765V63.626C19.145,64.235 19.627,64.718 20.262,64.718ZM33.516,64.718H42.352C42.986,64.718 43.469,64.235 43.469,63.626V54.765C43.469,54.155 42.986,53.647 42.352,53.647H33.516C32.881,53.647 32.398,54.155 32.398,54.765V63.626C32.398,64.235 32.881,64.718 33.516,64.718ZM21.354,62.509V55.856H28.006V62.509H21.354ZM34.607,62.509V55.856H41.26V62.509H34.607ZM23.283,60.579H26.076V57.786H23.283V60.579ZM36.563,60.579H39.33V57.786H36.563V60.579ZM20.262,77.997H29.098C29.732,77.997 30.215,77.515 30.215,76.88V68.044C30.215,67.409 29.732,66.927 29.098,66.927H20.262C19.627,66.927 19.145,67.409 19.145,68.044V76.88C19.145,77.515 19.627,77.997 20.262,77.997ZM32.729,69.999H35.496V67.231H32.729V69.999ZM40.371,69.999H43.139V67.231H40.371V69.999ZM21.354,75.788V69.136H28.006V75.788H21.354ZM23.283,73.833H26.076V71.065H23.283V73.833ZM36.537,73.833H39.33V71.065H36.537V73.833ZM14.447,90.667H20.643C21.988,90.667 22.725,89.931 22.725,88.636C22.725,87.315 21.988,86.579 20.643,86.579H14.498C11.959,86.579 10.563,85.233 10.563,82.593V76.601C10.563,75.255 9.826,74.519 8.506,74.519C7.186,74.519 6.475,75.255 6.475,76.601V82.796C6.475,88.052 9.141,90.667 14.447,90.667ZM41.996,90.667H48.217C53.523,90.667 56.189,88.026 56.189,82.796V76.601C56.189,75.255 55.453,74.519 54.133,74.519C52.813,74.519 52.102,75.255 52.102,76.601V82.593C52.102,85.233 50.654,86.579 48.141,86.579H41.996C40.676,86.579 39.939,87.315 39.939,88.636C39.939,89.931 40.676,90.667 41.996,90.667ZM32.729,77.667H35.496V74.899H32.729V77.667ZM40.371,77.667H43.139V74.899H40.371V77.667Z"
android:fillColor="#3E6883"/>
</vector>
Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
+ 18
− 20
View file @ 1a3f3a78
...@@ -23,17 +23,17 @@ ...@@ -23,17 +23,17 @@
android:layout_marginHorizontal="@dimen/spacing_normal" android:layout_marginHorizontal="@dimen/spacing_normal"
android:layout_marginVertical="@dimen/spacing_small" android:layout_marginVertical="@dimen/spacing_small"
android:text="@string/trace_location_onboarding_body_confirm" android:text="@string/trace_location_onboarding_body_confirm"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_scroll_view"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_scroll_view" />
<androidx.core.widget.NestedScrollView <ScrollView
android:id="@+id/check_in_onboarding_scroll_view" android:id="@+id/check_in_onboarding_scroll_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:paddingBottom="@dimen/spacing_small"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingBottom="@dimen/spacing_small"
android:scrollbarStyle="outsideOverlay" android:scrollbarStyle="outsideOverlay"
app:layout_constraintBottom_toTopOf="@+id/check_in_onboarding_acknowledge" app:layout_constraintBottom_toTopOf="@+id/check_in_onboarding_acknowledge"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_toolbar"> app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_toolbar">
...@@ -49,10 +49,10 @@ ...@@ -49,10 +49,10 @@
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="24dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:contentDescription="@string/trace_location_onboarding_content_description" android:contentDescription="@string/trace_location_onboarding_content_description"
app:srcCompat="@drawable/trace_location_onboarding"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/trace_location_onboarding" />
<TextView <TextView
android:id="@+id/check_in_onboarding_title" android:id="@+id/check_in_onboarding_title"
...@@ -86,9 +86,9 @@ ...@@ -86,9 +86,9 @@
android:layout_marginStart="@dimen/spacing_normal" android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginTop="@dimen/spacing_large" android:layout_marginTop="@dimen/spacing_large"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_qr_tracing_static"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_subtitle" /> app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_subtitle"
app:srcCompat="@drawable/ic_qr_tracing_static" />
<TextView <TextView
android:id="@+id/check_in_onboarding_warning" android:id="@+id/check_in_onboarding_warning"
...@@ -108,9 +108,9 @@ ...@@ -108,9 +108,9 @@
android:layout_marginStart="@dimen/spacing_normal" android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginTop="@dimen/spacing_medium" android:layout_marginTop="@dimen/spacing_medium"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_qr_time"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_warning" /> app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_warning"
app:srcCompat="@drawable/ic_qr_time" />
<TextView <TextView
android:id="@+id/check_in_onboarding_stay" android:id="@+id/check_in_onboarding_stay"
...@@ -128,10 +128,8 @@ ...@@ -128,10 +128,8 @@
style="@style/cardTracing" style="@style/cardTracing"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="@dimen/guideline_card"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:background="#F5F5F5"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_stay"> app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_stay">
...@@ -161,9 +159,9 @@ ...@@ -161,9 +159,9 @@
android:layout_width="8dp" android:layout_width="8dp"
android:layout_height="8dp" android:layout_height="8dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
app:srcCompat="@drawable/bullet_point"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_card_subtitle" /> app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_card_subtitle"
app:srcCompat="@drawable/bullet_point" />
<TextView <TextView
android:id="@+id/check_in_onboarding_body2" android:id="@+id/check_in_onboarding_body2"
...@@ -197,9 +195,9 @@ ...@@ -197,9 +195,9 @@
android:layout_width="8dp" android:layout_width="8dp"
android:layout_height="8dp" android:layout_height="8dp"
android:layout_marginTop="22dp" android:layout_marginTop="22dp"
app:srcCompat="@drawable/bullet_point"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body3" /> app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body3"
app:srcCompat="@drawable/bullet_point" />
<TextView <TextView
android:id="@+id/check_in_onboarding_body4" android:id="@+id/check_in_onboarding_body4"
...@@ -220,9 +218,9 @@ ...@@ -220,9 +218,9 @@
android:layout_width="8dp" android:layout_width="8dp"
android:layout_height="8dp" android:layout_height="8dp"
android:layout_marginTop="22dp" android:layout_marginTop="22dp"
app:srcCompat="@drawable/bullet_point"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body4" /> app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body4"
app:srcCompat="@drawable/bullet_point" />
<TextView <TextView
android:id="@+id/check_in_onboarding_body5" android:id="@+id/check_in_onboarding_body5"
...@@ -262,6 +260,6 @@ ...@@ -262,6 +260,6 @@
app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_card_container" app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_card_container"
app:titleText="@string/contact_diary_onboarding_legal_information" /> app:titleText="@string/contact_diary_onboarding_legal_information" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView> </ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
Corona-Warn-App/src/main/res/layout/rat_profile_onboarding_fragment.xml
+ 248
− 20
View file @ 1a3f3a78
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.coronatest.rat.profile.onboarding.RATProfileOnboardingFragment"> android:background="@color/colorBackground">
<!-- TODO: implement onboarding screen-->
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
style="@style/CWAToolbar.Close" style="@style/CWAToolbar.Close"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="?actionBarSize"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:title="Schnelltest-Profil" /> app:title="@string/rat_profile_create_title" />
<TextView <ScrollView
android:layout_width="wrap_content" android:id="@+id/rat_profile_onboarding_scroll_view"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_gravity="center" android:layout_height="0dp"
android:text="🚧 Onboarding Screen" android:layout_marginBottom="20dp"
android:textSize="40sp" app:layout_constraintBottom_toTopOf="@id/next_button"
app:layout_constraintBottom_toTopOf="@+id/nextButton" app:layout_constraintTop_toBottomOf="@id/toolbar">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" <androidx.constraintlayout.widget.ConstraintLayout
app:layout_constraintStart_toStartOf="parent" android:layout_width="match_parent"
app:layout_constraintTop_toTopOf="parent" /> android:layout_height="wrap_content">
<ImageView
android:id="@+id/rat_profile_onboarding_image"
android:layout_width="0dp"
android:layout_height="190dp"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="4dp"
android:contentDescription="@string/rat_profile_onboarding_image_content_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/rat_profile_onboarding" />
<TextView
android:id="@+id/rat_profile_onboarding_title"
style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="24dp"
android:text="@string/rat_profile_onboarding_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_image" />
<TextView
android:id="@+id/rat_profile_onboarding_subtitle"
style="@style/subtitleMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="22dp"
android:text="@string/rat_profile_onboarding_subtitle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_title" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rat_profile_onboarding_card_container"
style="@style/cardTracing"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/guideline_card"
android:layout_marginTop="32dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_subtitle">
<TextView
android:id="@+id/rat_profile_onboarding_card_title"
style="@style/headline6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/rat_profile_onboarding_card_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/rat_profile_onboarding_bullet_point1"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginTop="22dp"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_card_title"
app:srcCompat="@drawable/bullet_point" />
<TextView
android:id="@+id/rat_profile_onboarding_body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="16dp"
android:focusable="true"
android:text="@string/rat_profile_onboarding_card_consent1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/rat_profile_onboarding_bullet_point1"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_card_title" />
<ImageView
android:id="@+id/rat_profile_onboarding_bullet_point2"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginTop="22dp"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body1"
app:srcCompat="@drawable/bullet_point" />
<TextView
android:id="@+id/rat_profile_onboarding_body2"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="16dp"
android:focusable="true"
android:text="@string/rat_profile_onboarding_card_consent2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/rat_profile_onboarding_bullet_point2"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body1" />
<ImageView
android:id="@+id/rat_profile_onboarding_bullet_point3"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginTop="22dp"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body2"
app:srcCompat="@drawable/bullet_point" />
<TextView
android:id="@+id/rat_profile_onboarding_body3"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="16dp"
android:focusable="true"
android:text="@string/rat_profile_onboarding_card_consent3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/rat_profile_onboarding_bullet_point3"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body2" />
<ImageView
android:id="@+id/rat_profile_onboarding_bullet_point4"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginTop="22dp"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body3"
app:srcCompat="@drawable/bullet_point" />
<TextView
android:id="@+id/rat_profile_onboarding_body4"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="16dp"
android:focusable="true"
android:text="@string/rat_profile_onboarding_card_consent4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/rat_profile_onboarding_bullet_point4"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body3" />
<ImageView
android:id="@+id/rat_profile_onboarding_bullet_point5"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginTop="22dp"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body4"
app:srcCompat="@drawable/bullet_point" />
<TextView
android:id="@+id/rat_profile_onboarding_body5"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="16dp"
android:focusable="true"
android:text="@string/rat_profile_onboarding_card_consent5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/rat_profile_onboarding_bullet_point5"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body4" />
<ImageView
android:id="@+id/rat_profile_onboarding_bullet_point6"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginTop="22dp"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body5"
app:srcCompat="@drawable/bullet_point" />
<TextView
android:id="@+id/rat_profile_onboarding_body6"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="16dp"
android:focusable="true"
android:text="@string/rat_profile_onboarding_card_consent6"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/rat_profile_onboarding_bullet_point6"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body5" />
<ImageView
android:id="@+id/rat_profile_onboarding_bullet_point7"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_marginTop="22dp"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body6"
app:srcCompat="@drawable/bullet_point" />
<TextView
android:id="@+id/rat_profile_onboarding_body7"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="16dp"
android:focusable="true"
android:text="@string/rat_profile_onboarding_card_consent7"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/rat_profile_onboarding_bullet_point7"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_body6" />
</androidx.constraintlayout.widget.ConstraintLayout>
<de.rki.coronawarnapp.util.ui.views.MoreInformationView
android:id="@+id/rat_profile_onboarding_privacy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="30dp"
android:focusable="true"
app:layout_constraintTop_toBottomOf="@id/rat_profile_onboarding_card_container"
app:titleText="@string/rat_profile_onboarding_privacy" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<Button <Button
android:id="@+id/nextButton" android:id="@+id/next_button"
style="@style/buttonPrimary" style="@style/buttonPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:layout_marginHorizontal="24dp" android:layout_marginHorizontal="24dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:text="Weiter" android:text="@string/rat_profile_onboarding_next"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Corona-Warn-App/src/main/res/navigation/rapid_antigen_test_profile_nav_graph.xml
+ 9
− 0
View file @ 1a3f3a78
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
<action <action
android:id="@+id/action_ratProfileOnboardingFragment_to_ratProfileCreateFragment" android:id="@+id/action_ratProfileOnboardingFragment_to_ratProfileCreateFragment"
app:destination="@id/ratProfileCreateFragment" /> app:destination="@id/ratProfileCreateFragment" />
<action
android:id="@+id/action_ratProfileOnboardingFragment_to_privacyFragment"
app:destination="@id/privacyFragment" />
</fragment> </fragment>
<fragment <fragment
android:id="@+id/ratProfileCreateFragment" android:id="@+id/ratProfileCreateFragment"
...@@ -30,4 +33,10 @@ ...@@ -30,4 +33,10 @@
android:name="de.rki.coronawarnapp.ui.coronatest.rat.profile.qrcode.RATProfileQrCodeFragment" android:name="de.rki.coronawarnapp.ui.coronatest.rat.profile.qrcode.RATProfileQrCodeFragment"
android:label="rat_profile_qr_code_fragment" android:label="rat_profile_qr_code_fragment"
tools:layout="@layout/rat_profile_qr_code_fragment" /> tools:layout="@layout/rat_profile_qr_code_fragment" />
<fragment
android:id="@+id/privacyFragment"
android:name="de.rki.coronawarnapp.ui.information.InformationPrivacyFragment"
android:label="InformationPrivacyFragment"
tools:layout="@layout/fragment_information_privacy" />
</navigation> </navigation>
\ No newline at end of file
Corona-Warn-App/src/main/res/values-de/antigen_strings.xml
+ 11
− 0
View file @ 1a3f3a78
...@@ -170,4 +170,15 @@ ...@@ -170,4 +170,15 @@
<string name="rat_profile_create_phone_hint">Telefonnummer</string> <string name="rat_profile_create_phone_hint">Telefonnummer</string>
<!-- XTXT: Create RAT profile email hint --> <!-- XTXT: Create RAT profile email hint -->
<string name="rat_profile_create_email_hint">E-Mail-Adresse</string> <string name="rat_profile_create_email_hint">E-Mail-Adresse</string>
<!--RAT profile onboarding-->
<string name="rat_profile_onboarding_image_content_description">Eine Frau mit einem Smartphone in der Hand steht vor einem Gebäude. Ein QR-Code symbolisiert das zu scannende Schnelltest-Profil.</string>
<!-- XTXT: Create RAT profile onboarding title -->
<string name="rat_profile_onboarding_title">Legen Sie Ihre persönlichen Daten als QR-Code ab, um die Registrierung an der Teststelle zu beschleunigen.</string>
<!-- XTXT: Create RAT profile onboarding subtitle -->
<string name="rat_profile_onboarding_subtitle">Mit Ihrem eigenen Schnelltest-Profil müssen Sie Ihre persönlichen Daten nicht bei jedem neuen Schnelltest erneut ausfüllen.</string>
<!-- XTXT: Create RAT profile onboarding next button -->
<string name="rat_profile_onboarding_next">Weiter</string>
<!-- XTXT: Create RAT profile onboarding privacy -->
<string name="rat_profile_onboarding_privacy">Ausführliche Informationen zur Datenverarbeitung und Ihrem Einverständnis.</string>
</resources> </resources>
Corona-Warn-App/src/main/res/values-de/legal_strings.xml
+ 18
− 0
View file @ 1a3f3a78
...@@ -147,4 +147,22 @@ ...@@ -147,4 +147,22 @@
<string name="trace_location_onboarding_body_consent5">Falls Sie später selbst eine Warnung auslösen, werden automatisch alle anderen Nutzer, die zeitgleich mit Ihnen bei einem unter „Meine Check-ins“ eingetragenen Event oder Ort eingecheckt waren, anhand der Event-ID gewarnt.</string> <string name="trace_location_onboarding_body_consent5">Falls Sie später selbst eine Warnung auslösen, werden automatisch alle anderen Nutzer, die zeitgleich mit Ihnen bei einem unter „Meine Check-ins“ eingetragenen Event oder Ort eingecheckt waren, anhand der Event-ID gewarnt.</string>
<!-- YMSG: Onboarding trace location bullet points --> <!-- YMSG: Onboarding trace location bullet points -->
<string name="trace_location_onboarding_body_consent6">Unter „Meine Check-ins“ können Sie einen Check-in jederzeit löschen. In diesem Fall werden Sie nur gewarnt, wenn Ihr Smartphone die Zufalls-IDs des positiv getesteten Nutzers empfangen und eine Risiko-Begegnung ermittelt hat.</string> <string name="trace_location_onboarding_body_consent6">Unter „Meine Check-ins“ können Sie einen Check-in jederzeit löschen. In diesem Fall werden Sie nur gewarnt, wenn Ihr Smartphone die Zufalls-IDs des positiv getesteten Nutzers empfangen und eine Risiko-Begegnung ermittelt hat.</string>
<!-- RAT Profile Onboarding -->
<!-- XHED: Title for RAT Profile onboarding consent card -->
<string name="rat_profile_onboarding_card_title" translatable="false">Datenschutz und Datensicherheit</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent1" translatable="false">Das Anlegen eines Schnelltest-Profils in der App und dessen Verwendung sind freiwillig.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent2" translatable="false">Die App wandelt die Daten, die Sie für Ihr Schnelltest-Profil eingeben, in Ihren persönlichen QR-Code um. Im QR-Code sind dann alle eingegebenen Daten enthalten.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent3" translatable="false">In der Teststelle können Sie den QR-Code Ihres Schnelltest-Profils scannen lassen, um der Teststelle Ihre Daten schnell und sicher bereitzustellen. Die Teststelle benötigt Ihre Daten zur Durchführung des Tests. Sie können die Daten aber auch ohne die App bereitstellen. Sie entscheiden selbst, welche Daten im QR-Code enthalten sind und welche Sie der Teststelle auf andere Weise mitteilen.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent4" translatable="false">Auf Ihr persönliches Schnelltest-Profil haben zunächst nur Sie Zugriff. Nur wenn Sie den QR-Code des Schnelltest-Profils anderen Personen zeigen, können diese Zugriff auf die persönlichen Daten Ihres Schnelltest-Profils erhalten. Ein Zugriff auf andere Daten aus der App erfolgt dabei nicht (z.B. Ihre Check-ins oder Angaben im Kontakt-Tagebuch).</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent5" translatable="false">Sie haben jederzeit die Möglichkeit, Ihr Schnelltest-Profil wieder zu entfernen. Bis dahin bleibt es in der App auf Ihrem Smartphone gespeichert.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent6" translatable="false">Der QR-Code enthält Ihre persönlichen Angaben. Stellen Sie Ihren persönlichen QR-Code niemandem zur Verfügung, wenn Sie nicht wollen, dass die Daten ausgelesen werden. Wir empfehlen Ihren persönlichen QR-Code nicht zu veröffentlichen und nicht per E-Mail zu versenden.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent7" translatable="false">Private Personen oder Unternehmen dürfen von Ihnen nicht verlangen, dass Sie Ihr Schnelltest-Profil vorzeigen.</string>
</resources> </resources>
Corona-Warn-App/src/main/res/values-tr/legal_strings.xml
+ 18
− 0
View file @ 1a3f3a78
...@@ -145,4 +145,22 @@ ...@@ -145,4 +145,22 @@
<string name="trace_location_onboarding_body_consent5">Eğer kendiniz daha sonra bir uyarıyı tetiklerseniz, “Giriş denetimlerim” altında girilen bir olay veya konumda sizinle eş zamanlı giriş yapmış olan diğer tüm kullanıcılar, olay kimliği üzerinden otomatik olarak uyarılacaktır.</string> <string name="trace_location_onboarding_body_consent5">Eğer kendiniz daha sonra bir uyarıyı tetiklerseniz, “Giriş denetimlerim” altında girilen bir olay veya konumda sizinle eş zamanlı giriş yapmış olan diğer tüm kullanıcılar, olay kimliği üzerinden otomatik olarak uyarılacaktır.</string>
<!-- YMSG: Onboarding trace location bullet points --> <!-- YMSG: Onboarding trace location bullet points -->
<string name="trace_location_onboarding_body_consent6">“Giriş denetimlerim” altındaki bir giriş denetimini istediğiniz zaman silebilirsiniz. Bu durumda akıllı telefonunuz yalnızca, bir riskli karşılaşmada testi pozitif çıkan bir kullanıcının rastgele kimlik numaralarını alırsa uyarılırsınız.</string> <string name="trace_location_onboarding_body_consent6">“Giriş denetimlerim” altındaki bir giriş denetimini istediğiniz zaman silebilirsiniz. Bu durumda akıllı telefonunuz yalnızca, bir riskli karşılaşmada testi pozitif çıkan bir kullanıcının rastgele kimlik numaralarını alırsa uyarılırsınız.</string>
<!-- RAT Profile Onboarding -->
<!-- XHED: Title for RAT Profile onboarding consent card -->
<string name="rat_profile_onboarding_card_title" translatable="false">Veri koruma ve veri güvenliği</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent1" translatable="false">Uygulamada hızlı test profillerinin oluşturulması ve bunların kullanılması isteğe bağlıdır.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent2" translatable="false">Uygulama hızlı test profiliniz için girdiğiniz verileri kişisel kare kodunuza dönüştürür. Verilen tüm bilgiler kare kodunda mevcuttur.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent3" translatable="false">Test merkezine verilerinizi hızlı ve güvenli bir şekilde hazırlamak için test merkezinde hızlı test profilinizin kare kodunu taratabilirsiniz. Test merkezi verilerinizi test uygulamak için kullanır. Verilerinizi uygulama olmadan da sunabilirsiniz. Kare kodunda bulunan ve test merkezine başka şekilde sunacağınız verileri kendiniz belirlersiniz.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent4" translatable="false">Kişisel hızlı test profilinize öncelikle sadece siz erişebilirsiniz. Hızlı test profilinizin kare kodunu başkalarına gösterirseniz ancak o zaman bu kişiler hızlı test profilinizdeki kişisel verilere erişebilir. Bu sırada uygulamadaki diğer verilere erişim sağlanmaz (örn. Check-ins ya da rehber bilgileri gibi).</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent5" translatable="false">Hızlı test profilinizi istediğiniz zaman tekrar kaldırabilirsiniz. O zamana kadar akıllı telefonunuzdaki uygulamada kayıtlı kalır.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent6" translatable="false">Kare kodu kişisel verilerinizi içerir. Verilerinizin okunmasını istemiyorsanız kişisel kare kodunuzu kimseyle paylaşmayın. Kişisel kare kodunuzu paylaşmamanızı ve e-posta üzerinden göndermemenizi öneriyoruz.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent7" translatable="false">Özel şahıslar ya da şirketler hızlı test profilinizi göstermenizi talep edemezler.</string>
</resources> </resources>
Corona-Warn-App/src/main/res/values/antigen_strings.xml
+ 11
− 0
View file @ 1a3f3a78
...@@ -170,4 +170,15 @@ ...@@ -170,4 +170,15 @@
<string name="rat_profile_create_phone_hint">Telefonnummer</string> <string name="rat_profile_create_phone_hint">Telefonnummer</string>
<!-- XTXT: Create RAT profile email hint --> <!-- XTXT: Create RAT profile email hint -->
<string name="rat_profile_create_email_hint">E-Mail-Adresse</string> <string name="rat_profile_create_email_hint">E-Mail-Adresse</string>
<!--RAT profile onboarding-->
<string name="rat_profile_onboarding_image_content_description">Eine Frau mit einem Smartphone in der Hand steht vor einem Gebäude. Ein QR-Code symbolisiert das zu scannende Schnelltest-Profil.</string>
<!-- XTXT: Create RAT profile onboarding title -->
<string name="rat_profile_onboarding_title">Legen Sie Ihre persönlichen Daten als QR-Code ab, um die Registrierung an der Teststelle zu beschleunigen.</string>
<!-- XTXT: Create RAT profile onboarding subtitle -->
<string name="rat_profile_onboarding_subtitle">Mit Ihrem eigenen Schnelltest-Profil müssen Sie Ihre persönlichen Daten nicht bei jedem neuen Schnelltest erneut ausfüllen.</string>
<!-- XTXT: Create RAT profile onboarding next button -->
<string name="rat_profile_onboarding_next">Weiter</string>
<!-- XTXT: Create RAT profile onboarding privacy -->
<string name="rat_profile_onboarding_privacy">Ausführliche Informationen zur Datenverarbeitung und Ihrem Einverständnis.</string>
</resources> </resources>
Corona-Warn-App/src/main/res/values/legal_strings.xml
+ 18
− 0
View file @ 1a3f3a78
...@@ -146,4 +146,22 @@ ...@@ -146,4 +146,22 @@
<string name="trace_location_onboarding_body_consent5" translatable="false">If you later use the warning feature yourself, all of the other users who were checked in at the same time as you at an event or place listed under “My check-ins” will receive a warning based on the event ID.</string> <string name="trace_location_onboarding_body_consent5" translatable="false">If you later use the warning feature yourself, all of the other users who were checked in at the same time as you at an event or place listed under “My check-ins” will receive a warning based on the event ID.</string>
<!-- YMSG: Onboarding trace location bullet points --> <!-- YMSG: Onboarding trace location bullet points -->
<string name="trace_location_onboarding_body_consent6" translatable="false">You can erase a check-in at any time under “My check-ins”. In this case, you will only be warned if your smartphone identifies a possible exposure after receiving the random IDs of the user who tested positive.</string> <string name="trace_location_onboarding_body_consent6" translatable="false">You can erase a check-in at any time under “My check-ins”. In this case, you will only be warned if your smartphone identifies a possible exposure after receiving the random IDs of the user who tested positive.</string>
<!-- RAT Profile Onboarding -->
<!-- XHED: Title for RAT Profile onboarding consent card -->
<string name="rat_profile_onboarding_card_title" translatable="false">Data protection and data security</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent1" translatable="false">Creating a rapid test profile in the app, and using it, are voluntary.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent2" translatable="false">The app converts the data you enter for your rapid test profile into your personal QR code. The QR code then contains all the data you entered.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent3" translatable="false">At a testing point, you can then have your rapid test profile’s QR code scanned as a means of quickly and securely providing your data to the testing point. The testing point will need your data to carry out the test. However, you do not need the app to provide your data. You decide yourself which data is included in the QR code, and which information you communicate to the testing point by other means.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent4" translatable="false">To begin with, only you will have access to your personal rapid test profile. Other people can only access the personal data contained in your rapid test profile if you show them your rapid test profile’s QR code. This will not provide access to other data from the app (e.g. your check-ins or information in your contact journal).</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent5" translatable="false">You have the possibility to delete your rapid test profile at any time. Until then, it will remain stored in the app on your smartphone.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent6" translatable="false">The QR code contains your personal information. Do not provide your personal QR code to anyone if you do not want the data to be read. We do not recommend publishing your personal QR code or sending it by email.</string>
<!-- YMSG: RAT Profile Onboarding bullet points -->
<string name="rat_profile_onboarding_card_consent7" translatable="false">Private individuals as well as companies are not allowed to make you share your rapid test profile with them.</string>
</resources> </resources>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment