COVIDSafe code from version 1.0.18 (#2)

This commit is contained in:
COVIDSafe Support 2020-05-26 17:19:36 +10:00 committed by GitHub
parent 696e4ed498
commit 3b77cc31e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 6784 additions and 663 deletions

View file

@ -5,6 +5,7 @@
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:paddingBottom="@dimen/keyline_7"
tools:context=".ui.onboarding.OnboardingActivity">
<androidx.appcompat.widget.Toolbar
@ -69,7 +70,18 @@
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/intro_button" />
<TextView
android:id="@+id/onboarding_next_secondary"
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:gravity="center_horizontal"
android:text="@string/change_device_name_new_device_name"
android:textAppearance="?textAppearanceBody1"
android:textColor="@color/dark_green"/>
</LinearLayout>

View file

@ -21,7 +21,26 @@
app:layout_constraintHeight_percent="0.33"
/>
<ImageView
<androidx.appcompat.widget.AppCompatTextView
style="?textAppearanceBody2"
android:id="@+id/splash_migration_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_2"
android:layout_marginLeft="@dimen/keyline_2"
android:layout_marginRight="@dimen/keyline_2"
android:text="@string/migration_in_progress"
android:gravity="center"
android:visibility="gone"
app:layout_constraintWidth_percent="0.75"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/splash_screen_crest"
app:layout_constraintBottom_toTopOf="@+id/splash_screen_logo"
tools:text="@string/migration_in_progress"
/>
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/splash_screen_logo"
android:layout_width="0dp"
android:layout_height="0dp"
@ -32,8 +51,11 @@
app:layout_constraintBottom_toTopOf="@+id/help_stop_covid"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/splash_screen_crest"
app:layout_constraintVertical_chainStyle="spread" />
app:layout_constraintTop_toBottomOf="@+id/splash_migration_text"
app:layout_constraintVertical_chainStyle="spread"
app:lottie_autoPlay="false"
app:lottie_loop="true"
app:lottie_speed="1"/>
<ImageView
android:id="@+id/help_stop_covid"

View file

@ -25,22 +25,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/collapse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:src="@drawable/ic_unfold_less_black_24dp" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/expand"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:src="@drawable/ic_unfold_more_black_24dp" />
</LinearLayout>
@ -54,15 +38,6 @@
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/plot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:src="@drawable/ic_arrow_forward_black_24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="wrap_content"
@ -89,13 +64,22 @@
</LinearLayout>
<TextView
android:id="@+id/info"
android:textSize="12sp"
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/shareDatabase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:src="@drawable/ic_home_share"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -17,6 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/topInset"
app:layout_constraintWidth_default="wrap"
app:navigationContentDescription="@string/navigation_back_button_content_description"
app:navigationIcon="@drawable/ic_up"
app:title="@string/title_help">

View file

@ -26,39 +26,6 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_header_picture_setup_complete" />
<TextView
android:id="@+id/home_header_setup_complete_header_uploaded"
style="?textAppearanceBody1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:gravity="center_horizontal"
android:paddingLeft="@dimen/keyline_5"
android:paddingRight="@dimen/keyline_5"
android:text="@string/home_header_uploaded_title"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_header_picture_setup_complete_space" />
<View
android:id="@+id/home_header_setup_complete_header_divider"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="@dimen/keyline_4"
android:layout_marginBottom="@dimen/keyline_4"
android:background="@color/white"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_header_setup_complete_header_uploaded"
app:layout_constraintWidth_percent="0.5" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/home_header_setup_complete_header_uploaded_2"
style="?textAppearanceBody1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="home_header_setup_complete_header_divider,home_header_picture_setup_complete_space" />
<TextView
android:id="@+id/home_header_setup_complete_header"
style="?textAppearanceBody1"
@ -72,13 +39,26 @@
android:text="@string/home_header_active_title"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_header_setup_complete_header_uploaded_2" />
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: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_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_header_setup_complete_header" />
<Space
android:id="@+id/home_header_label_setup_complete_subtitle_bottom_space"
android:layout_width="match_parent"
android:layout_height="@dimen/keyline_7"
app:layout_constraintTop_toBottomOf="@+id/home_header_setup_complete_header" />
android:layout_height="@dimen/keyline_0"
app:layout_constraintTop_toBottomOf="@+id/home_header_no_bluetooth_pairing" />
</merge>

View file

@ -17,6 +17,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/keyline_4"
android:layout_marginRight="@dimen/keyline_4"
android:layout_marginTop="@dimen/keyline_7"
app:layout_constraintTop_toBottomOf="@+id/header_barrier"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="6dp"
@ -28,7 +29,6 @@
android:id="@+id/home_setup_incomplete_permissions_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_4"
android:orientation="vertical">
<TextView

View file

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView 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:fillViewport="true"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/keyline_5"
android:paddingEnd="@dimen/keyline_5"
android:paddingBottom="@dimen/keyline_7">
<ImageView
android:id="@+id/permission_picture"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/ic_permission"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/change_device_name_headline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_6"
android:text="@string/change_device_name_headline"
android:contentDescription="@string/change_device_name_headline_content_description"
android:textAppearance="?textAppearanceHeadline2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/permission_picture" />
<TextView
android:id="@+id/change_device_name_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_4"
android:text="@string/change_device_name_content_line_1"
android:textAppearance="?textAppearanceBody1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/change_device_name_headline" />
<TextView
android:id="@+id/change_device_name_new_device_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_6"
android:text="@string/change_device_name_new_device_name"
android:textAppearance="?textAppearanceBody1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/change_device_name_content" />
<EditText
android:id="@+id/change_device_name_text_box"
android:layout_width="0dp"
android:layout_height="@dimen/text_field_height"
android:layout_marginTop="@dimen/keyline_1"
android:background="@drawable/edittext_modified_states"
android:maxLines="1"
android:paddingStart="@dimen/keyline_1"
android:paddingEnd="@dimen/keyline_1"
android:singleLine="true"
android:textColor="@color/slack_black"
android:textColorHighlight="@color/dark_cerulean_3"
android:textCursorDrawable="@null"
android:textSize="@dimen/text_body_small"
android:text="@string/change_device_name_default_device_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/change_device_name_new_device_name" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

View file

@ -40,6 +40,7 @@
android:paddingStart="@dimen/keyline_5"
android:paddingEnd="@dimen/keyline_5"
android:text="@string/permission_success_content"
android:textColorLink="?attr/colorPrimary"
android:textAppearance="?textAppearanceBody1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

View file

@ -33,6 +33,7 @@
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"

View file

@ -26,6 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_6"
android:text="@string/upload_step_1_header"
android:contentDescription="@string/upload_step_1_header_content_description"
android:textAppearance="?textAppearanceHeadline2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

View file

@ -15,7 +15,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_up" />
app:navigationIcon="@drawable/ic_up"
app:navigationContentDescription="@string/navigation_back_button_content_description"/>
<fragment
android:id="@+id/fragment_nav_host_upload"

View file

@ -18,7 +18,9 @@
android:layout_marginTop="@dimen/keyline_4"
android:layout_marginEnd="@dimen/keyline_5"
android:textAppearance="?textAppearanceHeadline2"
android:text="@string/upload_step_4_header"/>
android:text="@string/upload_step_4_header"
android:contentDescription="@string/upload_step_4_header_content_description"
/>
<TextView
android:id="@+id/subHeader"

View file

@ -20,6 +20,7 @@
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"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"