diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..c6e7f40 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +StormWaterUtilityAndroid \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0947cea..6b5108f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,13 +20,14 @@ + > + diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java b/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java index bb325fa..95b3678 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java @@ -4,22 +4,49 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.RecyclerView; +import com.google.firebase.Timestamp; +import com.google.type.DateTime; import com.sf.stormwaterutilityandroid.R; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.Arrays; +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.FormElementSwitch; +import me.riddhimanadib.formmaster.model.FormElementTextMultiLine; +import me.riddhimanadib.formmaster.model.FormElementTextSingleLine; +import me.riddhimanadib.formmaster.model.FormHeader; + public class ConstructionFormFragment extends Fragment { + private FormBuilder formBuilder; + private RecyclerView recyclerView; + private Button submitButton; + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.activity_sample_fordm, container, false); - View root = inflater.inflate(R.layout.fragment_home, container, false); + recyclerView = root.findViewById(R.id.recyclerView2); - return root; + recyclerView.addView(submitButton); + return root; } + + } \ No newline at end of file diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java b/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java index a803dee..85ff781 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/HEI.java @@ -28,7 +28,10 @@ public class HEI { //constructor HEI(double QHEI_substrate_size, double QHEI_smothering, double QHEI_silting, double QHEI_rootwads, double QHEI_overhanging_veg, - double QHEI_oxbowsblack_waters, double QHEI_downed_treeslogs, double QHEI_shallows, double QHEI_water_plants, double QHEI_logswoody_debris, + + + double QHEI_oxbowsblack_waters, double QHEI_downed_treeslogs, double QHEI_shallows, double QHEI_water_plants, double QHEI_logswoody_debris, + double QHEI_boulders, double QHEI_undercut_banks, double QHEI_sinuosity, double QHEI_natural, double QHEI_riparian_width, double QHEI_land_use, double QHEI_bank_erosion, double QHEI_stream_shading, double QHEI_deepest_pool, double QHEI_velocity, double QHEI_rifflerun_depth, double QHEI_rifflerun_substrate, double QHEI_deep_pools) { @@ -79,4 +82,6 @@ public static double get_HEI(double QHEI_substrate_size, double QHEI_smothering, QHEI_velocity + QHEI_rifflerun_depth + QHEI_rifflerun_substrate; } -} \ No newline at end of file + +} + diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java index 9e8a740..35fbe5a 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java @@ -34,6 +34,7 @@ protected void onCreate(Bundle savedInstanceState) { // submitButton = findViewById(R.id.submitButton); + setupForm(); } diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/PTI.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/PTI.java index c46ef0b..3b5dc89 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/PTI.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/PTI.java @@ -36,4 +36,5 @@ public double calculatePTI() { public static double getPTI(double intolerant, double moderate, double fairly, double very) { return 4.0 * intolerant + 3.0 * moderate + 2.0 * fairly + 1.0 * very; } -} \ No newline at end of file + +} diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WQI.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WQI.java index 0426992..72d7601 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WQI.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WQI.java @@ -28,4 +28,8 @@ public double calculateWQI() { public static double getWQI(double tempChange, double turbidity, double pH, double nitrate, double phosphate, double oxygen) { return tempChange * 0.11 + turbidity * 0.09 + pH * 0.12 + nitrate * 0.1 + phosphate * 0.11 + oxygen * 0.18; } -} \ 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..806377b 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayFormFragment.java @@ -10,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; +import com.sf.stormwaterutilityandroid.InspectionForm; import com.sf.stormwaterutilityandroid.R; import com.sf.stormwaterutilityandroid.SampleFordm; @@ -31,6 +32,15 @@ public void onClick(View view) { } }); + b1 = root.findViewById(R.id.button2); + b1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + startActivity(new Intent(getContext(), InspectionForm.class)); + } + }); + + //CHeck To5a.03 project for dealing saved instance state /* if (savedInstanceState != null) { diff --git a/app/src/main/res/layout/activity_sample_fordm.xml b/app/src/main/res/layout/activity_sample_fordm.xml index bab35dc..7b0f1ef 100644 --- a/app/src/main/res/layout/activity_sample_fordm.xml +++ b/app/src/main/res/layout/activity_sample_fordm.xml @@ -5,9 +5,27 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".SampleFordm"> + + android:id="@+id/recyclerView2" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginBottom="10dp" + app:layout_constraintBottom_toTopOf="@+id/submitButton" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + +