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 551adb99a7acc50b1eaa738889de4cc641dc64ca..15760fbfc80c9b2965c69c8df7f7f910701e4e25 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 f999e680768098818f35201aeace23a995ae56f7..580f3a3a06a6a259be25a02843d486fac30e82ec 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 c6d99c737eb86aa8d70e29055548bf10e97b0d06..8ce53118defa2137a3186efc208f5fb560679a00 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 a2691e072744a7cb251e1283279094dcf599469d..d21b3e21610af2f2f898a917c2d1bf6017558391 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 7728dc4853d4d87b71f9d4e117dd9511ffad6551..8fb7b981c14039733990bfcc19db5333be3a30b6 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