Review for layouts, navigations, views, and some minor strings

app/instrumentation-tests/src/org/commcare/androidTests/DemoUserTest.kt

@@ -21,12 +21,12 @@ abstract class DemoUserTest: BaseTest() {
         // Enter practice mode
         enterPracticeMode()
 
-        onView(withId(R.id.home_gridview_buttons))
+        onView(withId(R.id.nsv_home_screen))
                 .perform(swipeUp())
         withText("Logged In: demo.user.test").isDisplayed()
 
         // Confirm that the right restore has been used
-        onView(withId(R.id.home_gridview_buttons))
+        onView(withId(R.id.nsv_home_screen))
                 .perform(swipeDown())
         openForm("Case List", "Followup")
 
@@ -54,12 +54,12 @@ abstract class DemoUserTest: BaseTest() {
         // Enter practice mode
         enterPracticeMode()
 
-        onView(withId(R.id.home_gridview_buttons))
+        onView(withId(R.id.nsv_home_screen))
                 .perform(swipeUp())
         withText("Logged In: demo.user.test.2").isDisplayed()
 
         // Confirm that the right restore has been used
-        onView(withId(R.id.home_gridview_buttons))
+        onView(withId(R.id.nsv_home_screen))
                 .perform(swipeDown())
         openForm("Case List", "Followup")
         matchListItems(arrayOf("balloon", "block", "bear"))

app/instrumentation-tests/src/org/commcare/androidTests/LogSubmissionTest.kt

@@ -61,6 +61,7 @@ class LogSubmissionTest: BaseTest() {
         InstrumentationUtility.selectOptionItem(withText("Advanced"))
         onView(withText("Report Problem"))
             .perform(click())
+        onView(ViewMatchers.isRoot()).perform(ViewActions.closeSoftKeyboard())
         InstrumentationUtility.enterText(R.id.ReportText01,reportText)
         onView(ViewMatchers.isRoot()).perform(ViewActions.closeSoftKeyboard())
         onView(withText("Submit Report")).isPresent()

app/instrumentation-tests/src/org/commcare/androidTests/LoginTest.kt

@@ -71,7 +71,7 @@ class LoginTest: BaseTest() {
 
         verifyAllHomeButtonsPresent(demoHomeButtons)
 
-        onView(withId(R.id.home_gridview_buttons))
+        onView(withId(R.id.nsv_home_screen))
                 .perform(swipeUp())
         onView(withText(demoHomeButtons[2]))
                 .perform(click())

app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt

@@ -26,6 +26,9 @@ import androidx.test.espresso.ViewAction
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.clearText
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.repeatedlyUntil
+import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.action.ViewActions.swipeUp
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -34,6 +37,7 @@ import androidx.test.espresso.intent.Intents.intending
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
 import androidx.test.espresso.matcher.RootMatchers
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
@@ -208,7 +212,13 @@ object InstrumentationUtility {
     @JvmStatic
     fun logout() {
         gotoHome()
-        onView(withId(R.id.home_gridview_buttons))
+        onView(withId(R.id.nsv_home_screen))
+            .perform(swipeUp())
+        onView(withId(R.id.nsv_home_screen))   // multiple swipe
+            .perform(swipeUp())                 // to make `logout` button visible as it may have large scroll
+        onView(withId(R.id.nsv_home_screen))
+            .perform(swipeUp())
+        onView(withId(R.id.nsv_home_screen))
             .perform(swipeUp())
         onView(withText("Log out of CommCare"))
             .perform(click())
@@ -306,10 +316,7 @@ object InstrumentationUtility {
     @JvmStatic
     fun enterText(@IdRes editTextId: Int, text: String) {
         onView(withId(editTextId))
-            .perform(clearText())
-        onView(withId(editTextId))
-            .perform(typeText(text))
-        Espresso.closeSoftKeyboard()
+            .perform(click(), replaceText(text), closeSoftKeyboard())
     }
 
     fun enterText(text: String) {

app/res/layout-land/home_screen.xml

@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout style="@style/MainPane"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="wrap_content"
+    style="@style/MainPane"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentLeft="true"
-    android:layout_alignParentRight="true"
-    android:layout_alignParentTop="true"
-    android:background="@color/cc_core_bg"
-    android:paddingLeft="@dimen/content_start"
-    android:paddingRight="@dimen/content_start"
+    android:background="@color/white"
+    android:orientation="vertical"
     android:paddingStart="@dimen/content_start"
-    android:layout_alignParentEnd="true"
+    android:paddingLeft="@dimen/content_start"
     android:paddingEnd="@dimen/content_start"
-    android:layout_alignParentStart="true"
-    tools:viewBindingIgnore="true"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:paddingRight="@dimen/content_start"
+    tools:viewBindingIgnore="true">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/connect_alert_tile"
@@ -28,10 +23,6 @@
         android:layout_marginBottom="2dp"
         android:clickable="true"
         android:focusable="true"
-        android:shadowColor="@color/connect_light_grey_transparent"
-        android:shadowDx="30"
-        android:shadowDy="30"
-        android:shadowRadius="50"
         android:visibility="gone"
         app:cardBackgroundColor="@color/white"
         app:cardCornerRadius="10dp"
@@ -68,33 +59,94 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/connect_phone_yes_button"
                 android:layout_width="wrap_content"
-                android:layout_height="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"
-                />
+                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_height="35dp"
                 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.recyclerview.widget.RecyclerView
-        android:id="@+id/home_gridview_buttons"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nsv_home_screen"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical"/>
-</RelativeLayout>
+        android:layout_height="wrap_content">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/cvConnectMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/viewJobCard"
+                android:visibility="gone"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="-35dp"
+                android:layout_marginRight="10dp"
+                app:cardBackgroundColor="@color/connect_light_orange_color"
+                app:cardCornerRadius="15dp"
+                app:cardElevation="10dp">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="15dp"
+                    android:orientation="horizontal"
+                    android:paddingStart="15dp"
+                    android:paddingTop="35dp"
+                    android:paddingEnd="15dp">
+
+                    <TextView
+                        android:id="@+id/tvConnectMessage"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="10dp"
+                        android:text="@string/connect_job_tile_daily_limit_description"
+                        android:textColor="@color/connect_warning_color"
+                        android:textSize="14sp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:textStyle="bold"/>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </androidx.cardview.widget.CardView>
+
+            <include
+                android:id="@+id/viewJobCard"
+                layout="@layout/view_progress_job_card"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/home_gridview_buttons"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/cvConnectMessage"
+                android:nestedScrollingEnabled="false"
+                android:scrollbars="vertical" />
+        </RelativeLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</LinearLayout>

app/res/layout/activity_connect_messaging.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="org.commcare.activities.connect.ConnectMessagingActivity">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment_connect_messaging"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:defaultNavHost="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navGraph="@navigation/nav_graph_connect_messaging" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/res/layout/connect_delivery_item.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="wrap_content"
+    android:padding="10dp">
+
+    <LinearLayout
+        android:id="@+id/llDeliveryStatus"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@drawable/shape_connect_delivery_pending"
+        android:gravity="center"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/imgDeliveryStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@null"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_connect_delivery_pending" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/delivery_item_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toTopOf="@+id/delivery_item_reason"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/llDeliveryStatus"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textStyle="bold"/>
+
+
+    <TextView
+        android:id="@+id/delivery_item_reason"
+        android:layout_width="0dp"
+        android:layout_marginEnd="8dp"
+        android:layout_height="wrap_content"
+        android:textColor="@color/connect_yellowish_orange_color"
+        android:textSize="12sp"
+        android:layout_marginTop="5dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/delivery_item_date"
+        app:layout_constraintStart_toStartOf="@+id/delivery_item_name"
+        app:layout_constraintTop_toBottomOf="@+id/delivery_item_name"
+        android:textStyle="bold"/>
+
+
+    <TextView
+        android:id="@+id/delivery_item_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="@+id/delivery_item_reason"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <TextView
+        android:id="@+id/delivery_item_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>