From f589774a754703e1fd0b992e54483c82381ecbb7 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Fri, 25 Sep 2020 16:35:24 +0900
Subject: [PATCH] refactor some xml files

---
 .../java/com/dkanada/gramophone/adapter/SearchAdapter.java    | 4 ++--
 .../com/dkanada/gramophone/adapter/album/AlbumAdapter.java    | 4 ++--
 .../dkanada/gramophone/adapter/song/ArtistSongAdapter.java    | 4 ++--
 .../dkanada/gramophone/adapter/song/PlaylistSongAdapter.java  | 2 +-
 .../java/com/dkanada/gramophone/adapter/song/SongAdapter.java | 4 ++--
 app/src/main/res/layout-land/fragment_card_player.xml         | 3 +--
 app/src/main/res/layout/activity_about.xml                    | 2 +-
 app/src/main/res/layout/activity_about_content.xml            | 2 +-
 app/src/main/res/layout/activity_album_detail.xml             | 2 +-
 app/src/main/res/layout/activity_login.xml                    | 2 +-
 app/src/main/res/layout/activity_main_content.xml             | 2 +-
 app/src/main/res/layout/activity_main_drawer_layout.xml       | 2 +-
 app/src/main/res/layout/activity_search.xml                   | 2 +-
 app/src/main/res/layout/activity_splash.xml                   | 2 +-
 app/src/main/res/layout/app_widget_album.xml                  | 2 +-
 app/src/main/res/layout/app_widget_classic.xml                | 2 +-
 app/src/main/res/layout/card_about_app.xml                    | 2 +-
 app/src/main/res/layout/card_special_thanks.xml               | 2 +-
 app/src/main/res/layout/dialog_file_details.xml               | 2 +-
 app/src/main/res/layout/fragment_album_cover.xml              | 2 +-
 app/src/main/res/layout/fragment_card_player.xml              | 1 -
 .../res/layout/fragment_card_player_playback_controls.xml     | 2 +-
 .../res/layout/fragment_flat_player_playback_controls.xml     | 2 +-
 .../main/res/layout/fragment_main_activity_recycler_view.xml  | 2 +-
 app/src/main/res/layout/fragment_mini_player.xml              | 2 +-
 app/src/main/res/layout/fragment_player_album_cover.xml       | 2 +-
 app/src/main/res/layout/item_list.xml                         | 2 +-
 app/src/main/res/layout/item_list_no_image.xml                | 2 +-
 app/src/main/res/layout/item_list_single_row.xml              | 2 +-
 app/src/main/res/layout/navigation_drawer_header.xml          | 2 +-
 app/src/main/res/layout/preference_dialog_now_playing.xml     | 2 +-
 .../main/res/layout/preference_dialog_now_playing_item.xml    | 2 +-
 app/src/main/res/layout/sliding_music_panel_layout.xml        | 2 +-
 app/src/main/res/layout/status_bar.xml                        | 2 +-
 app/src/main/res/layout/sub_header.xml                        | 2 +-
 .../menu_item_cannot_delete_single_songs_playlist_song.xml    | 2 +-
 app/src/main/res/menu/menu_item_playing_queue_song.xml        | 2 +-
 app/src/main/res/menu/menu_item_playlist.xml                  | 2 +-
 app/src/main/res/menu/menu_item_playlist_song.xml             | 2 +-
 app/src/main/res/menu/menu_item_song.xml                      | 2 +-
 app/src/main/res/menu/menu_main.xml                           | 2 +-
 app/src/main/res/menu/menu_search.xml                         | 2 +-
 app/src/main/res/values-land/integers.xml                     | 2 +-
 app/src/main/res/values-sw600dp/integers.xml                  | 2 +-
 app/src/main/res/values-v19/dimens.xml                        | 2 +-
 app/src/main/res/values-v23/dimens.xml                        | 2 +-
 app/src/main/res/values/{styles_parents.xml => parents.xml}   | 0
 app/src/main/res/values/{donottranslate.xml => static.xml}    | 0
 app/src/main/res/values/values.xml                            | 4 ++--
 app/src/main/res/xml/pref_images.xml                          | 2 +-
 app/src/main/res/xml/pref_now_playing.xml                     | 2 +-
 app/src/main/res/xml/pref_playback.xml                        | 2 +-
 52 files changed, 54 insertions(+), 56 deletions(-)
 rename app/src/main/res/values/{styles_parents.xml => parents.xml} (100%)
 rename app/src/main/res/values/{donottranslate.xml => static.xml} (100%)

diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
index 578481f0..a1662ae7 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
@@ -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,
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
index 848d972c..8c183a63 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
@@ -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);
             }
         }
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java
index 865e1e58..e5be6311 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java
@@ -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;
                 }
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
index 98b69f5d..575446f9 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
@@ -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;
             }
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
index cc953db9..816937f4 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
@@ -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;
                 }
diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml
index 5eeb5358..ba8f2445 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent">
 
     <!-- unused FrameLayout layout is necessary to prevent a crash on rotate -->
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -137,4 +136,4 @@
 
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index d2a36bd8..e2280c6b 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -23,4 +23,4 @@
 
     </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_about_content.xml b/app/src/main/res/layout/activity_about_content.xml
index 53967433..fe5c3962 100644
--- a/app/src/main/res/layout/activity_about_content.xml
+++ b/app/src/main/res/layout/activity_about_content.xml
@@ -30,4 +30,4 @@
         android:id="@+id/thanks_layout"
         layout="@layout/card_special_thanks" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
index 7c432f58..1033de3d 100644
--- a/app/src/main/res/layout/activity_album_detail.xml
+++ b/app/src/main/res/layout/activity_album_detail.xml
@@ -51,7 +51,7 @@
                     android:layout_margin="16dp"
                     android:scaleType="centerCrop"
                     android:src="@drawable/default_album_art"
-                    android:transitionName="@string/transition_album_art"
+                    android:transitionName="@string/transition_album_image"
                     tools:ignore="ContentDescription,UnusedAttribute" />
 
                 <LinearLayout
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index e5b93cf4..d939b956 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -84,4 +84,4 @@
         android:paddingBottom="8dp"
         android:text="@string/login" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml
index e5b4bd71..ef3f9ee6 100644
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -20,4 +20,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main_drawer_layout.xml b/app/src/main/res/layout/activity_main_drawer_layout.xml
index 36cd1fed..8cd0795a 100644
--- a/app/src/main/res/layout/activity_main_drawer_layout.xml
+++ b/app/src/main/res/layout/activity_main_drawer_layout.xml
@@ -17,4 +17,4 @@
         android:layout_gravity="start"
         app:menu="@menu/menu_drawer" />
 
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 4b3b12ae..b5288759 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -32,4 +32,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 1c4b3f11..894b2b1c 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -12,4 +12,4 @@
         android:layout_gravity="center"
         style="?android:attr/progressBarStyleLarge" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/app_widget_album.xml b/app/src/main/res/layout/app_widget_album.xml
index 34c66661..188cbc08 100644
--- a/app/src/main/res/layout/app_widget_album.xml
+++ b/app/src/main/res/layout/app_widget_album.xml
@@ -95,4 +95,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/app_widget_classic.xml b/app/src/main/res/layout/app_widget_classic.xml
index ad431aaf..aec90efc 100644
--- a/app/src/main/res/layout/app_widget_classic.xml
+++ b/app/src/main/res/layout/app_widget_classic.xml
@@ -96,4 +96,4 @@
 
     </RelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml
index 1a6b7e3b..2fe3eca6 100644
--- a/app/src/main/res/layout/card_about_app.xml
+++ b/app/src/main/res/layout/card_about_app.xml
@@ -114,4 +114,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/card_special_thanks.xml b/app/src/main/res/layout/card_special_thanks.xml
index 8764d79a..c269e345 100644
--- a/app/src/main/res/layout/card_special_thanks.xml
+++ b/app/src/main/res/layout/card_special_thanks.xml
@@ -310,4 +310,4 @@
 
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/dialog_file_details.xml b/app/src/main/res/layout/dialog_file_details.xml
index 6de3c151..f1990944 100644
--- a/app/src/main/res/layout/dialog_file_details.xml
+++ b/app/src/main/res/layout/dialog_file_details.xml
@@ -86,4 +86,4 @@
         android:textAppearance="?android:textAppearanceMedium"
         android:textSize="16sp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml
index b05a0b73..d5ea2c41 100644
--- a/app/src/main/res/layout/fragment_album_cover.xml
+++ b/app/src/main/res/layout/fragment_album_cover.xml
@@ -15,4 +15,4 @@
         app:srcCompat="@drawable/default_album_art"
         tools:ignore="ContentDescription,UnusedAttribute" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 29c86343..4337a0df 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -5,7 +5,6 @@
     android:layout_height="match_parent">
 
     <!-- unused FrameLayout layout is necessary to prevent a crash on rotate -->
-
     <com.sothree.slidinguppanel.SlidingUpPanelLayout
         android:id="@+id/player_sliding_layout"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 3d15e1c5..5517d271 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -124,4 +124,4 @@
 
     </RelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index b465c51a..bd3c0e24 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -124,4 +124,4 @@
 
     </RelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
index 8a1965c2..095cab21 100644
--- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
+++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
@@ -22,4 +22,4 @@
         android:textSize="@dimen/empty_text_size"
         android:visibility="gone" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index 22c3ebec..25d54e80 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -56,4 +56,4 @@
         app:mpb_progressStyle="horizontal"
         app:mpb_useIntrinsicPadding="false" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_player_album_cover.xml b/app/src/main/res/layout/fragment_player_album_cover.xml
index 3669e0de..5de58cb0 100644
--- a/app/src/main/res/layout/fragment_player_album_cover.xml
+++ b/app/src/main/res/layout/fragment_player_album_cover.xml
@@ -23,4 +23,4 @@
         app:srcCompat="@drawable/ic_favorite_white_24dp"
         tools:ignore="ContentDescription,UnusedAttribute" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index dab44807..6f7934e1 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -106,4 +106,4 @@
         android:layout_marginStart="72dp"
         android:background="?attr/dividerColor" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_list_no_image.xml b/app/src/main/res/layout/item_list_no_image.xml
index de1f3189..34551857 100644
--- a/app/src/main/res/layout/item_list_no_image.xml
+++ b/app/src/main/res/layout/item_list_no_image.xml
@@ -77,4 +77,4 @@
         android:layout_marginStart="72dp"
         android:background="?attr/dividerColor" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml
index 837d993e..42d10b36 100644
--- a/app/src/main/res/layout/item_list_single_row.xml
+++ b/app/src/main/res/layout/item_list_single_row.xml
@@ -87,4 +87,4 @@
         android:layout_marginStart="72dp"
         android:background="?attr/dividerColor" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/navigation_drawer_header.xml b/app/src/main/res/layout/navigation_drawer_header.xml
index fc06a02a..9eab523a 100644
--- a/app/src/main/res/layout/navigation_drawer_header.xml
+++ b/app/src/main/res/layout/navigation_drawer_header.xml
@@ -13,7 +13,7 @@
         android:id="@+id/image"
         android:scaleType="centerCrop"
         android:src="@drawable/default_album_art"
-        android:transitionName="@string/transition_album_art"
+        android:transitionName="@string/transition_album_image"
         app:layout_aspectRatio="178%"
         app:layout_widthPercent="100%"
         tools:ignore="ContentDescription,UnusedAttribute" />
diff --git a/app/src/main/res/layout/preference_dialog_now_playing.xml b/app/src/main/res/layout/preference_dialog_now_playing.xml
index c66c835d..088d7400 100644
--- a/app/src/main/res/layout/preference_dialog_now_playing.xml
+++ b/app/src/main/res/layout/preference_dialog_now_playing.xml
@@ -24,4 +24,4 @@
         app:dotGap="8dp"
         app:pageIndicatorColor="?android:textColorHint" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/preference_dialog_now_playing_item.xml b/app/src/main/res/layout/preference_dialog_now_playing_item.xml
index 21d409eb..2c5dd087 100644
--- a/app/src/main/res/layout/preference_dialog_now_playing_item.xml
+++ b/app/src/main/res/layout/preference_dialog_now_playing_item.xml
@@ -23,4 +23,4 @@
         android:layout_weight="1"
         tools:src="@drawable/np_card" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index 0eba6cea..89144188 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -33,4 +33,4 @@
 
     </FrameLayout>
 
-</com.sothree.slidinguppanel.SlidingUpPanelLayout>
\ No newline at end of file
+</com.sothree.slidinguppanel.SlidingUpPanelLayout>
diff --git a/app/src/main/res/layout/status_bar.xml b/app/src/main/res/layout/status_bar.xml
index 1d7f9fae..2cd09c92 100644
--- a/app/src/main/res/layout/status_bar.xml
+++ b/app/src/main/res/layout/status_bar.xml
@@ -6,4 +6,4 @@
     android:layout_height="@dimen/status_bar_padding"
     android:background="@android:color/transparent"
     android:elevation="@dimen/toolbar_elevation"
-    tools:ignore="UnusedAttribute" />
\ No newline at end of file
+    tools:ignore="UnusedAttribute" />
diff --git a/app/src/main/res/layout/sub_header.xml b/app/src/main/res/layout/sub_header.xml
index 328198c3..2ca00c77 100644
--- a/app/src/main/res/layout/sub_header.xml
+++ b/app/src/main/res/layout/sub_header.xml
@@ -7,4 +7,4 @@
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-    android:textColor="?android:textColorSecondary" />
\ No newline at end of file
+    android:textColor="?android:textColorSecondary" />
diff --git a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
index 9ee3e193..8d7a97b0 100644
--- a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
+++ b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
@@ -29,4 +29,4 @@
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_item_playing_queue_song.xml b/app/src/main/res/menu/menu_item_playing_queue_song.xml
index 67625c59..c5ea2ed1 100644
--- a/app/src/main/res/menu/menu_item_playing_queue_song.xml
+++ b/app/src/main/res/menu/menu_item_playing_queue_song.xml
@@ -29,4 +29,4 @@
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_item_playlist.xml b/app/src/main/res/menu/menu_item_playlist.xml
index ff8ea67d..983d78ed 100644
--- a/app/src/main/res/menu/menu_item_playlist.xml
+++ b/app/src/main/res/menu/menu_item_playlist.xml
@@ -20,4 +20,4 @@
         android:id="@+id/action_delete_playlist"
         android:title="@string/action_delete" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_item_playlist_song.xml b/app/src/main/res/menu/menu_item_playlist_song.xml
index d0b09c47..ea7680f3 100644
--- a/app/src/main/res/menu/menu_item_playlist_song.xml
+++ b/app/src/main/res/menu/menu_item_playlist_song.xml
@@ -33,4 +33,4 @@
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_item_song.xml b/app/src/main/res/menu/menu_item_song.xml
index 9ee3e193..8d7a97b0 100644
--- a/app/src/main/res/menu/menu_item_song.xml
+++ b/app/src/main/res/menu/menu_item_song.xml
@@ -29,4 +29,4 @@
         android:id="@+id/action_details"
         android:title="@string/action_details"
         app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index fabecfad..64eb81c8 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -69,4 +69,4 @@
         android:checkable="true"
         android:title="@string/colored_footers" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index 0277f89e..4e77cf96 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -7,4 +7,4 @@
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/values-land/integers.xml b/app/src/main/res/values-land/integers.xml
index 068d4f46..61855457 100644
--- a/app/src/main/res/values-land/integers.xml
+++ b/app/src/main/res/values-land/integers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <integer name="detail_header_tile_maxLines">1</integer>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sw600dp/integers.xml b/app/src/main/res/values-sw600dp/integers.xml
index aa8af21d..29a26036 100644
--- a/app/src/main/res/values-sw600dp/integers.xml
+++ b/app/src/main/res/values-sw600dp/integers.xml
@@ -10,4 +10,4 @@
     <integer name="max_columns_land">8</integer>
 
     <integer name="detail_header_tile_maxLines">3</integer>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-v19/dimens.xml b/app/src/main/res/values-v19/dimens.xml
index fb2106de..d0e70b1d 100644
--- a/app/src/main/res/values-v19/dimens.xml
+++ b/app/src/main/res/values-v19/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="status_bar_padding">25dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-v23/dimens.xml b/app/src/main/res/values-v23/dimens.xml
index 14c63dcf..fc9a551e 100644
--- a/app/src/main/res/values-v23/dimens.xml
+++ b/app/src/main/res/values-v23/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="status_bar_padding">24dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/parents.xml
similarity index 100%
rename from app/src/main/res/values/styles_parents.xml
rename to app/src/main/res/values/parents.xml
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/static.xml
similarity index 100%
rename from app/src/main/res/values/donottranslate.xml
rename to app/src/main/res/values/static.xml
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 8a213c2b..29ba21ed 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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_fab" translatable="false">fab_transition</string>
     <string name="transition_mini_player" translatable="false">mini_player_transition</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/xml/pref_images.xml b/app/src/main/res/xml/pref_images.xml
index 8c3b77f0..0df839ad 100644
--- a/app/src/main/res/xml/pref_images.xml
+++ b/app/src/main/res/xml/pref_images.xml
@@ -23,4 +23,4 @@
 
     </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_now_playing.xml b/app/src/main/res/xml/pref_now_playing.xml
index d17a82f2..81c270e2 100644
--- a/app/src/main/res/xml/pref_now_playing.xml
+++ b/app/src/main/res/xml/pref_now_playing.xml
@@ -11,4 +11,4 @@
 
     </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_playback.xml b/app/src/main/res/xml/pref_playback.xml
index 9d3d592b..eeb7926d 100644
--- a/app/src/main/res/xml/pref_playback.xml
+++ b/app/src/main/res/xml/pref_playback.xml
@@ -53,4 +53,4 @@
 
     </com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>