From 8fb7a24914db001b17dbb8308e278101209c7a46 Mon Sep 17 00:00:00 2001
From: t22couch <thibaud.couchet@imt-atlantique.net>
Date: Tue, 25 Mar 2025 14:42:39 +0100
Subject: [PATCH] maps fixes
---
.../imt_atlantique/myfirstapplication/EditUserFragment.java | 5 +++++
.../fr/imt_atlantique/myfirstapplication/MainActivity.java | 6 ++++++
app/src/main/res/menu/menu_main.xml | 4 ++++
app/src/main/res/values-FR/strings.xml | 1 +
app/src/main/res/values/strings.xml | 1 +
5 files changed, 17 insertions(+)
diff --git a/app/src/main/java/fr/imt_atlantique/myfirstapplication/EditUserFragment.java b/app/src/main/java/fr/imt_atlantique/myfirstapplication/EditUserFragment.java
index 551adb9..15760fb 100644
--- a/app/src/main/java/fr/imt_atlantique/myfirstapplication/EditUserFragment.java
+++ b/app/src/main/java/fr/imt_atlantique/myfirstapplication/EditUserFragment.java
@@ -77,6 +77,8 @@ public class EditUserFragment extends Fragment {
void onUserInfoSubmitted(String firstName, String lastName, String birthCity, String birthDate, int birthDept, ArrayList<String> phoneNumbers);
void onEditDateRequested(String birthDate, String firstName, String lastName, String birthCity, int birthDept, ArrayList<String> phoneNumbers, String previousBirthDate);
+
+ void showMaps();
}
public EditUserFragment() {
@@ -160,6 +162,9 @@ public class EditUserFragment extends Fragment {
} else if (item.getItemId() == R.id.resetAction) {
resetAllFields();
return true;
+ } else if (item.getItemId() == R.id.showMaps) {
+ callback.showMaps();
+ return true;
}
return false;
});
diff --git a/app/src/main/java/fr/imt_atlantique/myfirstapplication/MainActivity.java b/app/src/main/java/fr/imt_atlantique/myfirstapplication/MainActivity.java
index f999e68..580f3a3 100644
--- a/app/src/main/java/fr/imt_atlantique/myfirstapplication/MainActivity.java
+++ b/app/src/main/java/fr/imt_atlantique/myfirstapplication/MainActivity.java
@@ -102,6 +102,12 @@ public class MainActivity extends AppCompatActivity implements EditUserFragment.
.commit();
}
+ @Override
+ public void showMaps() {
+ MapsFragment fragment = MapsFragment.newInstance();
+ replaceFragment(fragment, false);
+ }
+
/**
* Sauvegarde les informations utilisateur dans `SharedPreferences`.
*/
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index c6d99c7..8ce5311 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -10,4 +10,8 @@
android:id="@+id/shareAction"
android:title="@string/share">
</item>
+ <item
+ android:id="@+id/showMaps"
+ android:title="@string/showMaps">
+ </item>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-FR/strings.xml b/app/src/main/res/values-FR/strings.xml
index a2691e0..d21b3e2 100644
--- a/app/src/main/res/values-FR/strings.xml
+++ b/app/src/main/res/values-FR/strings.xml
@@ -35,4 +35,5 @@
<string name="map_type_hybrid">Version hybride</string>
<string name="map_type_satellite">Version satellite</string>
<string name="date_in_future">The date can not be in the future.</string>
+ <string name="showMaps">Afficher les cartes</string>
</resources>
\ 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 7728dc4..8fb7b98 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,4 +35,5 @@
<string name="map_type_hybrid">Hydrid version</string>
<string name="map_type_satellite">Satellite version</string>
<string name="date_in_future">The date can not be in the future.</string>
+ <string name="showMaps">Show Maps</string>
</resources>
\ No newline at end of file
--
GitLab