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.48
This commit is contained in:
parent
15c427c73c
commit
3e3657e7f7
52 changed files with 3528 additions and 2165 deletions
|
@ -15,8 +15,21 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:navigationIcon="@drawable/ic_up"
|
||||
app:navigationContentDescription="@string/navigation_back_button_content_description"/>
|
||||
app:navigationContentDescription="@string/navigation_back_button_content_description"
|
||||
app:navigationIcon="@drawable/ic_up" />
|
||||
|
||||
<View
|
||||
android:id="@+id/toolbarReplacer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/keyline_4"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textViewSteps"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:text="@string/stepCounter"
|
||||
android:textAppearance="?textAppearanceBody1"/>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/fragment_nav_host"
|
||||
|
@ -51,17 +64,6 @@
|
|||
android:visibility="visible" />
|
||||
</FrameLayout>
|
||||
|
||||
<au.gov.health.covidsafe.ui.view.SegmentedProgressBar
|
||||
android:id="@+id/onboarding_progress_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="4dp"
|
||||
android:layout_marginStart="@dimen/keyline_7"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_7"
|
||||
android:visibility="gone"
|
||||
app:progress_max_value="5"
|
||||
app:progress_value="1" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/onboarding_next"
|
||||
style="?textAppearanceButton"
|
||||
|
@ -80,7 +82,6 @@
|
|||
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"/>
|
||||
|
||||
|
|
|
@ -9,7 +9,8 @@
|
|||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_1">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/enter_number_page_headline"
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_1"
|
||||
android:paddingStart="@dimen/keyline_5"
|
||||
android:paddingEnd="@dimen/keyline_5">
|
||||
|
||||
|
@ -17,7 +18,6 @@
|
|||
android:id="@+id/enter_pin_headline"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:gravity="center_vertical|start"
|
||||
android:text="@string/enter_pin_headline"
|
||||
android:textAlignment="viewStart"
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="push_card_view, help_topics_card" />
|
||||
app:constraint_referenced_ids="push_card_view, change_language_card" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/home_version_number"
|
||||
|
@ -116,48 +116,48 @@
|
|||
android:layout_height="@dimen/keyline_2"
|
||||
android:background="@color/error" />
|
||||
|
||||
<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" />
|
||||
<!-- <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" />-->
|
||||
|
||||
<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" />
|
||||
<!-- <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" />
|
||||
<!-- <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" />
|
||||
<!-- <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>
|
|
@ -142,5 +142,30 @@
|
|||
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>
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/change_language_card"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/keyline_4"
|
||||
app:layout_constraintTop_toBottomOf="@+id/help_topics_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/change_language_link"
|
||||
android:layout_width="match_parent"
|
||||
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/change_language_content"
|
||||
app:external_linkCard_icon="@drawable/ic_globe"
|
||||
app:external_linkCard_title="@string/change_language" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
</merge>
|
||||
|
||||
|
|
|
@ -68,12 +68,11 @@
|
|||
android:paddingStart="@dimen/keyline_1"
|
||||
android:paddingEnd="@dimen/keyline_1"
|
||||
android:singleLine="true"
|
||||
android:textAlignment="viewStart"
|
||||
android:textColor="@color/slack_black"
|
||||
android:textColorHighlight="@color/dark_cerulean_3"
|
||||
android:textCursorDrawable="@null"
|
||||
android:textSize="@dimen/text_body_small"
|
||||
android:textAlignment="viewStart"
|
||||
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" />
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_1"
|
||||
android:paddingStart="@dimen/keyline_5"
|
||||
android:paddingEnd="@dimen/keyline_5"
|
||||
android:paddingBottom="@dimen/keyline_9">
|
||||
|
@ -18,7 +19,6 @@
|
|||
android:id="@+id/personal_details_headline"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_0"
|
||||
android:text="@string/personal_details_headline"
|
||||
android:textAlignment="viewStart"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
android:id="@+id/registration_consent_headline"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/keyline_6"
|
||||
android:text="@string/registration_consent_headline"
|
||||
android:textAppearance="?textAppearanceHeadline2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
|
@ -27,16 +27,6 @@
|
|||
app:defaultNavHost="true"
|
||||
app:navGraph="@navigation/nav_upload" />
|
||||
|
||||
<au.gov.health.covidsafe.ui.view.SegmentedProgressBar
|
||||
android:id="@+id/upload_progress"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="4dp"
|
||||
android:layout_marginStart="@dimen/keyline_5"
|
||||
android:layout_marginTop="@dimen/keyline_4"
|
||||
android:layout_marginEnd="@dimen/keyline_5"
|
||||
app:progress_max_value="5"
|
||||
app:progress_value="1" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue