Update Icon, Update Menu Playlist..List Track..

kimsultech · Jan 10, 2021 · c85c2a8 · c85c2a8
1 parent 277c3fd
commit c85c2a8
Show file tree

Hide file tree

Showing 37 changed files with 542 additions and 240 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,14 +11,15 @@ android {
         minSdkVersion 22
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName "1.0 Testing"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,16 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+#Glide
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+-dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
+
+#Tauon  Remote
+-keep class com.kangtech.tauonremote** {*;}
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/com/kangtech/tauonremote/adapter/ExpandableListAdapter.java b/app/src/main/java/com/kangtech/tauonremote/adapter/ExpandableListAdapter.java
@@ -1,25 +1,42 @@
 package com.kangtech.tauonremote.adapter;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.Typeface;
+import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.core.view.GravityCompat;
+import androidx.navigation.NavController;
+import androidx.navigation.NavGraph;
+import androidx.navigation.NavInflater;
+import androidx.navigation.Navigation;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.kangtech.tauonremote.R;
 import com.kangtech.tauonremote.model.playlist.PlaylistData;
 import com.kangtech.tauonremote.model.playlist.PlaylistModel;
+import com.kangtech.tauonremote.view.MainActivity;
 
 import java.util.HashMap;
 import java.util.List;
 
+import static android.content.Context.MODE_PRIVATE;
+
 public class ExpandableListAdapter extends BaseExpandableListAdapter {
     private Context _context;
     private List<String> _listDataHeader;
     private HashMap<String, List<PlaylistModel>> _listdataChild;
 
+    private SharedPreferences.Editor editor;
+
     public ExpandableListAdapter (Context context, List<String> listDataHeader,
                                   HashMap<String, List<PlaylistModel>> listChildData) {
         this._context = context;
@@ -49,8 +66,31 @@ public View getChildView(int groupPosition, int childPosition, boolean isLastChi
 
         TextView tvListChild = (TextView) convertView.findViewById(R.id.lblListItem);
         tvListChild.setText(childText);
-        return convertView;
 
+        NavController navController = Navigation.findNavController((Activity) _context, R.id.nav_host_fragment);
+        Bundle bundle = new Bundle();
+        bundle.putBoolean("FROM_MENU_LIST_TRACK", true);
+        bundle.putString("PlaylistID", _listdataChild.get(_listDataHeader.get(groupPosition)).get(groupPosition).playlists.get(childPosition).id);
+        bundle.putString("PlaylistName", _listdataChild.get(_listDataHeader.get(groupPosition)).get(groupPosition).playlists.get(childPosition).name);
+
+        LinearLayout ll_child = convertView.findViewById(R.id.ll_child_list);
+        ll_child.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                navController.navigate(R.id.nav_track, bundle);
+
+                MainActivity.drawer.closeDrawer(GravityCompat.START);
+                if (MainActivity.bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+                    MainActivity.bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+                }
+
+                editor = _context.getSharedPreferences("tauon_remote", MODE_PRIVATE).edit();
+                editor.putString("titleToolbar", _listdataChild.get(_listDataHeader.get(groupPosition)).get(groupPosition).playlists.get(childPosition).name);
+                editor.apply();
+            }
+        });
+
+        return convertView;
     }
 
     @Override

diff --git a/app/src/main/java/com/kangtech/tauonremote/adapter/TrackListAdapter.java b/app/src/main/java/com/kangtech/tauonremote/adapter/TrackListAdapter.java
@@ -34,20 +34,24 @@
 import java.util.List;
 import java.util.Objects;
 
+import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
+import okhttp3.ResponseBody;
 
 public class TrackListAdapter extends RecyclerView.Adapter<TrackListAdapter.TrackListViewHolder> implements Filterable {
 
     private TrackListModel trackListModels;
     private TrackListModel getTrackListModelsFiltered;
     private final Context context;
-    private int getPosition;
+    private final String playlistID;
 
-    public TrackListAdapter(Context context, TrackListModel trackListModels) {
+    public TrackListAdapter(Context context, TrackListModel trackListModels, String playlistID) {
         this.context = context;
         this.trackListModels = trackListModels;
         this.getTrackListModelsFiltered = trackListModels;
+        this.playlistID = playlistID;
     }
 
     @NonNull
@@ -70,22 +74,71 @@ public void onBindViewHolder(@NonNull TrackListAdapter.TrackListViewHolder holde
                 .dontAnimate()
                 .into(holder.ivCover);
 
-        if (trackListModels.tracks.get(position).position == SharedPreferencesUtils.getInt("TrackPosition", 0)) {
-            holder.llTrack.setBackgroundColor(context.getResources().getColor(R.color.rose_bg_seekbar1));
-        } else {
-            holder.llTrack.setBackgroundColor(context.getResources().getColor(R.color.rose_bg_list));
+        if (playlistID.equals(SharedPreferencesUtils.getString("playlistID", "0"))) {
+            if (trackListModels.tracks.get(position).position == SharedPreferencesUtils.getInt("TrackPosition", 0)) {
+                holder.llTrack.setBackgroundColor(context.getResources().getColor(R.color.rose_bg_seekbar1));
+            } else {
+                holder.llTrack.setBackgroundColor(context.getResources().getColor(R.color.rose_bg_list));
+            }
         }
 
         holder.llTrack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                holder.apiServiceInterface.start(SharedPreferencesUtils.getString("playlistID", "0"), trackListModels.tracks.get(position).position)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe();
+                if (playlistID.equals(SharedPreferencesUtils.getString("playlistID", "0"))) {
+                    holder.apiServiceInterface.start(SharedPreferencesUtils.getString("playlistID", "0"), trackListModels.tracks.get(position).position)
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new Observer<ResponseBody>() {
+                                @Override
+                                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+
+                                }
+
+                                @Override
+                                public void onNext(@io.reactivex.annotations.NonNull ResponseBody responseBody) {
+
+                                }
+
+                                @Override
+                                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+
+                                }
+
+                                @Override
+                                public void onComplete() {
+
+                                }
+                            });
+                } else {
+                    holder.apiServiceInterface.start(playlistID, trackListModels.tracks.get(position).position)
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new Observer<ResponseBody>() {
+                                @Override
+                                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+
+                                }
+
+                                @Override
+                                public void onNext(@io.reactivex.annotations.NonNull ResponseBody responseBody) {
+
+                                }
+
+                                @Override
+                                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+
+                                }
+
+                                @Override
+                                public void onComplete() {
+
+                                }
+                            });
+                }
 
-                MainActivity.bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-                MainActivity.navController.navigate(R.id.nav_album);
+                //MainActivity.bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+                //MainActivity.navController.navigate(R.id.nav_album);
             }
         });
     }

diff --git a/app/src/main/java/com/kangtech/tauonremote/view/AddServer.java b/app/src/main/java/com/kangtech/tauonremote/view/AddServer.java
@@ -67,8 +67,15 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_server);
 
-        nettask = new NetworkSniffTask(getApplicationContext());
-        nettask.execute();
+        if (SharedPreferencesUtils.getBoolean("set_server", false)) {
+            Intent intent = new Intent(this, MainActivity.class);
+            startActivity(intent);
+            finish();
+        } else {
+            nettask = new NetworkSniffTask(getApplicationContext());
+            nettask.execute();
+        }
+
 
         refreshLayout = findViewById(R.id.srl_server);
         toolbar = findViewById(R.id.toolbar_addserver);
@@ -122,12 +129,6 @@ public void run() {
         refreshLayout.setRefreshing(true);
         refreshLayout.setEnabled(false);
 
-        if (SharedPreferencesUtils.getBoolean("set_server", false)) {
-            Intent intent = new Intent(this, MainActivity.class);
-            startActivity(intent);
-            finish();
-        }
-
 
         dataSet = new ArrayList<>();