Migrating to AndroidX

mergehez · Sep 23, 2020 · fc4a42a · fc4a42a
1 parent 080e726
commit fc4a42a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/app/src/main/java/com/arges/sepan/argmusicplayersample/FullScreenPlayerActivity.java b/app/src/main/java/com/arges/sepan/argmusicplayersample/FullScreenPlayerActivity.java
@@ -32,18 +32,18 @@ protected void onCreate(Bundle savedInstanceState) {
         //tvMusicType = (TextView)findViewById(R.id.tvMusicType);
         musicPlayer = (ArgPlayerFullScreenView) findViewById(R.id.argmusicplayer);
 
-        audioUrl = ArgAudio.createFromURL("One Piece","Binks Sake",url1);
-        audioRaw = ArgAudio.createFromRaw("Joe Hisaishi","Requiem", res1);
-        audioAssets = ArgAudio.createFromAssets("Nîzamettîn Ariç","Zînê","zine.mp3");
-        audioFile2 = ArgAudio.createFromFilePath("Andrea Bocelli","Caruso","/storage/emulated/0/Music/Andrea Bocelli Caruso.mp3");
-        audioFile = ArgAudio.createFromFilePath("Awaz Baran","Zara","/storage/emulated/0/Music/zaragiyan.m4a");
+        audioAssets = ArgAudio.createFromAssets("Nîzamettîn Ariç", "Zînê", "zine.mp3");
+        audioFile2 = ArgAudio.createFromFilePath("Andrea Bocelli", "Caruso", "/storage/emulated/0/Music/Andrea Bocelli Caruso.mp3");
+        audioFile = ArgAudio.createFromFilePath("Awaz Baran", "Zara", "/storage/emulated/0/Music/zaragiyan.m4a");
+        audioUrl = ArgAudio.createFromURL("One Piece", "Binks Sake", url1);
+        audioRaw = ArgAudio.createFromRaw("Joe Hisaishi", "Requiem", res1);
         playlist
-                .add(audioRaw) .add(audioAssets) .add(audioFile)
-                .add(audioRaw) .add(audioUrl)   .add(audioAssets) .add(audioFile2)
-                .add(audioRaw) .add(audioFile2) .add(audioAssets) .add(audioFile)
-                .add(audioRaw) .add(audioFile2) .add(audioAssets) .add(audioFile)
-                .add(audioRaw) .add(audioFile2) .add(audioAssets) .add(audioFile)
-                .add(audioRaw) .add(audioFile2) .add(audioAssets) .add(audioFile);
+                .add(audioRaw).add(audioAssets).add(audioFile)
+                .add(audioRaw).add(audioUrl).add(audioAssets).add(audioFile2)
+                .add(audioRaw).add(audioFile2).add(audioAssets).add(audioFile)
+                .add(audioRaw).add(audioFile2).add(audioAssets).add(audioFile)
+                .add(audioRaw).add(audioFile2).add(audioAssets).add(audioFile)
+                .add(audioRaw).add(audioFile2).add(audioAssets).add(audioFile);
         musicPlayer.continuePlaylistWhenError();
         musicPlayer.playAudioAfterPercent(50);
         musicPlayer.setPlaylistRepeat(true);

diff --git a/app/src/main/java/com/arges/sepan/argmusicplayersample/SmallPlayerActivity.java b/app/src/main/java/com/arges/sepan/argmusicplayersample/SmallPlayerActivity.java
@@ -1,5 +1,6 @@
 package com.arges.sepan.argmusicplayersample;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.View;
 
@@ -32,21 +33,22 @@ protected void onCreate(Bundle savedInstanceState) {
         tvMusicType = (AppCompatTextView) findViewById(R.id.tvMusicType);
         musicPlayer = (ArgPlayerSmallView) findViewById(R.id.argmusicplayer);
 
-        audioUrl = ArgAudio.createFromURL("One Piece", "Binks Sake", url1);
-        audioRaw = ArgAudio.createFromRaw("Joe Hisaishi", "Requiem", res1);
         audioAssets = ArgAudio.createFromAssets("Nîzamettîn Ariç", "Zînê", "zine.mp3");
         audioFile = ArgAudio.createFromFilePath("Andrea Bocelli", "Caruso", "/storage/emulated/0/Music/Andrea Bocelli Caruso.mp3");
         audioFile = ArgAudio.createFromFilePath("Awaz Baran", "Zara", "/storage/emulated/0/Music/zaragiyan.m4a");
+        audioUrl = ArgAudio.createFromURL("One Piece", "Binks Sake", url1);
+        audioRaw = ArgAudio.createFromRaw("Joe Hisaishi", "Requiem", res1);
         playlist.add(audioRaw).add(audioUrl).add(audioAssets).add(audioFile);
 
         musicPlayer.enableNotification(SmallPlayerActivity.class);
         musicPlayer.setOnErrorListener(new Arg.OnErrorListener() {
             @Override
             public void onError(ErrorType errorType, String description) {
-                tvError.setText("Error:\nType: " + errorType + "\nDescription: " + description);
+                tvError.setText(String.format("Error:\nType: %s\nDescription: %s", errorType, description));
             }
         });
         musicPlayer.setOnPlaylistAudioChangedListener(new Arg.OnPlaylistAudioChangedListener() {
+            @SuppressLint("DefaultLocale")
             @Override
             public void onPlaylistAudioChanged(ArgAudioList playlist, int currentAudioIndex) {
                 tvMusicType.setText(String.format("PLAYLIST Audio%d: %s", playlist.getCurrentIndex(), playlist.getCurrentAudio().getTitle()));