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;
} }

3
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"
@ -137,4 +136,4 @@
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

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

@ -23,4 +23,4 @@
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

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

@ -30,4 +30,4 @@
android:id="@+id/thanks_layout" android:id="@+id/thanks_layout"
layout="@layout/card_special_thanks" /> layout="@layout/card_special_thanks" />
</LinearLayout> </LinearLayout>

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

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

@ -84,4 +84,4 @@
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:text="@string/login" /> android:text="@string/login" />
</LinearLayout> </LinearLayout>

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

@ -20,4 +20,4 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
</LinearLayout> </LinearLayout>

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

@ -17,4 +17,4 @@
android:layout_gravity="start" android:layout_gravity="start"
app:menu="@menu/menu_drawer" /> app:menu="@menu/menu_drawer" />
</androidx.drawerlayout.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

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

@ -32,4 +32,4 @@
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

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

@ -12,4 +12,4 @@
android:layout_gravity="center" android:layout_gravity="center"
style="?android:attr/progressBarStyleLarge" /> style="?android:attr/progressBarStyleLarge" />
</LinearLayout> </LinearLayout>

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

@ -95,4 +95,4 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

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

@ -96,4 +96,4 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

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

@ -114,4 +114,4 @@
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

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

@ -310,4 +310,4 @@
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

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

@ -86,4 +86,4 @@
android:textAppearance="?android:textAppearanceMedium" android:textAppearance="?android:textAppearanceMedium"
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>

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

@ -15,4 +15,4 @@
app:srcCompat="@drawable/default_album_art" app:srcCompat="@drawable/default_album_art"
tools:ignore="ContentDescription,UnusedAttribute" /> tools:ignore="ContentDescription,UnusedAttribute" />
</FrameLayout> </FrameLayout>

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/fragment_card_player_playback_controls.xml
View file

@ -124,4 +124,4 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

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

@ -124,4 +124,4 @@
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

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

@ -22,4 +22,4 @@
android:textSize="@dimen/empty_text_size" android:textSize="@dimen/empty_text_size"
android:visibility="gone" /> android:visibility="gone" />
</FrameLayout> </FrameLayout>

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

@ -56,4 +56,4 @@
app:mpb_progressStyle="horizontal" app:mpb_progressStyle="horizontal"
app:mpb_useIntrinsicPadding="false" /> app:mpb_useIntrinsicPadding="false" />
</FrameLayout> </FrameLayout>

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

@ -23,4 +23,4 @@
app:srcCompat="@drawable/ic_favorite_white_24dp" app:srcCompat="@drawable/ic_favorite_white_24dp"
tools:ignore="ContentDescription,UnusedAttribute" /> tools:ignore="ContentDescription,UnusedAttribute" />
</FrameLayout> </FrameLayout>

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

@ -106,4 +106,4 @@
android:layout_marginStart="72dp" android:layout_marginStart="72dp"
android:background="?attr/dividerColor" /> android:background="?attr/dividerColor" />
</FrameLayout> </FrameLayout>

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

@ -77,4 +77,4 @@
android:layout_marginStart="72dp" android:layout_marginStart="72dp"
android:background="?attr/dividerColor" /> android:background="?attr/dividerColor" />
</FrameLayout> </FrameLayout>

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

@ -87,4 +87,4 @@
android:layout_marginStart="72dp" android:layout_marginStart="72dp"
android:background="?attr/dividerColor" /> android:background="?attr/dividerColor" />
</FrameLayout> </FrameLayout>

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" />

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

@ -24,4 +24,4 @@
app:dotGap="8dp" app:dotGap="8dp"
app:pageIndicatorColor="?android:textColorHint" /> app:pageIndicatorColor="?android:textColorHint" />
</LinearLayout> </LinearLayout>

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

@ -23,4 +23,4 @@
android:layout_weight="1" android:layout_weight="1"
tools:src="@drawable/np_card" /> tools:src="@drawable/np_card" />
</LinearLayout> </LinearLayout>

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

@ -33,4 +33,4 @@
</FrameLayout> </FrameLayout>
</com.sothree.slidinguppanel.SlidingUpPanelLayout> </com.sothree.slidinguppanel.SlidingUpPanelLayout>

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

@ -6,4 +6,4 @@
android:layout_height="@dimen/status_bar_padding" android:layout_height="@dimen/status_bar_padding"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:elevation="@dimen/toolbar_elevation" android:elevation="@dimen/toolbar_elevation"
tools:ignore="UnusedAttribute" /> tools:ignore="UnusedAttribute" />

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

@ -7,4 +7,4 @@
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="?android:textColorSecondary" /> android:textColor="?android:textColorSecondary" />

2
app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
View file

@ -29,4 +29,4 @@
android:id="@+id/action_details" android:id="@+id/action_details"
android:title="@string/action_details" android:title="@string/action_details"
app:showAsAction="never" /> app:showAsAction="never" />
</menu> </menu>

2
app/src/main/res/menu/menu_item_playing_queue_song.xml
View file

@ -29,4 +29,4 @@
android:id="@+id/action_details" android:id="@+id/action_details"
android:title="@string/action_details" android:title="@string/action_details"
app:showAsAction="never" /> app:showAsAction="never" />
</menu> </menu>

2
app/src/main/res/menu/menu_item_playlist.xml
View file

@ -20,4 +20,4 @@
android:id="@+id/action_delete_playlist" android:id="@+id/action_delete_playlist"
android:title="@string/action_delete" /> android:title="@string/action_delete" />
</menu> </menu>

2
app/src/main/res/menu/menu_item_playlist_song.xml
View file

@ -33,4 +33,4 @@
android:id="@+id/action_details" android:id="@+id/action_details"
android:title="@string/action_details" android:title="@string/action_details"
app:showAsAction="never" /> app:showAsAction="never" />
</menu> </menu>

2
app/src/main/res/menu/menu_item_song.xml
View file

@ -29,4 +29,4 @@
android:id="@+id/action_details" android:id="@+id/action_details"
android:title="@string/action_details" android:title="@string/action_details"
app:showAsAction="never" /> app:showAsAction="never" />
</menu> </menu>

2
app/src/main/res/menu/menu_main.xml
View file

@ -69,4 +69,4 @@
android:checkable="true" android:checkable="true"
android:title="@string/colored_footers" /> android:title="@string/colored_footers" />
</menu> </menu>

2
app/src/main/res/menu/menu_search.xml
View file

@ -7,4 +7,4 @@
android:title="@string/action_search" android:title="@string/action_search"
app:actionViewClass="androidx.appcompat.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" /> app:showAsAction="ifRoom|collapseActionView" />
</menu> </menu>

2
app/src/main/res/values-land/integers.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<integer name="detail_header_tile_maxLines">1</integer> <integer name="detail_header_tile_maxLines">1</integer>
</resources> </resources>

2
app/src/main/res/values-sw600dp/integers.xml
View file

@ -10,4 +10,4 @@
<integer name="max_columns_land">8</integer> <integer name="max_columns_land">8</integer>
<integer name="detail_header_tile_maxLines">3</integer> <integer name="detail_header_tile_maxLines">3</integer>
</resources> </resources>

2
app/src/main/res/values-v19/dimens.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="status_bar_padding">25dp</dimen> <dimen name="status_bar_padding">25dp</dimen>
</resources> </resources>

2
app/src/main/res/values-v23/dimens.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="status_bar_padding">24dp</dimen> <dimen name="status_bar_padding">24dp</dimen>
</resources> </resources>

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

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

@ -1,9 +1,9 @@
<?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>
</resources> </resources>

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

@ -23,4 +23,4 @@
</com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory> </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>

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

@ -11,4 +11,4 @@
</com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory> </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>

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

@ -53,4 +53,4 @@
</com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory> </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>