mirror-AU-COVIDSafe/mobile-android
1
0
Fork 0
mirror of https://github.com/AU-COVIDSafe/mobile-android.git synced 2025-04-19 21:15:18 +00:00
Code Issues Projects Releases Wiki Activity

COVIDSafe code from version 1.14 (#29)

Browse source
This commit is contained in:
COVIDSafe Support 2020-11-09 16:47:22 -08:00 • committed by GitHub
parent 415682238d
commit 6bf46ded07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 312 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/res/drawable/ic_vector.xml Normal file
View file

@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="8dp"
android:height="14dp"
android:viewportWidth="8"
android:viewportHeight="14">
<path
android:pathData="M1,13L7,7L1,1"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#A31919"
android:strokeLineCap="round"/>
</vector>

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

@ -37,8 +37,7 @@
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_weight="1"
app:defaultNavHost="true"
app:navGraph="@navigation/nav_onboarding" />
app:defaultNavHost="true"/>
<FrameLayout
android:id="@+id/loadingProgressBarFrame"

12
app/src/main/res/layout/database_peek.xml
View file

@ -23,9 +23,17 @@
<Space
android:id="@+id/push_token_space"
android:layout_width="match_parent"
android:layout_height="@dimen/space_24"
android:layout_height="@dimen/space_4"
app:layout_constraintTop_toBottomOf="@+id/home_push_notification_token" />
<Button
android:id="@+id/btn_de_active_token"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="De-Active Token"
android:layout_margin="16dp"
app:layout_constraintTop_toBottomOf="@+id/push_token_space"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="0dp"
@ -35,7 +43,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/push_token_space"
app:layout_constraintTop_toBottomOf="@+id/btn_de_active_token"
tools:listitem="@layout/recycler_view_item" />
<com.google.android.material.floatingactionbutton.FloatingActionButton

57
app/src/main/res/layout/view_home_setup_incomplete.xml
View file

@ -1,6 +1,7 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/home_setup_incomplete_permissions_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -40,7 +41,7 @@
style="@style/fontRobotoRegular16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/space_16"
android:padding="@dimen/space_16"
android:text="@string/home_app_permission_status_subtitle"
android:textColor="@color/slate_black_1" />
@ -98,4 +99,58 @@
</FrameLayout>
<FrameLayout
android:id="@+id/jwt_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/registration_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:selectableItemBackground"
android:padding="@dimen/space_16"
android:visibility="gone">
<ImageView
android:id="@+id/ic_register_again"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_vector"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/re_register"
style="@style/fontRobotoRegular20"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="start"
android:maxLines="2"
android:textColor="@color/error_red"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/permission_icon"
app:layout_constraintTop_toTopOf="parent"
android:text="@string/jwt_heading"
tools:text="Please register again" />
<TextView
android:id="@+id/register_body"
style="@style/fontRobotoRegular16"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="start"
android:paddingTop="@dimen/space_8"
android:textColor="@color/error_red"
app:layout_constraintTop_toBottomOf="@id/re_register"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ic_register_again"
tools:visibility="visible"
android:text="@string/jwt_description"
tools:text="There is an issue with your registration details." />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
</LinearLayout>

138
app/src/main/res/navigation/nav_re_register.xml Normal file
View file

@ -0,0 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation 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/nav_onboarding"
app:startDestination="@id/personalDetailsFragment">
<include app:graph="@navigation/nav_register" />
<fragment
android:id="@+id/introFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.introduction.IntroductionFragment"
android:label="IntroductionFragment"
tools:layout="@layout/fragment_intro">
<action
android:id="@+id/action_introFragment_to_howItWorksFragment"
app:destination="@id/howItWorksFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<fragment
android:id="@+id/howItWorksFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.howitworks.HowItWorksFragment"
android:label="HowItWorksFragment"
tools:layout="@layout/fragment_how_it_works">
<action
android:id="@+id/action_howItWorksFragment_to_dataPrivacy"
app:destination="@id/dataPrivacyFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<fragment
android:id="@+id/dataPrivacyFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.dataprivacy.DataPrivacyFragment"
android:label="DataPrivacyFragment"
tools:layout="@layout/fragment_data_privacy">
<action
android:id="@+id/action_dataPrivacy_to_registrationConsentFragment"
app:destination="@id/resistrationConsentFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<fragment
android:id="@+id/resistrationConsentFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.registrationconsent.RegistrationConsentFragment"
android:label="RegistrationContentFragment"
tools:layout="@layout/fragment_registration_consent">
<action
android:id="@+id/action_registrationConsentFragment_to_personalDetailsFragment"
app:destination="@id/personalDetailsFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<fragment
android:id="@+id/personalDetailsFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.personal.PersonalDetailsFragment"
android:label="PersonalDetailsFragment"
tools:layout="@layout/fragment_personal_details">
<action
android:id="@+id/action_personalDetails_to_enterNumberFragment"
app:destination="@id/nav_register"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
<action
android:id="@+id/action_personalDetails_to_underSixteenFragment"
app:destination="@id/underSixteenFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<fragment
android:id="@+id/underSixteenFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.undersixteen.UnderSixteenFragment"
android:label="UnderSixteenFragment"
tools:layout="@layout/fragment_under_sixteen" >
<action
android:id="@+id/action_underSixteenFragment_to_enterNumberFragment"
app:destination="@id/nav_register"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<fragment
android:id="@+id/permissionFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.permission.PermissionFragment"
android:label="PermissionFragment"
tools:layout="@layout/fragment_permission">
<action
android:id="@+id/action_permissionFragment_to_permissionDeviceNameFragment"
app:destination="@id/permissionDeviceNameFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<fragment
android:id="@+id/permissionDeviceNameFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.permission.PermissionDeviceNameFragment"
android:label="PermissionDeviceNameFragment"
tools:layout="@layout/fragment_permission_device_name">
<action
android:id="@+id/action_permissionDeviceNameFragment_to_permissionSuccessFragment"
app:destination="@id/permissionSuccessFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
</fragment>
<fragment
android:id="@+id/permissionSuccessFragment"
android:name="au.gov.health.covidsafe.ui.onboarding.fragment.permissionsuccess.PermissionSuccessFragment"
android:label="PermissionSuccessFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right"
tools:layout="@layout/fragment_permission_success" />
</navigation>

2
app/src/main/res/values-vi/strings.xml
View file

@ -253,7 +253,7 @@
<string name="enter_number_button">Nhận mã PIN</string>
<string name="enter_number_content">Chúng tôi sẽ gửi cho bạn mã PIN gồm 6 chữ số để xác minh số điện thoại của bạn.</string>
<string name="enter_number_for_example">Ví dụ:</string>
<string name="enter_number_headline">Nhập sô điện thoại di động của bạn</string>
<string name="enter_number_headline">Nhập số điện thoại di động của bạn</string>
<string name="enter_number_prefix">+61</string>
<string name="enter_number_relative">Đăng ký dùm bạn bè hoặc người thân? \n\nHọ cần phải đăng ký bằng máy điện thoại và số điện thoại của riêng họ để COVIDSafe có thể hoạt động cho họ.</string>
<string name="enter_pin_button">Xác minh</string>

1
app/src/main/res/values/strings.xml
View file

@ -347,6 +347,7 @@
<string name="IssueFooter">We may contact you for further details about your feedback. Your email address won’t be used for any other purpose.</string>
<string name="jwt_description">There is an issue with your registration details.</string>
<string name="jwt_heading">Please register again</string>
<string name="jwt_success">Registration successfully renewed</string>
<string name="loading_numbers">Loading latest numbers</string>
<!-- Splash Screen -->
<string name="migration_in_progress"> COVIDSafe update in progress. \n\n Please make sure you phone is not switched off until the update is complete.</string>