feat(sound effects): buttons, correct alternative, win, lost sound ef…

…fects added and working. Also configuration of music and sound working as intended

app/src/main/assets/metro_santiago.xml

@@ -141,10 +141,10 @@
         <station>Cerrillos</station>
     </line>
     <line name="TEST" color="#A53CEB">
-        <station>Los Leones</station>
-        <station>Cerrillos</station>
-        <station>Cerrillos</station>
-        <station>Cerrillos</station>
+        <station>station 1</station>
+        <station>station 2</station>
+        <station>station 3</station>
+        <station>station 4</station>
     </line>
 
 </metro>

app/src/main/java/com/jorgecruces/metrometro/activities/MainActivity.java

@@ -44,6 +44,9 @@ protected void onStop() {
     }
 
     public void goToLinesMenuActivity(View view) {
+        // Sound Effect
+        MediaPlayerReproducer.getInstance().reproduceClickSound(this);
+
         Intent intent = new Intent(this, MenuMetroActivity.class);
         startActivity(intent);
     }
@@ -62,6 +65,8 @@ public void goToMetroInfoActivity(View view) {
     }
 
     public void showConfigurationDialog(View view) {
+        // Sound Effect
+        MediaPlayerReproducer.getInstance().reproduceClickSound(this);
         // Show dialog
         Dialog dialog = new Dialog(this);
         dialog.setContentView(R.layout.configuration_dialog);
@@ -80,22 +85,34 @@ public void showConfigurationDialog(View view) {
 
 
         switchSoundConfiguration.setOnClickListener(switchSound -> {
+            MediaPlayerReproducer.getInstance().reproduceClickSound(this);
             MediaPlayerReproducer.getInstance().changeAudioReproducing();
         });
 
         switchMusicConfiguration.setOnClickListener(switchSound -> {
+            MediaPlayerReproducer.getInstance().reproduceClickSound(this);
             MediaPlayerReproducer.getInstance().changeMusicReproducing();
+            // Stop Music
+            if (MediaPlayerReproducer.getInstance().getMusicBoolean()) {
+                BackgroundMusic.onStart(this);
+            } else {
+                BackgroundMusic.forceStop();
+
+            }
         });
 
         // ImageView
         ImageView goBackImageView = (ImageView) dialog.findViewById(R.id.goBackButtonConfiguration);
         goBackImageView.setOnClickListener(imageView -> {
+            MediaPlayerReproducer.getInstance().reproduceClickSound(this);
             dialog.dismiss();
         });
         dialog.show();
     }
 
     public void showConfirmationResetDialog(View view) {
+        // Sound Effect
+        MediaPlayerReproducer.getInstance().reproduceClickSound(this);
         // Show dialog
         Dialog dialog = new Dialog(this);
         dialog.setContentView(R.layout.confirmation_reset_dialog);
@@ -108,10 +125,12 @@ public void showConfirmationResetDialog(View view) {
 
 
         buttonGoBack.setOnClickListener(button -> {
+            MediaPlayerReproducer.getInstance().reproduceClickSound(this);
             dialog.dismiss();
         });
 
         buttonResetSharedPreferences.setOnClickListener(button -> {
+            MediaPlayerReproducer.getInstance().reproduceClickSound(this);
             this.resetSharedPreferences();
             dialog.dismiss();
         });

app/src/main/java/com/jorgecruces/metrometro/activities/MenuMetroActivity.java

@@ -22,6 +22,7 @@
 import com.jorgecruces.metrometro.model.Metro;
 import com.jorgecruces.metrometro.model.MetroMenu;
 import com.jorgecruces.metrometro.sound.BackgroundMusic;
+import com.jorgecruces.metrometro.sound.MediaPlayerReproducer;
 
 import java.util.ArrayList;
 
@@ -47,7 +48,6 @@ protected void onStart() {
         BackgroundMusic.onStart(this);
     }
 
-
     @Override
     protected void onStop() {
         super.onStop();
@@ -93,13 +93,19 @@ private boolean getLevelStarSharedPreferences(String lineName) {
     }
 
     public void goToMainActivity(View view) {
+        // Sound Effect
+        MediaPlayerReproducer.getInstance().reproduceClickSound(this);
+
         Intent intent = new Intent(this, MainActivity.class);
         startActivity(intent);
     }
 
     @Override
     public void onBackPressed() {
-        super.onBackPressed();
+        // Sound Effect
+        MediaPlayerReproducer.getInstance().reproduceClickSound(this);
         this.goToMainActivity(null);
+
+        super.onBackPressed();
     }
 }

app/src/main/java/com/jorgecruces/metrometro/activities/MenuMetroRecyclerViewAdapter.java

@@ -19,6 +19,7 @@
 
 import com.jorgecruces.metrometro.R;
 import com.jorgecruces.metrometro.model.MetroMenu;
+import com.jorgecruces.metrometro.sound.MediaPlayerReproducer;
 
 import java.util.ArrayList;
 
@@ -51,6 +52,7 @@ public void onBindViewHolder(@NonNull MenuMetroRecyclerViewAdapter.MyViewHolder
         holder.lineaMetroName.setText(lineName);
         holder.backgroundMetroMenu.setColorFilter(color);
         holder.constraintLayoutContainer.setOnClickListener(view -> {
+            MediaPlayerReproducer.getInstance().reproduceClickSound(this.context.getApplicationContext());
             Intent intent = new Intent(this.context.getApplicationContext(), PlayGameActivity.class);
             intent.putExtra("LINEA", lineName);
             this.context.startActivity(intent);

app/src/main/java/com/jorgecruces/metrometro/activities/MetroInformationActivity.java

@@ -11,6 +11,7 @@
 import com.jorgecruces.metrometro.R;
 import com.jorgecruces.metrometro.customViews.ZoomableImageView;
 import com.jorgecruces.metrometro.sound.BackgroundMusic;
+import com.jorgecruces.metrometro.sound.MediaPlayerReproducer;
 
 public class MetroInformationActivity extends AppCompatActivity {
 
@@ -39,6 +40,9 @@ protected void onStop() {
     }
 
     public void goToMainActivity(View view) {
+        // Sound Effect
+        MediaPlayerReproducer.getInstance().reproduceClickSound(this);
+
         Intent intent = new Intent(this, MainActivity.class);
         startActivity(intent);
     }

app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java

@@ -47,7 +47,7 @@ public class PlayGameActivity extends AppCompatActivity {
     private ArrayList<StationView> stationViews;
 
     // Music
-    private MediaPlayer mediaPlayer;
+    private MediaPlayer mediaPlayerMusicGameplay;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -96,15 +96,15 @@ private void drawStationView(float marginStart, String stationName, String color
 
     private void reproduceMusic() {
         if (MediaPlayerReproducer.getInstance().getMusicBoolean()) {
-            this.mediaPlayer = MediaPlayer.create(this, R.raw.music_gameplay_loop);
-            this.mediaPlayer.setLooping(true);
-            this.mediaPlayer.start();
+            this.mediaPlayerMusicGameplay = MediaPlayer.create(this, R.raw.music_gameplay_loop);
+            this.mediaPlayerMusicGameplay.setLooping(true);
+            this.mediaPlayerMusicGameplay.start();
         }
     }
 
     private void stopMusic() {
-        if (this.mediaPlayer != null) {
-            this.mediaPlayer.stop();
+        if (this.mediaPlayerMusicGameplay != null) {
+            this.mediaPlayerMusicGameplay.stop();
         }
     }
 
@@ -291,6 +291,8 @@ private void checkAlternative(String alternativeString) {
     }
 
     private void onCorrectAlternative() {
+        // Reproduce Correct alternative sound
+        MediaPlayerReproducer.getInstance().reproduceCorrectAlternativeSound(this);
         this.position = this.position + 1;
         if (this.position < (this.stations.size() - 1)) {
             this.setCurrentStationQuestion(this.position);
@@ -300,6 +302,9 @@ private void onCorrectAlternative() {
     }
 
     public void onWinLevel() {
+        this.mediaPlayerMusicGameplay.stop();
+        // Reproduce win sound
+        MediaPlayerReproducer.getInstance().reproduceSoundWinLevel(this);
         this.updateProgressInfo();
         this.showWinningDialog();
     }
@@ -352,6 +357,10 @@ private void onIncorrectAlternative() {
     }
 
     private void onLostLevel() {
+        // Stop Gameplay Music
+        this.mediaPlayerMusicGameplay.stop();
+        MediaPlayerReproducer.getInstance().reproduceLostSound(this);
+
         // TODO - Ads
         Dialog lostDialog = new Dialog(this);
         lostDialog.setCancelable(false);
@@ -361,13 +370,15 @@ private void onLostLevel() {
         ImageView resetLevelImageView = (ImageView) lostDialog.findViewById(R.id.imageViewResetLevel);
 
         resetLevelImageView.setOnClickListener(listener-> {
+            MediaPlayerReproducer.getInstance().reproduceClickSound(this);
             this.resetLevel();
         });
 
         lostDialog.show();
     }
 
     public void goBackToMenu(View view) {
+        MediaPlayerReproducer.getInstance().reproduceClickSound(this);
         Intent intent = new Intent(this, MenuMetroActivity.class);
         startActivity(intent);
     }

app/src/main/java/com/jorgecruces/metrometro/sound/BackgroundMusic.java

@@ -11,8 +11,10 @@ public abstract class BackgroundMusic {
     private static int startCounter = 0;
 
     public static void onStart(Context context) {
+        if (!MediaPlayerReproducer.getInstance().getMusicBoolean()) {
+            return;
+        }
         startCounter++;
-        Log.d("COUNTER START",Integer.toString(startCounter));
         if (startCounter == 1) {
             mediaPlayer = MediaPlayer.create(context,R.raw.music_menu_loop);
             mediaPlayer.setLooping(true);
@@ -22,11 +24,19 @@ public static void onStart(Context context) {
     }
 
     public static void onStop(Context context) {
+        if (!MediaPlayerReproducer.getInstance().getMusicBoolean()) {
+            return;
+        }
         startCounter--;
-        Log.d("COUNTER STOP",Integer.toString(startCounter));
         if (startCounter == 0) {
             mediaPlayer.stop();
             mediaPlayer.release();
         }
     }
+
+    public static void forceStop() {
+        startCounter = 0;
+        mediaPlayer.stop();
+        mediaPlayer.release();
+    }
 }

app/src/main/java/com/jorgecruces/metrometro/sound/MediaPlayerReproducer.java

@@ -56,17 +56,31 @@ public boolean getMusicBoolean() {
      */
     public void reproduceClickSound(Context context)
     {
-        reproduceSound(context, R.raw.click);
+        reproduceSound(context, R.raw.sound_click_all);
     }
 
+    public void reproduceLostSound(Context context) {
+        reproduceSound(context, R.raw.sound_lost);
+    }
+
+    public void reproduceCorrectAlternativeSound(Context context) {
+        reproduceSound(context, R.raw.sound_correct_alternative);
+    }
+
+    public void reproduceSoundWinLevel(Context context) {
+        reproduceSound(context, R.raw.sound_win);
+
+    }
+
+
     /**
      * Reproduce Win Sound
      * @param context activity
      */
-    public void reproduceWinSound(Context context)
-    {
-        reproduceSound(context, R.raw.win_sound);
-    }
+//    public void reproduceWinSound(Context context)
+//    {
+//        reproduceSound(context, R.raw.win_sound);
+//    }
 
     public void reproduceMusicMainMenu(Context context) {
         if (!isMusicOn || isMusicReproducing) {return;}
@@ -81,7 +95,6 @@ public void stopMusicMainMenu(Context context) {
         if (isMusicReproducing && musicIntent != null) {
 
             //Stop music
-
             isMusicReproducing = false;
         }
     }