From 87bab15f3fb487e497a92bb8e8c14d8898615fe7 Mon Sep 17 00:00:00 2001
From: John Parrell <jparrell@purdue.edu>
Date: Thu, 18 Feb 2021 00:17:53 -0500
Subject: [PATCH 1/6] Unsure of how to integrate elements of form into running
 app, made a new test script similar to to the other one to implement elements
 of HQ part of waterway form that can later be combined.

---
 .../WaterWayFormTest.java                     | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java
new file mode 100644
index 0000000..fe92fd3
--- /dev/null
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java
@@ -0,0 +1,74 @@
+package com.sf.stormwaterutilityandroid;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.riddhimanadib.formmaster.FormBuilder;
+import me.riddhimanadib.formmaster.model.BaseFormElement;
+import me.riddhimanadib.formmaster.model.FormElementTextNumber;
+
+public class WaterWayFormTest extends AppCompatActivity {
+    //HQ form
+    private FormBuilder formBuilder;
+    private RecyclerView recyclerView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sample_fordm);
+        recyclerView = findViewById(R.id.recyclerView2);
+        setupForm();
+    }
+
+    private void setupForm() {
+
+
+        formBuilder = new FormBuilder(this, recyclerView);
+        FormElementTextNumber element2 = FormElementTextNumber.createInstance().setTitle("Substrate Size").setValue("0");
+        FormElementTextNumber element3 = FormElementTextNumber.createInstance().setTitle("Smothering").setValue("0");
+        FormElementTextNumber element4 = FormElementTextNumber.createInstance().setTitle("Silting").setValue("0");
+        FormElementTextNumber element5 = FormElementTextNumber.createInstance().setTitle("Rootwads").setValue("0");
+        FormElementTextNumber element6 = FormElementTextNumber.createInstance().setTitle("Overhanging Veg.").setValue("0");
+        FormElementTextNumber element7 = FormElementTextNumber.createInstance().setTitle("Oxbows/Black Waters").setValue("0");
+        FormElementTextNumber element8 = FormElementTextNumber.createInstance().setTitle("Downed Trees/Logs").setValue("0");
+        FormElementTextNumber element9 = FormElementTextNumber.createInstance().setTitle("Shallows (slow water)").setValue("0");
+        FormElementTextNumber element10 = FormElementTextNumber.createInstance().setTitle("Water Plants").setValue("0");
+        FormElementTextNumber element11 = FormElementTextNumber.createInstance().setTitle("Deep Pools").setValue("0");
+        FormElementTextNumber element12 = FormElementTextNumber.createInstance().setTitle("Logs/Woody Debris").setValue("0");
+        FormElementTextNumber element13 = FormElementTextNumber.createInstance().setTitle("Boulders").setValue("0");
+        FormElementTextNumber element14 = FormElementTextNumber.createInstance().setTitle("Undercut Banks").setValue("0");
+        FormElementTextNumber element15 = FormElementTextNumber.createInstance().setTitle("Sinuosity").setValue("0");
+        FormElementTextNumber element16 = FormElementTextNumber.createInstance().setTitle("Natural").setValue("0");
+        FormElementTextNumber element17 = FormElementTextNumber.createInstance().setTitle("Riparian Width").setValue("0");
+        FormElementTextNumber element18 = FormElementTextNumber.createInstance().setTitle("Land Use").setValue("0");
+        FormElementTextNumber element19 = FormElementTextNumber.createInstance().setTitle("Bank Erosion").setValue("0");
+
+
+        List<BaseFormElement> formItems = new ArrayList<>();
+        formItems.add(element2);
+        formItems.add(element3);
+        formItems.add(element4);
+        formItems.add(element5);
+        formItems.add(element6);
+        formItems.add(element7);
+        formItems.add(element8);
+        formItems.add(element9);
+        formItems.add(element10);
+        formItems.add(element11);
+        formItems.add(element12);
+        formItems.add(element13);
+        formItems.add(element14);
+        formItems.add(element15);
+        formItems.add(element16);
+        formItems.add(element17);
+        formItems.add(element18);
+        formItems.add(element19);
+        formBuilder.addFormElements(formItems);
+
+    }
+}
\ No newline at end of file

From bf5ff6165b57520ee3cbc3ac2328e6004ab50d8a Mon Sep 17 00:00:00 2001
From: kreyespa <kreyespa@purdue.edu>
Date: Thu, 18 Feb 2021 16:48:17 -0500
Subject: [PATCH 2/6] Trial

---
 try.docx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 try.docx

diff --git a/try.docx b/try.docx
new file mode 100644
index 0000000..e69de29

From 3c1d15fbd5a29ef32bee713d3a750d0f6e78fe30 Mon Sep 17 00:00:00 2001
From: John Parrell <jparrell@purdue.edu>
Date: Sun, 28 Feb 2021 20:08:49 -0500
Subject: [PATCH 3/6] HQ Section of WaterWay form completed

---
 .../{WaterWayFormTest.java => WaterWay/WaterWayForm.java}   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename app/src/main/java/com/sf/stormwaterutilityandroid/{WaterWayFormTest.java => WaterWay/WaterWayForm.java} (96%)

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
similarity index 96%
rename from app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java
rename to app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
index fe92fd3..a797f99 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWayFormTest.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
@@ -1,10 +1,12 @@
-package com.sf.stormwaterutilityandroid;
+package com.sf.stormwaterutilityandroid.WaterWay;
 
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.sf.stormwaterutilityandroid.R;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,7 +14,7 @@
 import me.riddhimanadib.formmaster.model.BaseFormElement;
 import me.riddhimanadib.formmaster.model.FormElementTextNumber;
 
-public class WaterWayFormTest extends AppCompatActivity {
+public class WaterWayForm extends AppCompatActivity {
     //HQ form
     private FormBuilder formBuilder;
     private RecyclerView recyclerView;

From 65ccb2237692820f033a02cf40baf846590a214f Mon Sep 17 00:00:00 2001
From: evanwilliams <will2312@purdue.edu>
Date: Thu, 4 Mar 2021 11:05:54 -0500
Subject: [PATCH 4/6] new forms

---
 .idea/gradle.xml                              |   1 +
 .idea/vcs.xml                                 |   2 +-
 .../DryWeatherScreening.java                  |  84 ++++++++++++++
 .../stormwaterutilityandroid/ReportPage.java  | 103 ++++++++++++++++++
 .../WaterWay/ChemicalTesting.java             |  98 +++++++++++++++++
 build.gradle                                  |   2 +-
 6 files changed, 288 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
 create mode 100644 app/src/main/java/com/sf/stormwaterutilityandroid/ReportPage.java
 create mode 100644 app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index aafa78e..c58b012 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="PLATFORM" />
+        <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="/usr/local/Cellar/gradle/6.5/libexec" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
new file mode 100644
index 0000000..e275a5d
--- /dev/null
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
@@ -0,0 +1,84 @@
+package com.sf.stormwaterutilityandroid;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.riddhimanadib.formmaster.FormBuilder;
+import me.riddhimanadib.formmaster.model.BaseFormElement;
+import me.riddhimanadib.formmaster.model.FormElementPickerDate;
+import me.riddhimanadib.formmaster.model.FormElementPickerMulti;
+import me.riddhimanadib.formmaster.model.FormElementPickerSingle;
+import me.riddhimanadib.formmaster.model.FormElementPickerTime;
+import me.riddhimanadib.formmaster.model.FormElementSwitch;
+import me.riddhimanadib.formmaster.model.FormElementTextEmail;
+import me.riddhimanadib.formmaster.model.FormElementTextMultiLine;
+import me.riddhimanadib.formmaster.model.FormElementTextNumber;
+import me.riddhimanadib.formmaster.model.FormElementTextPassword;
+import me.riddhimanadib.formmaster.model.FormElementTextPhone;
+import me.riddhimanadib.formmaster.model.FormElementTextSingleLine;
+import me.riddhimanadib.formmaster.model.FormHeader;
+
+public class DryWeatherScreening extends AppCompatActivity{
+
+    private FormBuilder formBuilder;
+    private RecyclerView recyclerView;
+    FormElementTextEmail element11;
+    //I assume onCreate is important so I will leave it unchanged
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sample_fordm);
+        recyclerView =  findViewById(R.id.recyclerView2);
+        setupForm();
+    }
+    private void setupForm() {
+        formBuilder = new FormBuilder(this, recyclerView);
+
+        //Outfall --> Question: How do you do a subheading?
+        FormHeader flow = FormHeader.createInstance("Presence of Flow");
+        FormElementTextNumber flowData = FormElementTextNumber.createInstance(); //what data type is this?
+
+        FormHeader odor = FormHeader.createInstance("Unusual Odor");
+        FormElementTextNumber odorData = FormElementTextNumber.createInstance();
+
+        FormHeader color = FormHeader.createInstance("Unusual Color");
+        FormElementTextNumber colorData = FormElementTextNumber.createInstance();
+
+        FormHeader polutants = FormHeader.createInstance("Polutants Nearby");
+        FormElementTextNumber polutantsData = FormElementTextNumber.createInstance();
+
+        FormHeader obstruction = FormHeader.createInstance("Obstruction");
+        FormElementTextNumber obstructionData = FormElementTextNumber.createInstance();
+
+        FormHeader maintenance = FormHeader.createInstance("Needs Maintenance");
+        FormElementTextNumber maintenanceData = FormElementTextNumber.createInstance();
+
+        FormHeader screen = FormHeader.createInstance("Screen OK");
+        FormElementTextNumber screenData = FormElementTextNumber.createInstance();
+
+
+        List<BaseFormElement> formItems = new ArrayList<>();
+
+        formItems.add(flow);
+        formItems.add(flowData);
+        formItems.add(odor);
+        formItems.add(odorData);
+        formItems.add(color);
+        formItems.add(colorData);
+        formItems.add(polutants);
+        formItems.add(polutantsData);
+        formItems.add(obstruction);
+        formItems.add(obstructionData);
+        formItems.add(maintenance);
+        formItems.add(maintenanceData);
+        formItems.add(screen);
+        formItems.add(screenData);
+
+        formBuilder.addFormElements(formItems);
+
+    }
+}
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/ReportPage.java b/app/src/main/java/com/sf/stormwaterutilityandroid/ReportPage.java
new file mode 100644
index 0000000..1e48724
--- /dev/null
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/ReportPage.java
@@ -0,0 +1,103 @@
+package com.sf.stormwaterutilityandroid;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.riddhimanadib.formmaster.FormBuilder;
+import me.riddhimanadib.formmaster.model.BaseFormElement;
+import me.riddhimanadib.formmaster.model.FormElementPickerDate;
+import me.riddhimanadib.formmaster.model.FormElementPickerMulti;
+import me.riddhimanadib.formmaster.model.FormElementPickerSingle;
+import me.riddhimanadib.formmaster.model.FormElementPickerTime;
+import me.riddhimanadib.formmaster.model.FormElementSwitch;
+import me.riddhimanadib.formmaster.model.FormElementTextEmail;
+import me.riddhimanadib.formmaster.model.FormElementTextMultiLine;
+import me.riddhimanadib.formmaster.model.FormElementTextNumber;
+import me.riddhimanadib.formmaster.model.FormElementTextPassword;
+import me.riddhimanadib.formmaster.model.FormElementTextPhone;
+import me.riddhimanadib.formmaster.model.FormElementTextSingleLine;
+import me.riddhimanadib.formmaster.model.FormHeader;
+
+public class ReportPage extends AppCompatActivity {
+    private FormBuilder formBuilder;
+    private RecyclerView recyclerView;
+    FormElementTextEmail element11;
+    @Override
+    //I assume onCreate is important so I will leave it unchanged
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sample_fordm);
+        recyclerView =  findViewById(R.id.recyclerView2);
+        setupForm();
+    }
+    private void setupForm() {
+        formBuilder = new FormBuilder(this, recyclerView);
+
+        //DateRow
+        FormHeader dateRow = FormHeader.createInstance("DateRow");
+        FormElementPickerDate dateElement = FormElementPickerDate.createInstance().setTitle("Date").setDateFormat("MMM dd, yyyy");
+
+        //Outfall --> Question: How do you do a subheading?
+        FormHeader outfall = FormHeader.createInstance("Outfall");
+        FormElementTextNumber outfallData = FormElementTextNumber.createInstance(); //what data type is this?
+
+        FormHeader longitude = FormHeader.createInstance("Longitude");
+        FormElementTextNumber longitudeData = FormElementTextNumber.createInstance();
+
+        FormHeader latitude = FormHeader.createInstance("Latitude");
+        FormElementTextNumber latitudeData = FormElementTextNumber.createInstance();
+
+        FormHeader elevation = FormHeader.createInstance("Insert Elevation");
+        FormElementTextNumber elevationData = FormElementTextNumber.createInstance();
+
+        FormHeader pipeType = FormHeader.createInstance("Type");
+        FormElementTextNumber pipeTypeData = FormElementTextNumber.createInstance();
+
+        FormHeader pipeSize = FormHeader.createInstance("Pipe Size");
+        FormElementTextNumber pipeSizeData = FormElementTextNumber.createInstance();
+
+        FormHeader channelBottomWidth = FormHeader.createInstance("Channel Bottom Width");
+        FormElementTextNumber channelBottomWidthData = FormElementTextNumber.createInstance();
+
+        FormHeader receivingWater = FormHeader.createInstance("Receiving Water");
+        FormElementTextNumber receivingWaterData = FormElementTextNumber.createInstance();
+
+        FormHeader routineEvaluation = FormHeader.createInstance("Routine Evaluation");
+        FormElementTextNumber routineEvaluationData = FormElementTextNumber.createInstance();
+
+        FormHeader complaintInvestigation = FormHeader.createInstance("Complaint Investigation");
+        FormElementTextNumber complaintInvestigationData = FormElementTextNumber.createInstance();
+
+        List<BaseFormElement> formItems = new ArrayList<>();
+
+        formItems.add(outfall);
+        formItems.add(outfallData);
+        formItems.add(longitude);
+        formItems.add(longitudeData);
+        formItems.add(latitude);
+        formItems.add(latitudeData);
+        formItems.add(elevation);
+        formItems.add(elevationData);
+        formItems.add(pipeType);
+        formItems.add(pipeTypeData);
+        formItems.add(pipeSize);
+        formItems.add(pipeSizeData);
+        formItems.add(channelBottomWidth);
+        formItems.add(channelBottomWidthData);
+        formItems.add(receivingWater);
+        formItems.add(receivingWaterData);
+        formItems.add(routineEvaluation);
+        formItems.add(routineEvaluationData);
+        formItems.add(complaintInvestigation);
+        formItems.add(complaintInvestigationData);
+
+        formBuilder.addFormElements(formItems);
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java
new file mode 100644
index 0000000..5040cae
--- /dev/null
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java
@@ -0,0 +1,98 @@
+package com.sf.stormwaterutilityandroid;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.riddhimanadib.formmaster.FormBuilder;
+import me.riddhimanadib.formmaster.model.BaseFormElement;
+import me.riddhimanadib.formmaster.model.FormElementPickerDate;
+import me.riddhimanadib.formmaster.model.FormElementPickerMulti;
+import me.riddhimanadib.formmaster.model.FormElementPickerSingle;
+import me.riddhimanadib.formmaster.model.FormElementPickerTime;
+import me.riddhimanadib.formmaster.model.FormElementSwitch;
+import me.riddhimanadib.formmaster.model.FormElementTextEmail;
+import me.riddhimanadib.formmaster.model.FormElementTextMultiLine;
+import me.riddhimanadib.formmaster.model.FormElementTextNumber;
+import me.riddhimanadib.formmaster.model.FormElementTextPassword;
+import me.riddhimanadib.formmaster.model.FormElementTextPhone;
+import me.riddhimanadib.formmaster.model.FormElementTextSingleLine;
+import me.riddhimanadib.formmaster.model.FormHeader;
+
+public class ChemicalTesting extends AppCompatActivity{
+    private FormBuilder formBuilder;
+    private RecyclerView recyclerView;
+    FormElementTextEmail element11;
+    @Override
+    //I assume onCreate is important so I will leave it unchanged
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sample_fordm);
+        recyclerView =  findViewById(R.id.recyclerView2);
+        setupForm();
+    }
+    private void setupForm() {
+        formBuilder = new FormBuilder(this, recyclerView);
+
+        FormHeader title = (FormHeader) new FormHeader().setTitle("Chemical Testing");
+
+        //Outfall --> Question: How do you do a subheading?
+
+        FormElementTextSingleLine temperature = new FormElementTextSingleLine().setTitle("Temperature (C) Change");
+        //FormHeader temp = FormHeader.createInstance("Temperature (C) Change");
+        FormElementTextNumber tempData = FormElementTextNumber.createInstance(); //what data type is this?
+
+        FormHeader tubidity = FormHeader.createInstance("Tubidity (NTU)");
+        FormElementTextNumber tubidityData = FormElementTextNumber.createInstance();
+
+        FormHeader pH = FormHeader.createInstance("pH");
+        FormElementTextNumber pHData = FormElementTextNumber.createInstance();
+
+        FormHeader nitrate = FormHeader.createInstance("Nitrate (mg/L)");
+        FormElementTextNumber nitrateData = FormElementTextNumber.createInstance();
+
+        FormHeader phosphate = FormHeader.createInstance("Total Phosphate (mg/L)");
+        FormElementTextNumber phosphateData = FormElementTextNumber.createInstance();
+
+        FormHeader oxygen = FormHeader.createInstance("Dissolved Oxygen (mg/L)");
+        FormElementTextNumber oxygenData = FormElementTextNumber.createInstance();
+
+        FormHeader coli = FormHeader.createInstance("E Coli (col/100mL)");
+        FormElementTextNumber coliData = FormElementTextNumber.createInstance();
+
+        FormHeader other1 = FormHeader.createInstance("Other 1");
+        FormElementTextNumber other1Data = FormElementTextNumber.createInstance();
+
+        FormHeader other2 = FormHeader.createInstance("Other2");
+        FormElementTextNumber other2Data = FormElementTextNumber.createInstance();
+
+        List<BaseFormElement> formItems = new ArrayList<>();
+
+        formItems.add(title);
+        formItems.add(temperature);
+        formItems.add(tempData);
+        formItems.add(tubidity);
+        formItems.add(tubidityData);
+        formItems.add(pH);
+        formItems.add(pHData);
+        formItems.add(nitrate);
+        formItems.add(nitrateData);
+        formItems.add(phosphate);
+        formItems.add(phosphateData);
+        formItems.add(oxygen);
+        formItems.add(oxygenData);
+        formItems.add(coli);
+        formItems.add(coliData);
+        formItems.add(other1);
+        formItems.add(other1Data);
+        formItems.add(other2);
+        formItems.add(other2Data);
+
+        formBuilder.addFormElements(formItems);
+
+    }
+}
diff --git a/build.gradle b/build.gradle
index 4d24be2..46397e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.1"
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From e2c793a4e0b7de8fe2c27253e782afcf339f8f3d Mon Sep 17 00:00:00 2001
From: evanwilliams <will2312@purdue.edu>
Date: Thu, 4 Mar 2021 14:45:08 -0500
Subject: [PATCH 5/6] new forms

---
 .../WaterWay/ChemicalTesting.java                | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java
index 5040cae..19e621c 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java
@@ -46,28 +46,28 @@ private void setupForm() {
         //FormHeader temp = FormHeader.createInstance("Temperature (C) Change");
         FormElementTextNumber tempData = FormElementTextNumber.createInstance(); //what data type is this?
 
-        FormHeader tubidity = FormHeader.createInstance("Tubidity (NTU)");
+        FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)");
         FormElementTextNumber tubidityData = FormElementTextNumber.createInstance();
 
-        FormHeader pH = FormHeader.createInstance("pH");
+        FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH");
         FormElementTextNumber pHData = FormElementTextNumber.createInstance();
 
-        FormHeader nitrate = FormHeader.createInstance("Nitrate (mg/L)");
+        FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)");
         FormElementTextNumber nitrateData = FormElementTextNumber.createInstance();
 
-        FormHeader phosphate = FormHeader.createInstance("Total Phosphate (mg/L)");
+        FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)");
         FormElementTextNumber phosphateData = FormElementTextNumber.createInstance();
 
-        FormHeader oxygen = FormHeader.createInstance("Dissolved Oxygen (mg/L)");
+        FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)");
         FormElementTextNumber oxygenData = FormElementTextNumber.createInstance();
 
-        FormHeader coli = FormHeader.createInstance("E Coli (col/100mL)");
+        FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)");
         FormElementTextNumber coliData = FormElementTextNumber.createInstance();
 
-        FormHeader other1 = FormHeader.createInstance("Other 1");
+        FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1");
         FormElementTextNumber other1Data = FormElementTextNumber.createInstance();
 
-        FormHeader other2 = FormHeader.createInstance("Other2");
+        FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2");
         FormElementTextNumber other2Data = FormElementTextNumber.createInstance();
 
         List<BaseFormElement> formItems = new ArrayList<>();

From 79398a7f97841f6a1c21013e64343fb898d030b5 Mon Sep 17 00:00:00 2001
From: evanwilliams <will2312@purdue.edu>
Date: Thu, 4 Mar 2021 14:58:14 -0500
Subject: [PATCH 6/6] fixed forms

---
 .../DryWeatherScreening.java                    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
index e275a5d..8220c5a 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
@@ -37,30 +37,30 @@ protected void onCreate(Bundle savedInstanceState) {
     }
     private void setupForm() {
         formBuilder = new FormBuilder(this, recyclerView);
+        FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening");
 
         //Outfall --> Question: How do you do a subheading?
-        FormHeader flow = FormHeader.createInstance("Presence of Flow");
+        FormElementTextSingleLine flow = new FormElementTextSingleLine().setTitle("Presence of Flow");
         FormElementTextNumber flowData = FormElementTextNumber.createInstance(); //what data type is this?
 
-        FormHeader odor = FormHeader.createInstance("Unusual Odor");
+        FormElementTextSingleLine odor = new FormElementTextSingleLine().setTitle("Unusual Odor");
         FormElementTextNumber odorData = FormElementTextNumber.createInstance();
 
-        FormHeader color = FormHeader.createInstance("Unusual Color");
+        FormElementTextSingleLine color = new FormElementTextSingleLine().setTitle("Unusual Color");
         FormElementTextNumber colorData = FormElementTextNumber.createInstance();
 
-        FormHeader polutants = FormHeader.createInstance("Polutants Nearby");
+        FormElementTextSingleLine polutants = new FormElementTextSingleLine().setTitle("Polutants Nearby");
         FormElementTextNumber polutantsData = FormElementTextNumber.createInstance();
 
-        FormHeader obstruction = FormHeader.createInstance("Obstruction");
+        FormElementTextSingleLine obstruction = new FormElementTextSingleLine().setTitle("Obstruction");
         FormElementTextNumber obstructionData = FormElementTextNumber.createInstance();
 
-        FormHeader maintenance = FormHeader.createInstance("Needs Maintenance");
+        FormElementTextSingleLine maintenance = new FormElementTextSingleLine().setTitle("Needs Maintenance");
         FormElementTextNumber maintenanceData = FormElementTextNumber.createInstance();
 
-        FormHeader screen = FormHeader.createInstance("Screen OK");
+        FormElementTextSingleLine screen = new FormElementTextSingleLine().setTitle("Screen OK");
         FormElementTextNumber screenData = FormElementTextNumber.createInstance();
 
-
         List<BaseFormElement> formItems = new ArrayList<>();
 
         formItems.add(flow);
@@ -79,6 +79,5 @@ private void setupForm() {
         formItems.add(screenData);
 
         formBuilder.addFormElements(formItems);
-
     }
 }