added segmented control to waterway form,fixed navigation, updated gr…

…adle

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'

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

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

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

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