Updated, fixed bugs

mergehez · Mar 22, 2021 · d706f30 · d706f30
1 parent af6ba41
commit d706f30
Show file tree

Hide file tree

Showing 29 changed files with 293 additions and 234 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
     defaultConfig {
         applicationId "com.arges.sepan.argmusicplayersample"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -17,6 +17,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -27,6 +31,6 @@ dependencies {
     implementation project(":argmusicplayer")
     //implementation 'com.android.support:appcompat-v7:25.4.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    testImplementation 'junit:junit:4.13.1'
 }
diff --git a/app/src/main/java/com/arges/sepan/argmusicplayersample/FullScreenPlayerActivity.java b/app/src/main/java/com/arges/sepan/argmusicplayersample/FullScreenPlayerActivity.java
@@ -5,22 +5,14 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.arges.sepan.argmusicplayer.Enums.ErrorType;
-import com.arges.sepan.argmusicplayer.IndependentClasses.Arg;
 import com.arges.sepan.argmusicplayer.IndependentClasses.ArgAudio;
 import com.arges.sepan.argmusicplayer.IndependentClasses.ArgAudioList;
 import com.arges.sepan.argmusicplayer.PlayerViews.ArgPlayerFullScreenView;
 
 
 public class FullScreenPlayerActivity extends AppCompatActivity {
-    String url1 = "http://www.noiseaddicts.com/samples_1w72b820/2563.mp3";   // 7.5 mb
-    String url2 = "http://mergesoft.org/thesis/argmusicplayer/binkssake.mp3";   // 1.5 mb
-    String url3 = "http://www.noiseaddicts.com/samples_1w72b820/4250.mp3";   // 0.5 mb
-    int res1 = R.raw.nausicaa_requiem;
     ArgPlayerFullScreenView musicPlayer;
-    //TextView tvError, tvMusicType;
-
-    ArgAudio audioUrl,audioRaw,audioAssets,audioFile,audioFile2;
+    ArgAudio audioUrl,audioUrl2,audioRaw,audioAssets,audioFile,audioFile2;
     ArgAudioList playlist = new ArgAudioList(true);
 
     @Override
@@ -33,27 +25,26 @@ protected void onCreate(Bundle savedInstanceState) {
         musicPlayer = (ArgPlayerFullScreenView) findViewById(R.id.argmusicplayer);
 
         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);
+        audioFile = ArgAudio.createFromFilePath("Andrea Bocelli", "Caruso", "/storage/emulated/0/Music/Andrea Bocelli Caruso.mp3");
+        audioFile2 = ArgAudio.createFromFilePath("Awaz Baran", "Zara", "/storage/emulated/0/Music/zaragiyan.m4a");
+        audioUrl = ArgAudio.createFromURL("Joan Baez", "North Country Blues", MainActivity.Url1);
+        audioUrl2 = ArgAudio.createFromURL("Boney M.", "Rasputin", MainActivity.Url2);
+        ArgAudio audioUrl3 = ArgAudio.createFromURL("Şehîd Argeş", "Dara Jînê", MainActivity.Url3);
+        ArgAudio audioUrl4 = ArgAudio.createFromURL("Vicor Jara", "La Partida", MainActivity.Url4);
+        ArgAudio audioUrl5 = ArgAudio.createFromURL("Mark Kelly & Soraya", "Under The Jasmine Tree", MainActivity.Url5);
+        ArgAudio audioUrl6 = ArgAudio.createFromURL("Koma Wetan", "Filîto Lawo", MainActivity.Url6);
+        audioRaw = ArgAudio.createFromRaw("Joe Hisaishi", "Castle in the Sky", MainActivity.RawSong);
         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(audioUrl3).add(audioUrl).add(audioUrl2).add(audioUrl4)
+                .add(audioRaw).add(audioUrl3).add(audioUrl5).add(audioUrl6)
+                .add(audioUrl).add(audioUrl2).add(audioUrl4).add(audioUrl3)
+                .add(audioUrl5).add(audioRaw).add(audioUrl6).add(audioUrl)
+                .add(audioUrl2).add(audioRaw).add(audioUrl3).add(audioUrl4);
         musicPlayer.continuePlaylistWhenError();
         musicPlayer.playAudioAfterPercent(50);
         musicPlayer.setPlaylistRepeat(true);
         musicPlayer.enableNotification(FullScreenPlayerActivity.class);
-        musicPlayer.setOnErrorListener(new Arg.OnErrorListener() {
-            @Override
-            public void onError(ErrorType errorType, String description) {
-                Toast.makeText(FullScreenPlayerActivity.this,"Error:\nType: "+errorType+"\nDescription: "+description,Toast.LENGTH_LONG).show();
-            }
-        });
+        musicPlayer.setOnErrorListener((errorType, description) -> Toast.makeText(FullScreenPlayerActivity.this,"Error:\nType: "+errorType+"\nDescription: "+description,Toast.LENGTH_LONG).show());
         musicPlayer.playPlaylist(playlist);
 
     }

diff --git a/app/src/main/java/com/arges/sepan/argmusicplayersample/LargePlayerActivity.java b/app/src/main/java/com/arges/sepan/argmusicplayersample/LargePlayerActivity.java
@@ -1,26 +1,20 @@
 package com.arges.sepan.argmusicplayersample;
 
 import android.os.Bundle;
-import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatTextView;
 
-import com.arges.sepan.argmusicplayer.Enums.ErrorType;
-import com.arges.sepan.argmusicplayer.IndependentClasses.Arg;
 import com.arges.sepan.argmusicplayer.IndependentClasses.ArgAudio;
 import com.arges.sepan.argmusicplayer.IndependentClasses.ArgAudioList;
 import com.arges.sepan.argmusicplayer.PlayerViews.ArgPlayerLargeView;
 
+import java.util.Locale;
+
 public class LargePlayerActivity extends AppCompatActivity {
-    String url1 = "http://www.noiseaddicts.com/samples_1w72b820/2563.mp3";   // 7.5 mb
-    String url2 = "http://mergesoft.org/thesis/argmusicplayer/binkssake.mp3";   // 1.5 mb
-    String url3 = "http://www.noiseaddicts.com/samples_1w72b820/4250.mp3";   // 0.5 mb
-    int res1 = R.raw.nausicaa_requiem;
     ArgPlayerLargeView musicPlayer;
     AppCompatTextView tvError, tvMusicType;
-
-    ArgAudio audioUrl, audioRaw, audioAssets, audioFile;
+    ArgAudio audioUrl, audioUrl2, audioRaw, audioAssets, audioFile;
     ArgAudioList playlist = new ArgAudioList(true);
 
     @Override
@@ -32,26 +26,21 @@ protected void onCreate(Bundle savedInstanceState) {
         tvMusicType = (AppCompatTextView) findViewById(R.id.tvMusicType);
         musicPlayer = (ArgPlayerLargeView) 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");
-        playlist.add(audioRaw).add(audioUrl).add(audioAssets).add(audioFile);
+        audioUrl = ArgAudio.createFromURL("Joan Baez", "North Country Blues", MainActivity.Url1);
+        audioUrl2 = ArgAudio.createFromURL("Boney M.", "Rasputin", MainActivity.Url2);
+        audioRaw = ArgAudio.createFromRaw("Joe Hisaishi", "Castle in the Sky", MainActivity.RawSong);
+        ArgAudio audioUrl3 = ArgAudio.createFromURL("Şehîd Argeş", "Dara Jînê", MainActivity.Url3);
+        ArgAudio audioUrl4 = ArgAudio.createFromURL("Vicor Jara", "La Partida", MainActivity.Url4);
+        ArgAudio audioUrl5 = ArgAudio.createFromURL("Mark Kelly & Soraya", "Under The Jasmine Tree", MainActivity.Url5);
+        ArgAudio audioUrl6 = ArgAudio.createFromURL("Koma Wetan", "Filîto Lawo", MainActivity.Url6);
+        playlist.add(audioRaw).add(audioUrl).add(audioUrl2).add(audioUrl3).add(audioUrl4).add(audioUrl5).add(audioUrl6);//.add(audioAssets).add(audioFile);
 
         musicPlayer.enableNotification(LargePlayerActivity.class);
-        musicPlayer.setOnErrorListener(new Arg.OnErrorListener() {
-            @Override
-            public void onError(ErrorType errorType, String description) {
-                tvError.setText("Error:\nType: " + errorType + "\nDescription: " + description);
-            }
-        });
-        musicPlayer.setOnPlaylistAudioChangedListener(new Arg.OnPlaylistAudioChangedListener() {
-            @Override
-            public void onPlaylistAudioChanged(ArgAudioList playlist, int currentAudioIndex) {
-                tvMusicType.setText(String.format("PLAYLIST Audio%d: %s", playlist.getCurrentIndex(), playlist.getCurrentAudio().getTitle()));
-            }
-        });
+        musicPlayer.setOnErrorListener((errorType, description) -> tvError.setText(String.format("Error:\nType: %s\nDescription: %s", errorType, description)));
+        musicPlayer.setOnPlaylistAudioChangedListener((playlist, currentAudioIndex) -> tvMusicType.setText(String.format(Locale.getDefault(), "PLAYLIST Audio%d: %s", playlist.getCurrentIndex(), playlist.getCurrentAudio().getTitle())));
         musicPlayer.play(audioFile);
 
         initBtns();
@@ -72,40 +61,26 @@ public void onBackPressed() {
 
     public void initBtns(){
 
-        findViewById(R.id.btnUrl).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                tvMusicType.setText(String.format("URL - %s", audioUrl.getTitle()));
-                musicPlayer.play(audioUrl);
-            }
+        findViewById(R.id.btnUrl).setOnClickListener(v -> {
+            tvMusicType.setText(String.format("URL - %s", audioUrl.getTitle()));
+            musicPlayer.play(audioUrl);
         });
-        findViewById(R.id.btnRaw).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                tvMusicType.setText(String.format("RAW - %s", audioRaw.getTitle()));
-                musicPlayer.play(audioRaw);
-            }
+        findViewById(R.id.btnRaw).setOnClickListener(v -> {
+            tvMusicType.setText(String.format("RAW - %s", audioRaw.getTitle()));
+            musicPlayer.play(audioRaw);
         });
-        findViewById(R.id.btnAssets).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                tvMusicType.setText(String.format("ASSETS - %s", audioAssets.getTitle()));
-                musicPlayer.play(audioAssets);
-            }
+        findViewById(R.id.btnAssets).setOnClickListener(v -> {
+            tvMusicType.setText(String.format("ASSETS - %s", audioAssets.getTitle()));
+            musicPlayer.play(audioAssets);
         });
-        findViewById(R.id.btnFile).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                tvMusicType.setText(String.format("FILE PATH - %s", audioFile.getTitle()));
-                musicPlayer.play(audioFile);
-            }
+        findViewById(R.id.btnFile).setOnClickListener(v -> {
+            tvMusicType.setText(String.format("FILE PATH - %s", audioFile.getTitle()));
+            musicPlayer.play(audioFile);
         });
-        findViewById(R.id.btnPlaylist).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                musicPlayer.setPlaylistRepeat(true);
-                musicPlayer.playPlaylist(playlist);
-            }
+        findViewById(R.id.btnPlaylist).setOnClickListener(v -> {
+            musicPlayer.setPlaylistRepeat(true);
+            musicPlayer.playPlaylist(playlist);
+            tvMusicType.setText(String.format("PLAYLIST - %s", musicPlayer.getCurrentAudio().getTitle()));
         });
     }
 }
diff --git a/app/src/main/java/com/arges/sepan/argmusicplayersample/MainActivity.java b/app/src/main/java/com/arges/sepan/argmusicplayersample/MainActivity.java
@@ -13,6 +13,14 @@
 import com.arges.sepan.argmusicplayer.IndependentClasses.ArgAudioList;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener{
+
+    public static final String Url1 = "https://www.gotinenstranan.com/joan-baez-north-country-blues.mp3";   // 2.3 mb
+    public static final String Url2 = "https://www.gotinenstranan.com/boney-m-rasputin.mp3";   // 4.2 mb
+    public static final String Url3 = "https://www.gotinenstranan.com/radyo/stran/s%CC%A7ehi%CC%82d%20arges%CC%A7%20-%20dara%20ji%CC%82ne%CC%82.mp3";   // 1.7 mb
+    public static final String Url4 = "https://www.gotinenstranan.com/radyo/stran/victor%20jara%20-%20la%20partida.mp3";   // 1.5 mb
+    public static final String Url5 = "https://www.gotinenstranan.com/radyo/stran/mark%20kelly%20%26%20soraya%20-%20under%20the%20jasmine%20tree.mp3";   // 1.5 mb
+    public static final String Url6 = "https://www.gotinenstranan.com/radyo/stran/koma%20wetan%20-%20fili%CC%82to%20lao.mp3";   // 2.1 mb
+    public static final int RawSong = R.raw.castle_in_the_sky;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -25,19 +33,18 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onClick(View v) {
-        if(v!=null)
-            switch (v.getId()){
-                case R.id.btnSmall: startActivity(new Intent(MainActivity.this,SmallPlayerActivity.class)); break;
-                case R.id.btnLarge: startActivity(new Intent(MainActivity.this,LargePlayerActivity.class)); break;
-                case R.id.btnFullScreen: startActivity(new Intent(MainActivity.this,FullScreenPlayerActivity.class)); break;
-            }
+        if(v!=null){
+            int id = v.getId();
+            if(id== R.id.btnSmall)
+                startActivity(new Intent(MainActivity.this,SmallPlayerActivity.class));
+            else if(id == R.id.btnLarge)
+                startActivity(new Intent(MainActivity.this,LargePlayerActivity.class));
+            else if(id == R.id.btnFullScreen)
+                startActivity(new Intent(MainActivity.this,FullScreenPlayerActivity.class));
+        }
     }
 
 
-
-
-
-
     private void allFunctions(){
         final ArgAudio myAudio = new ArgAudio("Singer","My Audio","symphony9",AudioType.RAW);
         final ArgAudioList myPlaylist = new ArgAudioList(true);