CCCT-467 || User Payment Info

app/res/layout/fragment_connect_payment_setup.xml

@@ -0,0 +1,167 @@
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/connect_background_color"
+    android:padding="16dp"
+    tools:context="org.commcare.fragments.connect.ConnectPaymentSetupFragment">
+
+    <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+        android:id="@+id/connectMediumTextView"
+        android:layout_width="match_parent"
+        android:textSize="14sp"
+        android:letterSpacing="0.08"
+        android:layout_height="wrap_content"
+        android:text="@string/connect_payment_info_description"
+        android:textColor="@color/black"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/name_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:gravity="start"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/connectMediumTextView">
+
+        <LinearLayout
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:background="@drawable/connect_side_icon_bg"
+            android:layout_marginTop="6dp"
+            android:gravity="center">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="1dp"
+                android:src="@drawable/ic_outline_person_24" />
+
+        </LinearLayout>
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/nameTextValue"
+            android:layout_width="match_parent"
+            android:layout_height="55dp"
+            android:layout_marginLeft="16dp"
+            android:background="@drawable/connect_edit_text_bg"
+            android:hint="@string/connect_payment_info_name_hint"
+            android:imeOptions="actionNext"
+            android:paddingStart="16dp"
+            android:textColorHint="@color/connect_grey"
+            tools:ignore="RtlSymmetry" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/phone_layout"
+        android:layout_width="match_parent"
+        android:layout_marginTop="16dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintTop_toBottomOf="@+id/name_layout"
+        tools:layout_editor_absoluteX="16dp">
+
+        <LinearLayout
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:background="@drawable/connect_side_icon_bg"
+            android:layout_marginTop="6dp"
+            android:gravity="center">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="1dp"
+                android:src="@drawable/ic_outline_phone_24" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/connect_edit_text_bg"
+                android:padding="0dp">
+
+                <EditText
+                    android:id="@+id/countryCode"
+                    android:layout_width="64dp"
+                    android:layout_height="55dp"
+                    android:background="@null"
+                    android:gravity="center"
+                    android:hint="@string/connect_phone_country_code_default"
+                    android:inputType="number"
+                    android:text="@string/connect_phone_country_code_default"
+                    android:textColorHint="@color/connect_grey" />
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginVertical="10dp"
+                    android:background="@color/connect_blue_color_10" />
+
+                <AutoCompleteTextView
+                    android:id="@+id/connect_primary_phone_input"
+                    android:layout_width="fill_parent"
+                    android:layout_height="55dp"
+                    android:background="@null"
+                    android:digits="1234567890"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:hint="@string/connect_phone_number_hint"
+                    android:inputType="numberDecimal"
+                    android:paddingStart="16dp"
+                    android:textAlignment="textStart"
+                    android:textColorHint="@color/connect_grey"
+                    tools:ignore="RtlSymmetry" />
+            </LinearLayout>
+
+            <org.commcare.views.connect.connecttextview.ConnectMediumTextView
+                android:id="@+id/errorTextView"
+                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:visibility="gone" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+        android:id="@+id/connectPaymentInfoNextStepText"
+        android:layout_width="match_parent"
+        android:layout_marginTop="10dp"
+        android:textSize="14sp"
+        android:letterSpacing="0.08"
+        android:layout_height="wrap_content"
+        android:text="@string/connect_verify_payment_phone_message"
+        android:textColor="@color/black"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/phone_layout" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/continue_button"
+        style="@style/CustomButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_gravity="end"
+        android:text="@string/connect_payment_info_next"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/connectPaymentInfoNextStepText"
+ />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/res/layout/fragment_recovery_code.xml

@@ -79,6 +79,7 @@
                 android:layout_width="42dp"
                 android:layout_height="42dp"
                 android:background="@drawable/connect_side_icon_bg"
+                android:layout_marginTop="6dp"
                 android:gravity="center">
 
                 <ImageView
@@ -124,6 +125,7 @@
                 android:layout_width="42dp"
                 android:layout_height="42dp"
                 android:background="@drawable/connect_side_icon_bg"
+                android:layout_marginTop="6dp"
                 android:gravity="center">
 
                 <ImageView

app/res/layout/fragment_secondary_phone_number.xml

@@ -97,6 +97,7 @@
                             android:layout_width="42dp"
                             android:layout_height="42dp"
                             android:background="@drawable/connect_side_icon_bg"
+                            android:layout_marginTop="6dp"
                             android:gravity="center">
 
                             <ImageView

app/res/layout/fragment_signup.xml

@@ -82,6 +82,7 @@
                     android:layout_width="42dp"
                     android:layout_height="42dp"
                     android:background="@drawable/connect_side_icon_bg"
+                    android:layout_marginTop="6dp"
                     android:gravity="center">
 
                     <ImageView
@@ -118,6 +119,7 @@
                     android:layout_width="42dp"
                     android:layout_height="42dp"
                     android:background="@drawable/connect_side_icon_bg"
+                    android:layout_marginTop="6dp"
                     android:gravity="center">
 
                     <ImageView

app/res/layout/screen_connect_password_verify.xml

@@ -73,6 +73,7 @@
                 android:layout_width="42dp"
                 android:layout_height="42dp"
                 android:background="@drawable/connect_side_icon_bg"
+                android:layout_marginTop="6dp"
                 android:gravity="center">
 
                 <ImageView

app/res/layout/screen_connect_phone_verify.xml

@@ -97,6 +97,7 @@
                 android:layout_width="42dp"
                 android:layout_height="42dp"
                 android:background="@drawable/connect_side_icon_bg"
+                android:layout_marginTop="6dp"
                 android:gravity="center">
 
                 <ImageView

app/res/layout/screen_connect_primary_phone.xml

@@ -75,6 +75,7 @@
                 android:layout_width="42dp"
                 android:layout_height="42dp"
                 android:background="@drawable/connect_side_icon_bg"
+                android:layout_marginTop="6dp"
                 android:gravity="center">
 
                 <ImageView

app/res/layout/screen_connect_user_deactivate_otp_verify.xml

@@ -72,6 +72,7 @@
                 android:layout_width="42dp"
                 android:layout_height="42dp"
                 android:background="@drawable/connect_side_icon_bg"
+                android:layout_marginTop="6dp"
                 android:gravity="center">
 
                 <ImageView

app/res/navigation/nav_graph_connect.xml

@@ -36,6 +36,9 @@
         <action
             android:id="@+id/action_connect_jobs_list_fragment_to_connect_downloading_fragment2"
             app:destination="@id/connect_downloading_fragment" />
+        <action
+            android:id="@+id/action_connect_jobs_list_fragment_to_connectPaymentSetupFragment"
+            app:destination="@id/connectPaymentSetupFragment" />
     </fragment>
 
     <fragment
@@ -157,13 +160,20 @@
             android:name="unitId"
             app:argType="string" />
     </fragment>
+    <fragment
+        android:id="@+id/connectPaymentSetupFragment"
+        android:name="org.commcare.fragments.connect.ConnectPaymentSetupFragment"
+        android:label="fragment_connect_payment_setup"
+        tools:layout="@layout/fragment_connect_payment_setup">
+        <action
+            android:id="@+id/action_connectPaymentSetupFragment_to_connectJobIntroFragment"
+            app:destination="@id/connect_job_intro_fragment" />
+    </fragment>
+
     <dialog
         android:id="@+id/connect_job_detail_bottom_sheet_dialog_fragment"
         android:name="org.commcare.fragments.connect.ConnectJobDetailBottomSheetDialogFragment"
         tools:layout="@layout/fragment_connect_job_detail_bottom_sheet_dialog"
         android:label="ConnectJobDetailBottomSheetDialogFragment">
-
-
     </dialog>
-
 </navigation>

app/res/navigation/nav_graph_connectid.xml

@@ -287,6 +287,9 @@
         <action
             android:id="@+id/action_connectid_signup_fragment_self"
             app:destination="@id/connectid_signup_fragment" />
+        <action
+            android:id="@+id/action_connectid_signup_fragment_to_connectid_phone_verify"
+            app:destination="@id/connectid_phone_verify" />
     </fragment>
 
     <fragment

app/res/values/strings.xml

@@ -22,6 +22,8 @@
     <string name="ConnectClaimJobURL">https://%s/api/opportunity/%d/claim</string>
     <string name="ConnectDeliveriesURL">https://%s/api/opportunity/%d/delivery_progress</string>
     <string name="ConnectPaymentConfirmationURL">https://%s/api/payment/%s/confirm</string>
+    <string name="ConnectPaymentPhoneNumberURL">https://connectid.dimagi.com/users/profile/payment_phone_number</string>
+    <string name="ConnectConfirmPaymentOtpURL">https://connectid.dimagi.com/users/profile/confirm_payment_otp</string>
 
     <!--    Connect Messaging URLs-->
     <string name="ConnectMessageRetrieveMessagesURL">https://connectid.dimagi.com/messaging/retrieve_messages/</string>
@@ -479,8 +481,6 @@
     <string name="connect_pin_verify_forgot">Forgot Code</string>
     <string name="connect_recovery_title">ConnectID Recovery</string>
 
-
-
     <string name="connect_recovery_decision_new">Choose a step below</string>
     <string name="connect_recovery_button_new">Create New ConnectID Account</string>
     <string name="connect_recovery_button_recover">Recover Existing Account</string>
@@ -529,12 +529,18 @@
 
     <string name="connect_verify_phone_title">Verification Code</string>
     <string name="connect_verify_phone_label">We attempted to send you a SMS ending with %s.</string>
+    <string name="connect_verify_phone_label_payment">We attempted to send you a SMS on your payment phone number.</string>
     <string name="connect_verify_phone_label_secondary">We attempted to send you a SMS on your secondary phone number.</string>
     <string name="connect_verify_phone_label_deactivate">In order to deactivate your account, please enter the code sent by SMS to your primary phone number.</string>
     <string name="connect_verify_phone_resend">Didn\'t receive your code? Resend</string>
     <string name="connect_verify_phone_error">Error verifying SMS code</string>
     <string name="connect_verify_phone_resend_code">Resend Code</string>
 
+    <string name="connect_verify_payment_phone_title">Verification Code</string>
+    <string name="connect_verify_payment_phone_message">On the next screen, we\'ll send a code via SMS to the payment phone number you entered.</string>
+    <string name="connect_verify_payment_phone_back">Back</string>
+    <string name="connect_verify_payment_phone_ok">OK</string>
+
     <string name="connect_verify_phone_resend_wait">Didn\'t receive your code? Resend in %d s</string>
     <string name="connect_verify_phone_change">Change</string>
 
@@ -778,6 +784,11 @@
     <string name="connect_expired">Expired</string>
     <string name="connect_job_tile_daily_limit_description">Daily Limit reached. No Payment for submitting forms</string>
     <string name="connect_job_tile_daily_limit">Over Limit</string>
+    <string name="connect_payment_info">Payment Info</string>
+    <string name="connect_payment_info_description">Please confirm your exact name and phone number to receive payment</string>
+    <string name="connect_payment_info_name_hint">Official Name</string>
+    <string name="connect_payment_info_next">Next</string>
+    <string name="connect_payment_info_resend_otp">Resend OTP</string>
     <string name="connect_job_tile_daily_visits">Daily Visits</string>
     <string name="connect_appbar_title_app_lock">App Lock</string>
     <string name="connect_appbar_title_password_verification">Password Verification</string>

app/src/org/commcare/activities/connect/ConnectActivity.java

@@ -6,22 +6,22 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.PorterDuff;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.Window;
 
 import com.google.common.base.Strings;
 
 import org.commcare.activities.CommCareActivity;
 import org.commcare.activities.CommCareVerificationActivity;
 import org.commcare.android.database.connect.models.ConnectJobRecord;
+import org.commcare.connect.ConnectConstants;
 import org.commcare.connect.ConnectDatabaseHelper;
 import org.commcare.connect.ConnectManager;
-import org.commcare.connect.MessageManager;
 import org.commcare.dalvik.R;
 import org.commcare.fragments.connect.ConnectDownloadingFragment;
+import org.commcare.fragments.connect.ConnectJobsListsFragmentDirections;
+import org.commcare.fragments.connect.ConnectPaymentSetupFragment;
 import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.services.CommCareFirebaseMessagingService;
 import org.commcare.tasks.ResourceEngineListener;
@@ -144,7 +144,19 @@ public void setTitle(CharSequence title) {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @androidx.annotation.Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        ConnectManager.handleFinishedActivity(this, requestCode, resultCode, data);
+
+        if (resultCode == RESULT_OK) {
+            Fragment fragment = getCurrentFragment();
+
+            if(fragment instanceof ConnectPaymentSetupFragment) {
+                if (requestCode == ConnectConstants.CONNECTID_REQUEST_CODE) {
+                    navController.navigate(ConnectJobsListsFragmentDirections.
+                            actionConnectJobsListFragmentToConnectJobIntroFragment());
+                }
+            } else {
+                ConnectManager.handleFinishedActivity(this, requestCode, resultCode, data);
+            }
+        }
     }
 
     @Override