Updated app

00aj99 · Feb 11, 2020 · 7291fcc · 7291fcc
1 parent 12c5cac
commit 7291fcc
Show file tree

Hide file tree

Showing 37 changed files with 656 additions and 418 deletions.
diff --git a/.gradle/4.6/fileContent/fileContent.lock b/.gradle/4.6/fileContent/fileContent.lock
diff --git a/.gradle/4.6/fileHashes/fileHashes.bin b/.gradle/4.6/fileHashes/fileHashes.bin
diff --git a/.gradle/4.6/fileHashes/fileHashes.lock b/.gradle/4.6/fileHashes/fileHashes.lock
diff --git a/.gradle/4.6/javaCompile/classAnalysis.bin b/.gradle/4.6/javaCompile/classAnalysis.bin
diff --git a/.gradle/4.6/javaCompile/javaCompile.lock b/.gradle/4.6/javaCompile/javaCompile.lock
diff --git a/.gradle/4.6/javaCompile/taskHistory.bin b/.gradle/4.6/javaCompile/taskHistory.bin
diff --git a/.gradle/4.6/taskHistory/taskHistory.bin b/.gradle/4.6/taskHistory/taskHistory.bin
diff --git a/.gradle/4.6/taskHistory/taskHistory.lock b/.gradle/4.6/taskHistory/taskHistory.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.kpstv.youtube"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 12
-        versionName "1.8"
+        versionCode 13
+        versionName "1.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {

diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"1.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":13,"versionName":"1.9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/java/com/kpstv/youtube/EqualizerActivity.java b/app/src/main/java/com/kpstv/youtube/EqualizerActivity.java
@@ -26,11 +26,11 @@
 import com.warkiz.widget.OnSeekChangeListener;
 import com.warkiz.widget.SeekParams;
 
-import static com.kpstv.youtube.MainActivity.settingPref;
 import static com.kpstv.youtube.services.MusicService.bassBoost;
 import static com.kpstv.youtube.services.MusicService.loudnessEnhancer;
 import static com.kpstv.youtube.services.MusicService.mEqualizer;
 import static com.kpstv.youtube.services.MusicService.presetReverb;
+import static com.kpstv.youtube.services.MusicService.settingPref;
 import static com.kpstv.youtube.services.MusicService.virtualizer;
 
 public class EqualizerActivity extends AppCompatActivity {

diff --git a/app/src/main/java/com/kpstv/youtube/MainActivity.java b/app/src/main/java/com/kpstv/youtube/MainActivity.java
@@ -190,7 +190,7 @@ public class MainActivity extends AppCompatActivity implements AppInterface, Sle
     public static Fragment PlaylistFrag, libraryFrag, FavouriteFrag,localMusicFrag, localSearchFrag,popularFrag;
     Fragment NCFrag; String ytLink;
     public static List<String> playListItems;
-    static SharedPreferences preferences,settingPref;
+    static SharedPreferences preferences;
     public static LinearLayout bottom_player, adViewLayout;
     public static ImageButton actionUp;
     public static ImageButton actionPlay;

diff --git a/app/src/main/java/com/kpstv/youtube/PlayerActivity2.java b/app/src/main/java/com/kpstv/youtube/PlayerActivity2.java
@@ -460,8 +460,22 @@ public void onStopTrackingTouch(IndicatorSeekBar seekBar) {
         });
 
         repeatButton.setOnClickListener(v1->{
-            MusicService.isLoop = !MusicService.isLoop;
-            makeRepeat(MusicService.isLoop);
+            switch (MusicService.repeatMode) {
+                case 0:
+                    MusicService.repeatMode=1;
+                    Toast.makeText(activity, "Playlist will be repeated!", Toast.LENGTH_SHORT).show();
+                    break;
+                case 1:
+                    MusicService.repeatMode = 2;
+                    Toast.makeText(activity, "Current song will be repeated!", Toast.LENGTH_SHORT).show();
+                    break;
+                case 2:
+                    MusicService.repeatMode = 0;
+                    break;
+            }
+           // MusicService.isLoop = !MusicService.isLoop;
+          //  makeRepeat(MusicService.isLoop);
+            makeRepeat(MusicService.repeatMode);
         });
 
         navigationDown.setOnClickListener(view -> {
@@ -619,7 +633,7 @@ static void player_common() {
         }
         backImage.setTag(colorTo);
 
-        makeRepeat(MusicService.isLoop);
+        makeRepeat(MusicService.repeatMode);
 
         setLyricData(MusicService.lyricText);
 
@@ -933,11 +947,22 @@ public static void makePause() {
         playFab.setImageDrawable(activity.getResources().getDrawable(R.drawable.pause));
     }
 
-    public static void makeRepeat(boolean value) {
-        if (value)
+    public static void makeRepeat(int value) {
+        switch (value) {
+            case 0:
+                repeatButton.setImageDrawable(activity.getResources().getDrawable(R.drawable.ic_repeat));
+                break;
+            case 1:
+                repeatButton.setImageDrawable(activity.getResources().getDrawable(R.drawable.ic_repeat_true));
+                break;
+            case 2:
+                repeatButton.setImageDrawable(activity.getResources().getDrawable(R.drawable.ic_repeat_one));
+                break;
+        }
+       /* if (value)
             repeatButton.setImageDrawable(activity.getResources().getDrawable(R.drawable.ic_repeat_true));
         else
-            repeatButton.setImageDrawable(activity.getResources().getDrawable(R.drawable.ic_repeat));
+            repeatButton.setImageDrawable(activity.getResources().getDrawable(R.drawable.ic_repeat));*/
     }
 
     private void getAllViews() {

diff --git a/app/src/main/java/com/kpstv/youtube/SilentDownloadActivity.java b/app/src/main/java/com/kpstv/youtube/SilentDownloadActivity.java
@@ -7,6 +7,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
@@ -34,7 +35,7 @@ public class SilentDownloadActivity extends AppCompatActivity {
     private RadioButton mRadio1080p;
     private RadioButton mRadio720p;
     private RadioButton mRadio480p;
-    private MetaModel meta;
+    private MetaModel meta; private AlertDialog alertDialog;
     private String url; private boolean adComplete=false,interstitialLoad=false;
     private LinearLayout mLoadlayout;
     private LinearLayout mMainlayout;
@@ -109,6 +110,18 @@ && getIntent().getType() != null && "text/plain".equals(getIntent().getType()))
 
     @SuppressLint("StaticFieldLeak")
     private void commonIntentLaunch() {
+        if (url.contains("/playlist/")||url.contains("/album/")||url.contains("/playlist?")) {
+            View v = getLayoutInflater().inflate(R.layout.alert_not_playlist,null);
+
+            alertDialog = new AlertDialog.Builder(this)
+                    .setView(v)
+                    .setCancelable(false)
+                    .setPositiveButton("OK",(dialogInterface, i) -> finish())
+                    .create();
+
+            alertDialog.show();
+            return;
+        }
         url = parseLinkfromText(url);
         Log.e(TAG, "onCreate: Action: " + getIntent().getAction() + ", Url: " + url);
 

diff --git a/app/src/main/java/com/kpstv/youtube/fragments/HistoryFragment.java b/app/src/main/java/com/kpstv/youtube/fragments/HistoryFragment.java
@@ -225,10 +225,7 @@ void LoadMainMethod() {
                 ));
             }
         }
-        /*if (!items.isEmpty()) {
-            String[] urlarray = items.split(",");
-            urls.addAll(Arrays.asList(urlarray));
-        }*/
+
         if (urls.size() > 0) {
             swipeRefreshLayout.setRefreshing(true);
             adapter = new HistoryAdapter(urls, getActivity(), recyclerItemLongListener);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"1.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":13,"versionName":"1.9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]