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) { switch (itemViewType) {
case ALBUM: case ALBUM:
setImageTransitionName(activity.getString(R.string.transition_album_art)); setImageTransitionName(activity.getString(R.string.transition_album_image));
break; break;
case ARTIST: case ARTIST:
setImageTransitionName(activity.getString(R.string.transition_artist_image)); setImageTransitionName(activity.getString(R.string.transition_artist_image));
@ -150,7 +150,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
case ALBUM: case ALBUM:
NavigationUtil.goToAlbum(activity, NavigationUtil.goToAlbum(activity,
(Album) item, (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; break;
case ARTIST: case ARTIST:
NavigationUtil.goToArtist(activity, 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 class ViewHolder extends MediaEntryViewHolder {
public ViewHolder(@NonNull final View itemView) { public ViewHolder(@NonNull final View itemView) {
super(itemView); super(itemView);
setImageTransitionName(activity.getString(R.string.transition_album_art)); setImageTransitionName(activity.getString(R.string.transition_album_image));
if (menu != null) { if (menu != null) {
menu.setVisibility(View.GONE); menu.setVisibility(View.GONE);
} }
@ -219,7 +219,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
if (isInQuickSelectMode()) { if (isInQuickSelectMode()) {
toggleChecked(getAdapterPosition()); toggleChecked(getAdapterPosition());
} else { } 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); 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); .build().into(albumArt);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { 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); final ImageView overflowButton = convertView.findViewById(R.id.menu);
@ -102,7 +102,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
@Override @Override
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_art))}; Pair[] albumPairs = new Pair[]{Pair.create(albumArt, activity.getResources().getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, new Album(song), albumPairs); NavigationUtil.goToAlbum(activity, new Album(song), albumPairs);
return true; 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 @Override
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_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); NavigationUtil.goToAlbum(activity, new Album(dataSet.get(getAdapterPosition() - 1)), albumPairs);
return true; 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) { public ViewHolder(@NonNull View itemView) {
super(itemView); super(itemView);
setImageTransitionName(activity.getString(R.string.transition_album_art)); setImageTransitionName(activity.getString(R.string.transition_album_image));
if (menu == null) { if (menu == null) {
return; return;
@ -252,7 +252,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
if (image != null && image.getVisibility() == View.VISIBLE) { if (image != null && image.getVisibility() == View.VISIBLE) {
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_art))}; Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))};
NavigationUtil.goToAlbum(activity, new Album(getSong()), albumPairs); NavigationUtil.goToAlbum(activity, new Album(getSong()), albumPairs);
return true; return true;
} }

1
app/src/main/res/layout-land/fragment_card_player.xml
View file

@ -6,7 +6,6 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<!-- unused FrameLayout layout is necessary to prevent a crash on rotate --> <!-- unused FrameLayout layout is necessary to prevent a crash on rotate -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
app/src/main/res/layout/activity_album_detail.xml
View file

@ -51,7 +51,7 @@
android:layout_margin="16dp" android:layout_margin="16dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/default_album_art" android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_art" android:transitionName="@string/transition_album_image"
tools:ignore="ContentDescription,UnusedAttribute" /> tools:ignore="ContentDescription,UnusedAttribute" />
<LinearLayout <LinearLayout

1
app/src/main/res/layout/fragment_card_player.xml
View file

@ -5,7 +5,6 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<!-- unused FrameLayout layout is necessary to prevent a crash on rotate --> <!-- unused FrameLayout layout is necessary to prevent a crash on rotate -->
<com.sothree.slidinguppanel.SlidingUpPanelLayout <com.sothree.slidinguppanel.SlidingUpPanelLayout
android:id="@+id/player_sliding_layout" android:id="@+id/player_sliding_layout"
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/navigation_drawer_header.xml
View file

@ -13,7 +13,7 @@
android:id="@+id/image" android:id="@+id/image"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/default_album_art" android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_art" android:transitionName="@string/transition_album_image"
app:layout_aspectRatio="178%" app:layout_aspectRatio="178%"
app:layout_widthPercent="100%" app:layout_widthPercent="100%"
tools:ignore="ContentDescription,UnusedAttribute" /> tools:ignore="ContentDescription,UnusedAttribute" />

0
app/src/main/res/values/styles_parents.xml → app/src/main/res/values/parents.xml
View file

0
app/src/main/res/values/donottranslate.xml → app/src/main/res/values/static.xml
View file

2
app/src/main/res/values/values.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="transition_album_art" translatable="false">album_art_transition</string> <string name="transition_album_image" translatable="false">album_image_transition</string>
<string name="transition_artist_image" translatable="false">artist_image_transition</string> <string name="transition_artist_image" translatable="false">artist_image_transition</string>
<string name="transition_fab" translatable="false">fab_transition</string> <string name="transition_fab" translatable="false">fab_transition</string>
<string name="transition_mini_player" translatable="false">mini_player_transition</string> <string name="transition_mini_player" translatable="false">mini_player_transition</string>