Merge branch 'master' into ibrahim

EPICSGroup · Apr 21, 2021 · ede96f2 · ede96f2
2 parents b5a41fe + 5376663
commit ede96f2
Show file tree

Hide file tree

Showing 56 changed files with 5,226 additions and 284 deletions.
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/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,7 +30,9 @@ android {
 }
 
 dependencies {
-
+    //Added this:
+    implementation 'com.github.AnyChart:AnyChart-Android:0.0.3'
+    //Done adding
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
@@ -40,6 +42,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'
     implementation 'com.google.firebase:firebase-storage:19.2.1'
     testImplementation 'junit:junit:4.+'

diff --git a/app/google-services.json b/app/google-services.json
@@ -0,0 +1,47 @@
+{
+  "project_info": {
+    "project_number": "667793859590",
+    "firebase_url": "https://aquasource-f5e44.firebaseio.com",
+    "project_id": "aquasource-f5e44",
+    "storage_bucket": "aquasource-f5e44.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:667793859590:android:8b4d04aebf855291eb8f87",
+        "android_client_info": {
+          "package_name": "com.sf.stormwaterutilityandroid"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "667793859590-o1vcunhlqe559bvuuetrkj6hels7bisl.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDbkcA22JD0-r8h4Xu6dcMGMwHpSKyvFc8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "667793859590-o1vcunhlqe559bvuuetrkj6hels7bisl.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "667793859590-kstclkrr6eial9patuhafmclk7p34re2.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "EPICS.StormWaterUtility"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,31 +2,56 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.sf.stormwaterutilityandroid">
 
+
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="" />
+
+    <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>
+        <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=".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/AgencyID.java b/app/src/main/java/com/sf/stormwaterutilityandroid/AgencyID.java
@@ -0,0 +1,13 @@
+package com.sf.stormwaterutilityandroid;
+
+public class AgencyID {
+   private String agencyID;
+
+    public AgencyID(String agencyID) {
+        this.agencyID = agencyID;
+    }
+
+    public String getAgencyID() {
+        return agencyID;
+    }
+}
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java b/app/src/main/java/com/sf/stormwaterutilityandroid/Construction/ConstructionFormFragment.java
@@ -43,7 +43,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
         recyclerView = root.findViewById(R.id.recyclerView2);
 
-        recyclerView.addView(submitButton);
+       // recyclerView.addView(submitButton);
 
         return root;
     }