Merge branch 'master' into ibrahim

app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java

@@ -0,0 +1,83 @@
+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);
+        FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening");
+
+        //Outfall --> Question: How do you do a subheading?
+        FormElementTextSingleLine flow = new FormElementTextSingleLine().setTitle("Presence of Flow");
+        FormElementTextNumber flowData = FormElementTextNumber.createInstance(); //what data type is this?
+
+        FormElementTextSingleLine odor = new FormElementTextSingleLine().setTitle("Unusual Odor");
+        FormElementTextNumber odorData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine color = new FormElementTextSingleLine().setTitle("Unusual Color");
+        FormElementTextNumber colorData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine polutants = new FormElementTextSingleLine().setTitle("Polutants Nearby");
+        FormElementTextNumber polutantsData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine obstruction = new FormElementTextSingleLine().setTitle("Obstruction");
+        FormElementTextNumber obstructionData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine maintenance = new FormElementTextSingleLine().setTitle("Needs Maintenance");
+        FormElementTextNumber maintenanceData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine screen = new FormElementTextSingleLine().setTitle("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);
+    }
+}

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);
+
+    }
+
+}

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?
+
+        FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)");
+        FormElementTextNumber tubidityData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH");
+        FormElementTextNumber pHData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)");
+        FormElementTextNumber nitrateData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)");
+        FormElementTextNumber phosphateData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)");
+        FormElementTextNumber oxygenData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)");
+        FormElementTextNumber coliData = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1");
+        FormElementTextNumber other1Data = FormElementTextNumber.createInstance();
+
+        FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2");
+        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);
+
+    }
+}

app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java

@@ -0,0 +1,76 @@
+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;
+
+import me.riddhimanadib.formmaster.FormBuilder;
+import me.riddhimanadib.formmaster.model.BaseFormElement;
+import me.riddhimanadib.formmaster.model.FormElementTextNumber;
+
+public class WaterWayForm 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);
+
+    }
+}

build.gradle

@@ -5,9 +5,13 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.1"
+
+
         classpath 'com.google.gms:google-services:4.3.5'
 
+        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
     }