From 7119c966e6bfcdbf4ae3da2936aa31a9c0c20490 Mon Sep 17 00:00:00 2001
From: Sasikanth Miriyampalli <hello@sasikanth.dev>
Date: Tue, 12 Dec 2023 09:41:30 +0530
Subject: [PATCH] Wrap `cardLayout` and `tei_recycler` in nested scroll view

We have to 2 options to make the entire content scroll in this screen.

1. We migrate the events items to use Compose as well and move them into `TeiDetailDashboard`. Which is ideal, but requires significant migration of UI and associated code with it. Since that's out of scope didn't go with that.

2. Since in earlier commit I have change the `LazyColumn` to `Column`, we can now place the card and the events list inside a nested scroll view to make the entire content scroll.

The 2nd option seems like a sensible change for now, until we migrate events list and eventually this entire screen.
---
 app/src/main/res/layout/fragment_tei_data.xml | 184 ++++++++++--------
 1 file changed, 99 insertions(+), 85 deletions(-)

diff --git a/app/src/main/res/layout/fragment_tei_data.xml b/app/src/main/res/layout/fragment_tei_data.xml
index 84e5176d80d..fb1e026ea8d 100644
--- a/app/src/main/res/layout/fragment_tei_data.xml
+++ b/app/src/main/res/layout/fragment_tei_data.xml
@@ -46,94 +46,108 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-         <LinearLayout
-            android:id="@+id/cardLayout"
+
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintTop_toTopOf="parent">
-
-             <androidx.compose.ui.platform.ComposeView
-                 android:id="@+id/detailCard"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 app:layout_constraintEnd_toEndOf="parent"
-                 app:layout_constraintStart_toStartOf="parent"
-                 app:layout_constraintTop_toTopOf="parent"/>
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/tei_data"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:cardElevation="4dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+            android:layout_height="match_parent">
 
-                <include
-                    android:id="@+id/card_front"
-                    layout="@layout/fragment_tei_data_card_front"
-                    android:visibility="@{ program != null ? View.GONE : View.VISIBLE}"
-                    app:dashboardModel="@{dashboardModel}"
-                    app:enrollment="@{enrollment}"
-                    app:followup="@{followup}"
-                    app:presenter="@{presenter}"
-                    app:program="@{program}"
-                    app:trackEntity="@{trackEntity}" />
-            </androidx.cardview.widget.CardView>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/filterLayout"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?colorPrimary"
-                android:visibility="gone"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:listitem="@layout/item_header_filter" />
+                android:layout_height="match_parent">
+
+                <LinearLayout
+                    android:id="@+id/cardLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.compose.ui.platform.ComposeView
+                        android:id="@+id/detailCard"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"/>
+
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/tei_data"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:cardElevation="4dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <include
+                            android:id="@+id/card_front"
+                            layout="@layout/fragment_tei_data_card_front"
+                            android:visibility="@{ program != null ? View.GONE : View.VISIBLE}"
+                            app:dashboardModel="@{dashboardModel}"
+                            app:enrollment="@{enrollment}"
+                            app:followup="@{followup}"
+                            app:presenter="@{presenter}"
+                            app:program="@{program}"
+                            app:trackEntity="@{trackEntity}" />
+
+                    </androidx.cardview.widget.CardView>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/filterLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="?colorPrimary"
+                        android:visibility="gone"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:listitem="@layout/item_header_filter" />
+
+                </LinearLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/tei_recycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clipToPadding="false"
+                    android:paddingBottom="200dp"
+                    app:layout_constraintVertical_weight="0"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/cardLayout"
+                    tools:listitem="@layout/item_event" />
+
+                <TextView
+                    android:id="@+id/empty_teis"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    android:padding="42dp"
+                    android:text="@string/empty_tei_add"
+                    android:textSize="@dimen/primaryTextSize"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/cardLayout" />
 
-        </LinearLayout>
+                <include
+                    android:id="@+id/loading_progress"
+                    layout="@layout/progress_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/cardLayout" />
 
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/tei_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:clipToPadding="false"
-            android:paddingBottom="200dp"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cardLayout"
-            tools:listitem="@layout/item_event" />
-
-        <TextView
-            android:id="@+id/empty_teis"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@color/white"
-            android:gravity="center"
-            android:padding="42dp"
-            android:text="@string/empty_tei_add"
-            android:textSize="@dimen/primaryTextSize"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cardLayout" />
-
-        <include
-            android:id="@+id/loading_progress"
-            layout="@layout/progress_layout"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cardLayout" />
+        </androidx.core.widget.NestedScrollView>
 
     <org.dhis2.utils.dialFloatingActionButton.DialFloatingActionButtonLayout
         android:id="@+id/dialFabLayout"
@@ -142,8 +156,8 @@
         app:fab_extra_bottom_margin="@{16}"
         app:fab_visibility="@{enrollment==null || enrollment.status() != EnrollmentStatus.ACTIVE || isGrouping || !canAddEvents}"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintEnd_toEndOf="parent" />
 
-    </org.dhis2.utils.dialFloatingActionButton.DialFloatingActionButtonLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+
+</layout>