diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4ce92a1..e1213d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,6 @@ - - + android:theme="@style/Theme.StormWaterUtilityAndroid" android:requestLegacyExternalStorage="true"> - - + @@ -48,12 +46,7 @@ - - - - - - + diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java b/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java index 8c1b45f..f11d855 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/ConstructionFormData.java @@ -32,6 +32,7 @@ public ConstructionFormData(String contact, String date, String 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 answers, List imgLinks) { diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java index 51fc665..1932022 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/InspectionForm.java @@ -38,6 +38,8 @@ import me.riddhimanadib.formmaster.model.FormElementTextSingleLine; import me.riddhimanadib.formmaster.model.FormHeader; +import static android.app.Activity.RESULT_OK; + public class InspectionForm extends Fragment { @@ -67,26 +69,15 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, View view = inflater.inflate(R.layout.activity_sample_fordm, container, false); recyclerView = view.findViewById(R.id.recyclerView2); submitButton = view.findViewById(R.id.submitButton); +uploadImageBtn = view.findViewById(R.id.uploadImageBtn); + setupForm(); return view; } - 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)); - - - this.storage = FirebaseStorage.getInstance(); - this.storageReference = storage.getReference(); - setupForm(); - - } private void setupForm() { FormBuilder formBuilder = new FormBuilder(getContext(), recyclerView); @@ -201,7 +192,7 @@ private void setupForm() { formBuilder.addFormElements(formItems); uploadImageBtn.setOnClickListener(view -> { - Intent intent = new Intent(getApplicationContext(), ImageAttachForm.class); + Intent intent = new Intent(getContext(), ImageAttachForm.class); startActivityForResult(intent, UPLOAD_IMAGE_REQUEST); }); @@ -281,7 +272,7 @@ private void setupForm() { // result of getting added images @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); if (requestCode == UPLOAD_IMAGE_REQUEST && resultCode == RESULT_OK && data != null && data.getExtras() != null) { diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/Settings.java b/app/src/main/java/com/sf/stormwaterutilityandroid/Settings.java index e9cac67..3d2a773 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/Settings.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/Settings.java @@ -61,6 +61,8 @@ public void onClick(View v) { public void onClick(View v) { //startActivity(new Intent(Reports.this, Inspector_name.class)); FirebaseAuth.getInstance().signOut(); + Intent intent = new Intent(getApplicationContext(),Login.class); + startActivity(intent); } }); @@ -73,7 +75,7 @@ public void onClick(View v) { // Get auth credentials from the user for re-authentication. The example below shows // email and password credentials but there are multiple possible providers, // such as GoogleAuthProvider or FacebookAuthProvider. - AuthCredential credential = EmailAuthProvider.getCredential("user@example.com", "password1234"); + AuthCredential credential = EmailAuthProvider.getCredential(user.getEmail(), "123456"); // Prompt the user to re-provide their sign-in credentials user.reauthenticate(credential).addOnCompleteListener(new OnCompleteListener() { @@ -83,6 +85,8 @@ public void onComplete(@NonNull Task task) { public void onComplete(@NonNull Task task) { if (task.isSuccessful()) { Log.d("UserDelete", "User account deleted."); + Intent intent = new Intent(getApplicationContext(),Login.class); + startActivity(intent); } } }); diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterwayReportDetail.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterwayReportDetail.java index 4436094..a89f13b 100644 --- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterwayReportDetail.java +++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterwayReportDetail.java @@ -234,7 +234,8 @@ public void createPDF(String[] labels, WaterWayReport wp) { //File naming convention: inspector _ site name _ date String fileName = String.valueOf(wp.getH_inspector_name()) + "_" + String.valueOf(wp.getH_site_name()) + "_" + String.valueOf(wp.getH_date()) + ".pdf"; - File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath(), fileName);// + "/Test", fileName);//"Test.pdf"); + // File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath(), fileName);// + "/Test", fileName);//"Test.pdf"); + File file = new File(getExternalFilesDir(null), fileName); if (!file.exists()) { Log.d("pdf", "DOESN'T EXIST"); file.getParentFile().mkdirs(); @@ -245,14 +246,16 @@ public void createPDF(String[] labels, WaterWayReport wp) { try { - //write pdf ot file location + file.createNewFile();//NEW document.writeTo(new FileOutputStream(file)); Toast.makeText(WaterwayReportDetail.this, "PDF file generated succesfully.", Toast.LENGTH_SHORT).show(); + document.close();//MOVED THIS HERE + Log.d("pdf", "file name is " + String.valueOf(fileName)); } catch (IOException e) { e.printStackTrace(); } - document.close(); + } private boolean checkPermission() { diff --git a/app/src/main/res/drawable-v24/folder.png b/app/src/main/res/drawable-v24/folder.png new file mode 100644 index 0000000..40eb01b Binary files /dev/null and b/app/src/main/res/drawable-v24/folder.png differ diff --git a/app/src/main/res/layout/activity_reports.xml b/app/src/main/res/layout/activity_reports.xml index 0a39c25..14786ab 100644 --- a/app/src/main/res/layout/activity_reports.xml +++ b/app/src/main/res/layout/activity_reports.xml @@ -11,10 +11,10 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="10dp" + android:hint="Date,name,or site" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:hint="Date,name,or site" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/btn_site_name" />