diff --git a/app/src/main/java/com/example/myapplication/GoogleFormApi.java b/app/src/main/java/com/example/myapplication/GoogleFormApi.java index 93f7f4f024087e43861e782c0a75c469c18c206d..3da37a2026cbd3113ec3f014a713df074a409ded 100644 --- a/app/src/main/java/com/example/myapplication/GoogleFormApi.java +++ b/app/src/main/java/com/example/myapplication/GoogleFormApi.java @@ -25,8 +25,7 @@ public interface GoogleFormApi { // Other fields @Field("entry.311834827") String unknownSpecies, @Field("entry.1710251376") String zone, - @Field("entry.1284627072") String surroundings, - @Field("entry.1321597415") String time + @Field("entry.1284627072") String surroundings ); } diff --git a/app/src/main/java/com/example/myapplication/OverlayDialogFragmentForm.java b/app/src/main/java/com/example/myapplication/OverlayDialogFragmentForm.java index 22d666c57289cf5b46f2651ac46786481b3085c8..1194bf3dde8e58fd41c1236870f8cc624653de4c 100644 --- a/app/src/main/java/com/example/myapplication/OverlayDialogFragmentForm.java +++ b/app/src/main/java/com/example/myapplication/OverlayDialogFragmentForm.java @@ -31,8 +31,6 @@ public class OverlayDialogFragmentForm extends DialogFragment { private String zoneSelected; private boolean isZoneSelected = false; - private String time; - private String finalPredictionOutput; private String becasseauCounter = "0"; @@ -110,21 +108,6 @@ public class OverlayDialogFragmentForm extends DialogFragment { } }); - - // Set the time picker settings - TimePicker timePicker = view.findViewById(R.id.time_picker); - timePicker.setIs24HourView(true); - if (timePicker.getHour()<10) time = "0" + timePicker.getHour() + ":" + timePicker.getMinute(); - else time = timePicker.getHour() + ":" + timePicker.getMinute(); - // If time is changed we retain its value - timePicker.setOnTimeChangedListener(new TimePicker.OnTimeChangedListener() { - @Override - public void onTimeChanged(TimePicker timePicker, int i, int i1) { - if (timePicker.getHour()<10) time = "0" + timePicker.getHour() + ":" + timePicker.getMinute(); - else time = timePicker.getHour() + ":" + timePicker.getMinute(); - } - }); - // Display the result in the form finalPredictionOutput = PhotoPage.getPredictionOutput(); if (finalPredictionOutput != "nothing") { @@ -259,7 +242,7 @@ public class OverlayDialogFragmentForm extends DialogFragment { @Override public void onClick(View view) { Call<Void> call = api.sendFormData(becasseauCounter, bernacheCounter, goelandCounter, mouetteCounter, pluvierCounter, cormoranCounter, - foulqueCounter, tadorneCounter, chevalierCounter, unknownSpeciesDescription, zoneSelected, surroundingsDescription, time); + foulqueCounter, tadorneCounter, chevalierCounter, unknownSpeciesDescription, zoneSelected, surroundingsDescription); call.enqueue(new Callback<Void>() { @Override diff --git a/app/src/main/res/drawable/zonage.png b/app/src/main/res/drawable/zonage.png deleted file mode 100644 index eebe990528c7087296d5ab6dd628e878d733427a..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/drawable/zonage.png and /dev/null differ diff --git a/app/src/main/res/layout/fragment_form.xml b/app/src/main/res/layout/fragment_form.xml index 25e264174bd080ef6a937eca587feb64d95f45eb..c1d6ddf8ada4d8f9971cd4f07bff7dc71d96f107 100644 --- a/app/src/main/res/layout/fragment_form.xml +++ b/app/src/main/res/layout/fragment_form.xml @@ -10,7 +10,8 @@ android:layout_height="wrap_content" android:background="@drawable/shape_transparent" android:orientation="vertical" - android:padding="20dp"> + android:padding="20dp" + android:layout_gravity="center"> <TextView android:id="@+id/prediction_output" @@ -72,12 +73,12 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="20dp" - android:text="@string/unknown_species_text" android:gravity="center" + android:text="@string/unknown_species_text" android:textColor="#333333" android:textSize="18sp" android:textStyle="bold" - android:visibility="gone"/> + android:visibility="gone" /> <EditText android:id="@+id/unknown_species_input" @@ -89,23 +90,6 @@ android:textColor="#000000" android:visibility="gone" /> - <TextView - android:id="@+id/form_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="15dp" - android:text="@string/photo_time_text" - android:textColor="#333333" - android:textSize="18sp" - android:textStyle="bold" /> - - <TimePicker - android:id="@+id/time_picker" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="15dp" /> - <Button android:id="@+id/submit_form_button" style="@style/ButtonAppearance"