From e94ffde26a97a3ccebd9b71f5c0cc1ef20933728 Mon Sep 17 00:00:00 2001
From: IbrahimSaeedPurdue
 <54752803+IbrahimSaeedPurdue@users.noreply.github.com>
Date: Wed, 10 Mar 2021 21:33:55 -0500
Subject: [PATCH 1/2] feature/upload gallery image to firebase

---
 app/build.gradle                              |  1 +
 .../InspectionForm.java                       | 66 +++++++++++++++++++
 .../main/res/layout/activity_sample_fordm.xml | 25 ++++---
 3 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index eea8c58..b11c57e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.firebase:firebase-auth:19.4.0'
     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/java/com/sf/stormwaterutilityandroid/InspectionForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java
index 9efb51c..d3e801a 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java
@@ -1,16 +1,28 @@
 package com.sf.stormwaterutilityandroid;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.storage.FirebaseStorage;
+import com.google.firebase.storage.StorageReference;
+import com.google.firebase.storage.UploadTask;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
 
 import me.riddhimanadib.formmaster.FormBuilder;
 import me.riddhimanadib.formmaster.model.BaseFormElement;
@@ -24,7 +36,13 @@
 
 public class InspectionForm extends AppCompatActivity {
     private RecyclerView recyclerView;
+
     private Button submitButton;
+    private Button uploadImageButton;
+
+    private Uri imageUri;
+    private FirebaseStorage storage;
+    private StorageReference storageReference;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -32,7 +50,11 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_sample_fordm);
         recyclerView = findViewById(R.id.recyclerView2);
 
+        storage = FirebaseStorage.getInstance();
+        storageReference = storage.getReference();
+
         submitButton = findViewById(R.id.submitButton);
+        uploadImageButton = findViewById(R.id.uploadImageButton);
 
         setupForm();
     }
@@ -157,6 +179,10 @@ private void setupForm() {
         // populate formBuilder with items
         formBuilder.addFormElements(formItems);
 
+        uploadImageButton.setOnClickListener(view -> {
+            chooseImage();
+        });
+
         // onSubmit
         submitButton.setOnClickListener(view -> {
 
@@ -231,4 +257,44 @@ private String getSwitchBool(FormElementSwitch switchElement) {
         return "false";
     }
 
+    private void chooseImage() {
+        Intent intent = new Intent();
+        intent.setType("image/*");
+        intent.setAction(Intent.ACTION_GET_CONTENT);
+        startActivityForResult(intent, 1);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1 && resultCode == RESULT_OK && data != null && data.getData() != null) {
+            // we got the image :D
+
+            System.out.println("GOT THE IMAGE !!!");
+            imageUri = data.getData();
+            uploadPicture();
+        }
+    }
+
+    private void uploadPicture() {
+        final String randomKey = UUID.randomUUID().toString();
+        StorageReference storageRef = storageReference.child("images/" + randomKey);
+        storageRef.putFile(imageUri)
+                .addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
+                    @Override
+                    public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
+                        System.out.println("SUCCESSS!!!");
+                        Task<Uri> downloadUri = taskSnapshot.getStorage().getDownloadUrl();
+                        System.out.println("downloadUri: " + downloadUri);
+                    }
+                })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        System.out.println("FAILEDDD");
+                    }
+                });
+    }
+
+
 }
diff --git a/app/src/main/res/layout/activity_sample_fordm.xml b/app/src/main/res/layout/activity_sample_fordm.xml
index 7b0f1ef..5bc7f25 100644
--- a/app/src/main/res/layout/activity_sample_fordm.xml
+++ b/app/src/main/res/layout/activity_sample_fordm.xml
@@ -8,23 +8,30 @@
 
     <androidx.recyclerview.widget.RecyclerView
         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" />
+        android:layout_width="413dp"
+        android:layout_height="633dp"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layout_editor_absoluteX="0dp" />
 
     <Button
         android:id="@+id/submitButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
+        android:layout_marginEnd="48dp"
         android:text="Submit"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/recyclerView2" />
+
+    <Button
+        android:id="@+id/uploadImageButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="96dp"
+        android:text="Upload Image"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/submitButton"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/recyclerView2" />
 

From 81151b2b9272c03fc8ba68a500b5d18f965775bc Mon Sep 17 00:00:00 2001
From: IbrahimSaeedPurdue
 <54752803+IbrahimSaeedPurdue@users.noreply.github.com>
Date: Sat, 10 Apr 2021 23:27:11 -0400
Subject: [PATCH 2/2] feature/image attachment form complete (camera image
 only)

---
 app/src/main/AndroidManifest.xml              |  18 +-
 .../ConstructionFormData.java                 |   4 +-
 .../ImageAttachForm.java                      | 200 ++++++++++++++++++
 .../InspectionForm.java                       |  89 ++++----
 .../res/layout/activity_image_attach_form.xml |  76 +++++++
 .../main/res/layout/activity_sample_fordm.xml |  33 +--
 6 files changed, 352 insertions(+), 68 deletions(-)
 create mode 100644 app/src/main/java/com/sf/stormwaterutilityandroid/ImageAttachForm.java
 create mode 100644 app/src/main/res/layout/activity_image_attach_form.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6b5108f..f19b33e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <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="" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -9,22 +12,17 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.StormWaterUtilityAndroid">
-        <activity android:name=".Settings"></activity>
-
-        <activity android:name=".MainMenu" >
+        <activity android:name=".ImageAttachForm"></activity>
+        <activity android:name=".Settings" />
+        <activity android:name=".MainMenu">
             <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=".WaterWay.WaterWayNav"></activity>
+        <activity android:name=".Construction.ConstructionNav"></activity>
         <activity android:name=".Reset_password" />
         <activity android:name=".SampleFordm" />
         <activity android:name=".InspectionForm" />
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java b/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java
index a66ec46..fbb491f 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java
@@ -16,14 +16,14 @@ public class ConstructionFormData {
     // List<String> imgLink
 
     public ConstructionFormData(String contact, String date, String inspector,
-                                String location, List<String> answers, List<String> imgLink) {
+                                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("imgLink", imgLink);
+        data.put("imgLinks", imgLinks);
     }
 
     public Map<String, Object> getMap() {
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/ImageAttachForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/ImageAttachForm.java
new file mode 100644
index 0000000..f64bfc2
--- /dev/null
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/ImageAttachForm.java
@@ -0,0 +1,200 @@
+package com.sf.stormwaterutilityandroid;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.widget.Button;
+import android.widget.ImageView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+
+import javax.annotation.Nullable;
+
+public class ImageAttachForm extends AppCompatActivity {
+    private static final int OPEN_GALLERY_REQUEST = 2;
+    private static final int OPEN_CAMERA_REQUEST = 3;
+
+    private Button uploadCameraImageBtn;
+    private Button uploadGalleryImageBtn;
+    private Button uploadImageBackBtn;
+
+
+    private ArrayList<Uri> imageURIs;
+
+    private ArrayList<ImageView> imageViews;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_image_attach_form);
+
+        this.uploadCameraImageBtn = findViewById(R.id.uploadCameraImageBtn);
+        this.uploadGalleryImageBtn = findViewById(R.id.uploadGalleryImageBtn);
+        this.uploadImageBackBtn = findViewById(R.id.uploadImageBackBtn);
+
+        // this.imageView = findViewById(R.id.ImageView1);
+
+
+        // this.imageUri = null;
+
+        this.imageURIs = new ArrayList<>(3);
+
+        imageViews = new ArrayList<>();
+
+        this.imageViews.add(findViewById(R.id.ImageView1));
+        this.imageViews.add(findViewById(R.id.ImageView2));
+        this.imageViews.add(findViewById(R.id.ImageView3));
+
+        initActionListeners();
+    }
+
+    private void initActionListeners() {
+
+        uploadImageBackBtn.setOnClickListener(view -> {
+            if (imageURIs == null) {
+                setResult(RESULT_CANCELED);
+                finish();
+            }
+
+            Intent data = new Intent();
+            // data.putExtra("imageURIs", imageURIs.toArray());
+            Bundle args = new Bundle();
+            args.putSerializable("IMAGEURIS", (Serializable) imageURIs);
+            data.putExtra("BUNDLE", args);
+            setResult(RESULT_OK, data);
+            finish();
+        });
+
+
+        // pick from gallery
+        uploadGalleryImageBtn.setOnClickListener(view -> {
+            chooseGalleryImage();
+        });
+
+        // pick from camera
+        uploadCameraImageBtn.setOnClickListener(view -> {
+            // request camera permission if not granted already
+            if (ContextCompat.checkSelfPermission(ImageAttachForm.this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(ImageAttachForm.this,
+                        new String[]{
+                                Manifest.permission.CAMERA
+                        },
+                        100);
+            }
+
+            chooseCameraImage();
+        });
+
+        imageViews.get(0).setOnClickListener(view -> {
+            imageURIs.remove(0);
+            updateImageViews();
+        });
+
+        imageViews.get(1).setOnClickListener(view -> {
+            imageURIs.remove(1);
+            updateImageViews();
+        });
+
+        imageViews.get(2).setOnClickListener(view -> {
+            imageURIs.remove(2);
+            updateImageViews();
+        });
+    }
+
+    private void chooseCameraImage() {
+        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        startActivityForResult(intent, OPEN_CAMERA_REQUEST);
+    }
+
+
+    private void chooseGalleryImage() {
+        Intent intent = new Intent();
+        intent.setType("image/*");
+        intent.setAction(Intent.ACTION_GET_CONTENT);
+        startActivityForResult(intent, OPEN_GALLERY_REQUEST);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == OPEN_GALLERY_REQUEST && resultCode == RESULT_OK && data != null && data.getData() != null) {
+            Uri newImageUri = data.getData();
+            //this.imageView.setImageURI(imageUri);
+            addImage(newImageUri);
+
+            // uploadPicture();
+        } else if (requestCode == OPEN_CAMERA_REQUEST && resultCode == RESULT_OK && data != null && data.getExtras() != null) {
+            Bundle extras = data.getExtras();
+            Bitmap imageBitmap = (Bitmap) extras.get("data");
+
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            imageBitmap.compress(Bitmap.CompressFormat.JPEG, 100, bytes);
+            String path = MediaStore.Images.Media.insertImage(getContentResolver(), imageBitmap, "Title", null);
+//            this.imageUri = Uri.parse(path);
+            Uri newImageUri = Uri.parse(path);
+            addImage(newImageUri);
+
+
+            // uploadPicture();
+        }
+    }
+
+//    private void uploadPicture() {
+//        final String randomKey = UUID.randomUUID().toString();
+//        StorageReference storageRef = storageReference.child("images/" + randomKey);
+//        storageRef.putFile(imageUri)
+//                .addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
+//                    @Override
+//                    public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
+//                        System.out.println("SUCCESSS!!!");
+//                        Task<Uri> downloadUri = taskSnapshot.getStorage().getDownloadUrl();
+//                        System.out.println("downloadUri: " + downloadUri);
+//                    }
+//                })
+//                .addOnFailureListener(new OnFailureListener() {
+//                    @Override
+//                    public void onFailure(@NonNull Exception e) {
+//                        System.out.println("FAILEDDD");
+//                    }
+//                });
+//    }
+
+    // adds image to imageURIs list and to the recycle view of displayed images
+    private void addImage(Uri newImageUri) {
+        System.out.println("Image URI HEREEE!!!:  " + newImageUri);
+
+
+        if (imageURIs.size() == 3) {
+            // send message to remove 1
+            System.out.println("EARLY RETURN !!!!!");
+            return;
+        }
+
+        this.imageURIs.add(newImageUri);
+
+        System.out.println("ImageURIs:\n" + imageURIs);
+        updateImageViews();
+    }
+
+    private void updateImageViews() {
+        // set images to first views
+        int i = 0;
+        for (i = 0; i < imageURIs.size(); i++) {
+            imageViews.get(i).setImageURI(imageURIs.get(i));
+        }
+
+        // set the rest to invisible
+        while (i < 3) imageViews.get(i++).setImageURI(null);
+    }
+}
\ 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 d3e801a..523385a 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java
@@ -35,38 +35,34 @@
 import me.riddhimanadib.formmaster.model.FormHeader;
 
 public class InspectionForm extends AppCompatActivity {
+    private final int UPLOAD_IMAGE_REQUEST = 1;
+
     private RecyclerView recyclerView;
 
     private Button submitButton;
-    private Button uploadImageButton;
+    private Button uploadImageBtn;
 
-    private Uri imageUri;
     private FirebaseStorage storage;
     private StorageReference storageReference;
 
+    private ArrayList<Uri> imageURIs;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sample_fordm);
+
         recyclerView = findViewById(R.id.recyclerView2);
 
-        storage = FirebaseStorage.getInstance();
-        storageReference = storage.getReference();
+        this.submitButton = findViewById(R.id.submitButton);
+        this.uploadImageBtn = findViewById(R.id.uploadImageBtn);
 
-        submitButton = findViewById(R.id.submitButton);
-        uploadImageButton = findViewById(R.id.uploadImageButton);
+        this.storage = FirebaseStorage.getInstance();
+        this.storageReference = storage.getReference();
 
         setupForm();
     }
 
-    private void uploadToFirestore(ConstructionFormData constructionFormData) {
-        FirebaseFirestore db = FirebaseFirestore.getInstance();
-        db.collection("ConstructionSiteForm")
-                .add(constructionFormData.getMap())
-                .addOnSuccessListener(documentReference -> System.out.println("SUCCESSFUL - FIRESTORE"))
-                .addOnFailureListener(e -> System.out.println("FAILED - FIRESTORE: " + e));
-    }
-
     private void setupForm() {
         FormBuilder formBuilder = new FormBuilder(this, recyclerView);
 
@@ -102,7 +98,7 @@ private void setupForm() {
         FormElementSwitch correctiveAction4Switch = FormElementSwitch.createInstance().setTitle("Individual Building Lot(s)").setSwitchTexts("Yes", "No");
 
         FormHeader correctiveAction5Header = FormHeader.createInstance("");
-        List<String> correctiveAction5Options= new ArrayList<>(Arrays.asList("Repair", "Install properly"," Replace", "Add (areas prone to sheet-flow erosion)"));
+        List<String> correctiveAction5Options = new ArrayList<>(Arrays.asList("Repair", "Install properly", " Replace", "Add (areas prone to sheet-flow erosion)"));
         FormElementPickerMulti correctiveAction5Multi = FormElementPickerMulti.createInstance().setTitle("Address silt fence issues which includes one or more of the following: Repair, install properly, Replace, Add (areas prone to sheet-flow erosion)").setOptions(correctiveAction5Options).setPickerTitle("Address silt fence issues which includes one or more of the following:");
 
         FormElementSwitch correctiveAction6Switch = FormElementSwitch.createInstance().setTitle("Install erosions and sediment control for individual building lot(s) as specified in the approved SWP3").setSwitchTexts("Yes", "No");
@@ -111,7 +107,7 @@ private void setupForm() {
         FormElementSwitch correctiveAction9Switch = FormElementSwitch.createInstance().setTitle("Individual Building Lot(s)").setSwitchTexts("Yes", "No");
 
         FormHeader correctiveAction10Header = FormHeader.createInstance("");
-        List<String> correctiveAction10Options= new ArrayList<>(Arrays.asList("sediment traps", "behind check dams", "around storm drain inlets or/and other"));
+        List<String> correctiveAction10Options = new ArrayList<>(Arrays.asList("sediment traps", "behind check dams", "around storm drain inlets or/and other"));
         FormElementPickerMulti correctiveAction10Multi = FormElementPickerMulti.createInstance().setTitle("Remove sediment from one or more of the following: sediment traps, behind check dams, around storm drain inlets or/and other").setOptions(correctiveAction10Options).setPickerTitle("Pick corrective action");
 
 
@@ -179,10 +175,12 @@ private void setupForm() {
         // populate formBuilder with items
         formBuilder.addFormElements(formItems);
 
-        uploadImageButton.setOnClickListener(view -> {
-            chooseImage();
+        uploadImageBtn.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), ImageAttachForm.class);
+            startActivityForResult(intent, UPLOAD_IMAGE_REQUEST);
         });
 
+
         // onSubmit
         submitButton.setOnClickListener(view -> {
 
@@ -239,12 +237,14 @@ private void setupForm() {
             List<String> enforcementAction = enforcementActionPickerSingle.getOptionsSelected();
             answersList.addAll(enforcementAction);
 
-            List<String> imgLink = new ArrayList<>();
-            imgLink.add(evidenceTextField.getValue());
-
-            ConstructionFormData constructionFormData = new ConstructionFormData(contact, date, inspector, location, answersList, imgLink);
-
+            List<String> imgLinks = new ArrayList<>();
+            for (Uri imageUri : imageURIs) {
+                imgLinks.add(uploadPicture(imageUri));
+            }
+            System.out.println(imgLinks);
+            ConstructionFormData constructionFormData = new ConstructionFormData(contact, date, inspector, location, answersList, imgLinks);
 
+            System.out.println(constructionFormData);
             // submit data to firestore
             uploadToFirestore(constructionFormData);
         });
@@ -252,31 +252,35 @@ private void setupForm() {
 
     }
 
-    private String getSwitchBool(FormElementSwitch switchElement) {
-        if (switchElement.getValue().equals("Yes")) return "true";
-        return "false";
-    }
-
-    private void chooseImage() {
-        Intent intent = new Intent();
-        intent.setType("image/*");
-        intent.setAction(Intent.ACTION_GET_CONTENT);
-        startActivityForResult(intent, 1);
-    }
-
+    // result of getting added images
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 1 && resultCode == RESULT_OK && data != null && data.getData() != null) {
-            // we got the image :D
 
-            System.out.println("GOT THE IMAGE !!!");
-            imageUri = data.getData();
-            uploadPicture();
+        if (requestCode == UPLOAD_IMAGE_REQUEST && resultCode == RESULT_OK && data != null && data.getExtras() != null) {
+            System.out.println("IM HERE!\n");
+            Bundle args = data.getBundleExtra("BUNDLE");
+            this.imageURIs = (ArrayList<Uri>) args.getSerializable("IMAGEURIS");
+            System.out.println(imageURIs);
         }
     }
 
-    private void uploadPicture() {
+    private void uploadToFirestore(ConstructionFormData constructionFormData) {
+        FirebaseFirestore db = FirebaseFirestore.getInstance();
+        db.collection("ConstructionSiteForm")
+                .add(constructionFormData.getMap())
+                .addOnSuccessListener(documentReference -> System.out.println("SUCCESSFUL - FIRESTORE"))
+                .addOnFailureListener(e -> System.out.println("FAILED - FIRESTORE: " + e));
+    }
+
+    private String getSwitchBool(FormElementSwitch switchElement) {
+        if (switchElement.getValue().equals("Yes")) return "true";
+        return "false";
+    }
+
+    private String uploadPicture(Uri imageUri) {
+        final String[] imageLink = {null};
+
         final String randomKey = UUID.randomUUID().toString();
         StorageReference storageRef = storageReference.child("images/" + randomKey);
         storageRef.putFile(imageUri)
@@ -286,6 +290,7 @@ public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
                         System.out.println("SUCCESSS!!!");
                         Task<Uri> downloadUri = taskSnapshot.getStorage().getDownloadUrl();
                         System.out.println("downloadUri: " + downloadUri);
+                        imageLink[0] = downloadUri.toString();
                     }
                 })
                 .addOnFailureListener(new OnFailureListener() {
@@ -294,6 +299,8 @@ public void onFailure(@NonNull Exception e) {
                         System.out.println("FAILEDDD");
                     }
                 });
+
+        return imageLink[0];
     }
 
 
diff --git a/app/src/main/res/layout/activity_image_attach_form.xml b/app/src/main/res/layout/activity_image_attach_form.xml
new file mode 100644
index 0000000..e7741d4
--- /dev/null
+++ b/app/src/main/res/layout/activity_image_attach_form.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    tools:context=".ImageAttachForm">
+
+    <ImageView
+        android:id="@+id/ImageView1"
+        android:layout_width="100dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="40dp"
+        app:layout_constraintBottom_toTopOf="@+id/ImageView2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/uploadImageBackBtn"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <ImageView
+        android:id="@+id/ImageView3"
+        android:layout_width="100dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="19dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ImageView2"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <Button
+        android:id="@+id/uploadCameraImageBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:text="Take a picture"
+        app:layout_constraintBottom_toTopOf="@+id/uploadGalleryImageBtn"
+        app:layout_constraintStart_toStartOf="@+id/uploadGalleryImageBtn"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/uploadImageBackBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginBottom="37dp"
+        android:text="Done"
+        app:layout_constraintBottom_toTopOf="@+id/ImageView1"
+        app:layout_constraintStart_toStartOf="@+id/ImageView1"
+        app:layout_constraintTop_toBottomOf="@+id/uploadGalleryImageBtn" />
+
+    <Button
+        android:id="@+id/uploadGalleryImageBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="74dp"
+        android:layout_marginBottom="123dp"
+        android:text="Choose from gallery"
+        app:layout_constraintBottom_toTopOf="@+id/uploadImageBackBtn"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/uploadCameraImageBtn" />
+
+    <ImageView
+        android:id="@+id/ImageView2"
+        android:layout_width="100dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="36dp"
+        app:layout_constraintBottom_toTopOf="@+id/ImageView3"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ImageView1"
+        tools:srcCompat="@tools:sample/avatars" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sample_fordm.xml b/app/src/main/res/layout/activity_sample_fordm.xml
index 5bc7f25..916ee59 100644
--- a/app/src/main/res/layout/activity_sample_fordm.xml
+++ b/app/src/main/res/layout/activity_sample_fordm.xml
@@ -8,31 +8,34 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView2"
-        android:layout_width="413dp"
-        android:layout_height="633dp"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:layout_editor_absoluteX="0dp" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="39dp"
+        app:layout_constraintBottom_toTopOf="@+id/submitButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/submitButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="48dp"
+        android:layout_marginStart="260dp"
+        android:layout_marginBottom="40dp"
         android:text="Submit"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/recyclerView2" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/recyclerView2"
+        app:layout_constraintVertical_bias="0.794" />
 
     <Button
-        android:id="@+id/uploadImageButton"
+        android:id="@+id/uploadImageBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="96dp"
-        android:text="Upload Image"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/submitButton"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/recyclerView2" />
+        android:layout_marginStart="73dp"
+        android:text="upload images"
+        app:layout_constraintBaseline_toBaselineOf="@+id/submitButton"
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file