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

Ticket validation font style fix (EXPOSUREAPP-10895) #4518

Merged
merged 4 commits into from
Dec 10, 2021
Merged

Ticket validation font style fix (EXPOSUREAPP-10895) #4518

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aa1633
Fixed text formatting.
SamuraiKek Dec 10, 2021
c151ae5
Merge branch 'release/2.15.x' into fix/10895-ticket-validation-font-s…
SamuraiKek Dec 10, 2021
feac018
Fixed text formatting for consent two.
SamuraiKek Dec 10, 2021
86904ab
Merge branch 'release/2.15.x' into fix/10895-ticket-validation-font-s…
mtwalli Dec 10, 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
25 changes: 13 additions & 12 deletions Corona-Warn-App/src/main/res/layout/fragment_dcc_ticketing_consent_one.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorSurface"
tools:context=".dccticketing.ui.consent.one.DccTicketingConsentOneFragment">

<androidx.coordinatorlayout.widget.CoordinatorLayout
Expand Down Expand Up @@ -124,11 +124,12 @@

<TextView
android:id="@+id/body"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="24dp"
android:letterSpacing="0.0015"
android:text="@string/dcc_ticketing_consent_one_body"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -140,8 +141,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="11dp"
android:layout_marginEnd="13dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="13dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body">
Expand All @@ -160,7 +161,7 @@

<TextView
android:id="@+id/legal_body"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
Expand All @@ -180,7 +181,7 @@

<TextView
android:id="@+id/legal_first_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
Expand All @@ -200,7 +201,7 @@

<TextView
android:id="@+id/legal_second_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand All @@ -217,15 +218,15 @@
<include
android:id="@+id/bulletpoint_one"
layout="@layout/include_bullet_point"
android:layout_marginStart="35dp"
android:layout_width="6dp"
android:layout_height="6dp"
android:layout_marginStart="35dp"
app:layout_constraintBaseline_toBaselineOf="@id/first_bulletpoint_text"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/first_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
Expand All @@ -246,7 +247,7 @@

<TextView
android:id="@+id/second_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand All @@ -266,7 +267,7 @@

<TextView
android:id="@+id/third_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand All @@ -286,7 +287,7 @@

<TextView
android:id="@+id/forth_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand Down Expand Up @@ -337,7 +338,7 @@
android:text="@string/dcc_ticketing_consent_one_cancel_btn"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

24 changes: 12 additions & 12 deletions Corona-Warn-App/src/main/res/layout/fragment_dcc_ticketing_consent_two.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

<TextView
android:id="@+id/body"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
Expand Down Expand Up @@ -144,7 +144,7 @@

<TextView
android:id="@+id/legal_body"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
Expand All @@ -164,7 +164,7 @@

<TextView
android:id="@+id/legal_first_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
Expand All @@ -184,7 +184,7 @@

<TextView
android:id="@+id/legal_second_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand All @@ -205,7 +205,7 @@

<TextView
android:id="@+id/legal_second_one_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
Expand All @@ -227,7 +227,7 @@

<TextView
android:id="@+id/legal_second_two_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
Expand All @@ -249,7 +249,7 @@

<TextView
android:id="@+id/legal_second_three_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
Expand All @@ -271,7 +271,7 @@

<TextView
android:id="@+id/legal_second_four_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
Expand All @@ -297,7 +297,7 @@

<TextView
android:id="@+id/first_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
Expand All @@ -318,7 +318,7 @@

<TextView
android:id="@+id/second_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand All @@ -338,7 +338,7 @@

<TextView
android:id="@+id/third_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand All @@ -358,7 +358,7 @@

<TextView
android:id="@+id/forth_bulletpoint_text"
style="@style/body1"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand Down