Skip to content

Commit

Permalink
Update Album, Add Search Album, Fix some bug and Improve... beta version
Browse files Browse the repository at this point in the history
  • Loading branch information
@kimsultech
kimsultech committed Jan 15, 2021
1 parent 5b1ab18 commit 92f26b3
Show file tree
Hide file tree
Showing 14 changed files with 261 additions and 173 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
minSdkVersion 22
targetSdkVersion 30
versionCode 2
versionName "1.0 alpha2"
versionName "1.0 beta"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
51 changes: 50 additions & 1 deletion app/src/main/java/com/kangtech/tauonremote/adapter/AlbumListAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Filter;
import android.widget.Filterable;
import android.widget.ImageView;
import android.widget.TextView;

Expand All @@ -19,14 +21,20 @@
import com.bumptech.glide.Glide;
import com.kangtech.tauonremote.R;
import com.kangtech.tauonremote.model.album.AlbumListModel;
import com.kangtech.tauonremote.model.album.AlbumModel;
import com.kangtech.tauonremote.model.track.TrackModel;
import com.kangtech.tauonremote.util.SharedPreferencesUtils;

import java.util.ArrayList;
import java.util.List;

import static android.content.Context.MODE_PRIVATE;

public class AlbumListAdapter extends RecyclerView.Adapter<AlbumListAdapter.AlbumListViewHolder> {
public class AlbumListAdapter extends RecyclerView.Adapter<AlbumListAdapter.AlbumListViewHolder> implements Filterable {

private final Context context;
private AlbumListModel albumListModel;
private AlbumListModel albumListModelFiltered;
private final String playlistID;

private SharedPreferences.Editor editor;
Expand All @@ -35,6 +43,7 @@ public AlbumListAdapter(Context context, AlbumListModel albumListModel, String p
this.context = context;
this.albumListModel = albumListModel;
this.playlistID = playlistID;
this.albumListModelFiltered = albumListModel;
}

@NonNull
Expand Down Expand Up @@ -81,11 +90,49 @@ public int getItemCount() {
return albumListModel.albums.size();
}

@Override
public Filter getFilter() {
return new Filter() {
@Override
protected FilterResults performFiltering(CharSequence charSequence) {

if(charSequence.toString().isEmpty()){
albumListModelFiltered.albums = albumListModel.albums;

}else{
String searchChr = charSequence.toString().toLowerCase();

List<AlbumModel> resultData = new ArrayList<>();

for(AlbumModel userModel: albumListModel.albums){
if(userModel.album.toLowerCase().contains(searchChr) || userModel.artist.toLowerCase().contains(searchChr)){
resultData.add(userModel);
}
}
albumListModelFiltered.albums = resultData;

}

FilterResults filterResults = new FilterResults();
filterResults.values = albumListModelFiltered.albums;
return filterResults;
}

@Override
protected void publishResults(CharSequence charSequence, FilterResults filterResults) {
albumListModelFiltered.albums = (List<AlbumModel>) filterResults.values;
notifyDataSetChanged();

}
};
}

public static class AlbumListViewHolder extends RecyclerView.ViewHolder {
private TextView album, artist;
private ImageView ivCover;
private ConstraintLayout llAlbum;


public AlbumListViewHolder(@NonNull View itemView) {
super(itemView);

Expand All @@ -97,4 +144,6 @@ public AlbumListViewHolder(@NonNull View itemView) {

}
}


}
48 changes: 0 additions & 48 deletions app/src/main/java/com/kangtech/tauonremote/adapter/MainTabAdapter.java
View file

This file was deleted.

5 changes: 3 additions & 2 deletions app/src/main/java/com/kangtech/tauonremote/view/AddServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class AddServer extends AppCompatActivity {
public static RecyclerView.Adapter adapter;

public static RecyclerRefreshLayout refreshLayout;
public NetworkSniffTask nettask;
public static NetworkSniffTask nettask;

private SharedPreferences.Editor editor;

Expand All @@ -68,7 +68,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_add_server);

if (SharedPreferencesUtils.getBoolean("set_server", false)) {
if (SharedPreferencesUtils.getBoolean("set_server", true)) {
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
finish();
Expand All @@ -95,6 +95,7 @@ public void onClick(View v) {
editor.apply();

Server.Reload();
nettask.cancel(true);

Intent intent = new Intent(AddServer.this, MainActivity.class);
startActivity(intent);
Expand Down
45 changes: 18 additions & 27 deletions app/src/main/java/com/kangtech/tauonremote/view/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,18 @@
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.content.ContextCompat;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.view.GravityCompat;
import androidx.core.widget.ImageViewCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.navigation.NavController;
import androidx.navigation.NavDestination;
import androidx.navigation.Navigation;
import androidx.navigation.fragment.NavHostFragment;
import androidx.navigation.ui.AppBarConfiguration;
import androidx.navigation.ui.NavigationUI;
import androidx.viewpager2.widget.ViewPager2;

import android.animation.Animator;
import android.animation.ValueAnimator;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.ColorStateList;
Expand All @@ -37,10 +30,8 @@
import android.os.Bundle;
import android.os.Handler;
import android.text.Html;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -55,29 +46,24 @@
import com.bumptech.glide.Glide;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.navigation.NavigationView;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import com.kangtech.tauonremote.BuildConfig;
import com.kangtech.tauonremote.R;
import com.kangtech.tauonremote.adapter.ExpandableListAdapter;
import com.kangtech.tauonremote.adapter.MainTabAdapter;
import com.kangtech.tauonremote.api.ApiServiceInterface;
import com.kangtech.tauonremote.model.lyrics.LyricsModel;
import com.kangtech.tauonremote.model.playlist.PlaylistData;
import com.kangtech.tauonremote.model.playlist.PlaylistModel;
import com.kangtech.tauonremote.model.status.StatusModel;
import com.kangtech.tauonremote.model.track.TrackModel;
import com.kangtech.tauonremote.util.Server;
import com.kangtech.tauonremote.util.SharedPreferencesUtils;
import com.kangtech.tauonremote.view.fragment.album.AlbumFragment;
import com.kangtech.tauonremote.view.fragment.track.TrackFragment;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.zip.Deflater;

import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
Expand Down Expand Up @@ -172,9 +158,8 @@ protected void onCreate(Bundle savedInstanceState) {

View header = navigationView.getHeaderView(0);


apiServiceInterface = Server.getApiServiceInterface();


nowplaying_sheet = findViewById(R.id.nowplaying_sheet);
bottomSheetBehavior = BottomSheetBehavior.from(nowplaying_sheet);
Expand Down Expand Up @@ -209,8 +194,6 @@ protected void onCreate(Bundle savedInstanceState) {
prepareMenuData();


//trackIDtemp = SharedPreferencesUtils.getInt("trackID", -1);

runStatus();

next();
Expand Down Expand Up @@ -342,6 +325,10 @@ public void onStateChanged(@NonNull View bottomSheet, int newState) {
TrackFragment.hideSearch();
}

if (Objects.requireNonNull(navController.getCurrentDestination()).getId() == R.id.nav_album) {
AlbumFragment.hideSearch();
}

}
break;
case BottomSheetBehavior.STATE_COLLAPSED: {
Expand All @@ -350,6 +337,7 @@ public void onStateChanged(@NonNull View bottomSheet, int newState) {
expand_NowPlayingMini();

toolbar.setTitle(SharedPreferencesUtils.getString("titleToolbar", ""));

}
}
break;
Expand Down Expand Up @@ -670,7 +658,7 @@ public void onComplete() {
}


int delay = 500; // 2 detik
int delay = 800;
new Handler().postDelayed(new Runnable() {
@RequiresApi(api = Build.VERSION_CODES.N)
@Override
Expand Down Expand Up @@ -707,10 +695,11 @@ public void run() {

// reload Album
if (Objects.requireNonNull(navController.getCurrentDestination()).getId() == R.id.nav_album) {
navController.navigate(R.id.nav_album);
//use action for disable mutiple backstack
navController.navigate(R.id.action_nav_album_self);
}

int delay = 500; // 2 detik
int delay = 500;
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
Expand Down Expand Up @@ -1135,11 +1124,6 @@ public void onComplete() {
});
}

private MainTabAdapter createMainTabAdapter() {
MainTabAdapter adapter = new MainTabAdapter(this);
return adapter;
}

private void expand_NowPlayingMini()
{
ll_nowplayingMini.setVisibility(View.VISIBLE);
Expand Down Expand Up @@ -1289,6 +1273,13 @@ public void onBackPressed() {
} else {
super.onBackPressed();
}

if (Objects.requireNonNull(navController.getCurrentDestination()).getId() == R.id.nav_album) {
editor = getSharedPreferences("tauon_remote", MODE_PRIVATE).edit();
editor.putString("titleToolbar", "Album");
editor.apply();
}

}

}
Loading

0 comments on commit 92f26b3

Please sign in to comment.