diff --git a/app/src/main/java/fr/svpro/radiomercure/MainActivity.java b/app/src/main/java/fr/svpro/radiomercure/MainActivity.java index 04b0d7a..266637f 100644 --- a/app/src/main/java/fr/svpro/radiomercure/MainActivity.java +++ b/app/src/main/java/fr/svpro/radiomercure/MainActivity.java @@ -38,6 +38,8 @@ import androidx.drawerlayout.widget.DrawerLayout; import com.google.android.material.navigation.NavigationView; +import java.util.Objects; + public class MainActivity extends AppCompatActivity { private static final int WRITE_EXTERNAL_STORAGE_RC = 100; @@ -62,7 +64,7 @@ public class MainActivity extends AppCompatActivity { private DrawerLayout drawerLayout; private Toolbar toolbar; - @SuppressLint({"SetJavaScriptEnabled", "WrongViewCast", "JavascriptInterface"}) + @SuppressLint({"SetJavaScriptEnabled", "WrongViewCast", "JavascriptInterface", "MissingInflatedId"}) @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -73,7 +75,7 @@ public class MainActivity extends AppCompatActivity { navigationView.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() { @Override - public boolean onNavigationItemSelected(MenuItem item) { + public boolean onNavigationItemSelected(@NonNull MenuItem item) { // Navigation drawer item switch (item.getItemId()) { @@ -82,12 +84,8 @@ public class MainActivity extends AppCompatActivity { 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) { - lectureAudio(URL_STREAM); - } else { - Toast.makeText(MainActivity.this, "Votre version d'Android n'est pas compatible", Toast.LENGTH_SHORT).show(); - } + Toast.makeText(MainActivity.this, R.string.toast_live, Toast.LENGTH_SHORT).show(); + lectureAudio(URL_STREAM); break; case R.id.tel: @@ -252,9 +250,9 @@ public class MainActivity extends AppCompatActivity { break; default: - return super.onOptionsItemSelected(item); + // } - return false; + return super.onOptionsItemSelected(item); } private void createDialog() @@ -305,8 +303,14 @@ public class MainActivity extends AppCompatActivity { @Override public void onBackPressed() { - if (web.canGoBack()) { + if (drawerLayout.isDrawerOpen(GravityCompat.START)) { + drawerLayout.closeDrawer(GravityCompat.START); + } + else if (web.canGoBack()) { web.goBack(); + if (Objects.equals(web.getOriginalUrl(), URL_PLATEFORM + "/")) { // Cliquez sur retour pour quitter + Toast.makeText(this, R.string.toast_quitter, Toast.LENGTH_SHORT).show(); + } } else { super.onBackPressed(); System.exit(0); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 982f824..2aedbf0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -48,7 +48,6 @@ app:headerLayout="@layout/drawer_header" app:itemIconTint="?attr/colorPrimary" app:menu="@menu/menu_drawer"> - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2cd06ee..a0c6beb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -38,5 +38,7 @@ Application Partager la page Politique de Confidentialité + Cliquez sur retour pour quitter + Vous écoutez Radio Mercure en direct \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 3ffe584..282687b 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -11,6 +11,7 @@ #FF5722 ?attr/colorPrimaryVariant + @android:color/white