tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix a large amount of deprecated and ide warnings

Browse source
This commit is contained in:
dkanada 2021-04-25 10:20:10 +09:00
commit beca66459b
26 changed files with 111 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
View file

@ -43,7 +43,7 @@ public class MainActivity extends AbsMusicPanelActivity {
private boolean onLogout;
@Nullable
MainActivityFragmentCallbacks currentFragment;
private MainActivityFragmentCallbacks currentFragment;
@Nullable
private List<BaseItemDto> libraries;
@ -59,7 +59,7 @@ public class MainActivity extends AbsMusicPanelActivity {
Menu menu = binding.navigationView.getMenu();
QueryUtil.getLibraries(media -> {
libraries = (List<BaseItemDto>) media;
libraries = media;
menu.clear();
for (BaseItemDto itemDto : libraries) {
@ -164,11 +164,7 @@ public class MainActivity extends AbsMusicPanelActivity {
|| menuItem.getItemId() == R.id.nav_logout) return true;
for (int i = 0; i < binding.navigationView.getMenu().size(); i++) {
if (binding.navigationView.getMenu().getItem(i) == menuItem) {
binding.navigationView.getMenu().getItem(i).setChecked(true);
} else {
binding.navigationView.getMenu().getItem(i).setChecked(false);
}
binding.navigationView.getMenu().getItem(i).setChecked(binding.navigationView.getMenu().getItem(i) == menuItem);
}
return true;

61
app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
View file

@ -1,5 +1,6 @@
package com.dkanada.gramophone.activities;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.os.Handler;
import android.view.Menu;
@ -29,8 +30,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@SuppressLint("ClickableViewAccessibility")
public class SearchActivity extends AbsMusicServiceActivity implements SearchView.OnQueryTextListener {
public String QUERY = "query";
private String QUERY = "query";
private ActivitySearchBinding binding;
@ -82,6 +84,7 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
@Override
protected void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString(QUERY, query);
}
@ -116,7 +119,7 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
});
searchView.setQuery(query, false);
searchView.post(() -> searchView.setOnQueryTextListener(SearchActivity.this));
searchView.setOnQueryTextListener(SearchActivity.this);
return super.onCreateOptionsMenu(menu);
}
@ -136,34 +139,31 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
ItemQuery itemQuery = new ItemQuery();
itemQuery.setSearchTerm(query);
MediaCallback<Object> callback = new MediaCallback<Object>() {
@Override
public void onLoadMedia(List<Object> media) {
List<Artist> artists = new ArrayList<>();
List<Album> albums = new ArrayList<>();
List<Song> songs = new ArrayList<>();
MediaCallback<Object> callback = media -> {
List<Artist> artists = new ArrayList<>();
List<Album> albums = new ArrayList<>();
List<Song> songs = new ArrayList<>();
for (Object result : media) {
if (result instanceof Artist) {
artists.add((Artist) result);
} else if (result instanceof Album) {
albums.add((Album) result);
} else if (result instanceof Song) {
songs.add((Song) result);
}
for (Object result : media) {
if (result instanceof Artist) {
artists.add((Artist) result);
} else if (result instanceof Album) {
albums.add((Album) result);
} else if (result instanceof Song) {
songs.add((Song) result);
}
Collections.sort(artists, (one, two) -> one.name.compareTo(two.name));
Collections.sort(albums, (one, two) -> one.title.compareTo(two.title));
Collections.sort(songs, (one, two) -> one.title.compareTo(two.title));
List<Object> sortedData = new ArrayList<>();
sortedData.addAll(artists);
sortedData.addAll(albums);
sortedData.addAll(songs);
adapter.swapDataSet(sortedData);
}
Collections.sort(artists, (one, two) -> one.name.compareTo(two.name));
Collections.sort(albums, (one, two) -> one.title.compareTo(two.title));
Collections.sort(songs, (one, two) -> one.title.compareTo(two.title));
List<Object> sortedData = new ArrayList<>();
sortedData.addAll(artists);
sortedData.addAll(albums);
sortedData.addAll(songs);
adapter.swapDataSet(sortedData);
};
QueryUtil.getItems(itemQuery, callback);
@ -178,12 +178,7 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
@Override
public boolean onQueryTextChange(String newText) {
handler.removeCallbacksAndMessages(null);
handler.postDelayed(new Runnable() {
@Override
public void run() {
search(newText);
}
}, 1000);
handler.postDelayed(() -> search(newText), 1000);
return false;
}

1
app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
View file

@ -24,7 +24,6 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.glide.CustomPaletteTarget;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.interfaces.MediaCallback;
import com.dkanada.gramophone.interfaces.PaletteColorHolder;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist;

2
app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
View file

@ -26,9 +26,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.glide.CustomPaletteTarget;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.interfaces.MediaCallback;
import com.dkanada.gramophone.interfaces.PaletteColorHolder;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.activities.base.AbsMusicPanelActivity;

11
app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
View file

@ -11,15 +11,12 @@ import androidx.recyclerview.widget.RecyclerView;
import com.afollestad.materialcab.MaterialCab;
import com.dkanada.gramophone.databinding.ActivityGenreDetailBinding;
import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.adapter.song.SongAdapter;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.interfaces.MediaCallback;
import com.dkanada.gramophone.model.Genre;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.activities.base.AbsMusicPanelActivity;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.QueryUtil;
@ -29,7 +26,6 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import org.jellyfin.apiclient.model.querying.ItemQuery;
import java.util.ArrayList;
import java.util.List;
public class GenreDetailActivity extends AbsMusicPanelActivity implements CabHolder {
public static final String EXTRA_GENRE = "extra_genre";
@ -41,8 +37,6 @@ public class GenreDetailActivity extends AbsMusicPanelActivity implements CabHol
private MaterialCab cab;
private SongAdapter adapter;
private RecyclerView.Adapter wrappedAdapter;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -148,11 +142,6 @@ public class GenreDetailActivity extends AbsMusicPanelActivity implements CabHol
protected void onDestroy() {
binding.recyclerView.setAdapter(null);
if (wrappedAdapter != null) {
WrapperAdapterUtils.releaseAll(wrappedAdapter);
wrappedAdapter = null;
}
adapter = null;
super.onDestroy();
}

2
app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
View file

@ -22,7 +22,6 @@ import com.dkanada.gramophone.adapter.song.SongAdapter;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.helper.menu.PlaylistMenuHelper;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.interfaces.MediaCallback;
import com.dkanada.gramophone.model.Playlist;
import com.dkanada.gramophone.model.PlaylistSong;
import com.dkanada.gramophone.model.Song;
@ -35,7 +34,6 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import org.jellyfin.apiclient.model.playlists.PlaylistItemQuery;
import java.util.ArrayList;
import java.util.List;
public class PlaylistDetailActivity extends AbsMusicPanelActivity implements CabHolder {
public static String EXTRA_PLAYLIST = "extra_playlist";