From fcf07769c41daa33a25fa71ccc9fa2843181028a Mon Sep 17 00:00:00 2001
From: Samuelford24 <Samuelford48@gmail.com>
Date: Sat, 20 Mar 2021 22:01:26 -0400
Subject: [PATCH 1/2] added segmented control to waterway form,fixed
 navigation, updated gradle

---
 .idea/jarRepositories.xml                     |   5 +
 app/build.gradle                              |   1 +
 .../InspectionForm.java                       |   1 +
 .../WaterWay/WaterWayForm.java                |   5 +-
 .../WaterWay/WaterWayFormFragment.java        | 115 ++++-
 .../WaterWay/WaterWayNav.java                 | 117 ++++-
 app/src/main/res/layout/fragment_wwform.xml   | 115 ++++-
 app/src/main/res/menu/waterway_menu.xml       |   8 +
 app/src/main/res/values/colors.xml            | 481 ++++++++++++++++++
 build.gradle                                  |   4 +-
 10 files changed, 821 insertions(+), 31 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..2370474 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index eea8c58..e22b778 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     implementation 'me.riddhimanadib.form-master:form-master:1.1.0'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.firebase:firebase-auth:19.4.0'
+    implementation 'com.github.addisonelliott:SegmentedButton:3.1.9'
     implementation 'com.google.firebase:firebase-firestore:21.6.0'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java
index 9e8a740..b1d39b2 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java
@@ -174,6 +174,7 @@ private void setupForm() {
             String projectManager = projectManagerTextField.getValue();
             String siteManager = siteManagerTextField.getValue();
             String projectOwner = projectOwnerTextField.getValue();
+
             answersList.add(projectManager);
             answersList.add(siteManager);
             answersList.add(projectOwner);
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
index a797f99..0d5fc0a 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
@@ -22,8 +22,8 @@ public class WaterWayForm extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_sample_fordm);
-        recyclerView = findViewById(R.id.recyclerView2);
+        setContentView(R.layout.fragment_wwform);
+        recyclerView = findViewById(R.id.rvWWF);
         setupForm();
     }
 
@@ -72,5 +72,6 @@ private void setupForm() {
         formItems.add(element19);
         formBuilder.addFormElements(formItems);
 
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java
index 6663fd4..2947c7e 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java
@@ -9,41 +9,114 @@
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.sf.stormwaterutilityandroid.R;
 import com.sf.stormwaterutilityandroid.SampleFordm;
 
+import java.util.ArrayList;
+import java.util.List;
 
-public class WaterWayFormFragment extends Fragment {
-
+import me.riddhimanadib.formmaster.FormBuilder;
+import me.riddhimanadib.formmaster.model.BaseFormElement;
+import me.riddhimanadib.formmaster.model.FormElementTextNumber;
 
 
-   Button b1,b2,b3,b4,b5;
+public class WaterWayFormFragment extends Fragment {
+RecyclerView recyclerView;
+ FormBuilder formBuilder;
+ Button gen,dws,ct,bm,hq;
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
 
-        View root = inflater.inflate(R.layout.fragment_home, container, false);
-       b1 = root.findViewById(R.id.button);
-       b1.setOnClickListener(new View.OnClickListener() {
-           @Override
-           public void onClick(View view) {
-               startActivity(new Intent(getContext(), SampleFordm.class));
-           }
-       });
-
-        //CHeck To5a.03 project for dealing saved instance state
-        /*
-        if (savedInstanceState != null) {
-                String allPreviousLifecycleCallbacks = savedInstanceState
-                        .getString("Email");
-                System.out.println("SavedInstanceState: "+allPreviousLifecycleCallbacks);
-                element11.setValue(allPreviousLifecycleCallbacks);
-            }
-*/
+        View root = inflater.inflate(R.layout.fragment_wwform, container, false);
+        recyclerView = root.findViewById(R.id.rvWWF);
+        setupForm();
+   gen = root.findViewById(R.id.gen);
+   dws = root.findViewById(R.id.dws);
+   ct = root.findViewById(R.id.ct);
+   bm = root.findViewById(R.id.bm);
+   hq = root.findViewById(R.id.hq);
+   gen.setOnClickListener(new View.OnClickListener() {
+       @Override
+       public void onClick(View v) {
+
+       }
+   });
+   dws.setOnClickListener(new View.OnClickListener() {
+       @Override
+       public void onClick(View v) {
+
+       }
+   });
+   ct.setOnClickListener(new View.OnClickListener() {
+       @Override
+       public void onClick(View v) {
+
+
+       }
+   });
+   bm.setOnClickListener(new View.OnClickListener() {
+       @Override
+       public void onClick(View v) {
+
+       }
+   });
+   hq.setOnClickListener(new View.OnClickListener() {
+       @Override
+       public void onClick(View v) {
+           
+       }
+   });
         return root;
     }
 
+    private void setupForm() {
+
+
+        formBuilder = new FormBuilder(getContext(), 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
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayNav.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayNav.java
index b851df5..c3a8b6b 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayNav.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayNav.java
@@ -51,4 +51,119 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             return false;
         }
     };
-};
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        // Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        //setSupportActionBar(toolbar);
+
+
+        BottomNavigationView navigation = findViewById(R.id.navigation);
+        navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
+        //  fm.beginTransaction().add(R.id.main_container, fragment5, "5").hide(fragment5).commit();
+        //  fm.beginTransaction().add(R.id.main_container, fragment4, "4").hide(fragment4).commit();
+
+        fm.beginTransaction().add(R.id.main_container, fragment2, "2").hide(fragment2).commit();
+        fm.beginTransaction().add(R.id.main_container, fragment1, "1").commit();
+
+    }
+
+  /*  @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        signout2 = (Button) findViewById(R.id.sign_out);
+
+        signout2.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                FirebaseAuth.getInstance().signOut();
+                startActivity(new Intent(com.samuelford48gmail.thsconnect.teacher.MainActivity.this, LoginActivity.class));
+                finish();
+            }
+        });
+
+
+        mTextMessage = (TextView) findViewById(R.id.message);
+        BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navigation);
+        navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
+
+    }
+
+    FirebaseAuth.AuthStateListener authListener = new FirebaseAuth.AuthStateListener() {
+        @SuppressLint("SetTextI18n")
+        @Override
+        public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
+            FirebaseUser user = firebaseAuth.getCurrentUser();
+            if (user == null) {
+                // user auth state is changed - user is null
+                // launch login activity
+                startActivity(new Intent(com.samuelford48gmail.thsconnect.teacher.MainActivity.this, LoginActivity.class));
+                finish();
+            }
+        }
+
+
+    };
+    // public void signout (View v){
+    //    signOut();
+    //}
+/*
+    public void signOut() {
+        auth.signOut();
+
+
+// this listener will be called when there is change in firebase user session
+       FirebaseAuth.AuthStateListener authListener = new FirebaseAuth.AuthStateListener() {
+            @Override
+            public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
+                FirebaseUser user = firebaseAuth.getCurrentUser();
+                if (user == null) {
+                    // user auth state is changed - user is null
+                    // launch login activity
+                    startActivity(new Intent(com.samuelford48gmail.thsconnect.teacher.MainActivity.this, LoginActivity.class));
+                    finish();
+                }
+            }
+        };
+
+    }
+
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        auth.addAuthStateListener(authListener);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (authListener != null) {
+            auth.removeAuthStateListener(authListener);
+        }
+    */
+  /*@Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+      getMenuInflater().inflate(R.menu., menu);
+      return super.onCreateOptionsMenu(menu);
+  }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        if (id == R.id.action_settings) {
+            startActivity(new Intent(com.samuelford48gmail.thsconnect.teacher.MainActivity.this, SettingsActivity.class));
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+*/
+}
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_wwform.xml b/app/src/main/res/layout/fragment_wwform.xml
index f3062b4..27bbcca 100644
--- a/app/src/main/res/layout/fragment_wwform.xml
+++ b/app/src/main/res/layout/fragment_wwform.xml
@@ -1,14 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.addisonelliott.segmentedbutton.SegmentedButtonGroup
+
+        android:id="@+id/buttonGroup_vectorDrawable"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="4dp"
+        android:weightSum="3"
+        app:borderColor="@color/indigo_800"
+        app:borderWidth="1dp"
+        app:draggable="true"
+        app:layout_constraintBottom_toTopOf="@+id/rvWWF"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:radius="12dp"
+        app:ripple="true"
+        app:rippleColor="@color/indigo_800"
+        app:selectedBackground="@color/indigo_800">
+
+        <com.addisonelliott.segmentedbutton.SegmentedButton
+            android:id="@+id/gen"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            app:drawable="@drawable/common_google_signin_btn_icon_dark_normal"
+            app:drawableGravity="top"
+            app:drawablePadding="4dp"
+            app:drawableTint="@color/indigo_800"
+            app:selectedDrawableTint="@color/white"
+            app:selectedTextColor="@color/white"
+            app:text="Gen"
+            app:textColor="@color/indigo_800"
+            app:textSize="18sp" />
+        <com.addisonelliott.segmentedbutton.SegmentedButton
+            android:id="@+id/dws"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            app:drawable="@drawable/common_google_signin_btn_icon_dark_normal"
+            app:drawableGravity="top"
+            app:drawablePadding="4dp"
+            app:drawableTint="@color/indigo_800"
+            app:selectedDrawableTint="@color/white"
+            app:selectedTextColor="@color/white"
+            app:text="DWS"
+            app:textColor="@color/indigo_800"
+            app:textSize="18sp" />
+        <com.addisonelliott.segmentedbutton.SegmentedButton
+            android:id="@+id/ct"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            app:drawable="@drawable/common_google_signin_btn_icon_dark_normal"
+            app:drawableGravity="top"
+            app:drawablePadding="4dp"
+            app:drawableTint="@color/indigo_800"
+            app:selectedDrawableTint="@color/white"
+            app:selectedTextColor="@color/white"
+            app:text="CT"
+            app:textColor="@color/indigo_800"
+            app:textSize="18sp" />
+        <com.addisonelliott.segmentedbutton.SegmentedButton
+            android:id="@+id/bm"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            app:drawable="@drawable/common_google_signin_btn_icon_dark_normal"
+            app:drawableGravity="top"
+            app:drawablePadding="4dp"
+            app:drawableTint="@color/indigo_800"
+            app:selectedDrawableTint="@color/white"
+            app:selectedTextColor="@color/white"
+            app:text="BM"
+            app:textColor="@color/indigo_800"
+            app:textSize="18sp" />
+
+        <com.addisonelliott.segmentedbutton.SegmentedButton
+            android:id="@+id/hq"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            app:drawable="@drawable/common_google_signin_btn_icon_dark_normal"
+            app:drawableGravity="top"
+            app:drawablePadding="4dp"
+            app:drawableTint="@color/indigo_800"
+            app:selectedDrawableTint="@color/white"
+            app:selectedTextColor="@color/white"
+            app:text="HQ"
+            app:textColor="@color/indigo_800"
+            app:textSize="18sp" />
+
+    </com.addisonelliott.segmentedbutton.SegmentedButtonGroup>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvWWF"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:layout_editor_absoluteX="206dp"
-        tools:layout_editor_absoluteY="312dp" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="14dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonGroup_vectorDrawable" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/waterway_menu.xml b/app/src/main/res/menu/waterway_menu.xml
index fe187c0..97a3a2d 100644
--- a/app/src/main/res/menu/waterway_menu.xml
+++ b/app/src/main/res/menu/waterway_menu.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/waterWayHome"
+        android:icon="@drawable/ic_home_black_24dp"
+        android:title="@string/title_home" />
 
+    <item
+        android:id="@+id/waterWayReports"
+        android:icon="@drawable/ic_dashboard_black_24dp"
+        android:title="Reports" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6fde8eb..46c9cf6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,4 +10,485 @@
     <color name="colorPrimary">#6200EE</color>
     <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#03DAC5</color>
+
+
+
+
+    -- http://www.google.com/design/spec/style/color.html#color-color-palette -->
+
+    <!-- Red -->
+    <color name="red_50">#FFEBEE</color>
+    <color name="red_100">#FFCDD2</color>
+    <color name="red_200">#EF9A9A</color>
+    <color name="red_300">#E57373</color>
+    <color name="red_400">#EF5350</color>
+    <color name="red_500">#F44336</color>
+    <color name="red_600">#E53935</color>
+    <color name="red_700">#D32F2F</color>
+    <color name="red_800">#C62828</color>
+    <color name="red_900">#B71C1C</color>
+    <color name="red_A100">#FF8A80</color>
+    <color name="red_A200">#FF5252</color>
+    <color name="red_A400">#FF1744</color>
+    <color name="red_A700">#D50000</color>
+
+    <!-- Red -->
+
+    <!-- Pink -->
+    <color name="pink_50">#FCE4EC</color>
+    <color name="pink_100">#F8BBD0</color>
+    <color name="pink_200">#F48FB1</color>
+    <color name="pink_300">#F06292</color>
+    <color name="pink_400">#EC407A</color>
+    <color name="pink_500">#E91E63</color>
+    <color name="pink_600">#D81B60</color>
+    <color name="pink_700">#C2185B</color>
+    <color name="pink_800">#AD1457</color>
+    <color name="pink_900">#880E4F</color>
+    <color name="pink_A100">#FF80AB</color>
+    <color name="pink_A200">#FF4081</color>
+    <color name="pink_A400">#F50057</color>
+    <color name="pink_A700">#C51162</color>
+    <!-- Pink -->
+
+    <!-- Purple -->
+    <color name="purple_50">#F3E5F5</color>
+    <color name="purple_100">#E1BEE7</color>
+
+    <color name="purple_300">#BA68C8</color>
+    <color name="purple_400">#AB47BC</color>
+
+    <color name="purple_600">#8E24AA</color>
+
+    <color name="purple_800">#6A1B9A</color>
+    <color name="purple_900">#4A148C</color>
+    <color name="purple_A100">#EA80FC</color>
+    <color name="purple_A200">#E040FB</color>
+    <color name="purple_A400">#D500F9</color>
+    <color name="purple_A700">#AA00FF</color>
+    <!-- Purple -->
+
+    <!-- Deep Purple -->
+    <color name="dark_purple_50">#EDE7F6</color>
+    <color name="dark_purple_100">#D1C4E9</color>
+    <color name="dark_purple_200">#B39DDB</color>
+    <color name="dark_purple_300">#9575CD</color>
+    <color name="dark_purple_400">#7E57C2</color>
+    <color name="dark_purple_500">#673AB7</color>
+    <color name="dark_purple_600">#5E35B1</color>
+    <color name="dark_purple_700">#512DA8</color>
+    <color name="dark_purple_800">#4527A0</color>
+    <color name="dark_purple_900">#311B92</color>
+    <color name="dark_purple_A100">#B388FF</color>
+    <color name="dark_purple_A200">#7C4DFF</color>
+    <color name="dark_purple_A400">#651FFF</color>
+    <color name="dark_purple_A700">#6200EA</color>
+    <!-- Deep Purple -->
+
+    <!-- Indigo -->
+    <color name="indigo_50">#E8EAF6</color>
+    <color name="indigo_100">#C5CAE9</color>
+    <color name="indigo_200">#9FA8DA</color>
+    <color name="indigo_300">#7986CB</color>
+    <color name="indigo_400">#5C6BC0</color>
+    <color name="indigo_500">#3F51B5</color>
+    <color name="indigo_600">#3949AB</color>
+    <color name="indigo_700">#303F9F</color>
+    <color name="indigo_800">#283593</color>
+    <color name="indigo_900">#1A237E</color>
+    <color name="indigo_A100">#8C9EFF</color>
+    <color name="indigo_A200">#536DFE</color>
+    <color name="indigo_A400">#3D5AFE</color>
+    <color name="indigo_A700">#304FFE</color>
+    <!-- Indigo -->
+
+    <!-- Blue -->
+    <color name="blue_50">#E3F2FD</color>
+    <color name="blue_100">#BBDEFB</color>
+    <color name="blue_200">#90CAF9</color>
+    <color name="blue_300">#64B5F6</color>
+    <color name="blue_400">#42A5F5</color>
+    <color name="blue_500">#2196F3</color>
+    <color name="blue_600">#1E88E5</color>
+    <color name="blue_700">#1976D2</color>
+    <color name="blue_800">#1565C0</color>
+    <color name="blue_900">#0D47A1</color>
+    <color name="blue_A100">#82B1FF</color>
+    <color name="blue_A200">#448AFF</color>
+    <color name="blue_A400">#2979FF</color>
+    <color name="blue_A700">#2962FF</color>
+    <!-- Blue -->
+
+    <!-- Light Blue -->
+    <color name="light_blue_50">#E1F5FE</color>
+    <color name="light_blue_100">#B3E5FC</color>
+    <color name="light_blue_200">#81D4FA</color>
+    <color name="light_blue_300">#4FC3F7</color>
+    <color name="light_blue_400">#29B6F6</color>
+    <color name="light_blue_500">#03A9F4</color>
+    <color name="light_blue_600">#039BE5</color>
+    <color name="light_blue_700">#0288D1</color>
+    <color name="light_blue_800">#0277BD</color>
+    <color name="light_blue_900">#01579B</color>
+    <color name="light_blue_A100">#80D8FF</color>
+    <color name="light_blue_A200">#40C4FF</color>
+    <color name="light_blue_A400">#00B0FF</color>
+    <color name="light_blue_A700">#0091EA</color>
+    <!-- Light Blue -->
+
+    <!-- Cyan -->
+    <color name="cyan_50">#E0F7FA</color>
+    <color name="cyan_100">#B2EBF2</color>
+    <color name="cyan_200">#80DEEA</color>
+    <color name="cyan_300">#4DD0E1</color>
+    <color name="cyan_400">#26C6DA</color>
+    <color name="cyan_500">#00BCD4</color>
+    <color name="cyan_600">#00ACC1</color>
+    <color name="cyan_700">#0097A7</color>
+    <color name="cyan_800">#00838F</color>
+    <color name="cyan_900">#006064</color>
+    <color name="cyan_A100">#84FFFF</color>
+    <color name="cyan_A200">#18FFFF</color>
+    <color name="cyan_A400">#00E5FF</color>
+    <color name="cyan_A700">#00B8D4</color>
+    <!-- Cyan -->
+
+
+    <color name="ateal_100">#aab2dfdb</color>
+    <!-- Teal -->
+    <color name="teal_50">#E0F2F1</color>
+    <color name="teal_100">#B2DFDB</color>
+
+    <color name="teal_300">#4DB6AC</color>
+    <color name="teal_400">#26A69A</color>
+    <color name="teal_500">#009688</color>
+    <color name="teal_600">#00897B</color>
+
+    <color name="teal_800">#00695C</color>
+    <color name="teal_900">#004D40</color>
+    <color name="teal_A100">#A7FFEB</color>
+    <color name="teal_A200">#64FFDA</color>
+    <color name="teal_A400">#1DE9B6</color>
+    <color name="teal_A700">#00BFA5</color>
+    <!-- Teal -->
+
+    <!-- Green -->
+    <color name="green_50">#E8F5E9</color>
+    <color name="green_100">#C8E6C9</color>
+    <color name="green_200">#A5D6A7</color>
+    <color name="green_300">#81C784</color>
+    <color name="green_400">#66BB6A</color>
+    <color name="green_500">#4CAF50</color>
+    <color name="green_600">#43A047</color>
+    <color name="green_700">#388E3C</color>
+    <color name="green_800">#2E7D32</color>
+    <color name="green_900">#1B5E20</color>
+    <color name="green_A100">#B9F6CA</color>
+    <color name="green_A200">#69F0AE</color>
+    <color name="green_A400">#00E676</color>
+    <color name="green_A700">#00C853</color>
+    <!-- Green -->
+
+    <!-- Light Green -->
+    <color name="light_green_50">#F1F8E9</color>
+    <color name="light_green_100">#DCEDC8</color>
+    <color name="light_green_200">#C5E1A5</color>
+    <color name="light_green_300">#AED581</color>
+    <color name="light_green_400">#9CCC65</color>
+    <color name="light_green_500">#8BC34A</color>
+    <color name="light_green_600">#7CB342</color>
+    <color name="light_green_700">#689F38</color>
+    <color name="light_green_800">#558B2F</color>
+    <color name="light_green_900">#33691E</color>
+    <color name="light_green_A100">#CCFF90</color>
+    <color name="light_green_A200">#B2FF59</color>
+    <color name="light_green_A400">#76FF03</color>
+    <color name="light_green_A700">#64DD17</color>
+    <!-- Light Green -->
+
+    <!-- Lime -->
+    <color name="lime_50">#F9FBE7</color>
+    <color name="lime_100">#F0F4C3</color>
+    <color name="lime_200">#E6EE9C</color>
+    <color name="lime_300">#DCE775</color>
+    <color name="lime_400">#D4E157</color>
+    <color name="lime_500">#CDDC39</color>
+    <color name="lime_600">#C0CA33</color>
+    <color name="lime_700">#AFB42B</color>
+    <color name="lime_800">#9E9D24</color>
+    <color name="lime_900">#827717</color>
+    <color name="lime_A100">#F4FF81</color>
+    <color name="lime_A200">#EEFF41</color>
+    <color name="lime_A400">#C6FF00</color>
+    <color name="lime_A700">#AEEA00</color>
+    <!-- Lime -->
+
+    <!-- Yellow -->
+    <color name="yellow_50">#FFFDE7</color>
+    <color name="yellow_100">#FFF9C4</color>
+    <color name="yellow_200">#FFF59D</color>
+    <color name="yellow_300">#FFF176</color>
+    <color name="yellow_400">#FFEE58</color>
+    <color name="yellow_500">#FFEB3B</color>
+    <color name="yellow_600">#FDD835</color>
+    <color name="yellow_700">#FBC02D</color>
+    <color name="yellow_800">#F9A825</color>
+    <color name="yellow_900">#F57F17</color>
+    <color name="yellow_A100">#FFFF8D</color>
+    <color name="yellow_A200">#FFFF00</color>
+    <color name="yellow_A400">#FFEA00</color>
+    <color name="yellow_A700">#FFD600</color>
+    <!-- Yellow -->
+
+    <!-- Amber -->
+    <color name="amber_50">#FFF8E1</color>
+    <color name="amber_100">#FFECB3</color>
+    <color name="amber_200">#FFE082</color>
+    <color name="amber_300">#FFD54F</color>
+    <color name="amber_400">#FFCA28</color>
+    <color name="amber_500">#FFC107</color>
+    <color name="amber_600">#FFB300</color>
+    <color name="amber_700">#FFA000</color>
+    <color name="amber_800">#FF8F00</color>
+    <color name="amber_900">#FF6F00</color>
+    <color name="amber_A100">#FFE57F</color>
+    <color name="amber_A200">#FFD740</color>
+    <color name="amber_A400">#FFC400</color>
+    <color name="amber_A700">#FFAB00</color>
+    <!-- Amber -->
+
+    <!-- Orange -->
+    <color name="orange_50">#FFF3E0</color>
+    <color name="orange_100">#FFE0B2</color>
+    <color name="orange_200">#FFCC80</color>
+    <color name="orange_300">#FFB74D</color>
+    <color name="orange_400">#FFA726</color>
+    <color name="orange_500">#FF9800</color>
+    <color name="orange_600">#FB8C00</color>
+    <color name="orange_700">#F57C00</color>
+    <color name="orange_800">#EF6C00</color>
+    <color name="orange_900">#E65100</color>
+    <color name="orange_A100">#FFD180</color>
+    <color name="orange_A200">#FFAB40</color>
+    <color name="orange_A400">#FF9100</color>
+    <color name="orange_A700">#FF6D00</color>
+    <!-- Orange -->
+
+    <!-- Deep Orange -->
+    <color name="deep_orange_50">#FBE9E7</color>
+    <color name="deep_orange_100">#FFCCBC</color>
+    <color name="deep_orange_200">#FFAB91</color>
+    <color name="deep_orange_300">#FF8A65</color>
+    <color name="deep_orange_400">#FF7043</color>
+    <color name="deep_orange_500">#FF5722</color>
+    <color name="deep_orange_600">#F4511E</color>
+    <color name="deep_orange_700">#E64A19</color>
+    <color name="deep_orange_800">#D84315</color>
+    <color name="deep_orange_900">#BF360C</color>
+    <color name="deep_orange_A100">#FF9E80</color>
+    <color name="deep_orange_A200">#FF6E40</color>
+    <color name="deep_orange_A400">#FF3D00</color>
+    <color name="deep_orange_A700">#DD2C00</color>
+    <!-- Deep Orange -->
+
+    <!-- Brown -->
+    <color name="brown_50">#EFEBE9</color>
+    <color name="brown_100">#D7CCC8</color>
+    <color name="brown_200">#BCAAA4</color>
+    <color name="brown_300">#A1887F</color>
+    <color name="brown_400">#8D6E63</color>
+    <color name="brown_500">#795548</color>
+    <color name="brown_600">#6D4C41</color>
+    <color name="brown_700">#5D4037</color>
+    <color name="brown_800">#4E342E</color>
+    <color name="brown_900">#3E2723</color>
+    <!-- Brown -->
+
+    <!-- Grey -->
+    <color name="grey_50">#FAFAFA</color>
+    <color name="grey_100">#F5F5F5</color>
+    <color name="grey_200">#EEEEEE</color>
+    <color name="grey_300">#E0E0E0</color>
+    <color name="grey_400">#BDBDBD</color>
+    <color name="grey_500">#9E9E9E</color>
+    <color name="grey_600">#757575</color>
+    <color name="grey_700">#616161</color>
+    <color name="grey_800">#424242</color>
+    <color name="grey_900">#212121</color>
+
+    <color name="agrey">#aa9e9e9e</color>
+
+    <!-- Grey -->
+
+    <!-- Blue Grey -->
+    <color name="blue_grey_50">#ECEFF1</color>
+    <color name="blue_grey_100">#CFD8DC</color>
+    <color name="blue_grey_200">#B0BEC5</color>
+    <color name="blue_grey_300">#90A4AE</color>
+    <color name="blue_grey_400">#78909C</color>
+    <color name="blue_grey_500">#607D8B</color>
+    <color name="blue_grey_600">#546E7A</color>
+    <color name="blue_grey_700">#455A64</color>
+    <color name="blue_grey_800">#37474F</color>
+    <color name="blue_grey_900">#263238</color>
+    <!-- Blue Grey -->
+
+
+    <!-- Mixed Colors -->
+    <color name="yellow">#FFFF00</color>
+    <color name="fuchsia">#FF00FF</color>
+    <color name="red">#FF0000</color>
+    <color name="silver">#C0C0C0</color>
+    <color name="gray">#808080</color>
+    <color name="olive">#808000</color>
+    <color name="purple">#800080</color>
+    <color name="maroon">#800000</color>
+    <color name="aqua">#00FFFF</color>
+    <color name="lime">#00FF00</color>
+    <color name="teal">#008080</color>
+    <color name="green">#008000</color>
+    <color name="blue">#0000FF</color>
+    <color name="navy">#000080</color>
+    <color name="White">#FFFFFF</color>
+    <color name="Ivory">#FFFFF0</color>
+    <color name="LightYellow">#FFFFE0</color>
+    <color name="Yellow">#FFFF00</color>
+    <color name="Snow">#FFFAFA</color>
+    <color name="FloralWhite">#FFFAF0</color>
+    <color name="LemonChiffon">#FFFACD</color>
+    <color name="Cornsilk">#FFF8DC</color>
+    <color name="Seashell">#FFF5EE</color>
+    <color name="LavenderBlush">#FFF0F5</color>
+    <color name="PapayaWhip">#FFEFD5</color>
+    <color name="BlanchedAlmond">#FFEBCD</color>
+    <color name="MistyRose">#FFE4E1</color>
+    <color name="Bisque">#FFE4C4</color>
+    <color name="Moccasin">#FFE4B5</color>
+    <color name="NavajoWhite">#FFDEAD</color>
+    <color name="PeachPuff">#FFDAB9</color>
+    <color name="Gold">#FFD700</color>
+    <color name="Pink">#FFC0CB</color>
+    <color name="LightPink">#FFB6C1</color>
+    <color name="Orange">#FFA500</color>
+    <color name="LightSalmon">#FFA07A</color>
+    <color name="DarkOrange">#FF8C00</color>
+    <color name="Coral">#FF7F50</color>
+    <color name="HotPink">#FF69B4</color>
+    <color name="Tomato">#FF6347</color>
+    <color name="OrangeRed">#FF4500</color>
+    <color name="DeepPink">#FF1493</color>
+    <color name="Fuchsia">#FF00FF</color>
+    <color name="Magenta">#FF00FF</color>
+    <color name="Red">#FF0000</color>
+    <color name="OldLace">#FDF5E6</color>
+    <color name="LightGoldenrodYellow">#FAFAD2</color>
+    <color name="Linen">#FAF0E6</color>
+    <color name="AntiqueWhite">#FAEBD7</color>
+    <color name="Salmon">#FA8072</color>
+    <color name="GhostWhite">#F8F8FF</color>
+    <color name="MintCream">#F5FFFA</color>
+    <color name="WhiteSmoke">#F5F5F5</color>
+    <color name="Beige">#F5F5DC</color>
+    <color name="Wheat">#F5DEB3</color>
+    <color name="SandyBrown">#F4A460</color>
+    <color name="Azure">#F0FFFF</color>
+    <color name="Honeydew">#F0FFF0</color>
+    <color name="AliceBlue">#F0F8FF</color>
+    <color name="Khaki">#F0E68C</color>
+    <color name="LightCoral">#F08080</color>
+    <color name="PaleGoldenrod">#EEE8AA</color>
+    <color name="Violet">#EE82EE</color>
+    <color name="DarkSalmon">#E9967A</color>
+    <color name="Lavender">#E6E6FA</color>
+    <color name="LightCyan">#E0FFFF</color>
+    <color name="BurlyWood">#DEB887</color>
+    <color name="Plum">#DDA0DD</color>
+    <color name="Gainsboro">#DCDCDC</color>
+    <color name="Crimson">#DC143C</color>
+    <color name="PaleVioletRed">#DB7093</color>
+    <color name="Goldenrod">#DAA520</color>
+    <color name="Orchid">#DA70D6</color>
+    <color name="Thistle">#D8BFD8</color>
+    <color name="LightGrey">#D3D3D3</color>
+    <color name="Tan">#D2B48C</color>
+    <color name="Chocolate">#D2691E</color>
+    <color name="Peru">#CD853F</color>
+    <color name="IndianRed">#CD5C5C</color>
+    <color name="MediumVioletRed">#C71585</color>
+    <color name="Silver">#C0C0C0</color>
+    <color name="DarkKhaki">#BDB76B</color>
+    <color name="RosyBrown">#BC8F8F</color>
+    <color name="MediumOrchid">#BA55D3</color>
+    <color name="DarkGoldenrod">#B8860B</color>
+    <color name="FireBrick">#B22222</color>
+    <color name="PowderBlue">#B0E0E6</color>
+    <color name="LightSteelBlue">#B0C4DE</color>
+    <color name="PaleTurquoise">#AFEEEE</color>
+    <color name="GreenYellow">#ADFF2F</color>
+    <color name="LightBlue">#ADD8E6</color>
+    <color name="DarkGray">#A9A9A9</color>
+    <color name="Brown">#A52A2A</color>
+    <color name="Sienna">#A0522D</color>
+    <color name="YellowGreen">#9ACD32</color>
+    <color name="DarkOrchid">#9932CC</color>
+    <color name="PaleGreen">#98FB98</color>
+    <color name="DarkViolet">#9400D3</color>
+    <color name="MediumPurple">#9370DB</color>
+    <color name="LightGreen">#90EE90</color>
+    <color name="DarkSeaGreen">#8FBC8F</color>
+    <color name="SaddleBrown">#8B4513</color>
+    <color name="DarkMagenta">#8B008B</color>
+    <color name="DarkRed">#8B0000</color>
+    <color name="BlueViolet">#8A2BE2</color>
+    <color name="LightSkyBlue">#87CEFA</color>
+    <color name="SkyBlue">#87CEEB</color>
+    <color name="Gray">#808080</color>
+    <color name="Olive">#808000</color>
+    <color name="Purple">#800080</color>
+    <color name="Maroon">#800000</color>
+    <color name="Aquamarine">#7FFFD4</color>
+    <color name="Chartreuse">#7FFF00</color>
+    <color name="LawnGreen">#7CFC00</color>
+    <color name="MediumSlateBlue">#7B68EE</color>
+    <color name="Indigo">#4B0082</color>
+    <color name="LightSlateGray">#778899</color>
+    <color name="SlateGray">#708090</color>
+    <color name="OliveDrab">#6B8E23</color>
+    <color name="SlateBlue">#6A5ACD</color>
+    <color name="DimGray">#696969</color>
+    <color name="MediumAquamarine">#66CDAA</color>
+    <color name="CornflowerBlue">#6495ED</color>
+    <color name="CadetBlue">#5F9EA0</color>
+    <color name="DarkOliveGreen">#556B2F</color>
+    <color name="MediumTurquoise">#48D1CC</color>
+    <color name="DarkSlateBlue">#483D8B</color>
+    <color name="SteelBlue">#4682B4</color>
+    <color name="RoyalBlue">#4169E1</color>
+    <color name="Turquoise">#40E0D0</color>
+    <color name="MediumSeaGreen">#3CB371</color>
+    <color name="LimeGreen">#32CD32</color>
+    <color name="DarkSlateGray">#2F4F4F</color>
+    <color name="SeaGreen">#2E8B57</color>
+    <color name="ForestGreen">#228B22</color>
+    <color name="LightSeaGreen">#20B2AA</color>
+    <color name="DodgerBlue">#1E90FF</color>
+    <color name="MidnightBlue">#191970</color>
+    <color name="Aqua">#00FFFF</color>
+    <color name="Cyan">#00FFFF</color>
+    <color name="SpringGreen">#00FF7F</color>
+    <color name="Lime">#00FF00</color>
+    <color name="MediumSpringGreen">#00FA9A</color>
+    <color name="DarkTurquoise">#00CED1</color>
+    <color name="DeepSkyBlue">#00BFFF</color>
+    <color name="DarkCyan">#008B8B</color>
+    <color name="Teal">#008080</color>
+    <color name="Green">#008000</color>
+    <color name="DarkGreen">#006400</color>
+    <color name="Blue">#0000FF</color>
+    <color name="MediumBlue">#0000CD</color>
+    <color name="DarkBlue">#00008B</color>
+    <color name="Navy">#000080</color>
+    <color name="Black">#000000</color>
+    <color name="dark_blue">#0000A0</color>
+    <!-- Mixed Colors -->
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index f1d7897..5346ccf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
+
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.1"
+        classpath "com.android.tools.build:gradle:4.1.2"
         classpath 'com.google.gms:google-services:4.3.4'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -15,6 +16,7 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url "https://jitpack.io" }
         google()
         jcenter()
     }

From 0bdce9b1579d09a844bfb6e54607f613192e6dde Mon Sep 17 00:00:00 2001
From: Samuelford24 <Samuelford48@gmail.com>
Date: Mon, 22 Mar 2021 21:36:19 -0400
Subject: [PATCH 2/2] restructured waterway form, completed navigation

---
 .../WaterWay/WaterWayFormFragment.java        | 238 +++++++++++++++---
 app/src/main/res/layout/fragment_wwform.xml   |  50 +++-
 2 files changed, 257 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java
index 2947c7e..e6487c2 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java
@@ -11,6 +11,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.addisonelliott.segmentedbutton.SegmentedButton;
 import com.sf.stormwaterutilityandroid.R;
 import com.sf.stormwaterutilityandroid.SampleFordm;
 
@@ -20,24 +21,62 @@
 import me.riddhimanadib.formmaster.FormBuilder;
 import me.riddhimanadib.formmaster.model.BaseFormElement;
 import me.riddhimanadib.formmaster.model.FormElementTextNumber;
+import me.riddhimanadib.formmaster.model.FormElementTextSingleLine;
+import me.riddhimanadib.formmaster.model.FormHeader;
 
 
 public class WaterWayFormFragment extends Fragment {
-RecyclerView recyclerView;
- FormBuilder formBuilder;
- Button gen,dws,ct,bm,hq;
+RecyclerView rvGen, rvDWS, rvHQ, rvBM,rvCT;
+ FormBuilder fbGEn,fbDWS,fbBM,fbHQ,fbCT;
+SegmentedButton gen,dws,ct,bm,hq;
+Button submit;
+Boolean boolgen,booldws,boolct,boolbm,boolhq;
+    List<BaseFormElement> formItemsHQ, formItemsGen, formItemsBM, formItemsCT, formItemsDWS;
+
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
 
         View root = inflater.inflate(R.layout.fragment_wwform, container, false);
-        recyclerView = root.findViewById(R.id.rvWWF);
-        setupForm();
+       //recylerViews for each piece of the form
+        submit = root.findViewById(R.id.submitForm);
+        rvGen = root.findViewById(R.id.rvWWF);
+        rvDWS = root.findViewById(R.id.rvDWS);
+        rvHQ = root.findViewById(R.id.rvHQ);
+        rvBM = root.findViewById(R.id.rvBM);
+        rvCT = root.findViewById(R.id.rvCT);
+
+        //making recyclerViews invisible
+        rvDWS.setVisibility(View.INVISIBLE);
+        rvHQ.setVisibility(View.INVISIBLE);
+        rvBM.setVisibility(View.INVISIBLE);
+        rvCT.setVisibility(View.INVISIBLE);
+        setupFormGen();
+        //Segemented Control Bar buttons
    gen = root.findViewById(R.id.gen);
    dws = root.findViewById(R.id.dws);
    ct = root.findViewById(R.id.ct);
    bm = root.findViewById(R.id.bm);
    hq = root.findViewById(R.id.hq);
+//setting booleans to false. If they are true, then an instance of the form section has been created.
+        boolbm = false;
+        boolct = false;
+        booldws = false;
+        boolhq = false;
+        boolgen = false;
    gen.setOnClickListener(new View.OnClickListener() {
+       @Override
+       public void onClick(View v) {
+           rvGen.setVisibility(View.VISIBLE);
+           rvDWS.setVisibility(View.INVISIBLE);
+           rvHQ.setVisibility(View.INVISIBLE);
+           rvBM.setVisibility(View.INVISIBLE);
+           rvCT.setVisibility(View.INVISIBLE);
+           if (!boolgen)
+           setupFormGen();
+
+       }
+   });
+   submit.setOnClickListener(new View.OnClickListener() {
        @Override
        public void onClick(View v) {
 
@@ -46,13 +85,26 @@ public void onClick(View v) {
    dws.setOnClickListener(new View.OnClickListener() {
        @Override
        public void onClick(View v) {
+           rvGen.setVisibility(View.INVISIBLE);
+           rvDWS.setVisibility(View.VISIBLE);
+           rvHQ.setVisibility(View.INVISIBLE);
+           rvBM.setVisibility(View.INVISIBLE);
+           rvCT.setVisibility(View.INVISIBLE);
+           if (!booldws)
+           setupFormDWS();
 
        }
    });
    ct.setOnClickListener(new View.OnClickListener() {
        @Override
        public void onClick(View v) {
-
+           rvGen.setVisibility(View.INVISIBLE);
+           rvDWS.setVisibility(View.INVISIBLE);
+           rvHQ.setVisibility(View.INVISIBLE);
+           rvBM.setVisibility(View.INVISIBLE);
+           rvCT.setVisibility(View.VISIBLE);
+           if (!boolct)
+           setupFormCT();
 
        }
    });
@@ -60,21 +112,39 @@ public void onClick(View v) {
        @Override
        public void onClick(View v) {
 
+           rvGen.setVisibility(View.INVISIBLE);
+           rvDWS.setVisibility(View.INVISIBLE);
+           rvHQ.setVisibility(View.INVISIBLE);
+           rvBM.setVisibility(View.VISIBLE);
+           rvCT.setVisibility(View.INVISIBLE);
+           if (!boolbm)
+           setupFormBM();
        }
    });
    hq.setOnClickListener(new View.OnClickListener() {
        @Override
        public void onClick(View v) {
-           
+
+           rvGen.setVisibility(View.INVISIBLE);
+           rvDWS.setVisibility(View.INVISIBLE);
+           rvHQ.setVisibility(View.VISIBLE);
+           rvBM.setVisibility(View.INVISIBLE);
+           rvCT.setVisibility(View.INVISIBLE);
+           if (!boolhq)
+               setupFormHQ();
        }
    });
         return root;
     }
 
-    private void setupForm() {
+    private void setupFormGen() {
+        boolgen = true;
 
 
-        formBuilder = new FormBuilder(getContext(), recyclerView);
+    }
+    private void setupFormHQ() {
+        boolhq = true;
+        fbHQ = new FormBuilder(getContext(),rvHQ);
         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");
@@ -94,29 +164,139 @@ private void setupForm() {
         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);
+         formItemsHQ = new ArrayList<>();
 
+        formItemsHQ.add(element2);
+        formItemsHQ.add(element3);
+        formItemsHQ.add(element4);
+        formItemsHQ.add(element5);
+        formItemsHQ.add(element6);
+        formItemsHQ.add(element7);
+        formItemsHQ.add(element8);
+        formItemsHQ.add(element9);
+        formItemsHQ.add(element10);
+        formItemsHQ.add(element11);
+        formItemsHQ.add(element12);
+        formItemsHQ.add(element13);
+        formItemsHQ.add(element14);
+        formItemsHQ.add(element15);
+        formItemsHQ.add(element16);
+        formItemsHQ.add(element17);
+        formItemsHQ.add(element18);
+        formItemsHQ.add(element19);
+        fbHQ.addFormElements(formItemsHQ);
 
     }
+    private void setupFormDWS() {
+        booldws = true;
+        fbDWS = new FormBuilder(getContext(), rvDWS);
+        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();
+        polutantsData.setTitle("Polutants Data");
+
+        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();
+
+        formItemsDWS = new ArrayList<>();
+
+        formItemsDWS.add(flow);
+        formItemsDWS.add(flowData);
+        formItemsDWS.add(odor);
+        formItemsDWS.add(odorData);
+        formItemsDWS.add(color);
+        formItemsDWS.add(colorData);
+        formItemsDWS.add(polutants);
+        formItemsDWS.add(polutantsData);
+        formItemsDWS.add(obstruction);
+        formItemsDWS.add(obstructionData);
+        formItemsDWS.add(maintenance);
+        formItemsDWS.add(maintenanceData);
+        formItemsDWS.add(screen);
+        formItemsDWS.add(screenData);
+
+        fbDWS.addFormElements(formItemsDWS);
+    }
+    private void setupFormCT() {
+        boolct = true;
+        fbCT = new FormBuilder(getContext(), rvCT);
+
+        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();
+
+       formItemsCT = new ArrayList<>();
+
+        formItemsCT.add(title);
+        formItemsCT.add(temperature);
+        formItemsCT.add(tempData);
+        formItemsCT.add(tubidity);
+        formItemsCT.add(tubidityData);
+        formItemsCT.add(pH);
+        formItemsCT.add(pHData);
+        formItemsCT.add(nitrate);
+        formItemsCT.add(nitrateData);
+        formItemsCT.add(phosphate);
+        formItemsCT.add(phosphateData);
+        formItemsCT.add(oxygen);
+        formItemsCT.add(oxygenData);
+        formItemsCT.add(coli);
+        formItemsCT.add(coliData);
+        formItemsCT.add(other1);
+        formItemsCT.add(other1Data);
+        formItemsCT.add(other2);
+        formItemsCT.add(other2Data);
+
+        fbCT.addFormElements(formItemsCT);
+
+    }
+    private void setupFormBM() {
+        boolbm = true;
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_wwform.xml b/app/src/main/res/layout/fragment_wwform.xml
index 27bbcca..0df8324 100644
--- a/app/src/main/res/layout/fragment_wwform.xml
+++ b/app/src/main/res/layout/fragment_wwform.xml
@@ -41,6 +41,7 @@
             app:text="Gen"
             app:textColor="@color/indigo_800"
             app:textSize="18sp" />
+
         <com.addisonelliott.segmentedbutton.SegmentedButton
             android:id="@+id/dws"
             android:layout_width="0dp"
@@ -56,6 +57,7 @@
             app:text="DWS"
             app:textColor="@color/indigo_800"
             app:textSize="18sp" />
+
         <com.addisonelliott.segmentedbutton.SegmentedButton
             android:id="@+id/ct"
             android:layout_width="0dp"
@@ -71,6 +73,7 @@
             app:text="CT"
             app:textColor="@color/indigo_800"
             app:textSize="18sp" />
+
         <com.addisonelliott.segmentedbutton.SegmentedButton
             android:id="@+id/bm"
             android:layout_width="0dp"
@@ -109,9 +112,52 @@
         android:id="@+id/rvWWF"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginBottom="14dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/submitForm"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonGroup_vectorDrawable" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvDWS"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/submitForm"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonGroup_vectorDrawable" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvCT"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/submitForm"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonGroup_vectorDrawable" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvBM"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/submitForm"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/buttonGroup_vectorDrawable" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvHQ"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/submitForm"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonGroup_vectorDrawable" />
+
+    <Button
+        android:id="@+id/submitForm"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:text="Submit"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rvWWF" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file