mirror-AU-COVIDSafe/mobile-android
1
0
Fork 0
mirror of https://github.com/AU-COVIDSafe/mobile-android.git synced 2025-04-28 09:25:17 +00:00
Code Issues Projects Releases Wiki Activity

COVIDSafe code from version 1.0.17 (#1)

Browse source
This commit is contained in:
COVIDSafe Support 2020-05-15 18:19:59 +10:00 • committed by GitHub
parent b827cf3cce
commit 696e4ed498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 205 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout/activity_onboarding.xml
View file

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

1
app/src/main/res/layout/fragment_data_privacy.xml
View file

@ -27,6 +27,7 @@
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:textAppearance="?textAppearanceHeadline2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

5
app/src/main/res/layout/fragment_home.xml
View file

@ -17,6 +17,7 @@
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" />
@ -34,6 +35,8 @@
android:layout_marginTop="@dimen/keyline_7"
android:layout_marginRight="@dimen/keyline_4"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/title_help"
android:accessibilityTraversalAfter="@id/home_header_setup_complete_header"
android:src="@drawable/ic_help_outline_black"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -57,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="push_card_view,external_links_bottom_card" />
app:constraint_referenced_ids="push_card_view, help_topics_card" />
<TextView
android:id="@+id/home_version_number"

32
app/src/main/res/layout/fragment_home_external_links.xml
View file

@ -14,8 +14,7 @@
android:id="@+id/external_links_top_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/keyline_4"
android:layout_marginRight="@dimen/keyline_4"
android:layout_margin="@dimen/keyline_4"
app:layout_constraintTop_toBottomOf="@+id/cards_top_barrier"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="6dp"
@ -32,7 +31,6 @@
android:id="@+id/home_setup_complete_share"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_4"
android:background="@color/white"
android:minHeight="@dimen/external_link_height"
app:external_linkCard_content="@string/home_set_complete_external_link_share_content"
@ -66,9 +64,7 @@
android:id="@+id/external_links_bottom_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/keyline_4"
android:layout_marginTop="@dimen/keyline_5"
android:layout_marginRight="@dimen/keyline_4"
android:layout_margin="@dimen/keyline_4"
app:layout_constraintTop_toBottomOf="@+id/external_links_top_card"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="6dp"
@ -106,6 +102,8 @@
android:layout_height="wrap_content"
android:background="@color/white"
android:minHeight="@dimen/external_link_height"
android:paddingTop="@dimen/keyline_0"
android:paddingBottom="@dimen/keyline_0"
app:external_linkCard_content="@string/home_set_complete_external_link_news_content"
app:external_linkCard_icon="@drawable/ic_home_news"
app:external_linkCard_icon_background="@drawable/background_circular_dark_cerulean_1"
@ -114,5 +112,27 @@
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/help_topics_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/keyline_4"
app:layout_constraintTop_toBottomOf="@+id/external_links_bottom_card"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="6dp"
card_view:cardMaxElevation="2dp"
card_view:cardUseCompatPadding="true"
card_view:contentPadding="0dp">
<au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
android:id="@+id/help_topics_link"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:minHeight="@dimen/external_link_height"
app:external_linkCard_title="@string/home_set_complete_external_link_help_topics_title"
app:external_linkCard_content="@string/home_set_complete_external_link_help_topics_content"
app:external_linkCard_icon="@drawable/ic_question_circle" />
</androidx.cardview.widget.CardView>
</merge>

1
app/src/main/res/layout/fragment_home_setup_complete_header.xml
View file

@ -68,6 +68,7 @@
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_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"

1
app/src/main/res/layout/fragment_how_it_works.xml
View file

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

1
app/src/main/res/layout/fragment_intro.xml
View file

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

10
app/src/main/res/layout/fragment_personal_details.xml
View file

@ -19,6 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_6"
android:text="@string/personal_details_headline"
android:contentDescription="@string/personal_details_headline_content_description"
android:textAppearance="?textAppearanceHeadline2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -31,6 +32,7 @@
android:layout_marginTop="@dimen/keyline_4"
android:text="@string/personal_details_name_title"
android:textAppearance="?textAppearanceBody1"
android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/personal_details_headline" />
@ -41,7 +43,6 @@
android:layout_height="@dimen/text_field_height"
android:layout_marginTop="@dimen/keyline_1"
android:background="@drawable/edittext_modified_states"
android:hint="@string/personal_details_name_hint"
android:inputType="textPersonName"
android:maxLines="1"
android:paddingStart="@dimen/keyline_1"
@ -51,6 +52,7 @@
android:textColorHighlight="@color/dark_cerulean_3"
android:textCursorDrawable="@null"
android:textSize="@dimen/text_body_small"
android:contentDescription="@string/personal_details_name_content_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/personal_details_name_title"
@ -83,6 +85,7 @@
android:layout_marginTop="@dimen/keyline_4"
android:text="@string/personal_details_age_title"
android:textAppearance="?textAppearanceBody1"
android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/personal_details_name_barrier" />
@ -94,7 +97,6 @@
android:layout_marginTop="@dimen/keyline_1"
android:background="@drawable/edit_text_black_background"
android:gravity="center_vertical"
android:hint="@string/personal_details_age_hint"
android:paddingStart="@dimen/keyline_1"
android:paddingEnd="@dimen/keyline_1"
android:textColor="@color/slack_black"
@ -103,6 +105,7 @@
android:textSize="@dimen/text_body_small"
android:drawableRight="@drawable/ic_arrow_drop_down"
android:drawableTint="@color/black"
android:contentDescription="@string/personal_details_age_content_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/personal_details_age_title"
@ -135,6 +138,7 @@
android:layout_marginTop="@dimen/keyline_4"
android:text="@string/personal_details_post_code"
android:textAppearance="?textAppearanceBody1"
android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/personal_details_age_barrier" />
@ -147,7 +151,6 @@
android:background="@drawable/edittext_modified_states"
android:digits="0123456789"
android:gravity="center_vertical"
android:hint="@string/personal_details_post_code_hint"
android:inputType="number"
android:maxLength="4"
android:paddingStart="@dimen/keyline_1"
@ -157,6 +160,7 @@
android:textCursorDrawable="@null"
android:textSize="@dimen/text_body_small"
android:imeOptions="actionDone"
android:contentDescription="@string/personal_details_post_code_content_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/personal_details_post_code_title"

4
app/src/main/res/layout/fragment_registration_consent.xml
View file

@ -63,7 +63,11 @@
android:id="@+id/registration_consent_checkbox"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="@dimen/keyline_8"
android:text="@string/registration_consent_checkbox"
android:textSize="18sp"
android:gravity="center_vertical"
android:layout_marginTop="@dimen/keyline_2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/registration_consent_second_paragraph" />

4
app/src/main/res/layout/fragment_under_sixteen.xml
View file

@ -18,6 +18,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_6"
android:text="@string/under_sixteen_headline"
android:contentDescription="@string/under_sixteen_headline_content_description"
android:textAppearance="?textAppearanceHeadline2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -63,7 +64,10 @@
android:id="@+id/under_sixteen_checkbox"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="@dimen/keyline_8"
android:textSize="18sp"
android:text="@string/under_sixteen_further_checkbox"
android:layout_marginTop="@dimen/keyline_2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/under_sixteen_second_paragraph" />

11
app/src/main/res/layout/fragment_upload_page_4.xml
View file

@ -32,15 +32,14 @@
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/upload_consent_checkbox"
style="?attr/textAppearanceBody2"
android:layout_marginStart="@dimen/keyline_5"
style="?attr/textAppearanceBody1"
android:layout_marginStart="@dimen/keyline_4"
android:layout_marginTop="@dimen/keyline_4"
android:layout_marginEnd="@dimen/keyline_5"
android:layout_marginEnd="@dimen/keyline_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/upload_consent"
/>
android:minHeight="@dimen/keyline_8"
android:text="@string/upload_consent" />
</LinearLayout>

18
app/src/main/res/layout/view_card_external_link_card.xml
View file

@ -8,9 +8,9 @@
<ImageView
android:id="@+id/external_link_round_image"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/keyline_5"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="@dimen/keyline_4"
android:background="@drawable/background_circular_dark_cerulean_4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/external_link_headline" />
@ -22,21 +22,13 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_4"
android:layout_marginTop="16dp"
app:layout_constraintBottom_toTopOf="@+id/external_link_space"
app:layout_constraintBottom_toTopOf="@+id/external_link_content"
app:layout_constraintEnd_toStartOf="@+id/next"
app:layout_constraintStart_toEndOf="@+id/external_link_round_image"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="@string/home_set_complete_external_link_app_title" />
<Space
android:id="@+id/external_link_space"
android:layout_width="match_parent"
android:layout_height="@dimen/keyline_1"
app:layout_constraintBottom_toTopOf="@+id/external_link_content"
app:layout_constraintTop_toBottomOf="@+id/external_link_headline"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/external_link_content"
style="?textAppearanceBody2"
@ -47,7 +39,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/next"
app:layout_constraintStart_toEndOf="@+id/external_link_round_image"
app:layout_constraintTop_toBottomOf="@+id/external_link_space"
app:layout_constraintTop_toBottomOf="@+id/external_link_headline"
app:layout_constraintVertical_chainStyle="packed"
tools:text="@string/home_set_complete_external_link_app_content" />