From ee8bb052ab7221f3a426c5488d701fb9ea6972d7 Mon Sep 17 00:00:00 2001
From: covidsafe-support <64945427+covidsafe-support@users.noreply.github.com>
Date: Wed, 9 Jun 2021 17:25:51 -0700
Subject: [PATCH] COVIDSafe code from version 2.7

---
 app/build.gradle                              |  4 +-
 .../health/covidsafe/ui/home/HomeFragment.kt  | 17 +++++++++
 .../ui/onboarding/CountryListRecyclerView.kt  |  3 +-
 .../enternumber/EnterNumberFragment.kt        |  8 ++++
 .../main/res/layout/fragment_enter_number.xml | 21 ++++++++++-
 .../layout/fragment_home_external_links.xml   |  3 +-
 .../res/layout/view_home_setup_complete.xml   | 28 ++++++++++++++
 .../res/layout/view_home_setup_incomplete.xml | 32 ++++++++++++++++
 .../res/layout/view_state_case_statistics.xml | 37 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  2 +
 10 files changed, 146 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6bc52cd..e0d211f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@ android {
         applicationId "au.gov.health.covidsafe"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 128
-        versionName "2.6"
+        versionCode 132
+        versionName "2.7"
         buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/au/gov/health/covidsafe/ui/home/HomeFragment.kt b/app/src/main/java/au/gov/health/covidsafe/ui/home/HomeFragment.kt
index e5c6777..ed2e296 100644
--- a/app/src/main/java/au/gov/health/covidsafe/ui/home/HomeFragment.kt
+++ b/app/src/main/java/au/gov/health/covidsafe/ui/home/HomeFragment.kt
@@ -110,6 +110,9 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
         removeRegistrationData()
 
         NetworkConnectionCheck.addNetworkChangedListener(requireContext(), this)
+
+        val case_numbers_desc = this.getString(R.string.latest_case_numbers)
+        date_desc_v2.text = case_numbers_desc.replace("%@"," ")
     }
 
     private fun removeRegistrationData() {
@@ -366,6 +369,20 @@ class HomeFragment : BaseFragment(), EasyPermissions.PermissionCallbacks, Networ
             browserIntent.data = Uri.parse(url)
             startActivity(browserIntent)
         }
+
+        privacy_card_layout.setOnClickListener {
+            val browserIntent = Intent(Intent.ACTION_VIEW)
+            val url = LinkBuilder.getPrivacyTopicsUrl()
+            browserIntent.data = Uri.parse(url)
+            startActivity(browserIntent)
+        }
+
+        privacy_card_inactive_layout.setOnClickListener {
+            val browserIntent = Intent(Intent.ACTION_VIEW)
+            val url = LinkBuilder.getPrivacyTopicsUrl()
+            browserIntent.data = Uri.parse(url)
+            startActivity(browserIntent)
+        }
     }
 
     private fun initializeChangeLanguageNavigation() {
diff --git a/app/src/main/java/au/gov/health/covidsafe/ui/onboarding/CountryListRecyclerView.kt b/app/src/main/java/au/gov/health/covidsafe/ui/onboarding/CountryListRecyclerView.kt
index 088ddba..3da41ec 100644
--- a/app/src/main/java/au/gov/health/covidsafe/ui/onboarding/CountryListRecyclerView.kt
+++ b/app/src/main/java/au/gov/health/covidsafe/ui/onboarding/CountryListRecyclerView.kt
@@ -13,6 +13,8 @@ import au.gov.health.covidsafe.app.TracerApp
 
 const val VIEW_TYPE_GROUP_TITLE = 1
 const val VIEW_TYPE_COUNTRY = 2
+const val NOLFOLK_ISLAND = 672
+const val AUS = 61
 
 interface CountryListItemInterface
 
@@ -69,7 +71,6 @@ class CountryListItemHolder(
             Preference.putCountryNameResID(TracerApp.AppContext, countryNameResId)
             Preference.putCallingCode(TracerApp.AppContext, callingCode)
             Preference.putNationalFlagResID(TracerApp.AppContext, flagResID)
-
             onCountryClicked()
         }
     }
diff --git a/app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/enternumber/EnterNumberFragment.kt b/app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/enternumber/EnterNumberFragment.kt
index 0d3e57f..60ce235 100644
--- a/app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/enternumber/EnterNumberFragment.kt
+++ b/app/src/main/java/au/gov/health/covidsafe/ui/onboarding/fragment/enternumber/EnterNumberFragment.kt
@@ -23,7 +23,9 @@ import au.gov.health.covidsafe.preference.Preference
 import au.gov.health.covidsafe.talkback.setHeading
 import au.gov.health.covidsafe.ui.base.PagerChildFragment
 import au.gov.health.covidsafe.ui.base.UploadButtonLayout
+import au.gov.health.covidsafe.ui.onboarding.AUS
 import au.gov.health.covidsafe.ui.onboarding.CountryCodeSelectionActivity
+import au.gov.health.covidsafe.ui.onboarding.NOLFOLK_ISLAND
 import au.gov.health.covidsafe.ui.onboarding.fragment.enterpin.EnterPinFragment.Companion.ENTER_PIN_CALLING_CODE
 import au.gov.health.covidsafe.ui.onboarding.fragment.enterpin.EnterPinFragment.Companion.ENTER_PIN_CHALLENGE_NAME
 import au.gov.health.covidsafe.ui.onboarding.fragment.enterpin.EnterPinFragment.Companion.ENTER_PIN_DESTINATION_ID
@@ -114,6 +116,12 @@ class EnterNumberFragment : PagerChildFragment() {
         country_selection_box.setOnClickListener {
             startActivity(Intent(this.requireContext(), CountryCodeSelectionActivity::class.java))
         }
+
+        if (callingCode == AUS || callingCode == NOLFOLK_ISLAND) {
+            registration_error.visibility = GONE
+        } else {
+            registration_error.visibility = VISIBLE
+        }
     }
 
     private fun hideInvalidPhoneNumberPrompt() {
diff --git a/app/src/main/res/layout/fragment_enter_number.xml b/app/src/main/res/layout/fragment_enter_number.xml
index 6bfd26f..c438227 100644
--- a/app/src/main/res/layout/fragment_enter_number.xml
+++ b/app/src/main/res/layout/fragment_enter_number.xml
@@ -83,6 +83,25 @@
 
         </FrameLayout>
 
+        <TextView
+            android:id="@+id/registration_error"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_5"
+            android:layout_marginTop="6dp"
+            android:layout_marginEnd="@dimen/keyline_5"
+            android:gravity="center_vertical|start"
+            android:importantForAccessibility="no"
+            android:text="@string/geoblock_rego_error"
+            android:textAlignment="viewStart"
+            android:singleLine="false"
+            android:textColor="@color/error_red"
+            android:textAppearance="?textAppearanceBody1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/country_selection_box"
+            android:visibility="gone"/>
+
         <TextView
             android:id="@+id/enter_number_headline"
             android:layout_width="match_parent"
@@ -97,7 +116,7 @@
             android:textAppearance="?textAppearanceBody1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/country_selection_box" />
+            app:layout_constraintTop_toBottomOf="@+id/registration_error" />
 
         <EditText
             android:id="@+id/enter_number_phone_number"
diff --git a/app/src/main/res/layout/fragment_home_external_links.xml b/app/src/main/res/layout/fragment_home_external_links.xml
index faee4db..6d621bf 100644
--- a/app/src/main/res/layout/fragment_home_external_links.xml
+++ b/app/src/main/res/layout/fragment_home_external_links.xml
@@ -71,7 +71,8 @@
             app:external_linkCard_start_icon="@drawable/ic_privace"
             app:external_linkCard_start_icon_background="@drawable/background_circular_green"
             app:external_linkCard_start_icon_padding="@dimen/space_8"
-            app:external_linkCard_title="@string/privacy_policy" />
+            app:external_linkCard_title="@string/privacy_policy"
+            android:visibility="gone"/>
 
     </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/view_home_setup_complete.xml b/app/src/main/res/layout/view_home_setup_complete.xml
index b15b14c..c7f613b 100644
--- a/app/src/main/res/layout/view_home_setup_complete.xml
+++ b/app/src/main/res/layout/view_home_setup_complete.xml
@@ -81,5 +81,33 @@
         android:text="@string/home_header_no_pairing"
         android:textColor="@color/slate_black_2"
         android:textColorLink="@color/slack_black_2" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/divider_line_grey" />
+
+    <RelativeLayout
+        android:id="@+id/privacy_card_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/space_16">
+
+        <TextView
+            style="@style/fontRobotoRegular16"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/privacy_policy"
+            android:textColor="@color/slate_black_2"
+            android:textColorLink="@color/slack_black_2" />
+
+        <ImageView
+            android:layout_width="@dimen/active_status_tick_image_size"
+            android:layout_height="@dimen/active_status_tick_image_size"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:src="@drawable/ic_chevron_right_black"/>
+
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_home_setup_incomplete.xml b/app/src/main/res/layout/view_home_setup_incomplete.xml
index aa7af36..e935b68 100644
--- a/app/src/main/res/layout/view_home_setup_incomplete.xml
+++ b/app/src/main/res/layout/view_home_setup_incomplete.xml
@@ -164,4 +164,36 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </FrameLayout>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/divider_line_grey" />
+
+            <RelativeLayout
+                android:id="@+id/privacy_card_inactive_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/space_16">
+
+                <TextView
+                    style="@style/fontRobotoRegular16"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/privacy_policy"
+                    android:textColor="@color/slate_black_2"
+                    android:textColorLink="@color/slack_black_2" />
+
+                <ImageView
+                    android:layout_width="@dimen/active_status_tick_image_size"
+                    android:layout_height="@dimen/active_status_tick_image_size"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:src="@drawable/ic_chevron_right_black"/>
+
+            </RelativeLayout>
+    </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_state_case_statistics.xml b/app/src/main/res/layout/view_state_case_statistics.xml
index 8011de1..6b6ec70 100644
--- a/app/src/main/res/layout/view_state_case_statistics.xml
+++ b/app/src/main/res/layout/view_state_case_statistics.xml
@@ -29,6 +29,21 @@
                 android:background="@color/divider_line_grey"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/date_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/space_16"
+                android:layout_marginEnd="@dimen/space_16"
+                android:layout_marginBottom="@dimen/space_16"
+                android:layout_marginTop="@dimen/space_16"
+                android:text="Latest available case number since "
+                android:textAppearance="@style/fontRobotoRegular16"
+                android:textColor="@color/slate_black_2"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/top_case_line_divider"
+                visibility="@{viewModel.caseStatisticsLiveData != null}"/>
+
             <TextView
                 android:id="@+id/date_text_view"
                 dateFormat="@{viewModel.caseStatisticsLiveData.updatedDate}"
@@ -38,14 +53,14 @@
                 android:layout_marginStart="@dimen/space_16"
                 android:layout_marginEnd="@dimen/space_16"
                 android:layout_marginBottom="@dimen/space_16"
-                android:layout_marginTop="@dimen/space_16"
+                android:layout_marginTop="@dimen/space_4"
                 android:text="27 August 2020 at 3pm AEST"
                 android:textAppearance="@style/fontRobotoRegular16"
                 android:textColor="@color/slate_black_2"
                 android:visibility="visible"
                 tools:text="27 August 2020 at 3pm AEST"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/top_case_line_divider" />
+                app:layout_constraintTop_toBottomOf="@+id/date_desc" />
 
             <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
                 android:id="@+id/national_new_case_card"
@@ -454,6 +469,20 @@
                 android:background="@color/divider_line_grey"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/date_desc_v2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/space_16"
+                android:layout_marginEnd="@dimen/space_16"
+                android:layout_marginBottom="@dimen/space_16"
+                android:layout_marginTop="@dimen/space_16"
+                android:textAppearance="@style/fontRobotoRegular16"
+                android:textColor="@color/slate_black_2"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/top_case_line_divider_v2"
+                visibility="@{viewModel.caseStatisticsLiveData != null}"/>
+
             <TextView
                 android:id="@+id/date_text_view_v2"
                 dateFormat="@{viewModel.caseStatisticsLiveData.updatedDate}"
@@ -463,14 +492,14 @@
                 android:layout_marginStart="@dimen/space_16"
                 android:layout_marginEnd="@dimen/space_16"
                 android:layout_marginBottom="@dimen/space_16"
-                android:layout_marginTop="@dimen/space_16"
+                android:layout_marginTop="@dimen/space_4"
                 android:text="27 August 2020 at 3pm AEST"
                 android:textAppearance="@style/fontRobotoRegular16"
                 android:textColor="@color/slate_black_2"
                 android:visibility="visible"
                 tools:text="27 August 2020 at 3pm AEST"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/top_case_line_divider_v2" />
+                app:layout_constraintTop_toBottomOf="@+id/date_desc_v2" />
 
             <au.gov.health.covidsafe.ui.home.view.ExternalLinkCard
                 android:id="@+id/state_new_case_card"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2f4636..8cd5967 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -298,6 +298,7 @@
   <string name="generic_internet_error">Please check your internet connection</string>
   <!-- Error message for when a user tries to signup outside of Australia. -->
   <string name="geoblock_error_message">You may be connected using an internet provider from outside Australia. This could happen when using international data roaming on a non-Australian SIM card.\n\nPlease connect to an Australian network or use a local Wi-Fi internet connection to continue.</string>
+  <string name="geoblock_rego_error">Note: You can only complete registration once you’ve arrived in Australia.</string>
   <string name="global_OK">OK</string>
   <string name="heading">Heading</string>
   <string name="hide">Hide</string>
@@ -396,6 +397,7 @@
   <string name="jwt_heading">Please register again</string>
   <string name="jwt_success">Registration successfully renewed</string>
   <string name="last_7_days">Last 7 days</string>
+  <string name="latest_case_numbers">Latest available case numbers since %@</string>
   <string name="learn_more">Learn more</string>
   <string name="loading_numbers">Loading latest numbers</string>
   <string name="locally_acquired">%@ locally acquired</string>