Merge branch 'master' into Samuel2

EPICSGroup · Apr 22, 2021 · 8035119 · 8035119
2 parents 7d11b87 + 31a59c6
commit 8035119
Show file tree

Hide file tree

Showing 24 changed files with 2,072 additions and 14 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,12 +30,17 @@ android {
 }
 
 dependencies {
+
     implementation 'com.google.maps.android:android-maps-utils:0.4.4'
     implementation 'com.google.android.libraries.places:places:2.4.0'
     implementation 'com.google.android.gms:play-services-location:18.0.0'
     implementation 'com.google.android.gms:play-services-games:21.0.0'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
 
+
+    //Added this:
+    implementation 'com.github.AnyChart:AnyChart-Android:0.0.3'
+
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
@@ -47,6 +52,7 @@ dependencies {
     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'
+    implementation 'com.google.firebase:firebase-storage:19.2.1'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,14 +3,30 @@
     package="com.sf.stormwaterutilityandroid">
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
+
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+
+
     <application
 
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+
         android:theme="@style/Theme.StormWaterUtilityAndroid">
+        <activity android:name=".ImageAttachForm"></activity>
+        <activity android:name=".Settings" />
+        <activity android:name=".MainMenu">
+
+        android:theme="@style/Theme.StormWaterUtilityAndroid"
+        android:requestLegacyExternalStorage="true">
+
         <activity android:name=".WaterwayReportDetail"></activity>
         <activity android:name=".Settings" />
         <activity android:name=".MainMenu"></activity>
@@ -19,13 +35,26 @@
         <activity android:name=".Reset_password" />
         <activity android:name=".SampleFordm" />
 
+        <activity android:name=".GraphPicker" />
+        <activity android:name=".PDFCreator" />
+        <activity android:name=".Grapher" />
+
         <activity android:name=".Login">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".WaterWay.WaterWayNav"></activity>
+        <activity android:name=".Construction.ConstructionNav"></activity>
+        <activity android:name=".Reset_password" />
+        <activity android:name=".SampleFordm" />
+        <activity android:name=".InspectionForm" />
+        <activity android:name=".Login" />
+
         <activity android:name=".SignUp" />
     </application>
 

diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java b/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java
@@ -22,6 +22,17 @@ public class ConstructionFormData implements Serializable {
      List<String> answers;
      List<String> imgLink;
 
+
+    public ConstructionFormData(String contact, String date, String inspector,
+                                String location, List<String> answers, List<String> imgLinks) {
+        data = new HashMap<>();
+        data.put("contact", contact);
+        data.put("date", date);
+        data.put("inspector", inspector);
+        data.put("location", location);
+        data.put("answers", answers);
+        data.put("imgLinks", imgLinks);
+
     public ConstructionFormData(String contact, String date, String inspector, Date timestamp, String location,
                                 GeoPoint geoPoint, List<String> answers, List<String> imgLinks) {
        this.contact = contact;
@@ -119,6 +130,7 @@ public List<String> getImgLink() {
 
     public void setImgLink(List<String> imgLink) {
         this.imgLink = imgLink;
+
     }
 
     public Map<String, Object> getMap() {