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

refactor some xml files

Browse source
This commit is contained in:
dkanada 2020-09-25 16:35:24 +09:00
commit f589774a75
52 changed files with 54 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
switch (itemViewType) {
case ALBUM:
setImageTransitionName(activity.getString(R.string.transition_album_art));
setImageTransitionName(activity.getString(R.string.transition_album_image));
break;
case ARTIST:
setImageTransitionName(activity.getString(R.string.transition_artist_image));
@ -150,7 +150,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
case ALBUM:
NavigationUtil.goToAlbum(activity,
(Album) item,
Pair.create(image, activity.getResources().getString(R.string.transition_album_art)));
Pair.create(image, activity.getResources().getString(R.string.transition_album_image)));
break;
case ARTIST:
NavigationUtil.goToArtist(activity,

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

@ -208,7 +208,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
public class ViewHolder extends MediaEntryViewHolder {
public ViewHolder(@NonNull final View itemView) {
super(itemView);
setImageTransitionName(activity.getString(R.string.transition_album_art));
setImageTransitionName(activity.getString(R.string.transition_album_image));
if (menu != null) {
menu.setVisibility(View.GONE);
}
@ -219,7 +219,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
if (isInQuickSelectMode()) {
toggleChecked(getAdapterPosition());
} else {
Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_art))};
Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, dataSet.get(getAdapterPosition()), albumPairs);
}
}

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

@ -89,7 +89,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
.build().into(albumArt);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
albumArt.setTransitionName(activity.getString(R.string.transition_album_art));
albumArt.setTransitionName(activity.getString(R.string.transition_album_image));
}
final ImageView overflowButton = convertView.findViewById(R.id.menu);
@ -102,7 +102,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
@Override
public boolean onMenuItemClick(MenuItem item) {
if (item.getItemId() == R.id.action_go_to_album) {
Pair[] albumPairs = new Pair[]{Pair.create(albumArt, activity.getResources().getString(R.string.transition_album_art))};
Pair[] albumPairs = new Pair[]{Pair.create(albumArt, activity.getResources().getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, new Album(song), albumPairs);
return true;
}

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

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

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

@ -216,7 +216,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
public ViewHolder(@NonNull View itemView) {
super(itemView);
setImageTransitionName(activity.getString(R.string.transition_album_art));
setImageTransitionName(activity.getString(R.string.transition_album_image));
if (menu == null) {
return;
@ -252,7 +252,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
if (image != null && image.getVisibility() == View.VISIBLE) {
switch (item.getItemId()) {
case R.id.action_go_to_album:
Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_art))};
Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, new Album(getSong()), albumPairs);
return true;
}