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

update method names for navigation

Browse source
This commit is contained in:
dkanada 2021-04-25 13:59:58 +09:00
commit 526b3788ac
14 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
View file

@ -82,7 +82,7 @@ public class SplashActivity extends AbsBaseActivity {
User user = App.getDatabase().userDao().getUser(PreferenceUtil.getInstance(this).getUser()); User user = App.getDatabase().userDao().getUser(PreferenceUtil.getInstance(this).getUser());
if (user == null) { if (user == null) {
NavigationUtil.goToLogin(this); NavigationUtil.startLogin(this);
return; return;
} }
@ -98,12 +98,12 @@ public class SplashActivity extends AbsBaseActivity {
App.getApiClient().ensureWebSocket(); App.getApiClient().ensureWebSocket();
App.getApiClient().ReportCapabilities(clientCapabilities, new EmptyResponse()); App.getApiClient().ReportCapabilities(clientCapabilities, new EmptyResponse());
NavigationUtil.goToMain(context); NavigationUtil.startMain(context);
} }
@Override @Override
public void onError(Exception exception) { public void onError(Exception exception) {
NavigationUtil.goToLogin(context); NavigationUtil.startLogin(context);
} }
}); });
} }

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

@ -96,7 +96,7 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett
setUpRecyclerView(); setUpRecyclerView();
setUpSongsAdapter(); setUpSongsAdapter();
binding.artistText.setOnClickListener(v -> { binding.artistText.setOnClickListener(v -> {
NavigationUtil.goToArtist(AlbumDetailActivity.this, new Artist(album)); NavigationUtil.startArtist(AlbumDetailActivity.this, new Artist(album));
}); });
setColors(DialogUtils.resolveColor(this, R.attr.defaultFooterColor)); setColors(DialogUtils.resolveColor(this, R.attr.defaultFooterColor));
@ -196,7 +196,7 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett
super.onBackPressed(); super.onBackPressed();
return true; return true;
case R.id.action_go_to_artist: case R.id.action_go_to_artist:
NavigationUtil.goToArtist(this, new Artist(album)); NavigationUtil.startArtist(this, new Artist(album));
return true; return true;
} }

2
app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java
View file

@ -117,7 +117,7 @@ public class GenreAdapter extends RecyclerView.Adapter<GenreAdapter.ViewHolder>
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Genre genre = dataSet.get(getBindingAdapterPosition()); Genre genre = dataSet.get(getBindingAdapterPosition());
NavigationUtil.goToGenre(activity, genre); NavigationUtil.startGenre(activity, genre);
} }
} }
} }

2
app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java
View file

@ -165,7 +165,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
toggleChecked(getBindingAdapterPosition()); toggleChecked(getBindingAdapterPosition());
} else { } else {
Playlist playlist = dataSet.get(getBindingAdapterPosition()); Playlist playlist = dataSet.get(getBindingAdapterPosition());
NavigationUtil.goToPlaylist(activity, playlist); NavigationUtil.startPlaylist(activity, playlist);
} }
} }

4
app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
View file

@ -148,12 +148,12 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
Object item = dataSet.get(getBindingAdapterPosition()); Object item = dataSet.get(getBindingAdapterPosition());
switch (getItemViewType()) { switch (getItemViewType()) {
case ALBUM: case ALBUM:
NavigationUtil.goToAlbum(activity, NavigationUtil.startAlbum(activity,
(Album) item, (Album) item,
Pair.create(image, activity.getResources().getString(R.string.transition_album_image))); Pair.create(image, activity.getResources().getString(R.string.transition_album_image)));
break; break;
case ARTIST: case ARTIST:
NavigationUtil.goToArtist(activity, NavigationUtil.startArtist(activity,
(Artist) item, (Artist) item,
Pair.create(image, activity.getResources().getString(R.string.transition_artist_image))); Pair.create(image, activity.getResources().getString(R.string.transition_artist_image)));
break; break;

2
app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
View file

@ -222,7 +222,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
toggleChecked(getBindingAdapterPosition()); toggleChecked(getBindingAdapterPosition());
} else { } else {
Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))}; Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, dataSet.get(getBindingAdapterPosition()), albumPairs); NavigationUtil.startAlbum(activity, dataSet.get(getBindingAdapterPosition()), albumPairs);
} }
} }

2
app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
View file

@ -194,7 +194,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
toggleChecked(getBindingAdapterPosition()); toggleChecked(getBindingAdapterPosition());
} else { } else {
Pair[] artistPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_artist_image))}; Pair[] artistPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_artist_image))};
NavigationUtil.goToArtist(activity, dataSet.get(getBindingAdapterPosition()), artistPairs); NavigationUtil.startArtist(activity, dataSet.get(getBindingAdapterPosition()), artistPairs);
} }
} }

2
app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java
View file

@ -103,7 +103,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
if (item.getItemId() == R.id.action_go_to_album) { if (item.getItemId() == R.id.action_go_to_album) {
Pair[] albumPairs = new Pair[]{Pair.create(albumArt, activity.getResources().getString(R.string.transition_album_image))}; Pair[] albumPairs = new Pair[]{Pair.create(albumArt, activity.getResources().getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, new Album(song), albumPairs); NavigationUtil.startAlbum(activity, new Album(song), albumPairs);
return true; return true;
} }

2
app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
View file

@ -84,7 +84,7 @@ public class PlaylistSongAdapter extends AbsOffsetSongAdapter {
protected boolean onSongMenuItemClick(MenuItem item) { protected boolean onSongMenuItemClick(MenuItem item) {
if (item.getItemId() == R.id.action_go_to_album) { if (item.getItemId() == R.id.action_go_to_album) {
Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getString(R.string.transition_album_image))}; Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, new Album(dataSet.get(getBindingAdapterPosition() - 1)), albumPairs); NavigationUtil.startAlbum(activity, new Album(dataSet.get(getBindingAdapterPosition() - 1)), albumPairs);
return true; return true;
} }

2
app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
View file

@ -254,7 +254,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_go_to_album: case R.id.action_go_to_album:
Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))}; Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, new Album(getSong()), albumPairs); NavigationUtil.startAlbum(activity, new Album(getSong()), albumPairs);
return true; return true;
} }
} }

5
app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
View file

@ -7,14 +7,11 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.dkanada.gramophone.App;
import com.dkanada.gramophone.R; import com.dkanada.gramophone.R;
import com.dkanada.gramophone.helper.MusicPlayerRemote; import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.util.NavigationUtil; import com.dkanada.gramophone.util.NavigationUtil;
import com.dkanada.gramophone.util.PreferenceUtil; import com.dkanada.gramophone.util.PreferenceUtil;
import org.jellyfin.apiclient.interaction.EmptyResponse;
public class ConfirmLogoutDialog extends DialogFragment { public class ConfirmLogoutDialog extends DialogFragment {
@NonNull @NonNull
public static ConfirmLogoutDialog create() { public static ConfirmLogoutDialog create() {
@ -34,7 +31,7 @@ public class ConfirmLogoutDialog extends DialogFragment {
PreferenceUtil.getInstance(requireContext()).setServer(null); PreferenceUtil.getInstance(requireContext()).setServer(null);
PreferenceUtil.getInstance(requireContext()).setUser(null); PreferenceUtil.getInstance(requireContext()).setUser(null);
NavigationUtil.goToLogin(requireContext()); NavigationUtil.startLogin(requireContext());
}) })
.build(); .build();
} }

4
app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
View file

@ -70,10 +70,10 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
SongDetailDialog.create(song).show(getParentFragmentManager(), "SONG_DETAIL"); SongDetailDialog.create(song).show(getParentFragmentManager(), "SONG_DETAIL");
return true; return true;
case R.id.action_go_to_album: case R.id.action_go_to_album:
NavigationUtil.goToAlbum(requireActivity(), new Album(song)); NavigationUtil.startAlbum(requireActivity(), new Album(song));
return true; return true;
case R.id.action_go_to_artist: case R.id.action_go_to_artist:
NavigationUtil.goToArtist(requireActivity(), new Artist(song)); NavigationUtil.startArtist(requireActivity(), new Artist(song));
return true; return true;
} }
return false; return false;

4
app/src/main/java/com/dkanada/gramophone/helper/menu/SongMenuHelper.java
View file

@ -39,10 +39,10 @@ public class SongMenuHelper {
SongDetailDialog.create(song).show(activity.getSupportFragmentManager(), "SONG_DETAILS"); SongDetailDialog.create(song).show(activity.getSupportFragmentManager(), "SONG_DETAILS");
return true; return true;
case R.id.action_go_to_album: case R.id.action_go_to_album:
NavigationUtil.goToAlbum(activity, new Album(song)); NavigationUtil.startAlbum(activity, new Album(song));
return true; return true;
case R.id.action_go_to_artist: case R.id.action_go_to_artist:
NavigationUtil.goToArtist(activity, new Artist(song)); NavigationUtil.startArtist(activity, new Artist(song));
return true; return true;
} }
return false; return false;

12
app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
View file

@ -41,42 +41,42 @@ public class NavigationUtil {
context.startActivity(intent); context.startActivity(intent);
} }
public static void goToLogin(@NonNull final Context context) { public static void startLogin(@NonNull final Context context) {
final Intent intent = new Intent(context, LoginActivity.class); final Intent intent = new Intent(context, LoginActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
context.startActivity(intent); context.startActivity(intent);
} }
public static void goToMain(@NonNull final Context context) { public static void startMain(@NonNull final Context context) {
final Intent intent = new Intent(context, MainActivity.class); final Intent intent = new Intent(context, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivity(intent); context.startActivity(intent);
} }
public static void goToArtist(@NonNull final Activity activity, final Artist artist, @Nullable Pair... sharedElements) { public static void startArtist(@NonNull final Activity activity, final Artist artist, @Nullable Pair... sharedElements) {
final Intent intent = new Intent(activity, ArtistDetailActivity.class); final Intent intent = new Intent(activity, ArtistDetailActivity.class);
intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST, artist); intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST, artist);
startActivitySharedElements(activity, intent, sharedElements); startActivitySharedElements(activity, intent, sharedElements);
} }
public static void goToAlbum(@NonNull final Activity activity, final Album album, @Nullable Pair... sharedElements) { public static void startAlbum(@NonNull final Activity activity, final Album album, @Nullable Pair... sharedElements) {
final Intent intent = new Intent(activity, AlbumDetailActivity.class); final Intent intent = new Intent(activity, AlbumDetailActivity.class);
intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM, album); intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM, album);
startActivitySharedElements(activity, intent, sharedElements); startActivitySharedElements(activity, intent, sharedElements);
} }
public static void goToGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) { public static void startGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) {
final Intent intent = new Intent(activity, GenreDetailActivity.class); final Intent intent = new Intent(activity, GenreDetailActivity.class);
intent.putExtra(GenreDetailActivity.EXTRA_GENRE, genre); intent.putExtra(GenreDetailActivity.EXTRA_GENRE, genre);
startActivitySharedElements(activity, intent, sharedElements); startActivitySharedElements(activity, intent, sharedElements);
} }
public static void goToPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable Pair... sharedElements) { public static void startPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable Pair... sharedElements) {
final Intent intent = new Intent(activity, PlaylistDetailActivity.class); final Intent intent = new Intent(activity, PlaylistDetailActivity.class);
intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist); intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist);