refactor: refactoring redirection for players

DeNoise/app/build.gradle

@@ -7,7 +7,7 @@ android {
 
  defaultConfig {
  applicationId "com.tarapogancev.denoise"
- minSdk 31
+ minSdk 24
  targetSdk 32
  versionCode 1
  versionName "1.0"

DeNoise/app/src/main/AndroidManifest.xml

@@ -17,8 +17,7 @@
  android:launchMode="singleInstance"
  android:roundIcon="@mipmap/ic_launcher_round"
  android:supportsRtl="true"
- android:theme="@style/Theme.DeNoiseCalmingWhiteNoise"
- tools:targetApi="31">
+ android:theme="@style/Theme.DeNoiseCalmingWhiteNoise">
  <activity
  android:name=".TimerDialog"
  android:exported="false" />
@@ -29,13 +28,13 @@
  android:name=".Onboarding"
  android:exported="false" />
  <activity
- android:name=".BrownNoisePlayer"
+ android:name=".player.BrownNoisePlayer"
  android:exported="false" />
  <activity
- android:name=".PinkNoisePlayer"
+ android:name=".player.PinkNoisePlayer"
  android:exported="false" />
  <activity
- android:name=".WhiteNoisePlayer"
+ android:name=".player.WhiteNoisePlayer"
  android:exported="false" />
  <activity
  android:name=".MainActivity"

DeNoise/app/src/main/java/com/tarapogancev/denoise/MainActivity.java

@@ -20,6 +20,9 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.tarapogancev.denoise.player.BrownNoisePlayer;
+import com.tarapogancev.denoise.player.PinkNoisePlayer;
+import com.tarapogancev.denoise.player.WhiteNoisePlayer;
 import com.tarapogancev.denoise.service.MediaPlayerService;
 
 import java.util.Calendar;

DeNoise/app/src/main/java/com/tarapogancev/denoise/BrownNoisePlayer.java → DeNoise/app/src/main/java/com/tarapogancev/denoise/player/BrownNoisePlayer.java

@@ -1,4 +1,4 @@
-package com.tarapogancev.denoise;
+package com.tarapogancev.denoise.player;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.cardview.widget.CardView;
@@ -20,11 +20,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.tarapogancev.denoise.MainActivity;
+import com.tarapogancev.denoise.R;
 import com.tarapogancev.denoise.service.MediaPlayerService;
 import com.tarapogancev.denoise.service.TimerService;
 
-import java.util.Objects;
-
 public class BrownNoisePlayer extends AppCompatActivity {
 
  CardView backButton, timerButton, whiteNoiseButton, pinkNoiseButton, nextButton, previousButton, playPauseButton;
@@ -68,14 +68,14 @@ protected void onCreate(Bundle savedInstanceState) {
  whiteNoiseButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectWhiteNoise();
+ redirect(WhiteNoisePlayer.class);
  }
  });
 
  pinkNoiseButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectPinkNoise();
+ redirect(PinkNoisePlayer.class);
  }
  });
 
@@ -96,14 +96,14 @@ public void onClick(View view) {
  previousButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectPinkNoise();
+ redirect(PinkNoisePlayer.class);
  }
  });
 
  nextButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectWhiteNoise();
+ redirect(WhiteNoisePlayer.class);
  }
  });
 
@@ -213,7 +213,7 @@ public void onClick(View view) {
  backButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectMainActivity();
+ redirect(MainActivity.class);
  }
  });
 
@@ -266,24 +266,8 @@ private boolean checkTimerButtonAvailability(EditText minutes, EditText hours) {
  return true;
  }
 
- private void redirectMainActivity() {
- Intent intent = new Intent(BrownNoisePlayer.this, MainActivity.class);
- finish();
- Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(BrownNoisePlayer.this,
- android.R.anim.fade_in, android.R.anim.fade_out).toBundle();
- startActivity(intent, bundle);
- }
-
- private void redirectWhiteNoise() {
- Intent intent = new Intent(BrownNoisePlayer.this, WhiteNoisePlayer.class);
- finish();
- Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(BrownNoisePlayer.this,
- android.R.anim.fade_in, android.R.anim.fade_out).toBundle();
- startActivity(intent, bundle);
- }
-
- private void redirectPinkNoise() {
- Intent intent = new Intent(BrownNoisePlayer.this, PinkNoisePlayer.class);
+ private void redirect(Class<?> activity) {
+ Intent intent = new Intent(BrownNoisePlayer.this, activity);
  finish();
  Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(BrownNoisePlayer.this,
  android.R.anim.fade_in, android.R.anim.fade_out).toBundle();

DeNoise/app/src/main/java/com/tarapogancev/denoise/PinkNoisePlayer.java → DeNoise/app/src/main/java/com/tarapogancev/denoise/player/PinkNoisePlayer.java

@@ -1,4 +1,4 @@
-package com.tarapogancev.denoise;
+package com.tarapogancev.denoise.player;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.cardview.widget.CardView;
@@ -20,11 +20,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.tarapogancev.denoise.MainActivity;
+import com.tarapogancev.denoise.R;
 import com.tarapogancev.denoise.service.MediaPlayerService;
 import com.tarapogancev.denoise.service.TimerService;
 
-import java.util.Objects;
-
 public class PinkNoisePlayer extends AppCompatActivity {
 
  CardView backButton, timerButton, whiteNoiseButton, brownNoiseButton, nextButton, previousButton, playPauseButton;
@@ -68,14 +68,14 @@ protected void onCreate(Bundle savedInstanceState) {
  whiteNoiseButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectWhiteNoise();
+ redirect(WhiteNoisePlayer.class);
  }
  });
 
  brownNoiseButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectBrownNoise();
+ redirect(BrownNoisePlayer.class);
  }
  });
 
@@ -96,14 +96,14 @@ public void onClick(View view) {
  previousButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectWhiteNoise();
+ redirect(WhiteNoisePlayer.class);
  }
  });
 
  nextButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectBrownNoise();
+ redirect(BrownNoisePlayer.class);
  }
  });
 
@@ -213,7 +213,7 @@ public void onClick(View view) {
  backButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectMainActivity();
+ redirect(MainActivity.class);
  }
  });
 
@@ -266,24 +266,8 @@ private boolean checkTimerButtonAvailability(EditText minutes, EditText hours) {
  return true;
  }
 
- private void redirectWhiteNoise() {
- Intent intent = new Intent(PinkNoisePlayer.this, WhiteNoisePlayer.class);
- finish();
- Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(PinkNoisePlayer.this,
- android.R.anim.fade_in, android.R.anim.fade_out).toBundle();
- startActivity(intent, bundle);
- }
-
- private void redirectBrownNoise() {
- Intent intent = new Intent(PinkNoisePlayer.this, BrownNoisePlayer.class);
- finish();
- Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(PinkNoisePlayer.this,
- android.R.anim.fade_in, android.R.anim.fade_out).toBundle();
- startActivity(intent, bundle);
- }
-
- private void redirectMainActivity() {
- Intent intent = new Intent(PinkNoisePlayer.this, MainActivity.class);
+ private void redirect(Class<?> activity) {
+ Intent intent = new Intent(PinkNoisePlayer.this, activity);
  finish();
  Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(PinkNoisePlayer.this,
  android.R.anim.fade_in, android.R.anim.fade_out).toBundle();

DeNoise/app/src/main/java/com/tarapogancev/denoise/WhiteNoisePlayer.java → DeNoise/app/src/main/java/com/tarapogancev/denoise/player/WhiteNoisePlayer.java

@@ -1,4 +1,4 @@
-package com.tarapogancev.denoise;
+package com.tarapogancev.denoise.player;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.cardview.widget.CardView;
@@ -20,11 +20,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.tarapogancev.denoise.MainActivity;
+import com.tarapogancev.denoise.R;
 import com.tarapogancev.denoise.service.MediaPlayerService;
 import com.tarapogancev.denoise.service.TimerService;
 
-import java.util.Objects;
-
 public class WhiteNoisePlayer extends AppCompatActivity {
 
  CardView backButton, timerButton, pinkNoiseButton, brownNoiseButton, nextButton, previousButton, playPauseButton;
@@ -68,14 +68,14 @@ protected void onCreate(Bundle savedInstanceState) {
  pinkNoiseButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectPinkNoise();
+ redirect(PinkNoisePlayer.class);
  }
  });
 
  brownNoiseButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectBrownNoise();
+ redirect(BrownNoisePlayer.class);
  }
  });
 
@@ -96,14 +96,14 @@ public void onClick(View view) {
  previousButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectBrownNoise();
+ redirect(BrownNoisePlayer.class);
  }
  });
 
  nextButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectPinkNoise();
+ redirect(PinkNoisePlayer.class);
  }
  });
 
@@ -213,7 +213,7 @@ public void onClick(View view) {
  backButton.setOnClickListener(new View.OnClickListener() {
  @Override
  public void onClick(View view) {
- redirectMainActivity();
+ redirect(MainActivity.class);
  }
  });
 
@@ -266,24 +266,8 @@ private boolean checkTimerButtonAvailability(EditText minutes, EditText hours) {
  return true;
  }
 
- private void redirectPinkNoise() {
- Intent intent = new Intent(WhiteNoisePlayer.this, PinkNoisePlayer.class);
- finish();
- Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(WhiteNoisePlayer.this,
- android.R.anim.fade_in, android.R.anim.fade_out).toBundle();
- startActivity(intent, bundle);
- }
-
- private void redirectBrownNoise() {
- Intent intent = new Intent(WhiteNoisePlayer.this, BrownNoisePlayer.class);
- finish();
- Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(WhiteNoisePlayer.this,
- android.R.anim.fade_in, android.R.anim.fade_out).toBundle();
- startActivity(intent, bundle);
- }
-
- private void redirectMainActivity() {
- Intent intent = new Intent(WhiteNoisePlayer.this, MainActivity.class);
+ private void redirect(Class<?> activity) {
+ Intent intent = new Intent(WhiteNoisePlayer.this, activity);
  finish();
  Bundle bundle = ActivityOptionsCompat.makeCustomAnimation(WhiteNoisePlayer.this,
  android.R.anim.fade_in, android.R.anim.fade_out).toBundle();

DeNoise/app/src/main/java/com/tarapogancev/denoise/service/MediaPlayerService.java

@@ -202,11 +202,11 @@ public Notification getNotification(String sound, Boolean isPlaying) {
  .setSmallIcon(R.drawable.logo)
  .setLargeIcon(picture)
  .setContentIntent(pendingIntent)
+ .addAction(R.drawable.ic_baseline_cancel_24, getString(R.string.close), actionIntent0)
 // .addAction(R.drawable.ic_baseline_skip_previous_24, "Previous", actionIntent1)
 // .addAction(playPauseIcon, "Play/Pause", actionIntent2)
 // .addAction(R.drawable.ic_baseline_skip_next_24, "Next", actionIntent3)
- .addAction(R.drawable.ic_baseline_cancel_24, getString(R.string.close), actionIntent0)
- // .setStyle(new androidx.media.app.NotificationCompat.MediaStyle().setShowActionsInCompactView(0))
+// .setStyle(new androidx.media.app.NotificationCompat.MediaStyle().setShowActionsInCompactView(0))
  .setSilent(true)
  .build();
 

DeNoise/app/src/main/res/layout/activity_brown_noise_player.xml

@@ -4,7 +4,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- tools:context=".BrownNoisePlayer"
+ tools:context=".player.BrownNoisePlayer"
  android:background="@drawable/waterfall"
  >
 

DeNoise/app/src/main/res/layout/activity_pink_noise_player.xml

@@ -4,7 +4,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- tools:context=".PinkNoisePlayer"
+ tools:context=".player.PinkNoisePlayer"
  android:background="@drawable/sunset"
  >
 

DeNoise/app/src/main/res/layout/activity_white_noise_player.xml

@@ -5,7 +5,7 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:background="@drawable/ocean"
- tools:context=".WhiteNoisePlayer">
+ tools:context=".player.WhiteNoisePlayer">
 
  <RelativeLayout
  android:layout_width="match_parent"

README.md

@@ -9,6 +9,7 @@ I plan on releasing this application on Play Store, as well as working on its ex
 https://www.flaticon.com/packs/music-224?word=music%20player
 https://unsplash.com/
 https://themeisle.com/illustrations/
+https://mixkit.co/
 
 ## Screenshots
 ![notesByCats](Screenshots/1.jpg)