From ee0ae909afc4872796e4cdf45d21e13a0cf2f66e Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Thu, 11 Mar 2021 14:20:47 -0800
Subject: [PATCH 01/16] enable draggable behavior for bottomsheet

---
 app/src/main/res/layout/fragment_data_collection.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_data_collection.xml b/app/src/main/res/layout/fragment_data_collection.xml
index 4583f33..f1f6907 100644
--- a/app/src/main/res/layout/fragment_data_collection.xml
+++ b/app/src/main/res/layout/fragment_data_collection.xml
@@ -67,8 +67,9 @@
                         app:cardCornerRadius="12dp"
                         android:background="@android:color/white"
                         app:behavior_peekHeight="80dp"
-                        app:behavior_fitToContents="true"
-                        app:behavior_draggable="false"
+                        app:behavior_halfExpandedRatio="0.5"
+                        app:behavior_fitToContents="false"
+                        app:behavior_draggable="true"
                         app:behavior_hideable="true"
                         android:clickable="true"
                         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">

From e9a54443417c505fd5984d3f718d1b27311b18cd Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Thu, 11 Mar 2021 14:22:04 -0800
Subject: [PATCH 02/16] fix the identify result layout

---
 .../main/res/layout/fragment_identify_result.xml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_identify_result.xml b/app/src/main/res/layout/fragment_identify_result.xml
index b2a687f..39e16f2 100644
--- a/app/src/main/res/layout/fragment_identify_result.xml
+++ b/app/src/main/res/layout/fragment_identify_result.xml
@@ -45,6 +45,13 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="00.333" />
 
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_begin="50dp" />
+
         <TextView
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
@@ -54,8 +61,8 @@
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.138"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.266" />
 
@@ -67,11 +74,10 @@
                 android:text="@{popupViewModel.popup}"
                 android:textAlignment="viewStart"
                 android:textSize="14sp"
-                app:layout_constraintStart_toEndOf="@id/symbol"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.148"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.65"/>
 

From 2a0dbe59e76e3bf7423f06487c7f01c0f88ef5a1 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Fri, 12 Mar 2021 10:24:52 -0800
Subject: [PATCH 03/16] update app primary color

---
 app/src/main/res/values/colors.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 21dbd5b..19c327e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorPrimary">#60993D</color>
+    <color name="colorPrimaryDark">#497C29</color>
     <color name="colorAccent">#D81B60</color>
     <color name="colorDrawerBackground">#DBEEDB</color>
 

From 4b8d84936ec0f38fa30176f4b806357d12b3568c Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Tue, 16 Mar 2021 14:49:07 -0700
Subject: [PATCH 04/16] update item popup row

---
 app/src/main/res/layout/item_popup_row.xml | 70 ++++++++++++++++------
 1 file changed, 52 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/item_popup_row.xml b/app/src/main/res/layout/item_popup_row.xml
index e8ea9a8..9e4bbfe 100644
--- a/app/src/main/res/layout/item_popup_row.xml
+++ b/app/src/main/res/layout/item_popup_row.xml
@@ -29,61 +29,95 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="73dp">
+            android:layout_height="85dp">
 
         <TextView
                 android:id="@+id/labelTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="28dp"
-                android:layout_marginTop="16dp"
                 android:text="@{popupField.label}"
                 android:textSize="14dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:textAlignment="viewStart"
+                app:layout_constraintBottom_toTopOf="@id/labelFieldValueFieldSeparator"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toStartOf="@+id/verticalConstraintGuideline"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="1.0" />
+
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/labelFieldValueFieldSeparator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.4" />
+
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/verticalConstraintGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_begin="40dp" />
 
         <EditText
                 android:id="@+id/valueEditText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
                 android:ems="12"
+                android:background="@null"
                 android:textSize="18dp"
                 android:text="@{popupManager.getFormattedValue(popupField)}"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.09"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toStartOf="@+id/verticalConstraintGuideline"
                 app:layout_constraintTop_toBottomOf="@+id/labelTextView"
-                app:layout_constraintVertical_bias="0.975"/>
+                app:layout_constraintVertical_bias="0.407"/>
 
         <TextView
                 android:id="@+id/valueTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
                 android:text="@{popupManager.getFormattedValue(popupField)}"
+                android:textAlignment="viewStart"
                 android:textSize="18dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.09"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/labelTextView"
-                app:layout_constraintVertical_bias="0.975" />
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toStartOf="@+id/verticalConstraintGuideline"
+                app:layout_constraintTop_toBottomOf="@+id/labelFieldValueFieldSeparator"
+                app:layout_constraintVertical_bias="0.407" />
 
         <Spinner
                 android:id="@+id/codedValueDomainSpinner"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:layout_marginTop="8dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.09"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toStartOf="@+id/verticalConstraintGuideline"
+                app:layout_constraintTop_toBottomOf="@+id/labelFieldValueFieldSeparator"
+                app:layout_constraintVertical_bias="0.407"/>
+
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_begin="83dp" />
+
+        <View
+                android:id="@+id/separatingLine"
+                android:layout_width="match_parent"
+                android:layout_marginEnd="20dp"
+                android:layout_marginStart="30dp"
+                android:layout_height="1dp"
+                android:background="#CDCCCC"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/labelTextView"
-                app:layout_constraintVertical_bias="0.975"/>
+                app:layout_constraintTop_toBottomOf="@id/guideline" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

From f535bb366ed283c29d004876aa068a2eaef11726 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Wed, 17 Mar 2021 13:11:13 -0700
Subject: [PATCH 05/16] Update Navigation drawer layout

---
 .../res/layout/fragment_navigation_drawer.xml | 186 +++++++++---------
 app/src/main/res/layout/item_popup_row.xml    |   6 +-
 2 files changed, 99 insertions(+), 93 deletions(-)

diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
index ef9cbbb..7a2c343 100644
--- a/app/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -27,54 +27,89 @@
 
     </data>
 
-<androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/colorDrawerBackground">
-
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/profile"
-            android:layout_width="407dp"
-            android:layout_height="71dp"
-            android:layout_marginTop="56dp"
-            android:background="@android:color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/profileStartGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_begin="6dp" />
 
         <androidx.cardview.widget.CardView
                 android:layout_width="40dp"
                 android:layout_height="40dp"
+                android:visibility="@{dataCollectionViewModel.portalUser == null ? View.GONE : View.VISIBLE}"
+                app:cardBackgroundColor="@android:color/white"
                 app:cardCornerRadius="20dp"
-                android:layout_marginStart="70dp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@+id/profileEndGuideline"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.04"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:visibility="@{dataCollectionViewModel.portalUser == null ? View.GONE : View.VISIBLE}"
-                app:cardBackgroundColor="@android:color/white">
-        <ImageView
-                android:id="@+id/profileImage"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                app:imageBitmap="@{dataCollectionViewModel.portalUserThumbnail}"/>
+                app:layout_constraintTop_toBottomOf="@+id/profileStartGuideline"
+                app:layout_constraintVertical_bias="0.407">
+
+            <ImageView
+                    android:id="@+id/profileImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    app:imageBitmap="@{dataCollectionViewModel.portalUserThumbnail}" />
         </androidx.cardview.widget.CardView>
 
+        <TextView
+                android:id="@+id/fullName"
+                android:layout_width="140sp"
+                android:layout_height="18sp"
+                android:ellipsize="marquee"
+                android:onClick="@{() -> fullName.isSelected() ? fullName.setSelected(false) : fullName.setSelected(true)}"
+                android:singleLine="true"
+                android:text="@{dataCollectionViewModel.portalUser.fullName}"
+                android:textAlignment="viewStart"
+                android:textSize="13sp"
+                android:textStyle="bold"
+                android:visibility="@{dataCollectionViewModel.portalUser == null ? View.GONE : View.VISIBLE}"
+                app:layout_constraintBottom_toTopOf="@+id/profileEndGuideline"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.402"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/profileStartGuideline"
+                app:layout_constraintVertical_bias="0.307" />
+
+        <TextView
+                android:id="@+id/userName"
+                android:layout_width="140sp"
+                android:layout_height="16sp"
+                android:ellipsize="marquee"
+                android:onClick="@{() -> userName.isSelected() ? userName.setSelected(false) : userName.setSelected(true)}"
+                android:singleLine="true"
+                android:text="@{dataCollectionViewModel.portalUser.username}"
+                android:textAlignment="viewStart"
+                android:textSize="12sp"
+                android:visibility="@{dataCollectionViewModel.portalUser == null ? View.GONE : View.VISIBLE}"
+                app:layout_constraintBottom_toTopOf="@+id/profileEndGuideline"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.402"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/profileStartGuideline"
+                app:layout_constraintVertical_bias="0.611" />
+
         <TextView
                 android:id="@+id/accessPortal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="17dp"
                 android:text="@string/access_portal"
                 android:textSize="13sp"
                 android:textStyle="bold"
                 android:visibility="@{dataCollectionViewModel.portalUser == null ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@+id/profileEndGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.245"
+                app:layout_constraintHorizontal_bias="0.13"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.444" />
+                app:layout_constraintTop_toBottomOf="@+id/profileStartGuideline"
+                app:layout_constraintVertical_bias="0.307" />
 
         <TextView
                 android:id="@+id/portalName"
@@ -83,12 +118,12 @@
                 android:text="@string/portal_name"
                 android:textSize="12sp"
                 android:visibility="@{dataCollectionViewModel.portalUser == null ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@+id/profileEndGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.252"
+                app:layout_constraintHorizontal_bias="0.133"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/accessPortal"
-                app:layout_constraintVertical_bias="0.461" />
+                app:layout_constraintTop_toBottomOf="@+id/accessPortal"
+                app:layout_constraintVertical_bias="0.0" />
 
         <Button
                 android:id="@+id/authenticateButton"
@@ -97,74 +132,40 @@
                 android:onClick="@{() -> dataCollectionViewModel.portalUser == null ? dataCollectionViewModel.signInToPortal() : dataCollectionViewModel.signOutOfPortal()}"
                 android:text="@{dataCollectionViewModel.portalUser == null ? @string/log_in : @string/log_out}"
                 android:textSize="12sp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@+id/profileEndGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.80"
+                app:layout_constraintHorizontal_bias="0.915"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.47" />
+                app:layout_constraintTop_toBottomOf="@+id/profileStartGuideline"
+                app:layout_constraintVertical_bias="0.333" />
 
-        <TextView
-                android:id="@+id/fullName"
-                android:layout_width="140sp"
-                android:layout_height="18sp"
-                android:text="@{dataCollectionViewModel.portalUser.fullName}"
-                android:textAlignment="viewStart"
-                android:textSize="13sp"
-                android:textStyle="bold"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:onClick="@{() -> fullName.isSelected() ? fullName.setSelected(false) : fullName.setSelected(true)}"
-                android:visibility="@{dataCollectionViewModel.portalUser == null ? View.GONE : View.VISIBLE}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.444"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.29" />
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/profileEndGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_begin="76dp" />
 
-        <TextView
-                android:id="@+id/userName"
-                android:layout_width="140sp"
-                android:layout_height="16sp"
-                android:text="@{dataCollectionViewModel.portalUser.username}"
-                android:textAlignment="viewStart"
-                android:textSize="12sp"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:onClick="@{() -> userName.isSelected() ? userName.setSelected(false) : userName.setSelected(true)}"
-                android:visibility="@{dataCollectionViewModel.portalUser == null ? View.GONE : View.VISIBLE}"
-                app:layout_constraintBottom_toBottomOf="parent"
+        <View
+                android:id="@+id/separatingLine"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#CDCCCC"
+                app:layout_constraintBottom_toBottomOf="@id/profileEndGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.444"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.618" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/appdetail"
-            android:layout_width="407dp"
-            android:layout_height="71dp"
-            android:background="@android:color/white"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/profile"
-            app:layout_constraintVertical_bias="0.851">
+                app:layout_constraintTop_toTopOf="@id/profileEndGuideline" />
 
         <TextView
                 android:id="@+id/appNameVersion"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{@string/app_name_with_version(BuildConfig.VERSION_NAME)}"
-                android:textColor="#B8DAB8"
                 android:textSize="12sp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/appDetailEndGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toTopOf="@id/profileEndGuideline"
                 app:layout_constraintVertical_bias="0.29" />
 
         <TextView
@@ -172,14 +173,19 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{@string/arcgis_runtime_sdk(ArcGISRuntimeEnvironment.getAPIVersion())}"
-                android:textColor="#B8DAB8"
                 android:textSize="12sp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/appDetailEndGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/appNameVersion" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/appDetailEndGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_begin="147dp" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/item_popup_row.xml b/app/src/main/res/layout/item_popup_row.xml
index 9e4bbfe..763e084 100644
--- a/app/src/main/res/layout/item_popup_row.xml
+++ b/app/src/main/res/layout/item_popup_row.xml
@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{popupField.label}"
-                android:textSize="14dp"
+                android:textSize="14sp"
                 android:textAlignment="viewStart"
                 app:layout_constraintBottom_toTopOf="@id/labelFieldValueFieldSeparator"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:ems="12"
                 android:background="@null"
-                android:textSize="18dp"
+                android:textSize="18sp"
                 android:text="@{popupManager.getFormattedValue(popupField)}"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:text="@{popupManager.getFormattedValue(popupField)}"
                 android:textAlignment="viewStart"
-                android:textSize="18dp"
+                android:textSize="18sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0"

From a6e3b33c486a7546fa9ab2179fc0c394013435ca Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Wed, 17 Mar 2021 13:29:25 -0700
Subject: [PATCH 06/16] update app bar configuration to use main_navigation
 instead of BottomSheetNavigation

---
 .../datacollection/views/fragments/DataCollectionFragment.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
index 664a4b7..cbfa8d8 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
@@ -160,7 +160,7 @@ class DataCollectionFragment : Fragment() {
             dataCollectionViewModel.setCurrentBottomSheetState(STATE_COLLAPSED)
         }
 
-        requireActivity().onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, onBackPressedCallback)
 
         return view
     }
@@ -169,7 +169,7 @@ class DataCollectionFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         // setup the app bar and drawer layout
-        val navController = activity?.findNavController(R.id.bottomSheetNavHostFragment)
+        val navController = activity?.findNavController(R.id.navHostFragment)
         navController?.let {
             val appBarConfiguration = AppBarConfiguration(navController.graph, drawer_layout)
             view.findViewById<Toolbar>(R.id.toolbar)

From 0edef9ea4877e2ea2a0fae2345f9aeb678eff0c2 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Wed, 17 Mar 2021 15:59:43 -0700
Subject: [PATCH 07/16] remove logic to handle app bar back button clicks

---
 .../views/fragments/DataCollectionFragment.kt    | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
index cbfa8d8..4721779 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
@@ -189,22 +189,6 @@ class DataCollectionFragment : Fragment() {
             }
         }
 
-        // Handle the navigation button clicks on the toolbar to open the drawer and act as a back
-        // button
-        toolbar.setNavigationOnClickListener {
-            // When the user presses the navigation button to go back from PopupAttributeListFragment
-            // to IdentifyResultFragment in the bottomsheet, the bottomSheetNavController will still
-            // be holding on to PopupAttributeListFragment as the current destination when we last
-            // navigated to it. If that is the case we navigate to IdentifyResultFragment, else we
-            // have already navigated to IdentifyResultFragment in the bottomsheet and
-            // show the drawer layout.
-            if (bottomSheetNavController.currentDestination?.id == R.id.popupFragment) {
-                requireActivity().onBackPressed()
-            } else {
-                drawer_layout.openDrawer(GravityCompat.START)
-            }
-        }
-
         mapView.onTouchListener =
             object : DefaultMapViewOnTouchListener(context, mapView) {
                 override fun onSingleTapConfirmed(e: MotionEvent?): Boolean {

From 25768de33f833372024de788615cc12696c0af18 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Thu, 18 Mar 2021 16:45:54 -0700
Subject: [PATCH 08/16] logic to handle bottomsheet states with bottomsheet
 sliding enabled

---
 .../views/fragments/DataCollectionFragment.kt | 62 ++++++++++++-------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
index 4721779..c53cb9f 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
@@ -95,10 +95,6 @@ class DataCollectionFragment : Fragment() {
                     } else {
                         requireActivity().finish()
                     }
-                // if the bottomsheet is in the STATE_EXPANDED then we are showing
-                // PopupAttributeListFragment and we need return back to the IdentifyResultFragment
-                // which shows up in STATE_COLLAPSED
-                bottomSheetBehavior.state == STATE_EXPANDED -> dataCollectionViewModel.setCurrentBottomSheetState(STATE_COLLAPSED)
             }
         }
     }
@@ -132,6 +128,22 @@ class DataCollectionFragment : Fragment() {
             bottomSheetBehavior.state = it
         })
 
+        // add logic to clear the identified feature on the map if the user dismisses the
+        // bottomsheet by sliding it.
+        bottomSheetBehavior.addBottomSheetCallback(object :
+            BottomSheetBehavior.BottomSheetCallback() {
+            override fun onStateChanged(bottomSheet: View, newState: Int) {
+                when(newState) {
+                    STATE_HIDDEN ->
+                        // Clear the selected features from the feature layer
+                        resetIdentifyResult()
+                }
+            }
+            override fun onSlide(bottomSheet: View, slideOffset: Float) {
+                // handle onSlide
+            }
+        })
+
         // On orientation change if we have a valid value for identifyLayerResult,
         // we highlight the first feature from the result.
         identifyResultViewModel.identifyLayerResult.value?.let {
@@ -144,20 +156,14 @@ class DataCollectionFragment : Fragment() {
 
         identifyResultViewModel.showPopupEvent.observeEvent(viewLifecycleOwner) {
             bottomSheetNavController.navigate(R.id.action_identifyResultFragment_to_popupFragment)
-            // PopupAttributeListFragment shows all popup attributes, so we
-            // show them in expanded(full screen) state of the bottom sheet
-            dataCollectionViewModel.setCurrentBottomSheetState(STATE_EXPANDED)
         }
 
         identifyResultViewModel.showIdentifyResultEvent.observeEvent(viewLifecycleOwner) {
-            // user has kicked off event to show IdentifyResultsFragment by tapping on the header of
-            // bottomsheet containing popupAttributeListFragment.
-            if (bottomSheetNavController.currentDestination?.id == R.id.popupFragment) {
-                bottomSheetNavController.popBackStack()
+            // IdentifyResultFragment shows a few selected popup attributes. We
+            // show them in half expanded state of the bottom sheet
+            if (dataCollectionViewModel.bottomSheetState.value == STATE_HIDDEN) {
+                dataCollectionViewModel.setCurrentBottomSheetState(STATE_HALF_EXPANDED)
             }
-            // IdentifyResultFragment only shows a few selected popup attributes, so we
-            // show them in collapsed state(roughly 1/4 screen size) of the bottom sheet
-            dataCollectionViewModel.setCurrentBottomSheetState(STATE_COLLAPSED)
         }
 
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, onBackPressedCallback)
@@ -192,18 +198,28 @@ class DataCollectionFragment : Fragment() {
         mapView.onTouchListener =
             object : DefaultMapViewOnTouchListener(context, mapView) {
                 override fun onSingleTapConfirmed(e: MotionEvent?): Boolean {
-                    dataCollectionViewModel.setCurrentBottomSheetState(STATE_HIDDEN)
-
-                    e?.let {
-                        val screenPoint = android.graphics.Point(
-                            it.x.roundToInt(),
-                            it.y.roundToInt()
-                        )
-                        identifyLayer(screenPoint)
+
+                    // Only perform identify on the mapview if the Popup is not in edit mode
+                    if (popupViewModel.isPopupInEditMode.value == false) {
+                        // If the user tapped on the mapview to perform an identify and
+                        // is currently looking at a popup's attributes we move back to
+                        // IdentifyResultFragment to perform identify
+                        if (bottomSheetNavController.currentDestination?.id == R.id.popupFragment) {
+                            bottomSheetNavController.popBackStack()
+                        }
+
+                        dataCollectionViewModel.setCurrentBottomSheetState(STATE_HIDDEN)
+
+                        e?.let {
+                            val screenPoint = android.graphics.Point(
+                                it.x.roundToInt(),
+                                it.y.roundToInt()
+                            )
+                            identifyLayer(screenPoint)
+                        }
                     }
                     return true
                 }
-
             }
     }
 

From 6fced81e43352c65d24f660526d5950638f3f9a0 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Tue, 30 Mar 2021 10:47:14 -0700
Subject: [PATCH 09/16] WIP for floating panel

---
 .../viewmodels/IdentifyResultViewModel.kt     | 10 +++
 .../viewmodels/PopupViewModel.kt              | 11 +++
 .../views/fragments/DataCollectionFragment.kt | 50 +++++------
 .../res/drawable/ic_edit_attributes_16.xml    |  9 ++
 app/src/main/res/drawable/ic_save_16.xml      |  9 ++
 app/src/main/res/drawable/ic_trash_16.xml     |  9 ++
 app/src/main/res/drawable/ic_x_circle_16.xml  |  9 ++
 .../res/layout/fragment_identify_result.xml   | 14 +++
 app/src/main/res/layout/fragment_popup.xml    | 85 +++++++++++++++----
 9 files changed, 160 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_edit_attributes_16.xml
 create mode 100644 app/src/main/res/drawable/ic_save_16.xml
 create mode 100644 app/src/main/res/drawable/ic_trash_16.xml
 create mode 100644 app/src/main/res/drawable/ic_x_circle_16.xml

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/IdentifyResultViewModel.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/IdentifyResultViewModel.kt
index 3b72fdd..cc80f9d 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/IdentifyResultViewModel.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/IdentifyResultViewModel.kt
@@ -38,6 +38,9 @@ class IdentifyResultViewModel(val popupViewModel: PopupViewModel) : ViewModel()
     private val _showIdentifyResultEvent = MutableLiveData<Event<Unit>>()
     val showIdentifyResultEvent: LiveData<Event<Unit>> = _showIdentifyResultEvent
 
+    private val _dismissIdentifyResultEvent = MutableLiveData<Event<Unit>>()
+    val dismissIdentifyResultEvent: LiveData<Event<Unit>> = _dismissIdentifyResultEvent
+
     private val _identifyLayerResult = MutableLiveData<IdentifyLayerResult>()
     val identifyLayerResult: LiveData<IdentifyLayerResult> = _identifyLayerResult
 
@@ -89,6 +92,13 @@ class IdentifyResultViewModel(val popupViewModel: PopupViewModel) : ViewModel()
         popupViewModel.clearPopup()
     }
 
+    /**
+     * Raises an event to dismiss the identify results
+     */
+    fun dismissIdentifyLayerResult() {
+        _dismissIdentifyResultEvent.raiseEvent()
+    }
+
     /**
      * Raises an event to show the Popup
      */
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/PopupViewModel.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/PopupViewModel.kt
index cced00f..f51c201 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/PopupViewModel.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/PopupViewModel.kt
@@ -73,6 +73,10 @@ class PopupViewModel(application: Application) : AndroidViewModel(application) {
     // It is used for showing confirmation dialog to the user, before calling cancelEditing()
     val confirmCancelPopupEditingEvent: LiveData<Event<Unit>> = _confirmCancelPopupEditingEvent
 
+    private val _dismissPopupEvent = MutableLiveData<Event<Unit>>()
+    // This event is raised when the user taps on the close button to dismiss the popup.
+    val dismissPopupEvent: LiveData<Event<Unit>> = _dismissPopupEvent
+
     /**
      * Updates popup property to set the popup field values being displayed in
      * the bottom sheet. Creates PopupManager for PopupView to perform edit operations.
@@ -116,6 +120,13 @@ class PopupViewModel(application: Application) : AndroidViewModel(application) {
         _confirmCancelPopupEditingEvent.raiseEvent()
     }
 
+    /**
+     * Raises an event to dismiss the popup
+     */
+    fun dismissPopup() {
+        _dismissPopupEvent.raiseEvent()
+    }
+
     /**
      * Saves Popup edits by applying changes to the feature service associated with a Popup's
      * feature.
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
index c53cb9f..fa90388 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
@@ -27,7 +27,6 @@ import androidx.core.view.GravityCompat
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Observer
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
@@ -45,7 +44,10 @@ import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.PopupView
 import com.esri.arcgisruntime.security.AuthenticationManager
 import com.esri.arcgisruntime.security.DefaultAuthenticationChallengeHandler
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.*
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
+import com.google.android.material.bottomsheet.BottomSheetBehavior.from
 import kotlinx.android.synthetic.main.fragment_data_collection.*
 import java.security.InvalidParameterException
 import kotlin.math.roundToInt
@@ -85,16 +87,9 @@ class DataCollectionFragment : Fragment() {
                 // when the user presses the back button when PopupAttributesListFragment is showing
                 // from the bottomsheet_navigation graph we pop it from the BackStack to go to the
                 // previous IdentifyResultFragment. When the backstack is at identifyResultFragment
-                // popBackStack() will return a false and we will hide the bottomsheet and clear the
-                // selected feature in the Featurelayer. If the bottomsheet is already hidden exit
-                // the DataCollectionActivity.
+                // popBackStack() will return a false and we will exit the DataCollectionActivity.
                 !bottomSheetNavController.popBackStack(R.id.identifyResultFragment, false) ->
-                    if (bottomSheetBehavior.state == STATE_COLLAPSED) {
-                        dataCollectionViewModel.setCurrentBottomSheetState(STATE_HIDDEN)
-                        resetIdentifyResult()
-                    } else {
-                        requireActivity().finish()
-                    }
+                    requireActivity().finish()
             }
         }
     }
@@ -124,24 +119,11 @@ class DataCollectionFragment : Fragment() {
                 ?: throw InvalidParameterException("bottomSheetNavHostFragment must exist")
         bottomSheetNavController = bottomSheetNavHostFragment.findNavController()
 
-        dataCollectionViewModel.bottomSheetState.observe(viewLifecycleOwner, Observer {
-            bottomSheetBehavior.state = it
-        })
-
-        // add logic to clear the identified feature on the map if the user dismisses the
-        // bottomsheet by sliding it.
-        bottomSheetBehavior.addBottomSheetCallback(object :
-            BottomSheetBehavior.BottomSheetCallback() {
-            override fun onStateChanged(bottomSheet: View, newState: Int) {
-                when(newState) {
-                    STATE_HIDDEN ->
-                        // Clear the selected features from the feature layer
-                        resetIdentifyResult()
-                }
-            }
-            override fun onSlide(bottomSheet: View, slideOffset: Float) {
-                // handle onSlide
+        dataCollectionViewModel.bottomSheetState.observe(viewLifecycleOwner, { bottomSheetState ->
+            if (bottomSheetState == STATE_HIDDEN) {
+                bottomSheetBehavior.isHideable = true
             }
+            bottomSheetBehavior.state = bottomSheetState
         })
 
         // On orientation change if we have a valid value for identifyLayerResult,
@@ -162,10 +144,22 @@ class DataCollectionFragment : Fragment() {
             // IdentifyResultFragment shows a few selected popup attributes. We
             // show them in half expanded state of the bottom sheet
             if (dataCollectionViewModel.bottomSheetState.value == STATE_HIDDEN) {
+                bottomSheetBehavior.isHideable = false
                 dataCollectionViewModel.setCurrentBottomSheetState(STATE_HALF_EXPANDED)
             }
         }
 
+        popupViewModel.dismissPopupEvent.observeEvent(viewLifecycleOwner) {
+            bottomSheetNavController.popBackStack(R.id.identifyResultFragment, false)
+            resetIdentifyResult()
+            dataCollectionViewModel.setCurrentBottomSheetState(STATE_HIDDEN)
+        }
+
+        identifyResultViewModel.dismissIdentifyResultEvent.observeEvent(viewLifecycleOwner) {
+            resetIdentifyResult()
+            dataCollectionViewModel.setCurrentBottomSheetState(STATE_HIDDEN)
+        }
+
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, onBackPressedCallback)
 
         return view
diff --git a/app/src/main/res/drawable/ic_edit_attributes_16.xml b/app/src/main/res/drawable/ic_edit_attributes_16.xml
new file mode 100644
index 0000000..b87605a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit_attributes_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M7.95,5l-1,1L1,6L1,5zM1,2v1h8.95l1,-1zM1,8v1h2.95l1,-1zM4.841,10.23l8.052,-8.051a0.965,0.965 0,0 1,1.385 0.03l1.414,1.413a0.965,0.965 0,0 1,0.03 1.385l-1.444,1.444h-0.002L7.67,13.058l-4.096,1.755a0.371,0.371 0,0 1,-0.488 -0.487zM13.787,3.132a0.306,0.306 0,0 0,-0.433 0l-1.09,1.09 1.414,1.414 1.09,-1.09a0.306,0.306 0,0 0,0 -0.433zM5.55,10.937l1.413,1.415 6.008,-6.008 -1.414,-1.415zM5.18,11.982l-0.555,1.294 1.294,-0.555z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_save_16.xml b/app/src/main/res/drawable/ic_save_16.xml
new file mode 100644
index 0000000..3c98dbe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_save_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M14.707,3.293l-2,-2A0.995,0.995 0,0 0,12 1L2,1a1,1 0,0 0,-1 1v12a1,1 0,0 0,1 1h12a1,1 0,0 0,1 -1L15,4a0.99,0.99 0,0 0,-0.293 -0.707zM9,2v2L8,4L8,2zM5,2h2v3h3L10,2h1v4L5,6zM11,14L5,14v-4h6zM14,14h-2L12,9L4,9v5L2,14L2,2l2,0.001L4,6a1,1 0,0 0,1 1h6a1,1 0,0 0,1 -1L12,2l2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_trash_16.xml b/app/src/main/res/drawable/ic_trash_16.xml
new file mode 100644
index 0000000..559e5ae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_trash_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12.854,4h1.003l-0.79,11.071a1.004,1.004 0,0 1,-0.999 0.929L3.932,16a1.004,1.004 0,0 1,-0.998 -0.93L2.143,4h1.003l0.786,11h8.136zM3.074,3L1,3L1,2h4L5,1a1.001,1.001 0,0 1,1 -1h4a1.001,1.001 0,0 1,1 1v1h4v1L3.074,3zM6,2h4L10,1L6,1zM9.5,13a0.5,0.5 0,0 0,0.5 -0.5v-7a0.5,0.5 0,0 0,-1 0v7a0.5,0.5 0,0 0,0.5 0.5zM6.5,13a0.5,0.5 0,0 0,0.5 -0.5v-7a0.5,0.5 0,0 0,-1 0v7a0.5,0.5 0,0 0,0.5 0.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_x_circle_16.xml b/app/src/main/res/drawable/ic_x_circle_16.xml
new file mode 100644
index 0000000..35d6ebc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_x_circle_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M8.5,7.793l2.828,-2.829 0.708,0.708L9.207,8.5l2.829,2.828 -0.708,0.708L8.5,9.207l-2.828,2.829 -0.708,-0.708L7.793,8.5 4.964,5.672l0.708,-0.708zM15.8,8.5a7.3,7.3 0,1 1,-7.3 -7.3,7.3 7.3,0 0,1 7.3,7.3zM14.8,8.5a6.3,6.3 0,1 0,-6.3 6.3,6.307 6.307,0 0,0 6.3,-6.3z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_identify_result.xml b/app/src/main/res/layout/fragment_identify_result.xml
index 39e16f2..58d1b2e 100644
--- a/app/src/main/res/layout/fragment_identify_result.xml
+++ b/app/src/main/res/layout/fragment_identify_result.xml
@@ -81,6 +81,20 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.65"/>
 
+        <ImageView
+                android:id="@+id/close"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginStart="12dp"
+                android:onClick="@{() -> identifyResultViewModel.dismissIdentifyLayerResult()}"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.918"
+                app:layout_constraintStart_toEndOf="@id/title"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.446"
+                app:srcCompat="@drawable/ic_x_circle_16" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_popup.xml b/app/src/main/res/layout/fragment_popup.xml
index ef27ff2..f6adf7f 100644
--- a/app/src/main/res/layout/fragment_popup.xml
+++ b/app/src/main/res/layout/fragment_popup.xml
@@ -65,7 +65,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/controlLayout"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
+                android:layout_height="80dp"
                 app:layout_constraintBottom_toTopOf="@id/guideline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -97,37 +97,76 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_bias="0.466" />
 
+            <ImageView
+                    android:id="@+id/close"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="12dp"
+                    android:onClick="@{() -> popupViewModel.dismissPopup()}"
+                    android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.918"
+                    app:layout_constraintStart_toEndOf="@id/title"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.464"
+                    app:srcCompat="@drawable/ic_x_circle_16" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/editLayout"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="#E6DEDE"
+                app:layout_constraintTop_toBottomOf="@id/guideline"
+                app:layout_constraintBottom_toTopOf="@id/popupView"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent">
+
             <ImageView
                     android:id="@+id/edit"
                     android:layout_width="30dp"
                     android:layout_height="34dp"
-                    android:layout_marginStart="12dp"
                     android:contentDescription="@string/edit"
                     android:onClick="@{() -> popupViewModel.setEditMode(true)}"
                     android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.918"
-                    app:layout_constraintStart_toEndOf="@id/title"
+                    app:layout_constraintHorizontal_bias="0.718"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.466"
-                    app:srcCompat="@drawable/ic_pencil_24" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintVertical_bias="0.475"
+                    app:srcCompat="@drawable/ic_edit_attributes_16" />
+
+            <ImageView
+                    android:id="@+id/delete"
+                    android:layout_width="30dp"
+                    android:layout_height="34dp"
+                    android:contentDescription="@string/cancel"
+                    android:onClick="@{() -> popupViewModel.confirmCancelEditing()}"
+                    android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/edit"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintVertical_bias="0.475"
+                    app:srcCompat="@drawable/ic_trash_16" />
 
             <ImageView
                     android:id="@+id/ok"
                     android:layout_width="30dp"
                     android:layout_height="34dp"
-                    android:layout_marginStart="12dp"
                     android:contentDescription="@string/ok"
                     android:onClick="@{() -> popupViewModel.savePopupEdits()}"
                     android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.918"
-                    app:layout_constraintStart_toEndOf="@id/title"
+                    app:layout_constraintHorizontal_bias="0.718"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.466"
-                    app:srcCompat="@drawable/ic_check_24" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintVertical_bias="0.475"
+                    app:srcCompat="@drawable/ic_save_16" />
 
             <ImageView
                     android:id="@+id/cancel"
@@ -137,10 +176,10 @@
                     android:onClick="@{() -> popupViewModel.confirmCancelEditing()}"
                     android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/edit"
-                    app:layout_constraintHorizontal_bias="0.825"
-                    app:layout_constraintStart_toEndOf="@id/title"
+                    app:layout_constraintStart_toEndOf="@id/ok"
                     app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintVertical_bias="0.475"
                     app:srcCompat="@drawable/ic_x_24" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -150,18 +189,28 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                app:layout_constraintGuide_begin="64dp" />
+                app:layout_constraintGuide_begin="80dp" />
 
         <View
-                android:id="@+id/separatingLine"
+                android:id="@+id/separatingLine1"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#c0c0c0"
-                app:layout_constraintBottom_toTopOf="@id/popupView"
+                app:layout_constraintBottom_toTopOf="@id/editLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/controlLayout" />
 
+        <View
+                android:id="@+id/separatingLine2"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#c0c0c0"
+                app:layout_constraintBottom_toTopOf="@id/popupView"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/editLayout" />
+
             <com.esri.arcgisruntime.opensourceapps.datacollection.views.popup.PopupView
                     android:id="@+id/popupView"
                     android:layout_width="match_parent"
@@ -169,7 +218,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/guideline"
+                    app:layout_constraintTop_toBottomOf="@id/editLayout"
                     app:popup="@{popupViewModel.popup}"
                     app:popupManager="@{popupViewModel.popupManager}"
                     app:editMode="@{popupViewModel.isPopupInEditMode()}">

From b044762c700909c362e8b84a169f03d170f26ccb Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Tue, 30 Mar 2021 14:03:54 -0700
Subject: [PATCH 10/16] update popupview layout

---
 .../views/fragments/DataCollectionFragment.kt |  4 +--
 .../datacollection/views/popup/PopupView.kt   |  7 ++++
 app/src/main/res/layout/item_popup_row.xml    | 34 ++++++++++++-------
 app/src/main/res/values/styles.xml            |  2 +-
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
index fa90388..f9b311d 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
@@ -150,9 +150,9 @@ class DataCollectionFragment : Fragment() {
         }
 
         popupViewModel.dismissPopupEvent.observeEvent(viewLifecycleOwner) {
-            bottomSheetNavController.popBackStack(R.id.identifyResultFragment, false)
             resetIdentifyResult()
             dataCollectionViewModel.setCurrentBottomSheetState(STATE_HIDDEN)
+            bottomSheetNavController.popBackStack(R.id.identifyResultFragment, false)
         }
 
         identifyResultViewModel.dismissIdentifyResultEvent.observeEvent(viewLifecycleOwner) {
@@ -199,7 +199,7 @@ class DataCollectionFragment : Fragment() {
                         // is currently looking at a popup's attributes we move back to
                         // IdentifyResultFragment to perform identify
                         if (bottomSheetNavController.currentDestination?.id == R.id.popupFragment) {
-                            bottomSheetNavController.popBackStack()
+                            bottomSheetNavController.popBackStack(R.id.identifyResultFragment, false)
                         }
 
                         dataCollectionViewModel.setCurrentBottomSheetState(STATE_HIDDEN)
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt
index 86566fe..b6c4f72 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt
@@ -167,6 +167,10 @@ class PopupView : FrameLayout {
             binding.root.codedValueDomainSpinner
         }
 
+        val separatingLineView: View by lazy {
+            binding.root.separatingLine
+        }
+
         fun bind(
             popupField: PopupField
         ) {
@@ -187,9 +191,11 @@ class PopupView : FrameLayout {
                     valueEditText.visibility = View.GONE
                     valueTextView.visibility = View.GONE
                     codedValueDomainSpinner.visibility = View.VISIBLE
+                    separatingLineView.visibility = View.VISIBLE
                 } else {
                     valueEditText.inputType = getInputType(popupManager.getFieldType(popupField))
                     valueEditText.visibility = View.VISIBLE
+                    separatingLineView.visibility = View.GONE
                     valueTextView.visibility = View.GONE
                     //save original colors
                     val oldColors: ColorStateList = labelTextView.textColors
@@ -218,6 +224,7 @@ class PopupView : FrameLayout {
                 valueEditText.visibility = View.GONE
                 codedValueDomainSpinner.visibility = View.GONE
                 valueTextView.visibility = View.VISIBLE
+                separatingLineView.visibility = View.VISIBLE
             }
         }
 
diff --git a/app/src/main/res/layout/item_popup_row.xml b/app/src/main/res/layout/item_popup_row.xml
index 763e084..061a0c7 100644
--- a/app/src/main/res/layout/item_popup_row.xml
+++ b/app/src/main/res/layout/item_popup_row.xml
@@ -29,7 +29,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="85dp">
+            android:layout_height="105dp">
 
         <TextView
                 android:id="@+id/labelTextView"
@@ -59,21 +59,29 @@
                 android:orientation="vertical"
                 app:layout_constraintGuide_begin="40dp" />
 
-        <EditText
-                android:id="@+id/valueEditText"
-                android:layout_width="wrap_content"
+        <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/outlinedTextField"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:ems="12"
-                android:background="@null"
-                android:textSize="18sp"
-                android:text="@{popupManager.getFormattedValue(popupField)}"
-                android:visibility="gone"
+                android:layout_marginEnd="20dp"
+                android:layout_marginStart="30dp"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toStartOf="@+id/verticalConstraintGuideline"
                 app:layout_constraintTop_toBottomOf="@+id/labelTextView"
-                app:layout_constraintVertical_bias="0.407"/>
+                app:layout_constraintVertical_bias="0.407">
+
+            <com.google.android.material.textfield.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    android:id="@+id/valueEditText"
+                    android:text="@{popupManager.getFormattedValue(popupField)}"
+                    />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
                 android:id="@+id/valueTextView"
@@ -91,8 +99,10 @@
 
         <Spinner
                 android:id="@+id/codedValueDomainSpinner"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="20dp"
+                android:layout_marginStart="30dp"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -106,7 +116,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                app:layout_constraintGuide_begin="83dp" />
+                app:layout_constraintGuide_begin="102dp" />
 
         <View
                 android:id="@+id/separatingLine"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bcc8d60..1d31e96 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From c5cc071dc791ed6110bd663d61259c1909787e49 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Tue, 30 Mar 2021 14:11:57 -0700
Subject: [PATCH 11/16] fix the NPE issue happening on clear popup, because of
 popup being a non null property

---
 .../datacollection/views/popup/PopupView.kt   | 160 +++++++++---------
 1 file changed, 84 insertions(+), 76 deletions(-)

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt
index b6c4f72..7c5e0b8 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt
@@ -59,8 +59,8 @@ class PopupView : FrameLayout {
     private val popupAttributeListAdapter by lazy { PopupAttributeListAdapter() }
     private var isEditMode: Boolean = false
 
-    lateinit var popupManager: PopupManager
-    lateinit var popup: Popup
+    var popupManager: PopupManager? = null
+    var popup: Popup? = null
 
     /**
      * Constructor used when instantiating this View directly to attach it to another view programmatically.
@@ -90,13 +90,15 @@ class PopupView : FrameLayout {
      */
     fun setEditMode(isEnabled: Boolean) {
         isEditMode = isEnabled
-        if (isEnabled) {
-            popupAttributeListAdapter.submitList(popupManager.editableFields)
-            popupManager.startEditing()
-        } else {
-            popupAttributeListAdapter.submitList(popupManager.displayedFields)
+        popupManager?.let { popupManager->
+            if (isEnabled) {
+                popupAttributeListAdapter.submitList(popupManager.editableFields)
+                popupManager.startEditing()
+            } else {
+                popupAttributeListAdapter.submitList(popupManager.displayedFields)
+            }
+            popupAttributeListAdapter.notifyDataSetChanged()
         }
-        popupAttributeListAdapter.notifyDataSetChanged()
     }
 
     /**
@@ -184,47 +186,51 @@ class PopupView : FrameLayout {
          * edit mode of the popupView.
          */
         fun updateView(popupField: PopupField) {
-            if (isEditMode) {
-                val codedValueDomain : CodedValueDomain? = popupManager.getDomain(popupField) as? CodedValueDomain
-                if (codedValueDomain != null) {
-                    setUpSpinner(codedValueDomain, popupField)
-                    valueEditText.visibility = View.GONE
-                    valueTextView.visibility = View.GONE
-                    codedValueDomainSpinner.visibility = View.VISIBLE
-                    separatingLineView.visibility = View.VISIBLE
-                } else {
-                    valueEditText.inputType = getInputType(popupManager.getFieldType(popupField))
-                    valueEditText.visibility = View.VISIBLE
-                    separatingLineView.visibility = View.GONE
-                    valueTextView.visibility = View.GONE
-                    //save original colors
-                    val oldColors: ColorStateList = labelTextView.textColors
-                    // here we assign and hold the values of the editable fields, entered by the user
-                    // in popupAttribute.tempValue
-                    valueEditText.doAfterTextChanged {
-                        if (valueEditText.hasFocus()) {
+            popupManager?.let { popupManager ->
+                if (isEditMode) {
+                    val codedValueDomain: CodedValueDomain? =
+                        popupManager.getDomain(popupField) as? CodedValueDomain
+                    if (codedValueDomain != null) {
+                        setUpSpinner(codedValueDomain, popupField)
+                        valueEditText.visibility = View.GONE
+                        valueTextView.visibility = View.GONE
+                        codedValueDomainSpinner.visibility = View.VISIBLE
+                        separatingLineView.visibility = View.VISIBLE
+                    } else {
+                        valueEditText.inputType =
+                            getInputType(popupManager.getFieldType(popupField))
+                        valueEditText.visibility = View.VISIBLE
+                        separatingLineView.visibility = View.GONE
+                        valueTextView.visibility = View.GONE
+                        //save original colors
+                        val oldColors: ColorStateList = labelTextView.textColors
+                        // here we assign and hold the values of the editable fields, entered by the user
+                        // in popupAttribute.tempValue
+                        valueEditText.doAfterTextChanged {
+                            if (valueEditText.hasFocus()) {
 
-                            val validationError: ArcGISRuntimeException? = updateValue(
-                                popupField,
-                                valueEditText.text.toString()
-                            )
-                            if (validationError != null) {
-                                val fieldLabelWithValidationError =
-                                    popupField.label + ": " + validationError.message
-                                labelTextView.text = fieldLabelWithValidationError
-                                labelTextView.setTextColor(Color.RED)
-                            } else {
-                                labelTextView.text = popupField.label
-                                labelTextView.setTextColor(oldColors)
+                                val validationError: ArcGISRuntimeException? = updateValue(
+                                    popupField,
+                                    valueEditText.text.toString()
+                                )
+                                if (validationError != null) {
+                                    val fieldLabelWithValidationError =
+                                        popupField.label + ": " + validationError.message
+                                    labelTextView.text = fieldLabelWithValidationError
+                                    labelTextView.setTextColor(Color.RED)
+                                } else {
+                                    labelTextView.text = popupField.label
+                                    labelTextView.setTextColor(oldColors)
+                                }
                             }
                         }
                     }
+                } else {
+                    valueEditText.visibility = View.GONE
+                    codedValueDomainSpinner.visibility = View.GONE
+                    valueTextView.visibility = View.VISIBLE
+                    separatingLineView.visibility = View.VISIBLE
                 }
-            } else {
-                valueEditText.visibility = View.GONE
-                codedValueDomainSpinner.visibility = View.GONE
-                valueTextView.visibility = View.VISIBLE
-                separatingLineView.visibility = View.VISIBLE
             }
         }
 
@@ -240,7 +246,7 @@ class PopupView : FrameLayout {
                 codedValuesNames
             )
             val codedValuePosition = codedValueDomain.codedValues.indexOfFirst { codedValue ->
-                codedValue.code == popupManager.getFieldValue(popupField)
+                codedValue.code == popupManager?.getFieldValue(popupField)
             }
             // set the PopupField value as selected in the spinner
             codedValueDomainSpinner.setSelection(codedValuePosition)
@@ -256,7 +262,7 @@ class PopupView : FrameLayout {
                         position: Int,
                         id: Long
                     ) {
-                        popupManager.updateValue(
+                        popupManager?.updateValue(
                             codedValueDomain.codedValues[position].code,
                             popupField
                         )
@@ -270,37 +276,39 @@ class PopupView : FrameLayout {
          */
         private fun updateValue(popupField: PopupField, newValue: String): ArcGISRuntimeException? {
             var error: ArcGISRuntimeException? = null
-            when (popupManager.getFieldType(popupField)) {
-                Field.Type.SHORT -> error =
-                    if (newValue.toShortOrNull() != null) {
-                        popupManager.updateValue(newValue.toShort(), popupField)
-                    } else {
-                        popupManager.updateValue(newValue, popupField)
-                    }
-                Field.Type.INTEGER -> error =
-                    if (newValue.toIntOrNull() != null) {
-                        popupManager.updateValue(newValue.toInt(), popupField)
-                    } else {
-                        popupManager.updateValue(newValue, popupField)
-                    }
-                Field.Type.FLOAT -> error =
-                    if (newValue.toFloatOrNull() != null) {
-                        popupManager.updateValue(newValue.toFloat(), popupField)
-                    } else {
-                        popupManager.updateValue(newValue, popupField)
-                    }
-                Field.Type.DOUBLE -> error =
-                    if (newValue.toDoubleOrNull() != null) {
-                        popupManager.updateValue(newValue.toDouble(), popupField)
-                    } else {
-                        popupManager.updateValue(newValue, popupField)
-                    }
-                Field.Type.TEXT -> error = popupManager.updateValue(newValue, popupField)
+            popupManager?.let { popupManager ->
+                when (popupManager.getFieldType(popupField)) {
+                    Field.Type.SHORT -> error =
+                        if (newValue.toShortOrNull() != null) {
+                            popupManager.updateValue(newValue.toShort(), popupField)
+                        } else {
+                            popupManager.updateValue(newValue, popupField)
+                        }
+                    Field.Type.INTEGER -> error =
+                        if (newValue.toIntOrNull() != null) {
+                            popupManager.updateValue(newValue.toInt(), popupField)
+                        } else {
+                            popupManager.updateValue(newValue, popupField)
+                        }
+                    Field.Type.FLOAT -> error =
+                        if (newValue.toFloatOrNull() != null) {
+                            popupManager.updateValue(newValue.toFloat(), popupField)
+                        } else {
+                            popupManager.updateValue(newValue, popupField)
+                        }
+                    Field.Type.DOUBLE -> error =
+                        if (newValue.toDoubleOrNull() != null) {
+                            popupManager.updateValue(newValue.toDouble(), popupField)
+                        } else {
+                            popupManager.updateValue(newValue, popupField)
+                        }
+                    Field.Type.TEXT -> error = popupManager.updateValue(newValue, popupField)
 
-                else -> Log.i(
-                    TAG,
-                    "Unhandled field type: " + popupManager.getFieldType(popupField)
-                )
+                    else -> Log.i(
+                        TAG,
+                        "Unhandled field type: " + popupManager.getFieldType(popupField)
+                    )
+                }
             }
             return error
         }

From 936d534fe590d1d64c5ac10f429a48c034dd5c0c Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Wed, 31 Mar 2021 14:44:21 -0700
Subject: [PATCH 12/16] disable screen touch while progress bar is visible

---
 .../datacollection/views/fragments/PopupFragment.kt      | 5 +++++
 app/src/main/res/drawable/ic_edit_attributes_16.xml      | 9 ---------
 app/src/main/res/drawable/ic_save_16.xml                 | 9 ---------
 app/src/main/res/drawable/ic_trash_16.xml                | 9 ---------
 app/src/main/res/drawable/ic_x_circle_16.xml             | 9 ---------
 5 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_edit_attributes_16.xml
 delete mode 100644 app/src/main/res/drawable/ic_save_16.xml
 delete mode 100644 app/src/main/res/drawable/ic_trash_16.xml
 delete mode 100644 app/src/main/res/drawable/ic_x_circle_16.xml

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
index e69ad15..0b17711 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import androidx.appcompat.app.AlertDialog
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@@ -54,9 +55,13 @@ class PopupFragment : Fragment() {
 
         popupViewModel.showSavingProgressEvent.observeEvent(viewLifecycleOwner) { isShowProgressBar ->
             if (isShowProgressBar) {
+                requireActivity().window.setFlags(
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
                 progressBarLayout.visibility = View.VISIBLE
             } else {
                 progressBarLayout.visibility = View.GONE
+                requireActivity().window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
             }
         }
 
diff --git a/app/src/main/res/drawable/ic_edit_attributes_16.xml b/app/src/main/res/drawable/ic_edit_attributes_16.xml
deleted file mode 100644
index b87605a..0000000
--- a/app/src/main/res/drawable/ic_edit_attributes_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M7.95,5l-1,1L1,6L1,5zM1,2v1h8.95l1,-1zM1,8v1h2.95l1,-1zM4.841,10.23l8.052,-8.051a0.965,0.965 0,0 1,1.385 0.03l1.414,1.413a0.965,0.965 0,0 1,0.03 1.385l-1.444,1.444h-0.002L7.67,13.058l-4.096,1.755a0.371,0.371 0,0 1,-0.488 -0.487zM13.787,3.132a0.306,0.306 0,0 0,-0.433 0l-1.09,1.09 1.414,1.414 1.09,-1.09a0.306,0.306 0,0 0,0 -0.433zM5.55,10.937l1.413,1.415 6.008,-6.008 -1.414,-1.415zM5.18,11.982l-0.555,1.294 1.294,-0.555z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_save_16.xml b/app/src/main/res/drawable/ic_save_16.xml
deleted file mode 100644
index 3c98dbe..0000000
--- a/app/src/main/res/drawable/ic_save_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M14.707,3.293l-2,-2A0.995,0.995 0,0 0,12 1L2,1a1,1 0,0 0,-1 1v12a1,1 0,0 0,1 1h12a1,1 0,0 0,1 -1L15,4a0.99,0.99 0,0 0,-0.293 -0.707zM9,2v2L8,4L8,2zM5,2h2v3h3L10,2h1v4L5,6zM11,14L5,14v-4h6zM14,14h-2L12,9L4,9v5L2,14L2,2l2,0.001L4,6a1,1 0,0 0,1 1h6a1,1 0,0 0,1 -1L12,2l2,2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_trash_16.xml b/app/src/main/res/drawable/ic_trash_16.xml
deleted file mode 100644
index 559e5ae..0000000
--- a/app/src/main/res/drawable/ic_trash_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M12.854,4h1.003l-0.79,11.071a1.004,1.004 0,0 1,-0.999 0.929L3.932,16a1.004,1.004 0,0 1,-0.998 -0.93L2.143,4h1.003l0.786,11h8.136zM3.074,3L1,3L1,2h4L5,1a1.001,1.001 0,0 1,1 -1h4a1.001,1.001 0,0 1,1 1v1h4v1L3.074,3zM6,2h4L10,1L6,1zM9.5,13a0.5,0.5 0,0 0,0.5 -0.5v-7a0.5,0.5 0,0 0,-1 0v7a0.5,0.5 0,0 0,0.5 0.5zM6.5,13a0.5,0.5 0,0 0,0.5 -0.5v-7a0.5,0.5 0,0 0,-1 0v7a0.5,0.5 0,0 0,0.5 0.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_x_circle_16.xml b/app/src/main/res/drawable/ic_x_circle_16.xml
deleted file mode 100644
index 35d6ebc..0000000
--- a/app/src/main/res/drawable/ic_x_circle_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M8.5,7.793l2.828,-2.829 0.708,0.708L9.207,8.5l2.829,2.828 -0.708,0.708L8.5,9.207l-2.828,2.829 -0.708,-0.708L7.793,8.5 4.964,5.672l0.708,-0.708zM15.8,8.5a7.3,7.3 0,1 1,-7.3 -7.3,7.3 7.3,0 0,1 7.3,7.3zM14.8,8.5a6.3,6.3 0,1 0,-6.3 6.3,6.307 6.307,0 0,0 6.3,-6.3z"/>
-</vector>

From ef73bc5fa706d8b96bde35a1e5e569db326e4c92 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Wed, 31 Mar 2021 14:45:15 -0700
Subject: [PATCH 13/16] update icons/ dimensions

---
 app/src/main/res/drawable/ic_save_24.xml      |  9 ++++++
 app/src/main/res/drawable/ic_trash_24.xml     |  9 ++++++
 app/src/main/res/drawable/ic_x_circle_24.xml  |  9 ++++++
 .../res/layout/fragment_identify_result.xml   |  6 ++--
 app/src/main/res/layout/fragment_popup.xml    | 30 +++++++++----------
 5 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_save_24.xml
 create mode 100644 app/src/main/res/drawable/ic_trash_24.xml
 create mode 100644 app/src/main/res/drawable/ic_x_circle_24.xml

diff --git a/app/src/main/res/drawable/ic_save_24.xml b/app/src/main/res/drawable/ic_save_24.xml
new file mode 100644
index 0000000..a73dcf2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_save_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M16.765,2c1.187,0 1.363,0.06 1.51,0.168L21.662,4.7a0.845,0.845 0,0 1,0.339 0.677v15.78a0.844,0.844 0,0 1,-0.844 0.844H2.844A0.844,0.844 0,0 1,2 21.156V2.844A0.844,0.844 0,0 1,2.844 2zM17,21v-7H7v7zM14,3v3h1V3zM7,3v6h10V3h-1v4h-3V3zM3,21h3v-8h12v8h3V5.452l-3,-2.278v6.17a0.769,0.769 0,0 1,-0.844 0.656H6.844A0.769,0.769 0,0 1,6 9.344V3H3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_trash_24.xml b/app/src/main/res/drawable/ic_trash_24.xml
new file mode 100644
index 0000000..db47363
--- /dev/null
+++ b/app/src/main/res/drawable/ic_trash_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M18.87,6h1.007l-0.988,16.015A1.051,1.051 0,0 1,17.84 23L6.158,23a1.052,1.052 0,0 1,-1.048 -0.984v-0.001L4.123,6h1.003l0.982,15.953a0.05,0.05 0,0 0,0.05 0.047h11.683zM9.5,19a0.5,0.5 0,0 0,0.5 -0.5v-10a0.5,0.5 0,0 0,-1 0v10a0.5,0.5 0,0 0,0.5 0.5zM14.5,19a0.5,0.5 0,0 0,0.5 -0.5v-10a0.5,0.5 0,0 0,-1 0v10a0.5,0.5 0,0 0,0.5 0.5zM5.064,5L3,5L3,4h5v-0.75A1.251,1.251 0,0 1,9.25 2h5.5A1.251,1.251 0,0 1,16 3.25L16,4h5v1L5.064,5zM9,4h6v-0.75a0.25,0.25 0,0 0,-0.25 -0.25h-5.5a0.25,0.25 0,0 0,-0.25 0.25z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_x_circle_24.xml b/app/src/main/res/drawable/ic_x_circle_24.xml
new file mode 100644
index 0000000..7720aa5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_x_circle_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M17.45,8.257L13.207,12.5l4.243,4.243 -0.707,0.707 -4.243,-4.243 -4.243,4.243 -0.707,-0.707 4.243,-4.243L7.55,8.257l0.707,-0.707 4.243,4.243 4.243,-4.243zM22.8,12.5A10.3,10.3 0,1 1,12.5 2.2a10.297,10.297 0,0 1,10.3 10.3zM21.8,12.5a9.3,9.3 0,1 0,-9.3 9.3,9.31 9.31,0 0,0 9.3,-9.3z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_identify_result.xml b/app/src/main/res/layout/fragment_identify_result.xml
index 58d1b2e..875bfb9 100644
--- a/app/src/main/res/layout/fragment_identify_result.xml
+++ b/app/src/main/res/layout/fragment_identify_result.xml
@@ -83,8 +83,8 @@
 
         <ImageView
                 android:id="@+id/close"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
                 android:layout_marginStart="12dp"
                 android:onClick="@{() -> identifyResultViewModel.dismissIdentifyLayerResult()}"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -93,7 +93,7 @@
                 app:layout_constraintStart_toEndOf="@id/title"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.446"
-                app:srcCompat="@drawable/ic_x_circle_16" />
+                app:srcCompat="@drawable/ic_x_circle_24" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_popup.xml b/app/src/main/res/layout/fragment_popup.xml
index f6adf7f..c13763b 100644
--- a/app/src/main/res/layout/fragment_popup.xml
+++ b/app/src/main/res/layout/fragment_popup.xml
@@ -99,8 +99,8 @@
 
             <ImageView
                     android:id="@+id/close"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:layout_marginStart="12dp"
                     android:onClick="@{() -> popupViewModel.dismissPopup()}"
                     android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
@@ -110,7 +110,7 @@
                     app:layout_constraintStart_toEndOf="@id/title"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_bias="0.464"
-                    app:srcCompat="@drawable/ic_x_circle_16" />
+                    app:srcCompat="@drawable/ic_x_circle_24" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -118,7 +118,7 @@
                 android:id="@+id/editLayout"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
-                android:background="#E6DEDE"
+                android:background="#F7F7F7"
                 app:layout_constraintTop_toBottomOf="@id/guideline"
                 app:layout_constraintBottom_toTopOf="@id/popupView"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -126,8 +126,8 @@
 
             <ImageView
                     android:id="@+id/edit"
-                    android:layout_width="30dp"
-                    android:layout_height="34dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:contentDescription="@string/edit"
                     android:onClick="@{() -> popupViewModel.setEditMode(true)}"
                     android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
@@ -137,12 +137,12 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintVertical_bias="0.475"
-                    app:srcCompat="@drawable/ic_edit_attributes_16" />
+                    app:srcCompat="@drawable/ic_pencil_24" />
 
             <ImageView
                     android:id="@+id/delete"
-                    android:layout_width="30dp"
-                    android:layout_height="34dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:contentDescription="@string/cancel"
                     android:onClick="@{() -> popupViewModel.confirmCancelEditing()}"
                     android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
@@ -151,12 +151,12 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintVertical_bias="0.475"
-                    app:srcCompat="@drawable/ic_trash_16" />
+                    app:srcCompat="@drawable/ic_trash_24" />
 
             <ImageView
                     android:id="@+id/ok"
-                    android:layout_width="30dp"
-                    android:layout_height="34dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:contentDescription="@string/ok"
                     android:onClick="@{() -> popupViewModel.savePopupEdits()}"
                     android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
@@ -166,12 +166,12 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintVertical_bias="0.475"
-                    app:srcCompat="@drawable/ic_save_16" />
+                    app:srcCompat="@drawable/ic_save_24" />
 
             <ImageView
                     android:id="@+id/cancel"
-                    android:layout_width="30dp"
-                    android:layout_height="34dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:contentDescription="@string/cancel"
                     android:onClick="@{() -> popupViewModel.confirmCancelEditing()}"
                     android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"

From 48ee577400369c032acd0807fcdc32db5d97c703 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Fri, 30 Apr 2021 17:43:59 -0700
Subject: [PATCH 14/16] refactor to use popupview toolkit component

---
 app/build.gradle                              |   1 +
 .../datacollection/util/Event.kt              |  76 ----
 .../viewmodels/DataCollectionViewModel.kt     |   4 +-
 .../viewmodels/IdentifyResultViewModel.kt     |   5 +-
 .../viewmodels/PopupViewModel.kt              | 191 ----------
 .../views/fragments/DataCollectionFragment.kt |   5 +-
 .../views/fragments/IdentifyResultFragment.kt |   2 +-
 .../views/fragments/PopupFragment.kt          |   5 +-
 .../datacollection/views/popup/PopupView.kt   | 327 ------------------
 .../res/layout/fragment_identify_result.xml   |   2 +-
 app/src/main/res/layout/fragment_popup.xml    |   6 +-
 11 files changed, 15 insertions(+), 609 deletions(-)
 delete mode 100644 app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/util/Event.kt
 delete mode 100644 app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/PopupViewModel.kt
 delete mode 100644 app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt

diff --git a/app/build.gradle b/app/build.gradle
index bd25e8f..bdb83c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,6 +42,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.esri.arcgisruntime:arcgis-android:100.10.0'
+    implementation 'com.esri.arcgisruntime:arcgis-android-toolkit:100.11.0-3131'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/util/Event.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/util/Event.kt
deleted file mode 100644
index 376bb9e..0000000
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/util/Event.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2020 Esri
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.esri.arcgisruntime.opensourceapps.datacollection.util
-
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
-
-/**
- * Used as a wrapper for data that is exposed via a LiveData that represents an event.
- *
- * <p>
- * This avoids a common problem with events: on configuration change (like rotation) an update
- * can be emitted if the observer is active. This LiveData only calls the observable if there's an
- * explicit call to postValue().
- * <p>
- * https://medium.com/androiddevelopers/livedata-with-snackbar-navigation-and-other-events-the-singleliveevent-case-ac2622673150
- */
-open class Event<out T>(private val content: T) {
-    private var hasBeenHandled = false
-    /**
-     * Returns the content and prevents its use again.
-     */
-    fun getContentIfNotHandled(): T? {
-        return if (hasBeenHandled) {
-            null
-        } else {
-            hasBeenHandled = true
-            content
-        }
-    }
-}
-
-/**
- * Adds the given event function to observer being added to the observers list within the lifespan
- * of the given owner. The events are dispatched on the main thread.
- *
- * @param owner    The LifecycleOwner which controls the observer
- * @param onEventRaised The observer function that will receive the events from the observer
-*/
-fun <T> LiveData<Event<T>>.observeEvent(owner: LifecycleOwner, onEventRaised: (T) -> Unit) {
-    observe(owner, Observer<Event<T>> { event  ->
-        event?.getContentIfNotHandled()?.let { onEventRaised(it) }
-    })
-}
-
-/**
- * Raises an event with given argument by calling postValue() on the MutableLiveData object.
- *
- * @param arg The argument to pass to the observers
- */
-fun <T> MutableLiveData<Event<T>>.raiseEvent(arg: T) {
-    postValue(Event(arg))
-}
-
-/**
- * Raises an event by calling postValue() on the MutableLiveData object.
- */
-fun MutableLiveData<Event<Unit>>.raiseEvent() {
-    postValue(Event(Unit))
-}
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/DataCollectionViewModel.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/DataCollectionViewModel.kt
index 0a4320b..4864638 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/DataCollectionViewModel.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/DataCollectionViewModel.kt
@@ -25,9 +25,9 @@ import androidx.security.crypto.MasterKeys
 import com.esri.arcgisruntime.loadable.LoadStatus
 import com.esri.arcgisruntime.mapping.ArcGISMap
 import com.esri.arcgisruntime.opensourceapps.datacollection.R
-import com.esri.arcgisruntime.opensourceapps.datacollection.util.Event
+import com.esri.arcgisruntime.toolkit.util.Event
 import com.esri.arcgisruntime.opensourceapps.datacollection.util.Logger
-import com.esri.arcgisruntime.opensourceapps.datacollection.util.raiseEvent
+import com.esri.arcgisruntime.toolkit.util.raiseEvent
 import com.esri.arcgisruntime.portal.Portal
 import com.esri.arcgisruntime.portal.PortalItem
 import com.esri.arcgisruntime.portal.PortalUser
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/IdentifyResultViewModel.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/IdentifyResultViewModel.kt
index cc80f9d..21ec487 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/IdentifyResultViewModel.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/IdentifyResultViewModel.kt
@@ -25,8 +25,9 @@ import com.esri.arcgisruntime.layers.FeatureLayer
 import com.esri.arcgisruntime.layers.LayerContent
 import com.esri.arcgisruntime.mapping.GeoElement
 import com.esri.arcgisruntime.mapping.view.IdentifyLayerResult
-import com.esri.arcgisruntime.opensourceapps.datacollection.util.Event
-import com.esri.arcgisruntime.opensourceapps.datacollection.util.raiseEvent
+import com.esri.arcgisruntime.toolkit.util.Event
+import com.esri.arcgisruntime.toolkit.util.raiseEvent
+import com.esri.arcgisruntime.toolkit.popup.PopupViewModel
 
 /**
  * The view model for IdentifyResultFragment, that is responsible for processing the result of
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/PopupViewModel.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/PopupViewModel.kt
deleted file mode 100644
index f51c201..0000000
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/PopupViewModel.kt
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2020 Esri
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels
-
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.esri.arcgisruntime.ArcGISRuntimeException
-import com.esri.arcgisruntime.concurrent.ListenableFuture
-import com.esri.arcgisruntime.data.Feature
-import com.esri.arcgisruntime.data.FeatureEditResult
-import com.esri.arcgisruntime.data.FeatureTable
-import com.esri.arcgisruntime.data.ServiceFeatureTable
-import com.esri.arcgisruntime.mapping.popup.Popup
-import com.esri.arcgisruntime.mapping.popup.PopupManager
-import com.esri.arcgisruntime.opensourceapps.datacollection.util.Event
-import com.esri.arcgisruntime.opensourceapps.datacollection.util.raiseEvent
-
-/**
- * The view model that represents a Popup. It supports:
- *
- * <ul>
- * <li>Viewing a GeoElement's attributes
- * <li>Editing a GeoElement's attributes as well as saving
- * </ul>
- *
- * A PopupViewModel can be bound to a PopupView for visualisation of the Popup GeoElement's
- * attributes and editing experience.
- */
-class PopupViewModel(application: Application) : AndroidViewModel(application) {
-
-    private val _popup = MutableLiveData<Popup>()
-    // The Popup whose fields are viewed and edited in the PopupView
-    val popup: LiveData<Popup> = _popup
-
-    private val _popupManager = MutableLiveData<PopupManager>()
-    // The manager for the Popup responsible for viewing and editing of the Popup
-    val popupManager: LiveData<PopupManager> = _popupManager
-
-    private val _isPopupInEditMode = MutableLiveData<Boolean>()
-    // Depicts whether the PopupManager is currently in editing mode
-    // When in edit mode the user can edit the values of fields of the Popup
-    val isPopupInEditMode: LiveData<Boolean> = _isPopupInEditMode
-
-    private val _showSavePopupErrorEvent = MutableLiveData<Event<String>>()
-    // This event is raised when an error is encountered while trying to save edits on a popup.
-    // It passes the exception message to all the observers in the observeEvent() method.
-    val showSavePopupErrorEvent: LiveData<Event<String>> = _showSavePopupErrorEvent
-
-    private val _showSavingProgressEvent = MutableLiveData<Event<Boolean>>()
-    // This event is raised when the save operation begins/ends.
-    // It passes true to all the observers in the observeEvent() method when the save operation
-    // is initiated and false when it ends.
-    val showSavingProgressEvent: LiveData<Event<Boolean>> = _showSavingProgressEvent
-
-    private val _confirmCancelPopupEditingEvent = MutableLiveData<Event<Unit>>()
-    // This event is raised when the user cancels the edit mode on the Popup.
-    // It is used for showing confirmation dialog to the user, before calling cancelEditing()
-    val confirmCancelPopupEditingEvent: LiveData<Event<Unit>> = _confirmCancelPopupEditingEvent
-
-    private val _dismissPopupEvent = MutableLiveData<Event<Unit>>()
-    // This event is raised when the user taps on the close button to dismiss the popup.
-    val dismissPopupEvent: LiveData<Event<Unit>> = _dismissPopupEvent
-
-    /**
-     * Updates popup property to set the popup field values being displayed in
-     * the bottom sheet. Creates PopupManager for PopupView to perform edit operations.
-     *
-     * @param popup
-     */
-    fun setPopup(popup: Popup) {
-        _popup.value = popup
-        _popupManager.value = PopupManager(getApplication(), _popup.value)
-    }
-
-    /**
-     * Enables/disables edit mode on the PopupView
-     */
-    fun setEditMode(isEnabled: Boolean) {
-        _isPopupInEditMode.value = isEnabled
-    }
-
-    /**
-     * Clear the popup
-     */
-    fun clearPopup() {
-        _popup.value = null
-        _popupManager.value = null
-    }
-
-    /**
-     * Cancels the edit mode.
-     */
-    fun cancelEditing() {
-        _popupManager.value?.cancelEditing()
-        _isPopupInEditMode.value = false
-    }
-
-    /**
-     * Raises ConfirmCancelPopupEditingEvent that can be observed and used for
-     * prompting user with confirmation dialog to make sure the user wants to cancel edits.
-     * To be followed by cancelEditing() if the user response is positive.
-     */
-    fun confirmCancelEditing() {
-        _confirmCancelPopupEditingEvent.raiseEvent()
-    }
-
-    /**
-     * Raises an event to dismiss the popup
-     */
-    fun dismissPopup() {
-        _dismissPopupEvent.raiseEvent()
-    }
-
-    /**
-     * Saves Popup edits by applying changes to the feature service associated with a Popup's
-     * feature.
-     */
-    fun savePopupEdits() {
-        // show the Progress bar informing user that save operation is in progress
-        _showSavingProgressEvent.raiseEvent(true)
-        _popupManager.value?.let { popupManager ->
-            // Call finishEditingAsync() to apply edit changes locally and end the popup manager
-            // editing session
-            val finishEditingFuture: ListenableFuture<ArcGISRuntimeException> =
-                popupManager.finishEditingAsync()
-            finishEditingFuture.addDoneListener {
-                try {
-                    finishEditingFuture.get()
-
-                    // The edits were applied successfully to the local geodatabase,
-                    // push those changes to the feature service by calling applyEditsAsync()
-                    val feature: Feature = popupManager.popup.geoElement as Feature
-                    val featureTable: FeatureTable = feature.featureTable
-                    if (featureTable is ServiceFeatureTable) {
-                        val applyEditsFuture: ListenableFuture<List<FeatureEditResult>> =
-                            featureTable.applyEditsAsync()
-                        applyEditsFuture.addDoneListener {
-                            // dismiss the Progress bar
-                            _showSavingProgressEvent.raiseEvent(false)
-                            // dismiss edit mode
-                            _isPopupInEditMode.value = false
-                            try {
-                                val featureEditResults: List<FeatureEditResult> =
-                                    applyEditsFuture.get()
-                                // Check for errors in FeatureEditResults
-                                if (featureEditResults.any { result -> result.hasCompletedWithErrors() }) {
-                                    // an error was encountered when trying to apply edits
-                                    val exception =
-                                        featureEditResults.filter { featureEditResult -> featureEditResult.hasCompletedWithErrors() }[0].error
-                                    // show the error message to the user
-                                    exception.message?.let { exceptionMessage ->
-                                        _showSavePopupErrorEvent.raiseEvent(exceptionMessage)
-                                    }
-                                }
-
-                            } catch (exception: Exception) {
-                                // show the error message to the user
-                                exception.message?.let { exceptionMessage ->
-                                    _showSavePopupErrorEvent.raiseEvent(exceptionMessage)
-                                }
-                            }
-                        }
-                    }
-                } catch (exception: Exception) {
-                    // dismiss the Progress bar
-                    _showSavingProgressEvent.raiseEvent(false)
-                    // show the error message to the user
-                    exception.message?.let { exceptionMessage ->
-                        _showSavePopupErrorEvent.raiseEvent(exceptionMessage)
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
index f9b311d..a21de4c 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
@@ -36,15 +36,14 @@ import com.esri.arcgisruntime.mapping.view.DefaultMapViewOnTouchListener
 import com.esri.arcgisruntime.opensourceapps.datacollection.R
 import com.esri.arcgisruntime.opensourceapps.datacollection.databinding.FragmentDataCollectionBinding
 import com.esri.arcgisruntime.opensourceapps.datacollection.util.Logger
-import com.esri.arcgisruntime.opensourceapps.datacollection.util.observeEvent
 import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.DataCollectionViewModel
 import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.IdentifyResultViewModel
 import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.MapViewModel
-import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.PopupViewModel
 import com.esri.arcgisruntime.security.AuthenticationManager
 import com.esri.arcgisruntime.security.DefaultAuthenticationChallengeHandler
+import com.esri.arcgisruntime.toolkit.popup.PopupViewModel
+import com.esri.arcgisruntime.toolkit.util.observeEvent
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
 import com.google.android.material.bottomsheet.BottomSheetBehavior.from
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/IdentifyResultFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/IdentifyResultFragment.kt
index ce9d236..ad6c58a 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/IdentifyResultFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/IdentifyResultFragment.kt
@@ -26,7 +26,7 @@ import androidx.fragment.app.activityViewModels
 import com.esri.arcgisruntime.opensourceapps.datacollection.R
 import com.esri.arcgisruntime.opensourceapps.datacollection.databinding.FragmentIdentifyResultBinding
 import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.IdentifyResultViewModel
-import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.PopupViewModel
+import com.esri.arcgisruntime.toolkit.popup.PopupViewModel
 
 /**
  * Responsible for displaying properties of the resulting GeoElement of an identify operation in
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
index 0b17711..1e5c629 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
@@ -27,9 +27,8 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.esri.arcgisruntime.opensourceapps.datacollection.R
 import com.esri.arcgisruntime.opensourceapps.datacollection.databinding.FragmentPopupBinding
-import com.esri.arcgisruntime.opensourceapps.datacollection.util.observeEvent
-import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.IdentifyResultViewModel
-import com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.PopupViewModel
+import com.esri.arcgisruntime.toolkit.popup.PopupViewModel
+import com.esri.arcgisruntime.toolkit.util.observeEvent
 import kotlinx.android.synthetic.main.fragment_popup.*
 
 /**
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt
deleted file mode 100644
index 7c5e0b8..0000000
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/popup/PopupView.kt
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright 2020 Esri
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.esri.arcgisruntime.opensourceapps.datacollection.views.popup
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.text.InputType
-import android.util.AttributeSet
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.core.widget.doAfterTextChanged
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import com.esri.arcgisruntime.ArcGISRuntimeException
-import com.esri.arcgisruntime.data.CodedValueDomain
-import com.esri.arcgisruntime.data.Field
-import com.esri.arcgisruntime.mapping.popup.Popup
-import com.esri.arcgisruntime.mapping.popup.PopupField
-import com.esri.arcgisruntime.mapping.popup.PopupManager
-import com.esri.arcgisruntime.opensourceapps.datacollection.BR
-import com.esri.arcgisruntime.opensourceapps.datacollection.R
-import kotlinx.android.synthetic.main.item_popup_row.view.*
-import kotlinx.android.synthetic.main.layout_popupview.view.*
-
-private const val TAG = "PopupView"
-
-/**
- * Displays the popup attribute list in a [RecyclerView].
- */
-class PopupView : FrameLayout {
-
-    private val popupAttributeListAdapter by lazy { PopupAttributeListAdapter() }
-    private var isEditMode: Boolean = false
-
-    var popupManager: PopupManager? = null
-    var popup: Popup? = null
-
-    /**
-     * Constructor used when instantiating this View directly to attach it to another view programmatically.
-     */
-    constructor(context: Context) : super(context) {
-        init(context)
-    }
-
-    /**
-     * Constructor used when defining this view in an XML layout.
-     */
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
-        init(context)
-    }
-
-    /**
-     * Initializes this PopupView by inflating the layout and setting the [RecyclerView] adapter.
-     */
-    private fun init(context: Context) {
-        inflate(context, R.layout.layout_popupview, this)
-        popupRecyclerView.layoutManager = LinearLayoutManager(context)
-        popupRecyclerView.adapter = popupAttributeListAdapter
-    }
-
-    /**
-     * Enables/Disables edit mode on the PopupView.
-     */
-    fun setEditMode(isEnabled: Boolean) {
-        isEditMode = isEnabled
-        popupManager?.let { popupManager->
-            if (isEnabled) {
-                popupAttributeListAdapter.submitList(popupManager.editableFields)
-                popupManager.startEditing()
-            } else {
-                popupAttributeListAdapter.submitList(popupManager.displayedFields)
-            }
-            popupAttributeListAdapter.notifyDataSetChanged()
-        }
-    }
-
-    /**
-     * Adapter used by PopupView to display a list of PopupAttributes in a
-     * recyclerView.
-     */
-    private inner class PopupAttributeListAdapter :
-        ListAdapter<PopupField, ViewHolder>(DiffCallback()) {
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-            val inflater = LayoutInflater.from(parent.context)
-            val binding = DataBindingUtil.inflate<ViewDataBinding>(
-                inflater,
-                R.layout.item_popup_row,
-                parent,
-                false
-            )
-            return ViewHolder(binding)
-        }
-
-        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            val popupField: PopupField = getItem(position)
-            holder.updateView(popupField)
-
-            holder.bind(popupField)
-        }
-    }
-
-    /**
-     * Callback for calculating the diff between two non-null items in a list.
-     */
-    private class DiffCallback : DiffUtil.ItemCallback<PopupField>() {
-
-        override fun areItemsTheSame(
-            oldItem: PopupField,
-            newItem: PopupField
-        ): Boolean {
-            return oldItem == newItem
-        }
-
-        override fun areContentsTheSame(
-            oldItem: PopupField,
-            newItem: PopupField
-        ): Boolean {
-            return oldItem.fieldName == newItem.fieldName
-        }
-    }
-
-    /**
-     * The PopupAttributeListAdapter ViewHolder.
-     */
-    private inner class ViewHolder(private val binding: ViewDataBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        val labelTextView: TextView by lazy {
-            binding.root.labelTextView
-        }
-
-        val valueTextView: TextView by lazy {
-            binding.root.valueTextView
-        }
-
-        val valueEditText: EditText by lazy {
-            binding.root.valueEditText
-        }
-
-        val codedValueDomainSpinner: Spinner by lazy {
-            binding.root.codedValueDomainSpinner
-        }
-
-        val separatingLineView: View by lazy {
-            binding.root.separatingLine
-        }
-
-        fun bind(
-            popupField: PopupField
-        ) {
-            binding.setVariable(BR.popupField, popupField)
-            binding.setVariable(BR.popupManager, popupManager)
-            binding.executePendingBindings()
-        }
-
-        /**
-         * Toggles the view for popup field value from edittext to textview and vice-versa, given the
-         * edit mode of the popupView.
-         */
-        fun updateView(popupField: PopupField) {
-            popupManager?.let { popupManager ->
-                if (isEditMode) {
-                    val codedValueDomain: CodedValueDomain? =
-                        popupManager.getDomain(popupField) as? CodedValueDomain
-                    if (codedValueDomain != null) {
-                        setUpSpinner(codedValueDomain, popupField)
-                        valueEditText.visibility = View.GONE
-                        valueTextView.visibility = View.GONE
-                        codedValueDomainSpinner.visibility = View.VISIBLE
-                        separatingLineView.visibility = View.VISIBLE
-                    } else {
-                        valueEditText.inputType =
-                            getInputType(popupManager.getFieldType(popupField))
-                        valueEditText.visibility = View.VISIBLE
-                        separatingLineView.visibility = View.GONE
-                        valueTextView.visibility = View.GONE
-                        //save original colors
-                        val oldColors: ColorStateList = labelTextView.textColors
-                        // here we assign and hold the values of the editable fields, entered by the user
-                        // in popupAttribute.tempValue
-                        valueEditText.doAfterTextChanged {
-                            if (valueEditText.hasFocus()) {
-
-                                val validationError: ArcGISRuntimeException? = updateValue(
-                                    popupField,
-                                    valueEditText.text.toString()
-                                )
-                                if (validationError != null) {
-                                    val fieldLabelWithValidationError =
-                                        popupField.label + ": " + validationError.message
-                                    labelTextView.text = fieldLabelWithValidationError
-                                    labelTextView.setTextColor(Color.RED)
-                                } else {
-                                    labelTextView.text = popupField.label
-                                    labelTextView.setTextColor(oldColors)
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    valueEditText.visibility = View.GONE
-                    codedValueDomainSpinner.visibility = View.GONE
-                    valueTextView.visibility = View.VISIBLE
-                    separatingLineView.visibility = View.VISIBLE
-                }
-            }
-        }
-
-        /**
-         * Sets up spinner for PopupFields that have a CodedValueDomain.
-         */
-        private fun setUpSpinner(codedValueDomain: CodedValueDomain, popupField: PopupField) {
-            val codedValuesNames = mutableListOf<String>()
-            codedValueDomain.codedValues.forEach { codedValue -> codedValuesNames.add(codedValue.name) }
-            codedValueDomainSpinner.adapter = ArrayAdapter(
-                binding.root.context,
-                android.R.layout.simple_spinner_dropdown_item,
-                codedValuesNames
-            )
-            val codedValuePosition = codedValueDomain.codedValues.indexOfFirst { codedValue ->
-                codedValue.code == popupManager?.getFieldValue(popupField)
-            }
-            // set the PopupField value as selected in the spinner
-            codedValueDomainSpinner.setSelection(codedValuePosition)
-            codedValueDomainSpinner.onItemSelectedListener =
-                object : AdapterView.OnItemSelectedListener {
-                    override fun onNothingSelected(parent: AdapterView<*>?) {
-                        TODO("Not yet implemented")
-                    }
-
-                    override fun onItemSelected(
-                        parent: AdapterView<*>?,
-                        view: View?,
-                        position: Int,
-                        id: Long
-                    ) {
-                        popupManager?.updateValue(
-                            codedValueDomain.codedValues[position].code,
-                            popupField
-                        )
-                    }
-                }
-        }
-
-        /**
-         * Updates the value of the specified PopupField to the appropriately cast string value of
-         * the specified value
-         */
-        private fun updateValue(popupField: PopupField, newValue: String): ArcGISRuntimeException? {
-            var error: ArcGISRuntimeException? = null
-            popupManager?.let { popupManager ->
-                when (popupManager.getFieldType(popupField)) {
-                    Field.Type.SHORT -> error =
-                        if (newValue.toShortOrNull() != null) {
-                            popupManager.updateValue(newValue.toShort(), popupField)
-                        } else {
-                            popupManager.updateValue(newValue, popupField)
-                        }
-                    Field.Type.INTEGER -> error =
-                        if (newValue.toIntOrNull() != null) {
-                            popupManager.updateValue(newValue.toInt(), popupField)
-                        } else {
-                            popupManager.updateValue(newValue, popupField)
-                        }
-                    Field.Type.FLOAT -> error =
-                        if (newValue.toFloatOrNull() != null) {
-                            popupManager.updateValue(newValue.toFloat(), popupField)
-                        } else {
-                            popupManager.updateValue(newValue, popupField)
-                        }
-                    Field.Type.DOUBLE -> error =
-                        if (newValue.toDoubleOrNull() != null) {
-                            popupManager.updateValue(newValue.toDouble(), popupField)
-                        } else {
-                            popupManager.updateValue(newValue, popupField)
-                        }
-                    Field.Type.TEXT -> error = popupManager.updateValue(newValue, popupField)
-
-                    else -> Log.i(
-                        TAG,
-                        "Unhandled field type: " + popupManager.getFieldType(popupField)
-                    )
-                }
-            }
-            return error
-        }
-
-        /**
-         * Returns the int value representing the input type for EditText view.
-         */
-        private fun getInputType(fieldType: Field.Type): Int {
-            return when (fieldType) {
-                Field.Type.SHORT, Field.Type.INTEGER -> InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_SIGNED
-                Field.Type.FLOAT, Field.Type.DOUBLE -> InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL or InputType.TYPE_NUMBER_FLAG_SIGNED
-                else -> InputType.TYPE_CLASS_TEXT
-            }
-        }
-    }
-}
diff --git a/app/src/main/res/layout/fragment_identify_result.xml b/app/src/main/res/layout/fragment_identify_result.xml
index 875bfb9..d16a48d 100644
--- a/app/src/main/res/layout/fragment_identify_result.xml
+++ b/app/src/main/res/layout/fragment_identify_result.xml
@@ -24,7 +24,7 @@
                 type="com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.IdentifyResultViewModel" />
         <variable
                 name="popupViewModel"
-                type="com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.PopupViewModel"/>
+                type="com.esri.arcgisruntime.toolkit.popup.PopupViewModel"/>
     </data>
 
 
diff --git a/app/src/main/res/layout/fragment_popup.xml b/app/src/main/res/layout/fragment_popup.xml
index c13763b..0d76727 100644
--- a/app/src/main/res/layout/fragment_popup.xml
+++ b/app/src/main/res/layout/fragment_popup.xml
@@ -21,7 +21,7 @@
         <import type="android.view.View"/>
         <variable
                 name="popupViewModel"
-                type="com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.PopupViewModel"/>
+                type="com.esri.arcgisruntime.toolkit.popup.PopupViewModel"/>
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -211,7 +211,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/editLayout" />
 
-            <com.esri.arcgisruntime.opensourceapps.datacollection.views.popup.PopupView
+            <com.esri.arcgisruntime.toolkit.popup.PopupView
                     android:id="@+id/popupView"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
@@ -222,7 +222,7 @@
                     app:popup="@{popupViewModel.popup}"
                     app:popupManager="@{popupViewModel.popupManager}"
                     app:editMode="@{popupViewModel.isPopupInEditMode()}">
-            </com.esri.arcgisruntime.opensourceapps.datacollection.views.popup.PopupView>
+            </com.esri.arcgisruntime.toolkit.popup.PopupView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

From 5c801828c283fca2d4bf69721d3aeb23691063a0 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Sun, 2 May 2021 19:38:30 -0700
Subject: [PATCH 15/16] update layout to have edit layout at the bottom

---
 .../viewmodels/DataCollectionViewModel.kt     |  14 ++
 .../views/fragments/DataCollectionFragment.kt |   4 +
 .../views/fragments/PopupFragment.kt          |  28 ++++
 .../fragment_data_collection.xml              | 139 +++++++++++++++---
 .../res/layout/fragment_data_collection.xml   | 127 ++++++++++++++--
 app/src/main/res/layout/fragment_popup.xml    |  86 +----------
 6 files changed, 281 insertions(+), 117 deletions(-)

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/DataCollectionViewModel.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/DataCollectionViewModel.kt
index 4864638..56d2f28 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/DataCollectionViewModel.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/viewmodels/DataCollectionViewModel.kt
@@ -73,6 +73,11 @@ class DataCollectionViewModel(application: Application, val mapViewModel: MapVie
     private val _bottomSheetState: MutableLiveData<Int> = MutableLiveData(BottomSheetBehavior.STATE_HIDDEN)
     val bottomSheetState: LiveData<Int> = _bottomSheetState
 
+    private val _isShowPopupEditControls = MutableLiveData(false)
+    // Depicts whether to show the edit layout to modify the selected popup attributes
+    // being displayed in the bottomsheet
+    val isShowPopupEditControls: LiveData<Boolean> = _isShowPopupEditControls
+
     private val encryptedSharedPrefs by lazy {
         val masterKeyAlias = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
         EncryptedSharedPreferences.create(
@@ -180,6 +185,15 @@ class DataCollectionViewModel(application: Application, val mapViewModel: MapVie
         _bottomSheetState.value = bottomSheetState
     }
 
+    /**
+     * Sets whether to display the Popup editing control view.
+     *
+     * @param showPopupEditControls
+     */
+    fun setShowPopupEditControls(showPopupEditControls: Boolean) {
+        _isShowPopupEditControls.value = showPopupEditControls
+    }
+
     /**
      * Loads the Portal with the given value of the loginRequired flag and sets it on the Map.
      */
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
index a21de4c..77dc445 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
@@ -81,6 +81,7 @@ class DataCollectionFragment : Fragment() {
 
     private val onBackPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
+            dataCollectionViewModel.setShowPopupEditControls(false)
             when {
                 // we handle the back button press here to navigate back in the bottomsheet.
                 // when the user presses the back button when PopupAttributesListFragment is showing
@@ -106,6 +107,7 @@ class DataCollectionFragment : Fragment() {
 
         val view = fragmentDataCollectionBinding.root
 
+        fragmentDataCollectionBinding.popupViewModel = popupViewModel
         fragmentDataCollectionBinding.dataCollectionViewModel = dataCollectionViewModel
         fragmentDataCollectionBinding.lifecycleOwner = this
 
@@ -136,6 +138,7 @@ class DataCollectionFragment : Fragment() {
         }
 
         identifyResultViewModel.showPopupEvent.observeEvent(viewLifecycleOwner) {
+            dataCollectionViewModel.setShowPopupEditControls(true)
             bottomSheetNavController.navigate(R.id.action_identifyResultFragment_to_popupFragment)
         }
 
@@ -150,6 +153,7 @@ class DataCollectionFragment : Fragment() {
 
         popupViewModel.dismissPopupEvent.observeEvent(viewLifecycleOwner) {
             resetIdentifyResult()
+            dataCollectionViewModel.setShowPopupEditControls(false)
             dataCollectionViewModel.setCurrentBottomSheetState(STATE_HIDDEN)
             bottomSheetNavController.popBackStack(R.id.identifyResultFragment, false)
         }
diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
index 1e5c629..729eab1 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/PopupFragment.kt
@@ -25,6 +25,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import com.esri.arcgisruntime.mapping.popup.Popup
 import com.esri.arcgisruntime.opensourceapps.datacollection.R
 import com.esri.arcgisruntime.opensourceapps.datacollection.databinding.FragmentPopupBinding
 import com.esri.arcgisruntime.toolkit.popup.PopupViewModel
@@ -72,9 +73,36 @@ class PopupFragment : Fragment() {
             showConfirmCancelEditingDialog()
         }
 
+        popupViewModel.confirmDeletePopupEvent.observeEvent(viewLifecycleOwner) {
+            showConfirmDeletePopupDialog()
+        }
+
+        popupViewModel.showDeletePopupErrorEvent.observeEvent(viewLifecycleOwner) { errorMessage ->
+            showAlertDialog(errorMessage)
+        }
+
         return binding.root
     }
 
+    /**
+     * Shows dialog to confirm deleting the popup.
+     */
+    private fun showConfirmDeletePopupDialog() {
+        val dialogBuilder = AlertDialog.Builder(requireContext())
+        dialogBuilder.setMessage("Delete ${(popupViewModel.popup.value as Popup).title}?")
+            .setCancelable(false)
+            // positive button text and action
+            .setPositiveButton(getString(R.string.ok)) { dialog, id ->
+                popupViewModel.deletePopup()
+            }
+            // negative button text and action
+            .setNegativeButton(getString(R.string.cancel)) { dialog, id -> dialog.cancel()
+            }
+        val alert = dialogBuilder.create()
+        // show alert dialog
+        alert.show()
+    }
+
     /**
      * Shows dialog to confirm cancelling edit mode on popup view.
      */
diff --git a/app/src/main/res/layout-w600dp/fragment_data_collection.xml b/app/src/main/res/layout-w600dp/fragment_data_collection.xml
index ea91a83..43cc201 100644
--- a/app/src/main/res/layout-w600dp/fragment_data_collection.xml
+++ b/app/src/main/res/layout-w600dp/fragment_data_collection.xml
@@ -19,10 +19,14 @@
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
+        <import type="android.view.View"/>
         <variable
                 name="dataCollectionViewModel"
                 type="com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.DataCollectionViewModel" />
+
+        <variable
+                name="popupViewModel"
+                type="com.esri.arcgisruntime.toolkit.popup.PopupViewModel"/>
     </data>
 
     <androidx.drawerlayout.widget.DrawerLayout
@@ -30,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -42,34 +46,40 @@
                     android:layout_height="?attr/actionBarSize"
                     android:background="?attr/colorPrimary"
                     android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:title="@{dataCollectionViewModel.portalItemTitle}"
                     app:titleTextColor="@android:color/white" />
 
-            <androidx.coordinatorlayout.widget.CoordinatorLayout
+            <com.esri.arcgisruntime.mapping.view.MapView
+                    android:id="@+id/mapView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/toolbar"
+                    app:map="@{dataCollectionViewModel.mapViewModel.map}" />
 
-                <com.esri.arcgisruntime.mapping.view.MapView
-                        android:id="@+id/mapView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:map="@{dataCollectionViewModel.mapViewModel.map}" />
+            <androidx.coordinatorlayout.widget.CoordinatorLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
 
                 <androidx.cardview.widget.CardView
                         android:id="@+id/bottomSheetContainer"
                         style="?attr/bottomSheetStyle"
                         android:layout_width="380dp"
                         android:layout_height="match_parent"
+                        app:cardElevation="50dp"
+                        app:cardCornerRadius="12dp"
                         android:background="@android:color/white"
-                        app:behavior_draggable="false"
-                        app:behavior_fitToContents="true"
-                        app:behavior_hideable="true"
                         app:behavior_peekHeight="80dp"
-                        app:cardCornerRadius="12dp"
-                        app:cardElevation="50dp"
+                        app:behavior_halfExpandedRatio="0.5"
+                        app:behavior_fitToContents="false"
+                        app:behavior_draggable="true"
+                        app:behavior_hideable="true"
                         android:clickable="true"
                         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -83,9 +93,100 @@
                             app:navGraph="@navigation/bottomsheet_navigation" />
 
                 </androidx.cardview.widget.CardView>
-
             </androidx.coordinatorlayout.widget.CoordinatorLayout>
-        </LinearLayout>
+
+            <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_end="50dp"/>
+
+            <View
+                    android:id="@+id/separatingLine"
+                    android:layout_width="380dp"
+                    android:layout_height="1dp"
+                    android:background="#c0c0c0"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    android:visibility="@{dataCollectionViewModel.isShowPopupEditControls ? View.VISIBLE : View.GONE}"
+                    app:layout_constraintBottom_toTopOf="@id/editLayout"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/editLayout" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/editLayout"
+                    android:layout_width="380dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintVertical_bias="0.0"
+                    android:background="#F7F7F7"
+                    android:visibility="@{dataCollectionViewModel.isShowPopupEditControls ? View.VISIBLE : View.GONE}"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/guideline">
+
+                <ImageView
+                        android:id="@+id/edit"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:contentDescription="@string/edit"
+                        android:onClick="@{() -> popupViewModel.setEditMode(true)}"
+                        android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.718"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.475"
+                        app:srcCompat="@drawable/ic_pencil_24" />
+
+                <ImageView
+                        android:id="@+id/delete"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:contentDescription="@string/cancel"
+                        android:onClick="@{() -> popupViewModel.confirmDeletePopup()}"
+                        android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/edit"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.475"
+                        app:srcCompat="@drawable/ic_trash_24" />
+
+                <ImageView
+                        android:id="@+id/ok"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:contentDescription="@string/ok"
+                        android:onClick="@{() -> popupViewModel.savePopupEdits()}"
+                        android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.718"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.475"
+                        app:srcCompat="@drawable/ic_save_24" />
+
+                <ImageView
+                        android:id="@+id/cancel"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:contentDescription="@string/cancel"
+                        android:onClick="@{() -> popupViewModel.confirmCancelEditing()}"
+                        android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/ok"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.475"
+                        app:srcCompat="@drawable/ic_x_24" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <!-- Container for contents of drawer - use NavigationView to make configuration easier -->
         <com.google.android.material.navigation.NavigationView
diff --git a/app/src/main/res/layout/fragment_data_collection.xml b/app/src/main/res/layout/fragment_data_collection.xml
index f1f6907..887a498 100644
--- a/app/src/main/res/layout/fragment_data_collection.xml
+++ b/app/src/main/res/layout/fragment_data_collection.xml
@@ -19,10 +19,14 @@
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-
+        <import type="android.view.View"/>
         <variable
                 name="dataCollectionViewModel"
                 type="com.esri.arcgisruntime.opensourceapps.datacollection.viewmodels.DataCollectionViewModel" />
+
+        <variable
+                name="popupViewModel"
+                type="com.esri.arcgisruntime.toolkit.popup.PopupViewModel"/>
     </data>
 
     <androidx.drawerlayout.widget.DrawerLayout
@@ -30,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -42,21 +46,26 @@
                     android:layout_height="?attr/actionBarSize"
                     android:background="?attr/colorPrimary"
                     android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:title="@{dataCollectionViewModel.portalItemTitle}"
                     app:titleTextColor="@android:color/white" />
 
-            <androidx.coordinatorlayout.widget.CoordinatorLayout
+            <com.esri.arcgisruntime.mapping.view.MapView
+                    android:id="@+id/mapView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                <com.esri.arcgisruntime.mapping.view.MapView
-                        android:id="@+id/mapView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:map="@{dataCollectionViewModel.mapViewModel.map}" />
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/toolbar"
+                    app:map="@{dataCollectionViewModel.mapViewModel.map}" />
+
+                 <androidx.coordinatorlayout.widget.CoordinatorLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
 
                 <androidx.cardview.widget.CardView
                         android:id="@+id/bottomSheetContainer"
@@ -84,9 +93,97 @@
                             app:navGraph="@navigation/bottomsheet_navigation" />
 
                 </androidx.cardview.widget.CardView>
-
             </androidx.coordinatorlayout.widget.CoordinatorLayout>
-        </LinearLayout>
+
+            <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_percent="0.93" />
+
+            <View
+                    android:id="@+id/separatingLine"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#c0c0c0"
+                    android:visibility="@{dataCollectionViewModel.isShowPopupEditControls ? View.VISIBLE : View.GONE}"
+                    app:layout_constraintBottom_toTopOf="@id/editLayout"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/editLayout" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/editLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="#F7F7F7"
+                    android:visibility="@{dataCollectionViewModel.isShowPopupEditControls ? View.VISIBLE : View.GONE}"
+                    app:layout_constraintTop_toBottomOf="@id/guideline"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent">
+
+                <ImageView
+                        android:id="@+id/edit"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:contentDescription="@string/edit"
+                        android:onClick="@{() -> popupViewModel.setEditMode(true)}"
+                        android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.718"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintVertical_bias="0.475"
+                        app:srcCompat="@drawable/ic_pencil_24" />
+
+                <ImageView
+                        android:id="@+id/delete"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:contentDescription="@string/cancel"
+                        android:onClick="@{() -> popupViewModel.confirmDeletePopup()}"
+                        android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/edit"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintVertical_bias="0.475"
+                        app:srcCompat="@drawable/ic_trash_24" />
+
+                <ImageView
+                        android:id="@+id/ok"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:contentDescription="@string/ok"
+                        android:onClick="@{() -> popupViewModel.savePopupEdits()}"
+                        android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.718"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintVertical_bias="0.475"
+                        app:srcCompat="@drawable/ic_save_24" />
+
+                <ImageView
+                        android:id="@+id/cancel"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:contentDescription="@string/cancel"
+                        android:onClick="@{() -> popupViewModel.confirmCancelEditing()}"
+                        android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/ok"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintVertical_bias="0.475"
+                        app:srcCompat="@drawable/ic_x_24" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <!-- Container for contents of drawer - use NavigationView to make configuration easier -->
         <com.google.android.material.navigation.NavigationView
diff --git a/app/src/main/res/layout/fragment_popup.xml b/app/src/main/res/layout/fragment_popup.xml
index 0d76727..69585b9 100644
--- a/app/src/main/res/layout/fragment_popup.xml
+++ b/app/src/main/res/layout/fragment_popup.xml
@@ -114,76 +114,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/editLayout"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:background="#F7F7F7"
-                app:layout_constraintTop_toBottomOf="@id/guideline"
-                app:layout_constraintBottom_toTopOf="@id/popupView"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
-
-            <ImageView
-                    android:id="@+id/edit"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:contentDescription="@string/edit"
-                    android:onClick="@{() -> popupViewModel.setEditMode(true)}"
-                    android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.718"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintVertical_bias="0.475"
-                    app:srcCompat="@drawable/ic_pencil_24" />
-
-            <ImageView
-                    android:id="@+id/delete"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:contentDescription="@string/cancel"
-                    android:onClick="@{() -> popupViewModel.confirmCancelEditing()}"
-                    android:visibility="@{popupViewModel.isPopupInEditMode ? View.GONE : View.VISIBLE}"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/edit"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintVertical_bias="0.475"
-                    app:srcCompat="@drawable/ic_trash_24" />
-
-            <ImageView
-                    android:id="@+id/ok"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:contentDescription="@string/ok"
-                    android:onClick="@{() -> popupViewModel.savePopupEdits()}"
-                    android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.718"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintVertical_bias="0.475"
-                    app:srcCompat="@drawable/ic_save_24" />
-
-            <ImageView
-                    android:id="@+id/cancel"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:contentDescription="@string/cancel"
-                    android:onClick="@{() -> popupViewModel.confirmCancelEditing()}"
-                    android:visibility="@{popupViewModel.isPopupInEditMode ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/ok"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintVertical_bias="0.475"
-                    app:srcCompat="@drawable/ic_x_24" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
         <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideline"
                 android:layout_width="wrap_content"
@@ -192,25 +122,15 @@
                 app:layout_constraintGuide_begin="80dp" />
 
         <View
-                android:id="@+id/separatingLine1"
+                android:id="@+id/separatingLine"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#c0c0c0"
-                app:layout_constraintBottom_toTopOf="@id/editLayout"
+                app:layout_constraintBottom_toBottomOf="@id/controlLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/controlLayout" />
 
-        <View
-                android:id="@+id/separatingLine2"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="#c0c0c0"
-                app:layout_constraintBottom_toTopOf="@id/popupView"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/editLayout" />
-
             <com.esri.arcgisruntime.toolkit.popup.PopupView
                     android:id="@+id/popupView"
                     android:layout_width="match_parent"
@@ -218,7 +138,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/editLayout"
+                    app:layout_constraintTop_toBottomOf="@id/separatingLine"
                     app:popup="@{popupViewModel.popup}"
                     app:popupManager="@{popupViewModel.popupManager}"
                     app:editMode="@{popupViewModel.isPopupInEditMode()}">

From 7055c9ac8c554466a462c66b9cb5f8247b8f6d44 Mon Sep 17 00:00:00 2001
From: Puneet Prakash <Puneet_Prakash@esri.com>
Date: Tue, 4 May 2021 14:07:17 -0700
Subject: [PATCH 16/16] address code review comments

---
 .../views/fragments/DataCollectionFragment.kt | 28 ++++++++++++++++++-
 app/src/main/res/layout/fragment_popup.xml    |  9 +++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
index 77dc445..2bea997 100644
--- a/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
+++ b/app/src/main/java/com/esri/arcgisruntime/opensourceapps/datacollection/views/fragments/DataCollectionFragment.kt
@@ -17,6 +17,7 @@
 package com.esri.arcgisruntime.opensourceapps.datacollection.views.fragments
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
@@ -44,8 +45,12 @@ import com.esri.arcgisruntime.security.DefaultAuthenticationChallengeHandler
 import com.esri.arcgisruntime.toolkit.popup.PopupViewModel
 import com.esri.arcgisruntime.toolkit.util.observeEvent
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_SETTLING
 import com.google.android.material.bottomsheet.BottomSheetBehavior.from
 import kotlinx.android.synthetic.main.fragment_data_collection.*
 import java.security.InvalidParameterException
@@ -127,6 +132,25 @@ class DataCollectionFragment : Fragment() {
             bottomSheetBehavior.state = bottomSheetState
         })
 
+        bottomSheetBehavior.addBottomSheetCallback(object :
+            BottomSheetBehavior.BottomSheetCallback() {
+
+            override fun onSlide(bottomSheet: View, slideOffset: Float) {
+                // handle onSlide
+            }
+
+            override fun onStateChanged(bottomSheet: View, newState: Int) {
+                if (bottomSheetNavController.currentDestination?.id == R.id.popupFragment) {
+                    when (newState) {
+                        STATE_COLLAPSED -> dataCollectionViewModel.setShowPopupEditControls(false)
+                        STATE_HIDDEN -> dataCollectionViewModel.setShowPopupEditControls(false)
+                        STATE_HALF_EXPANDED -> dataCollectionViewModel.setShowPopupEditControls(true)
+                        STATE_EXPANDED -> dataCollectionViewModel.setShowPopupEditControls(true)
+                    }
+                }
+            }
+        })
+
         // On orientation change if we have a valid value for identifyLayerResult,
         // we highlight the first feature from the result.
         identifyResultViewModel.identifyLayerResult.value?.let {
@@ -138,7 +162,9 @@ class DataCollectionFragment : Fragment() {
         }
 
         identifyResultViewModel.showPopupEvent.observeEvent(viewLifecycleOwner) {
-            dataCollectionViewModel.setShowPopupEditControls(true)
+            if (bottomSheetBehavior.state != STATE_COLLAPSED) {
+                dataCollectionViewModel.setShowPopupEditControls(true)
+            }
             bottomSheetNavController.navigate(R.id.action_identifyResultFragment_to_popupFragment)
         }
 
diff --git a/app/src/main/res/layout/fragment_popup.xml b/app/src/main/res/layout/fragment_popup.xml
index 69585b9..36f49f7 100644
--- a/app/src/main/res/layout/fragment_popup.xml
+++ b/app/src/main/res/layout/fragment_popup.xml
@@ -135,7 +135,7 @@
                     android:id="@+id/popupView"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/bufferGuideline"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/separatingLine"
@@ -144,6 +144,13 @@
                     app:editMode="@{popupViewModel.isPopupInEditMode()}">
             </com.esri.arcgisruntime.toolkit.popup.PopupView>
 
+        <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/bufferGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_end="60dp" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>