Commcare 2.61

app/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           android:versionCode="106"
-          android:versionName="2.62">
+          android:versionName="2.61.0">
 
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

app/res/drawable/bg_location_tooltip.xml

@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/sapphire_blue" />
+    <corners android:radius="8dp" />
+</shape>

app/res/drawable/ic_blue_triangle.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="22dp"
+    android:viewportWidth="20"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M9.526,0L19.053,21.507H0L9.526,0Z"
+      android:fillColor="#3843CF"/>
+</vector>

app/res/drawable/ic_location_info.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22C17.52,22 22,17.52 22,12C22,6.48 17.52,2 12,2ZM11,17V15H13V17H11ZM11,7V13H13V7H11Z"
+      android:fillColor="#3B43C5"
+      android:fillType="evenOdd"/>
+</vector>

app/res/layout/nav_drawer_base.xml

@@ -2,15 +2,15 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    android:background="@color/cc_brand_color"
+    android:background="@color/connect_blue_color"
     android:layout_gravity="start"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fillViewport="true"
-            android:background="@color/cc_brand_color">
+            android:background="@color/connect_blue_color">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -48,7 +48,7 @@
                         android:text="@string/nav_drawer_not_signed_in_to_personal_id"/>
 
                     <com.google.android.material.button.MaterialButton
-                        android:backgroundTint="@color/palatinate_blue"
+                        android:backgroundTint="@color/cc_brand_color"
                         android:id="@+id/nav_drawer_sign_in_button"
                         android:layout_gravity="center"
                         android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
                     android:nestedScrollingEnabled="false"
-                    android:background="@color/cc_brand_color" />
+                    android:background="@color/connect_blue_color" />
 
                 <include
                     android:id="@+id/nav_drawer_footer"

app/res/layout/nav_drawer_footer.xml

@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:padding="16dp"
     android:layout_gravity="bottom"
-    android:background="@color/cc_brand_color">
+    android:background="@color/connect_blue_color">
     <View
         android:layout_marginTop="16dp"
         android:layout_width="match_parent"
@@ -98,6 +98,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="@style/TextAppearance.NavDrawerItem.SubTitle"
         android:enabled="false"
+        android:textColor="@color/white"
         android:layout_marginTop="8dp"/>
 
 </LinearLayout>

app/res/layout/nav_drawer_header.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="16dp"
-    android:background="@color/cc_brand_color">
+    android:background="@color/connect_blue_color">
     <ImageView
         android:contentDescription="@null"
         android:layout_gravity="center"
@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         app:cardCornerRadius="8dp"
-        android:backgroundTint="@color/start_sync_dark_button">
+        android:backgroundTint="@color/persian_indigo">
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

app/res/layout/nav_drawer_list_item.xml

@@ -9,7 +9,7 @@
     android:gravity="center_vertical"
     android:clipChildren="false"
     android:clipToPadding="false"
-    android:background="@color/cc_brand_color">
+    android:background="@color/connect_blue_color">
 
     <FrameLayout
         android:layout_width="wrap_content"

app/res/layout/screen_personalid_phoneno.xml

@@ -1,20 +1,22 @@
 <layout 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">
+
     <ScrollView
-            android:id="@+id/firstLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/white"
-            android:orientation="vertical"
-            tools:context="org.commcare.fragments.personalId.PersonalIdPhoneFragment">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical"
+        android:fillViewport="true"
+        tools:context="org.commcare.fragments.personalId.PersonalIdPhoneFragment">
 
         <LinearLayout
+            android:id="@+id/firstLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <include layout="@layout/grid_header_top_banner"/>
+            <include layout="@layout/grid_header_top_banner" />
 
             <View
                 android:id="@+id/divider"
@@ -29,12 +31,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:textStyle="bold"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
                 android:text="@string/connect_registration_subtitle"
                 android:textColor="@color/connect_dark_blue_color"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/phone_sub_text"
@@ -43,10 +45,10 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
-                android:textStyle="normal"
                 android:text="@string/connect_registration_title"
                 android:textColor="@color/connect_subtext"
-                android:textSize="12sp" />
+                android:textSize="12sp"
+                android:textStyle="normal" />
 
             <LinearLayout
                 android:id="@+id/phone_layout"
@@ -59,9 +61,9 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:background="@drawable/connect_side_icon_bg"
-                    android:gravity="center"
-                    android:layout_gravity="center">
+                    android:gravity="center">
 
                     <ImageView
                         android:layout_width="42dp"
@@ -116,64 +118,153 @@
                     </LinearLayout>
 
                     <TextView
-                        android:textStyle="bold"
                         android:id="@+id/personalid_phone_error"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="16dp"
                         android:paddingTop="4dp"
                         android:textColor="@android:color/holo_red_light"
                         android:textSize="14sp"
+                        android:textStyle="bold"
                         android:visibility="gone" />
                 </LinearLayout>
 
 
             </LinearLayout>
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/ll_location"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="55dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="20dp"
-                android:gravity="start"
+                android:layout_gravity="center"
+                android:layout_marginTop="13dp"
+                android:gravity="center"
                 android:orientation="horizontal">
 
-                <CheckBox
-                    android:id="@+id/connect_consent_check"
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/iv_location"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="5dp"
+                    android:src="@drawable/ic_place"
+                    app:layout_constraintEnd_toStartOf="@+id/tv_location"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_location"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginBottom="16dp"
-                    android:buttonTint="@color/connect_blue_color"
-                    android:padding="1dp"
-                    android:textColor="@color/connect_subtext"
-                    android:textSize="13sp" />
-
-                <TextView
-                    android:textStyle="bold"
-                    android:id="@+id/checkText"
+                    android:layout_marginHorizontal="5dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:textColor="@color/connect_grey"
+                    android:textSize="16sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@string/personalid_using_your_location" />
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/iv_location_info"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="20dp"
-                    android:text="@string/connect_consent_message_1"
-                    android:textColor="@color/connect_grey"
-                    android:textSize="16sp" />
-            </LinearLayout>
+                    android:layout_marginStart="5dp"
+                    android:src="@drawable/ic_location_info"
+                    app:layout_constraintStart_toEndOf="@+id/tv_location"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/personalid_phone_continue_button"
-                style="@style/CustomButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="16dp"
-                android:gravity="start|center"
-                android:text="@string/review"
-                android:drawableEnd="@drawable/connect_right_arrow"
-                />
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/group_tooltip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:constraint_referenced_ids="iv_location,tv_location,iv_location_info" />
 
-            </LinearLayout>
-        </ScrollView>
+                <LinearLayout
+                    android:id="@+id/ll_privacy_policy"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="55dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="20dp"
+                    android:gravity="start"
+                    android:orientation="horizontal"
+                    app:layout_constraintTop_toBottomOf="@+id/iv_location_info">
+
+                    <CheckBox
+                        android:id="@+id/connect_consent_check"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginBottom="16dp"
+                        android:buttonTint="@color/connect_blue_color"
+                        android:padding="1dp"
+                        android:textColor="@color/connect_subtext"
+                        android:textSize="13sp" />
+
+                    <TextView
+                        android:id="@+id/checkText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="20dp"
+                        android:text="@string/connect_consent_message_1"
+                        android:textColor="@color/connect_grey"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/iv_triangle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:rotation="360"
+                    android:src="@drawable/ic_blue_triangle"
+                    app:layout_constraintEnd_toEndOf="@id/iv_location_info"
+                    app:layout_constraintStart_toStartOf="@id/iv_location_info"
+                    app:layout_constraintTop_toBottomOf="@id/iv_location_info" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tooltipText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="10dp"
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/bg_location_tooltip"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:linksClickable="true"
+                    android:padding="10dp"
+                    android:textColor="@android:color/white"
+                    android:textColorLink="@color/white"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/iv_triangle" />
+
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/group_tooltip_info"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:constraint_referenced_ids="iv_triangle,tooltipText" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/personalid_phone_continue_button"
+                    style="@style/CustomButtonStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:drawableEnd="@drawable/connect_right_arrow"
+                    android:gravity="start|center"
+                    android:text="@string/review"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/ll_privacy_policy" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </LinearLayout>
+    </ScrollView>
 </layout>