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.21 (#3)
This commit is contained in:
parent
3b77cc31e5
commit
05a2ca94a6
20 changed files with 1558 additions and 112 deletions
|
@ -32,6 +32,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/white"
|
||||
android:paddingTop="@dimen/keyline_0"
|
||||
android:paddingBottom="@dimen/keyline_0"
|
||||
android:minHeight="@dimen/external_link_height"
|
||||
app:external_linkCard_content="@string/home_set_complete_external_link_share_content"
|
||||
app:external_linkCard_icon="@drawable/ic_home_share"
|
||||
|
@ -52,6 +54,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_been_contacted_content"
|
||||
app:external_linkCard_icon="@drawable/ic_upload_icon"
|
||||
app:external_linkCard_icon_background="@drawable/background_circular_green"
|
||||
|
@ -83,6 +87,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_app_content"
|
||||
app:external_linkCard_icon="@drawable/ic_home_news"
|
||||
app:external_linkCard_icon_background="@drawable/background_circular_black"
|
||||
|
@ -130,9 +136,11 @@
|
|||
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"
|
||||
android:paddingTop="@dimen/keyline_0"
|
||||
android:paddingBottom="@dimen/keyline_0"
|
||||
app:external_linkCard_content="@string/home_set_complete_external_link_help_topics_content"
|
||||
app:external_linkCard_icon="@drawable/ic_question_circle" />
|
||||
app:external_linkCard_icon="@drawable/ic_question_circle"
|
||||
app:external_linkCard_title="@string/home_set_complete_external_link_help_topics_title" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
</merge>
|
||||
|
||||
|
|
|
@ -59,15 +59,14 @@
|
|||
app:layout_constraintTop_toBottomOf="@+id/registration_consent_first_paragraph"
|
||||
app:ul_view_text="@string/registration_consent_second_paragraph" />
|
||||
|
||||
<com.google.android.material.checkbox.MaterialCheckBox
|
||||
android:id="@+id/registration_consent_checkbox"
|
||||
<TextView
|
||||
android:id="@+id/registration_consent_call_for_action"
|
||||
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"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:text="@string/consent_call_for_action"
|
||||
android:textAppearance="?textAppearanceBody1"
|
||||
android:textColorLink="@color/hyperlink_enabled"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/registration_consent_second_paragraph" />
|
||||
|
|
|
@ -60,14 +60,13 @@
|
|||
app:layout_constraintTop_toBottomOf="@+id/under_sixteen_first_paragraph"
|
||||
app:ul_view_text="@string/under_sixteen_second_paragraph" />
|
||||
|
||||
<com.google.android.material.checkbox.MaterialCheckBox
|
||||
android:id="@+id/under_sixteen_checkbox"
|
||||
android:layout_width="0dp"
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
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"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:text="@string/consent_call_for_action"
|
||||
android:textAppearance="?textAppearanceBody1"
|
||||
android:textColorLink="@color/hyperlink_enabled"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/under_sixteen_second_paragraph" />
|
||||
|
|
|
@ -32,16 +32,14 @@
|
|||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:text="@string/upload_step_4_sub_header"/>
|
||||
|
||||
<com.google.android.material.checkbox.MaterialCheckBox
|
||||
android:id="@+id/upload_consent_checkbox"
|
||||
style="?attr/textAppearanceBody1"
|
||||
android:layout_marginStart="@dimen/keyline_4"
|
||||
<TextView
|
||||
style="?attr/textAppearanceBody2"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="@dimen/keyline_8"
|
||||
android:text="@string/upload_consent" />
|
||||
android:text="@string/consent_call_for_action" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/external_link_height"
|
||||
android:layout_height="wrap_content"
|
||||
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
|
||||
|
||||
<ImageView
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue