Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Paragraph format & dark mode icons (EXPOSUREAPP-6188, EXPOSUREAPP-6211) #2753

Merged
merged 10 commits into from
Apr 7, 2021
Merged

Paragraph format & dark mode icons (EXPOSUREAPP-6188, EXPOSUREAPP-6211) #2753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7fd3527
reused existing icons with dark mode and deleted wrong unused icons
harambasicluka Apr 6, 2021
7ecb8d3
update font styling
harambasicluka Apr 6, 2021
1e018d2
removed font weight
harambasicluka Apr 6, 2021
6b9ba8a
Merge branch 'release/2.0.x' into fix/6188-icons
harambasicluka Apr 6, 2021
9e8f8a8
Merge branch 'release/2.0.x' into fix/6188-icons
harambasicluka Apr 6, 2021
f2b3fee
Merge branch 'release/2.0.x' into fix/6188-icons
BMItr Apr 7, 2021
a33e55c
Merge branch 'release/2.0.x' into fix/6188-icons
mtwalli Apr 7, 2021
348d8f9
Merge branch 'release/2.0.x' into fix/6188-icons
axelherbstreith Apr 7, 2021
c64a68c
Merge branch 'release/2.0.x' into fix/6188-icons
axelherbstreith Apr 7, 2021
ccdd09d
Merge branch 'release/2.0.x' into fix/6188-icons
BMItr Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions Corona-Warn-App/src/main/res/drawable/trace_location_stay.xml
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions Corona-Warn-App/src/main/res/drawable/trace_location_warning.xml
View file
Open in desktop

This file was deleted.

34 changes: 18 additions & 16 deletions Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,13 @@

<ImageView
android:id="@+id/check_in_warning_image"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginTop="24dp"
android:src="@drawable/trace_location_warning"
android:layout_marginStart="24dp"
app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginTop="@dimen/spacing_large"
android:importantForAccessibility="no"
android:src="@drawable/ic_qr_tracing_static"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_subtitle"
app:layout_constraintStart_toStartOf="parent" />

<TextView
Expand All @@ -98,12 +99,13 @@

<ImageView
android:id="@+id/check_in_stay_image"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginTop="24dp"
android:src="@drawable/trace_location_stay"
android:layout_marginStart="24dp"
app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginTop="@dimen/spacing_medium"
android:importantForAccessibility="no"
android:src="@drawable/ic_qr_time"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_warning"
app:layout_constraintStart_toStartOf="parent" />

<TextView
Expand Down Expand Up @@ -148,15 +150,15 @@
android:layout_marginTop="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_card_title" />
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_card_title" />

<ImageView
android:id="@+id/check_in_onboarding_bulletpoint1"
android:layout_width="8dp"
android:layout_height="8dp"
android:src="@drawable/bullet_point"
android:layout_marginTop="24dp"
app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_card_subtitle"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_card_subtitle"
app:layout_constraintStart_toStartOf="parent" />

<TextView
Expand Down Expand Up @@ -192,7 +194,7 @@
android:layout_height="8dp"
android:src="@drawable/bullet_point"
android:layout_marginTop="22dp"
app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_body3"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body3"
app:layout_constraintStart_toStartOf="parent" />

<TextView
Expand All @@ -215,7 +217,7 @@
android:layout_height="8dp"
android:src="@drawable/bullet_point"
android:layout_marginTop="22dp"
app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_body4"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body4"
app:layout_constraintStart_toStartOf="parent" />

<TextView
Expand Down
6 changes: 4 additions & 2 deletions Corona-Warn-App/src/main/res/layout/trace_location_privacy_card.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@

<TextView
android:id="@+id/first_bulletpoint_title"
style="@style/subtitleBoldSixteen"
style="@style/subtitle"
android:textStyle="bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
Expand Down Expand Up @@ -71,7 +72,8 @@

<TextView
android:id="@+id/second_bulletpoint_title"
style="@style/subtitleBoldSixteen"
style="@style/subtitle"
android:textStyle="bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
Expand Down