Connect Beta Backmerge

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.57">
+          android:versionName="2.58">
 
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -552,7 +552,9 @@
         <activity android:name="org.commcare.activities.TargetMismatchErrorActivity"/>
         <activity android:name="org.commcare.recovery.measures.ExecuteRecoveryMeasuresActivity"/>
         <activity android:name="org.commcare.activities.PromptCCReinstallActivity"/>
-        <activity android:name="org.commcare.fragments.MicroImageActivity" />
+        <activity
+            android:name="org.commcare.fragments.MicroImageActivity"
+            android:screenOrientation="portrait"/>
         <!-- Start Collect Manifest -->
 
         <meta-data

app/assets/locales/android_translatable_strings.txt

@@ -208,8 +208,8 @@ post.server.error=Server-side error (code ${0}) received from network request.
 post.gone.error=Case is not present on server.
 post.conflict.error=You have already claimed this case.
 
-version.id.long=CommCare Android, version "${0}"(${1}). App v${4}. CommCare Version ${0}. Build ${2}, built on: ${3}
-version.id.short=CCDroid:"${0}"(${1}). v${4} CC${0}b[${2}] on ${3}
+version.id.long=CommCare Android, version "${0}"(${1}). App v${5}. CommCare Version ${2}. Build ${3}, built on: ${4}
+version.id.short=CCDroid:"${0}"(${1}). v${5} CC${2}b[${3}] on ${4}
 commcare.version=CommCare Android, version "${0}"(${1}), built on: ${2}
 
 auth.request.not.using.https=${0} is an invalid URL. CommCare can't connect with authentication to an insecure (HTTP) server.

app/res/layout-land/home_screen.xml

@@ -13,74 +13,6 @@
     android:paddingRight="@dimen/content_start"
     tools:viewBindingIgnore="true">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/connect_alert_tile"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="2dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="5dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/connect_jobs_last_update">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:visibility="visible">
-
-            <ImageView
-                android:id="@+id/connect_secondary_phone_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/phone_heart"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/black" />
-
-            <TextView
-                android:id="@+id/connect_phone_label"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:textColor="@color/black"
-                android:textSize="16sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/connect_phone_yes_button"
-                android:layout_width="wrap_content"
-                android:layout_height="35dp"
-                android:layout_marginTop="10dp"
-                android:text="@string/connect_payment_confirm_yes"
-                android:textColor="@color/blue"
-                android:textSize="18sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
-
-            <com.google.android.material.button.MaterialButton
-                style="@style/NegativeButtonStyle"
-                android:id="@+id/connect_phone_no_button"
-                android:layout_width="wrap_content"
-                android:layout_height="35dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="10dp"
-                android:text="@string/connect_payment_confirm_no"
-                app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
-                app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
     <androidx.core.widget.NestedScrollView
         android:id="@+id/nsv_home_screen"
         android:layout_width="match_parent"

app/res/layout/fragment_connect_delivery_progress.xml

@@ -76,7 +76,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
                         android:text="@string/connect_payment_confirm_yes"
-                        android:textColor="@color/blue"
                         android:textSize="18sp"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/connect_payment_confirm_label" />
@@ -87,7 +86,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="10dp"
                         android:text="@string/connect_payment_confirm_no"
-                        android:textColor="@color/blue"
                         android:textSize="18sp"
                         style="@style/NegativeButtonStyle"
                         app:layout_constraintEnd_toStartOf="@id/connect_payment_confirm_yes_button"

app/res/layout/fragment_connect_jobs_list.xml

@@ -29,71 +29,6 @@
         app:layout_constraintEnd_toStartOf="@id/connect_jobs_refresh"
         app:layout_constraintTop_toTopOf="@+id/connect_jobs_refresh" />
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/connect_alert_tile"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="2dp"
-        android:clickable="true"
-        android:focusable="true"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="5dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/connect_jobs_last_update">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:visibility="visible">
-
-            <ImageView
-                android:id="@+id/connect_secondary_phone_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/phone_heart"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/black" />
-
-            <TextView
-                android:id="@+id/connect_phone_label"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:textColor="@color/black"
-                android:textSize="16sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/connect_phone_yes_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/connect_payment_confirm_yes"
-                android:layout_marginTop="10dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/connect_phone_no_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="10dp"
-                android:text="@string/connect_payment_confirm_no"
-                app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
-                app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
-                />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
     <TextView
         android:id="@+id/connect_no_jobs_text"
         android:layout_width="match_parent"
@@ -104,7 +39,7 @@
         android:textColor="@color/blue"
         android:textSize="18sp"
         android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/connect_alert_tile"
+        app:layout_constraintTop_toBottomOf="@id/connect_jobs_last_update"
         android:textStyle="bold"/>
 
     <androidx.recyclerview.widget.RecyclerView
@@ -113,6 +48,6 @@
         android:layout_height="0dp"
         android:layout_marginTop="10dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/connect_alert_tile"
+        app:layout_constraintTop_toBottomOf="@id/connect_jobs_last_update"
         tools:listitem="@layout/item_login_connect_home_apps" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/res/layout/fragment_recovery_code.xml

@@ -185,7 +185,7 @@
                     android:id="@+id/not_me_button"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/this_is_not_me"
+                    android:text="@string/personalid_this_is_not_me"
                     android:textColor="@color/cc_brand_color"
                     android:layout_marginStart="16dp"
                     android:clickable="true"
@@ -214,4 +214,4 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
     </ScrollView>
-</layout>
+</layout>

app/res/layout/home_screen.xml

@@ -8,79 +8,6 @@
     android:orientation="vertical"
     android:padding="4dp"
     tools:viewBindingIgnore="true">
-    <androidx.cardview.widget.CardView
-        android:id="@+id/connect_alert_tile"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="2dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone"
-        android:shadowColor="@color/connect_light_grey_transparent"
-        android:shadowDx="30"
-        android:shadowDy="30"
-        android:shadowRadius="50"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="5dp"
-        app:layout_constraintStart_toStartOf="parent"
-        >
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:visibility="visible">
-
-            <ImageView
-                android:id="@+id/connect_secondary_phone_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/phone_heart"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:tint="@color/black" />
-
-            <TextView
-                android:id="@+id/connect_phone_label"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:textColor="@color/black"
-                android:textSize="16sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/connect_phone_yes_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/connect_payment_confirm_yes"
-                android:layout_marginTop="10dp"
-                android:textSize="18sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
-
-            <com.google.android.material.button.MaterialButton
-                style="@style/NegativeButtonStyle"
-                android:id="@+id/connect_phone_no_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="10dp"
-                android:text="@string/connect_payment_confirm_no"
-                android:textSize="18sp"
-                app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
-                app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
-                />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
     <androidx.core.widget.NestedScrollView
         android:id="@+id/nsv_home_screen"
         android:layout_width="match_parent"

app/res/layout/screen_login.xml

@@ -133,7 +133,7 @@
                                 android:layout_gravity="center"
                                 android:layout_margin="@dimen/content_min_margin"
                                 android:textStyle="bold"
-                                android:text="@string/login_via_connect"
+                                android:text="@string/personalid_login_via_connect"
                                 android:textColor="@color/cc_neutral_color"
                                 android:textSize="@dimen/text_medium"
                                 android:visibility="gone"/>
@@ -275,4 +275,4 @@
         android:focusableInTouchMode="true"
         android:orientation="horizontal" />
 
-</LinearLayout>
+</LinearLayout>

app/res/layout/screen_personalid_name.xml

@@ -34,7 +34,7 @@
                     android:textStyle="bold"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/name_fragment_subtitle"
+                    android:text="@string/personalid_name_fragment_subtitle"
                     android:textColor="@color/connect_dark_blue_color"
                     android:textSize="16sp" />
 
@@ -103,4 +103,4 @@
 
             </LinearLayout>
         </ScrollView>
-</layout>
+</layout>

app/res/layout/screen_personalid_phone_verify.xml

@@ -33,9 +33,9 @@
 
         <TextView
             android:id="@+id/connect_phone_verify_label"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="16dp"
             android:textColor="@color/connect_secondary_text"
             android:textSize="16sp"
             tools:text="+91 7748962888"
@@ -45,8 +45,7 @@
             android:id="@+id/connect_phone_verify_change"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:gravity="end"
+            android:layout_marginStart="16dp"
             android:text="@string/connect_verify_phone_change"
             android:textColor="@color/connect_blue_color"
             android:textSize="16sp"
@@ -156,4 +155,4 @@
         </RelativeLayout>
 
     </LinearLayout>
-</layout>
+</layout>

app/res/layout/screen_personalid_phoneno.xml

@@ -116,7 +116,7 @@
 
                     <TextView
                         android:textStyle="bold"
-                        android:id="@+id/personalid_name_error"
+                        android:id="@+id/personalid_phone_error"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="16dp"