diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index b424710..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b8a7771..4616d0c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,8 @@ android { applicationId "fr.svpro.radiomercure" minSdk 26 targetSdk 32 - versionCode 200 - versionName '2.0.0' + versionCode 201 + versionName '2.0.1' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/fr/svpro/radiomercure/MainActivity.java b/app/src/main/java/fr/svpro/radiomercure/MainActivity.java index 0287c5a..23b6e17 100644 --- a/app/src/main/java/fr/svpro/radiomercure/MainActivity.java +++ b/app/src/main/java/fr/svpro/radiomercure/MainActivity.java @@ -73,8 +73,12 @@ public class MainActivity extends AppCompatActivity { @Override public boolean onNavigationItemSelected(MenuItem item) { - // Navigation drawer item click listener + // Navigation drawer item switch (item.getItemId()) { + case R.id.historique: + web.loadUrl(URL_PLATEFORM + "/pages/historique-de-la-radio"); + break; + case R.id.live: Toast.makeText(MainActivity.this, "Vous écoutez Radio Mercure en direct", Toast.LENGTH_SHORT).show(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { @@ -95,21 +99,30 @@ public class MainActivity extends AppCompatActivity { startActivity(form_mail); break; - case R.id.home: - web.loadUrl(URL_PLATEFORM); + case R.id.promouvoir: + web.loadUrl(URL_PLATEFORM + "/pages/vos-evenements-a-la-radio"); break; - case R.id.exit: - System.exit(0); + case R.id.home: + web.loadUrl(URL_PLATEFORM); break; case R.id.podmap: web.loadUrl(URL_PLATEFORM + "/map"); break; + case R.id.privacy: + web.loadUrl(URL_PLATEFORM + "/pages/politique-de-confidentialite"); + break; + case R.id.about: dialog.show(); break; + + case R.id.exit: + System.exit(0); + break; + } drawerLayout.closeDrawer(GravityCompat.START); diff --git a/app/src/main/res/drawable/icons8_facebook_24.png b/app/src/main/res/drawable/icons8_facebook_24.png new file mode 100644 index 0000000..0840424 Binary files /dev/null and b/app/src/main/res/drawable/icons8_facebook_24.png differ diff --git a/app/src/main/res/menu/menu_drawer.xml b/app/src/main/res/menu/menu_drawer.xml index 28a4306..6482f2c 100644 --- a/app/src/main/res/menu/menu_drawer.xml +++ b/app/src/main/res/menu/menu_drawer.xml @@ -1,8 +1,12 @@ - + + + + + - + + + Aucun client mail trouvé !! Annulation par l\'utilisateur A Propos de l\'Application - RADIO MERCURE - Version + RADIO MERCURE - Version\ + ]]> + Historique + Promouvoir + Radio Mercure + Application + Politique de Confidentialité \ No newline at end of file