mirror of
https://github.com/AU-COVIDSafe/mobile-android.git
synced 2025-07-10 05:05:15 +00:00
COVIDSafe code from version 1.0.39 (#11)
This commit is contained in:
parent
24e16807e5
commit
15c427c73c
95 changed files with 3571 additions and 4502 deletions
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<WebView
|
||||
android:id="@+id/webView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal" />
|
||||
|
||||
</LinearLayout>
|
|
@ -1,72 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/root"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:orientation="vertical">
|
||||
|
||||
<View
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize" />
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:fillViewport="true">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="@dimen/keyline_5"
|
||||
android:paddingEnd="@dimen/keyline_5">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/activity_self_isolation_picture"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/illustration_upload_finished"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/activity_self_isolation_headline"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:text="@string/activity_self_isolation_headline"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/activity_self_isolation_picture" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/activity_self_isolation_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:text="@string/activity_self_isolation_content"
|
||||
android:textAppearance="?textAppearanceBody1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/activity_self_isolation_headline" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</ScrollView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/activity_self_isolation_next"
|
||||
style="?textAppearanceButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_5"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:layout_marginBottom="@dimen/keyline_7"
|
||||
android:text="@string/activity_self_isolation_button" />
|
||||
|
||||
</LinearLayout>
|
|
@ -27,7 +27,6 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:text="@string/data_privacy_headline"
|
||||
android:contentDescription="@string/data_privacy_headline_content_description"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
|
@ -40,13 +40,13 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_headline" />
|
||||
|
||||
<au.gov.health.covidsafe.ui.view.PinInputView
|
||||
<EditText
|
||||
android:id="@+id/pin"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/otpStyle"
|
||||
android:contentDescription="@string/pin_number"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number"
|
||||
tools:ignore="TextFields" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/enter_pin_error_label"
|
||||
|
@ -54,13 +54,13 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_2"
|
||||
android:text="@string/wrong_pin_number"
|
||||
android:text="@string/wrong_ping_number"
|
||||
android:textAlignment="viewStart"
|
||||
android:textColor="@color/error"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/pin"
|
||||
tools:text="@string/wrong_pin_number"
|
||||
tools:text="@string/wrong_ping_number"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
|
@ -79,8 +79,8 @@
|
|||
style="?textAppearanceBody2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAlignment="viewStart"
|
||||
android:layout_marginStart="@dimen/keyline_0"
|
||||
android:textAlignment="viewStart"
|
||||
app:layout_constraintStart_toEndOf="@+id/enter_pin_timer_label"
|
||||
app:layout_constraintTop_toTopOf="@+id/enter_pin_timer_label"
|
||||
tools:text="1:59" />
|
||||
|
@ -112,7 +112,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:gravity="center_vertical|start"
|
||||
android:text="@string/pin_issue"
|
||||
android:text="@string/ReceivePinIssue"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?textAppearanceSubtitle1"
|
||||
android:textColorLink="?attr/colorPrimary"
|
||||
|
|
|
@ -1,85 +1,163 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/home_root"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="#f6f6f6"
|
||||
android:fillViewport="true">
|
||||
android:layout_height="match_parent"
|
||||
android:background="#f6f6f6">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
android:fillViewport="true">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<View
|
||||
android:id="@+id/header_background"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:background="@color/lighter_green"
|
||||
android:importantForAccessibility="no"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/header_background_overlap"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/header_background_overlap"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="50dp"
|
||||
android:background="@color/lighter_green"
|
||||
app:layout_constraintTop_toBottomOf="@+id/header_barrier" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/home_header_top_left_icon"
|
||||
android:layout_width="@dimen/keyline_8"
|
||||
android:layout_height="@dimen/keyline_8"
|
||||
android:layout_marginLeft="@dimen/keyline_4"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
android:src="@drawable/ic_splash_screen_logo"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/home_header_help"
|
||||
android:layout_width="@dimen/keyline_9"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
android:accessibilityTraversalAfter="@id/home_header_setup_complete_header_line_2"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:drawableTop="@drawable/ic_help_outline_black"
|
||||
android:drawablePadding="-4dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/title_help"
|
||||
android:textAlignment="center"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<include layout="@layout/fragment_home_setup_complete_header" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/header_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="home_header_no_bluetooth_pairing" />
|
||||
|
||||
<include layout="@layout/fragment_home_setup_incomplete_content" />
|
||||
|
||||
<include layout="@layout/fragment_home_external_links" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/content_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="push_card_view, help_topics_card" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/home_version_number"
|
||||
style="?textAppearanceBody2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginBottom="@dimen/keyline_5"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/cadet_grey"
|
||||
app:layout_constraintTop_toBottomOf="@+id/content_barrier" />
|
||||
|
||||
<Space
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/keyline_2"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_version_number" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/app_update_reminder"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone"
|
||||
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
|
||||
tools:visibility="visible">
|
||||
|
||||
<View
|
||||
android:id="@+id/header_background"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:background="@color/lighter_green"
|
||||
android:importantForAccessibility="no"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/header_background_overlap"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/header_background_overlap"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="50dp"
|
||||
android:background="@color/lighter_green"
|
||||
app:layout_constraintTop_toBottomOf="@+id/header_barrier" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/home_header_help"
|
||||
android:layout_width="@dimen/keyline_9"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
android:accessibilityTraversalAfter="@id/home_header_setup_complete_header"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:drawableTop="@drawable/ic_help_outline_black"
|
||||
android:drawablePadding="-4dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/title_help"
|
||||
android:textAlignment="center"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<include layout="@layout/fragment_home_setup_complete_header" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/header_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="home_header_label_setup_complete_subtitle_bottom_space" />
|
||||
|
||||
<include layout="@layout/fragment_home_setup_incomplete_content" />
|
||||
|
||||
<include layout="@layout/fragment_home_external_links" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/content_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="push_card_view, help_topics_card" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/home_version_number"
|
||||
style="?textAppearanceBody2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginBottom="@dimen/keyline_5"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/cadet_grey"
|
||||
app:layout_constraintTop_toBottomOf="@+id/content_barrier" />
|
||||
|
||||
<Space
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/keyline_2"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_version_number" />
|
||||
android:background="@color/error" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="@dimen/keyline_5"
|
||||
android:layout_marginBottom="@dimen/keyline_1"
|
||||
android:text="@string/update_available_title"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
</ScrollView>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginHorizontal="@dimen/keyline_8"
|
||||
android:layout_marginBottom="@dimen/keyline_5"
|
||||
android:text="@string/update_available_message"
|
||||
android:textAlignment="center"
|
||||
android:textSize="16sp" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatButton
|
||||
android:id="@+id/go_to_play_store"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/keyline_8"
|
||||
android:layout_marginHorizontal="@dimen/keyline_5"
|
||||
android:layout_marginBottom="@dimen/keyline_4"
|
||||
android:background="@color/dark_green"
|
||||
android:text="@string/update_available_play_store_btn"
|
||||
android:textColor="@color/white"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/remind_me_later"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:paddingHorizontal="@dimen/keyline_5"
|
||||
android:paddingBottom="@dimen/keyline_5"
|
||||
android:text="@string/update_available_dismiss_btn"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/dark_green"
|
||||
android:textSize="18sp" />
|
||||
|
||||
</LinearLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -1,64 +1,66 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge 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:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/lighter_green">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/home_header_setup_complete_header_line_1"
|
||||
style="?textAppearanceBody1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="120dp"
|
||||
android:accessibilityTraversalBefore="@id/home_header_help"
|
||||
android:gravity="center_horizontal"
|
||||
android:text="@string/home_header_active_title"
|
||||
android:textSize="28sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/home_header_setup_complete_header_line_2"
|
||||
style="?textAppearanceBody1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_1"
|
||||
android:gravity="center_horizontal"
|
||||
android:text="@string/home_header_active_title"
|
||||
android:textSize="18sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_header_setup_complete_header_line_1" />
|
||||
|
||||
<com.airbnb.lottie.LottieAnimationView
|
||||
android:id="@+id/home_header_picture_setup_complete"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="90dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_width="160dp"
|
||||
android:layout_height="160dp"
|
||||
android:layout_marginTop="60dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_header_help"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_header_setup_complete_header_line_2"
|
||||
app:lottie_autoPlay="true"
|
||||
app:lottie_fileName="spinner_home.json"
|
||||
app:lottie_loop="true"
|
||||
app:lottie_speed="1" />
|
||||
|
||||
<Space
|
||||
android:id="@+id/home_header_picture_setup_complete_space"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="78dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_header_picture_setup_complete" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/home_header_setup_complete_header"
|
||||
style="?textAppearanceBody1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:paddingLeft="@dimen/keyline_5"
|
||||
android:paddingRight="@dimen/keyline_5"
|
||||
android:gravity="center_horizontal"
|
||||
android:accessibilityTraversalBefore="@id/home_header_help"
|
||||
android:text="@string/home_header_active_title"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_header_picture_setup_complete_space" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/home_header_no_bluetooth_pairing"
|
||||
style="?textAppearanceBody1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginTop="60dp"
|
||||
android:layout_marginBottom="@dimen/keyline_4"
|
||||
android:gravity="center_horizontal"
|
||||
android:paddingLeft="@dimen/keyline_5"
|
||||
android:paddingRight="@dimen/keyline_5"
|
||||
android:gravity="center_horizontal"
|
||||
android:text="@string/home_header_no_pairing"
|
||||
android:textColorLink="@color/slack_black"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_header_setup_complete_header" />
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_header_picture_setup_complete" />
|
||||
|
||||
<Space
|
||||
android:id="@+id/home_header_label_setup_complete_subtitle_bottom_space"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/keyline_0"
|
||||
app:layout_constraintTop_toBottomOf="@+id/home_header_no_bluetooth_pairing" />
|
||||
</merge>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -25,7 +25,6 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:contentDescription="@string/how_it_works_headline_content_description"
|
||||
android:text="@string/how_it_works_headline"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:contentDescription="@string/intro_headline_content_description"
|
||||
android:text="@string/intro_headline"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:text="@string/change_device_name_headline"
|
||||
android:textAlignment="viewStart"
|
||||
android:contentDescription="@string/change_device_name_headline_content_description"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_0"
|
||||
android:contentDescription="@string/personal_details_headline_content_description"
|
||||
android:text="@string/personal_details_headline"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
|
@ -96,15 +95,13 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/personal_details_name_barrier" />
|
||||
|
||||
<EditText
|
||||
<au.gov.health.covidsafe.ui.onboarding.fragment.personal.SelectionCallbackSpinner
|
||||
android:id="@+id/personal_details_age"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/text_field_height"
|
||||
android:layout_marginTop="@dimen/keyline_1"
|
||||
android:background="@drawable/edit_text_black_background"
|
||||
android:contentDescription="@string/personal_details_age_content_description"
|
||||
android:drawableRight="@drawable/ic_arrow_drop_down"
|
||||
android:drawableTint="@color/black"
|
||||
android:gravity="center_vertical|start"
|
||||
android:paddingStart="@dimen/keyline_1"
|
||||
android:paddingEnd="@dimen/keyline_1"
|
||||
|
@ -115,8 +112,7 @@
|
|||
android:textSize="@dimen/text_body_small"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/personal_details_age_title"
|
||||
tools:text="John Smith" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/personal_details_age_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/personal_details_age_error"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
android:textAppearance="?textAppearanceHeadline2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/registration_consent_text"
|
||||
|
@ -34,7 +34,7 @@
|
|||
android:textColorLink="@color/hyperlink_enabled"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toBottomOf="@id/registration_consent_headline" />
|
||||
|
||||
<au.gov.health.covidsafe.ui.view.UlView
|
||||
android:id="@+id/registration_consent_first_paragraph"
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:contentDescription="@string/under_sixteen_headline_content_description"
|
||||
android:text="@string/under_sixteen_headline"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
android:text="@string/upload_finished_header"
|
||||
android:contentDescription="@string/upload_finished_header_content_description"
|
||||
app:layout_constraintBottom_toTopOf="@+id/subHeader"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:text="@string/upload_step_1_header"
|
||||
android:textAlignment="viewStart"
|
||||
android:contentDescription="@string/upload_step_1_header_content_description"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
@ -12,14 +12,13 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/header"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
android:text="@string/upload_step_4_header"
|
||||
android:contentDescription="@string/upload_step_4_header_content_description" />
|
||||
android:textAppearance="?textAppearanceHeadline2" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/subHeader"
|
||||
|
@ -29,18 +28,17 @@
|
|||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:text="@string/upload_step_4_sub_header"/>
|
||||
android:text="@string/upload_step_4_sub_header" />
|
||||
|
||||
<TextView
|
||||
style="?attr/textAppearanceBody2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/consent_call_for_action" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
</ScrollView>
|
|
@ -5,7 +5,8 @@
|
|||
android:id="@+id/root"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:fillViewport="true">
|
||||
android:fillViewport="true"
|
||||
android:padding="@dimen/keyline_5">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -13,15 +14,10 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/header"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:text="@string/upload_step_verify_pin_header"
|
||||
android:contentDescription="@string/upload_step_verify_pin_header_content_description"
|
||||
app:layout_constraintBottom_toTopOf="@+id/subHeader"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
|
@ -32,41 +28,33 @@
|
|||
style="?attr/textAppearanceBody2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:text="@string/upload_step_verify_pin_sub_header"
|
||||
app:layout_constraintBottom_toTopOf="@id/pin"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/header"
|
||||
app:layout_constraintVertical_chainStyle="packed" />
|
||||
|
||||
<au.gov.health.covidsafe.ui.view.PinInputView
|
||||
<EditText
|
||||
android:id="@+id/pin"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:layout_marginBottom="@dimen/keyline_4"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/subHeader" />
|
||||
style="@style/otpStyle"
|
||||
android:contentDescription="@string/pin_number"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/subHeader"
|
||||
tools:ignore="TextFields" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/enter_pin_error_label"
|
||||
style="?textAppearanceBody2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_1"
|
||||
android:text="@string/action_verify_invalid_pin"
|
||||
android:textColor="@color/error"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/pin"
|
||||
tools:text="@string/action_verify_invalid_pin"
|
||||
tools:visibility="visible" />
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:gravity="start"
|
||||
android:text="@string/country_au"
|
||||
android:text="@string/country_region_name_au"
|
||||
android:textSize="18sp"
|
||||
android:textAlignment="viewStart"
|
||||
app:layout_constraintEnd_toStartOf="@+id/country_list_flag"
|
||||
|
|
|
@ -1,121 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge 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"
|
||||
tools:layout_height="match_parent"
|
||||
tools:layout_width="match_parent"
|
||||
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/pin_1"
|
||||
style="@style/PinInput"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
android:contentDescription="@string/pin_number"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toLeftOf="@+id/space_1"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<Space
|
||||
android:id="@+id/space_1"
|
||||
android:layout_width="@dimen/keyline_2"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/pin_1"
|
||||
app:layout_constraintRight_toLeftOf="@+id/pin_2"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/pin_2"
|
||||
style="@style/PinInput"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/space_1"
|
||||
app:layout_constraintRight_toLeftOf="@+id/space_2"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<Space
|
||||
android:id="@+id/space_2"
|
||||
android:layout_width="@dimen/keyline_2"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/pin_2"
|
||||
app:layout_constraintRight_toLeftOf="@+id/pin_3"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/pin_3"
|
||||
style="@style/PinInput"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/space_2"
|
||||
app:layout_constraintRight_toLeftOf="@+id/space_3"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<Space
|
||||
android:id="@+id/space_3"
|
||||
android:layout_width="@dimen/keyline_2"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/pin_3"
|
||||
app:layout_constraintRight_toLeftOf="@+id/pin_4"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/pin_4"
|
||||
style="@style/PinInput"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/space_3"
|
||||
app:layout_constraintRight_toLeftOf="@+id/space_4"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number"
|
||||
/>
|
||||
|
||||
<Space
|
||||
android:id="@+id/space_4"
|
||||
android:layout_width="@dimen/keyline_2"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/pin_4"
|
||||
app:layout_constraintRight_toLeftOf="@+id/pin_5"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/pin_5"
|
||||
style="@style/PinInput"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/space_4"
|
||||
app:layout_constraintRight_toLeftOf="@+id/space_6"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<Space
|
||||
android:id="@+id/space_6"
|
||||
android:layout_width="@dimen/keyline_2"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/pin_5"
|
||||
app:layout_constraintRight_toLeftOf="@+id/pin_6"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/pin_6"
|
||||
style="@style/PinInput"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_7"
|
||||
app:layout_constraintHorizontal_chainStyle="spread"
|
||||
app:layout_constraintLeft_toRightOf="@+id/space_6"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/enter_pin_wrong_number" />
|
||||
</merge>
|
Loading…
Add table
Add a link
Reference in a new issue