diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000000000000000000000000000000000000..42c6229878a9197a11b54f5b1d8a73ef4a4b707f --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +Martin Masson, Othmane Ouhaddou, Melvil Pfeffer, Prosper-Adrien Sourabie, Aeddan Williams + +2025 - IMT Atlantique \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..9b5e4019df618fc47d429529c369f4903142669b --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file 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/java/com/example/myapplication/StatsPage.java b/app/src/main/java/com/example/myapplication/StatsPage.java index c253f7f8ecd8e44da3b51a20a7c6fd3a11d56d7a..19cf2d935e639fc5b32d9109adeb9b5de84236b2 100644 --- a/app/src/main/java/com/example/myapplication/StatsPage.java +++ b/app/src/main/java/com/example/myapplication/StatsPage.java @@ -1,12 +1,21 @@ package com.example.myapplication; +import static androidx.core.content.ContextCompat.getSystemService; + +import android.app.DownloadManager; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import androidx.fragment.app.Fragment; + +import android.os.Environment; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.webkit.WebView; import android.widget.Button; import android.widget.EditText; import android.widget.Toast; @@ -22,4 +31,33 @@ public class StatsPage extends Fragment { return view; } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + // Set up the web view to display a few statistics + WebView sheetsView = view.findViewById(R.id.sheets_view); + + sheetsView.getSettings().setJavaScriptEnabled(true); + sheetsView.setInitialScale(250); + sheetsView.loadUrl("https://docs.google.com/spreadsheets/d/e/2PACX-1vTic7i0iLCZzMpbmMKfsEzW4F6aYTBPoARxt_kkTpvWpWoLoUstdfN1F5kp0sKMCZu2IYhB7XIlN_kr/pubhtml?gid=1133598439&single=true"); + + Button exportButton = view.findViewById(R.id.export_button); + + exportButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + DownloadManager downloadManager = (DownloadManager) getContext().getSystemService(Context.DOWNLOAD_SERVICE); + Uri uri = Uri.parse("https://docs.google.com/spreadsheets/d/e/2PACX-1vTic7i0iLCZzMpbmMKfsEzW4F6aYTBPoARxt_kkTpvWpWoLoUstdfN1F5kp0sKMCZu2IYhB7XIlN_kr/pub?gid=1600309431&single=true&output=csv"); + String fileName="formReponses.csv"; + DownloadManager.Request request = new DownloadManager.Request(uri); + request.setTitle(fileName); + request.setDescription("Downloading " + fileName); + request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName); + request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); + + downloadManager.enqueue(request); + } + }); + } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_form.xml b/app/src/main/res/layout/fragment_form.xml index 25e264174bd080ef6a937eca587feb64d95f45eb..084debdd210ebfc2e979dced319ca6b011d0d15d 100644 --- a/app/src/main/res/layout/fragment_form.xml +++ b/app/src/main/res/layout/fragment_form.xml @@ -5,12 +5,13 @@ tools:context=".PhotoPage"> <LinearLayout + style="@style/TopTopAppearance" android:id="@+id/form_layout" android:layout_width="match_parent" 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" diff --git a/app/src/main/res/layout/fragment_settings_page.xml b/app/src/main/res/layout/fragment_settings_page.xml index e794c9853f00746a5534d99eb1c864760a07e382..a4a61c2aea1912091867ee2dda0ae7c7831ae8d4 100644 --- a/app/src/main/res/layout/fragment_settings_page.xml +++ b/app/src/main/res/layout/fragment_settings_page.xml @@ -113,20 +113,29 @@ android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:text="@string/settings_conf" /> + android:text="@string/auteurs" /> <TextView style="@style/TopAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="8dp" - android:text="@string/personal_data" /> + android:text="@string/collab" /> - <TextView + <LinearLayout style="@style/BottomAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" - android:layout_marginBottom="10dp" /> + android:layout_marginBottom="23dp" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:text="@string/authors" /> + </LinearLayout> </LinearLayout> </ScrollView> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_stats_page.xml b/app/src/main/res/layout/fragment_stats_page.xml index 1d27aa9814570cb5692db26e01d36f5d4ed588c0..37c0dc2d04f012ff060226fc340ed9be055cd944 100644 --- a/app/src/main/res/layout/fragment_stats_page.xml +++ b/app/src/main/res/layout/fragment_stats_page.xml @@ -25,10 +25,11 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:orientation="vertical"> <Button + android:id="@+id/export_button" style="@style/ButtonAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -42,98 +43,12 @@ app:icon="@drawable/folder" app:iconGravity="textStart" /> - <TextView - style="@style/TopAppearance" + <WebView + android:id="@+id/sheets_view" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="40dp" - android:layout_marginRight="40dp" - android:layout_marginBottom="8dp" - android:fontFamily="@font/inter" - android:gravity="center" - android:text="@string/nombre_de_photos_prises" - android:textAlignment="center" - android:textSize="16sp" /> - - <TextView - style="@style/BottomAppearance" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="40dp" - android:layout_marginRight="40dp" - android:layout_marginBottom="10dp"/> + android:layout_height="match_parent" + android:layout_marginHorizontal="40dp" /> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/refreshed" - android:gravity="end" - android:layout_marginEnd="66dp" - android:layout_marginBottom="10dp" - android:fontFamily="@font/inter" - android:textColor="@color/white"/> - - <TextView - style="@style/TopAppearance" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="40dp" - android:layout_marginRight="40dp" - android:layout_marginBottom="8dp" - android:fontFamily="@font/inter" - android:gravity="center" - android:text="@string/proportions" - android:textAlignment="center" - android:textSize="16sp" /> - - <TextView - style="@style/BottomAppearance" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="40dp" - android:layout_marginRight="40dp" - android:layout_marginBottom="10dp"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/refreshed" - android:gravity="end" - android:layout_marginEnd="66dp" - android:layout_marginBottom="10dp" - android:fontFamily="@font/inter" - android:textColor="@color/white"/> - - <TextView - style="@style/TopAppearance" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="40dp" - android:layout_marginRight="40dp" - android:layout_marginBottom="8dp" - android:fontFamily="@font/inter" - android:gravity="center" - android:text="@string/nombre_ind" - android:textAlignment="center" - android:textSize="16sp" /> - - <TextView - style="@style/BottomAppearance" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="40dp" - android:layout_marginRight="40dp" - android:layout_marginBottom="10dp"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/refreshed" - android:gravity="end" - android:layout_marginEnd="66dp" - android:layout_marginBottom="10dp" - android:fontFamily="@font/inter" - android:textColor="@color/white"/> </LinearLayout> </ScrollView> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index 19dd5372e5973851b74e672e07429382db752871..6a0708a5a213ec8d1c6fee01d22160d49358767c 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -3,25 +3,25 @@ android:checkable="true" android:id="@+id/navigation_apprendre" android:icon="@drawable/book" - android:title="Apprendre" /> + android:title="@string/learn" /> <item android:checkable="true" android:id="@+id/navigation_statistiques" android:icon="@drawable/stats" - android:title="Stats" /> + android:title="@string/stats" /> <item android:checkable="true" android:id="@+id/navigation_accueil" android:icon="@drawable/home" - android:title="Accueil"/> + android:title="@string/accueil"/> <item android:checkable="true" android:id="@+id/navigation_identifier" android:icon="@drawable/camera" - android:title="Documenter" /> + android:title="@string/photo" /> <item android:checkable="true" android:id="@+id/navigation_parametres" android:icon="@drawable/param" - android:title="Paramètres" /> + android:title="@string/settings" /> </menu> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e2d549b0bb4c7041081b8cb67004aeb9571e4096..1272c73827e38d8321de1f6783c7fd67d9833af6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,6 +90,10 @@ <string name="display_prediction_text">Si rien ne s\'affiche ici, c\'est que la détection d\'espèces n\'a pas fonctionné.</string> <string name="unknown_species_text">Si rien ne s\'affiche en haut de l\'écran et que vous connaissez l\'espèce en question, écrivez cela ici. Sinon écrivez je ne sais pas.</string> <string name="unknown_species_question">Quelle est cette espèce ?</string> + <string name="accueil">Accueil</string> + <string name="auteurs">Auteurs</string> + <string name="authors">Martin Masson, Othmane Ouhaddou, Melvil Pfeffer, Prosper-Adrien Sourabie, Aeddan Williams\n2025 - IMT Atlantique</string> + <string name="collab">En collaboration avec\nLorient Agglomération</string> <string-array name="zone_array"> <item>Zone 1</item> <item>Zone 2</item>