diff --git a/README.md b/README.md
index 0dc8ecd19..dd02e0119 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,6 @@ Material Design music player for Android music lovers
alt="Get it on F-Droid"
height="80">](https://f-droid.org/en/packages/io.github.muntashirakon.Music/)
-[
](https://github.com/MuntashirAkon/Metro/releases)
-
## Differences between Metro and [RetroMusicPlayer](https://github.com/h4h13/RetroMusicPlayer)
- Google Play libraries removed (fully libre)
- Pro features available for free
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java
index 211576a04..e47c770ea 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java
@@ -22,7 +22,7 @@ import androidx.annotation.Nullable;
import com.heinrichreimersoftware.materialintro.app.IntroActivity;
import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
/** Created by hemanths on 2019-07-31. */
public class SAFGuideActivity extends IntroActivity {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
index eab1afbed..d68186c0f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
@@ -27,7 +27,7 @@ import androidx.appcompat.widget.AppCompatImageView;
import com.google.android.material.card.MaterialCardView;
import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableSwipeableItemViewHolder;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHolder
implements View.OnLongClickListener, View.OnClickListener {
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java
index 4d7ee7a65..60f904bdb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java
@@ -40,8 +40,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import io.github.muntashirakon.music.BuildConfig;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.BuildConfig;
+import code.name.monkey.retromusic.R;
/**
* 歌词 Created by wcy on 2015/11/9.
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java b/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
index e6bff309b..d749cf223 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
@@ -23,7 +23,7 @@ import android.widget.Toast;
import java.lang.ref.WeakReference;
import java.util.List;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
/**
* @author Karim Abou Zeid (kabouzeid)
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
index 5cdc18813..66556bbe0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
@@ -31,7 +31,7 @@ import androidx.annotation.Nullable;
import org.jetbrains.annotations.NotNull;
import code.name.monkey.appthemehelper.util.VersionUtils;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.service.playback.Playback;
import code.name.monkey.retromusic.util.PreferenceUtil;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
index 24391d965..096c2d786 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
@@ -35,7 +35,7 @@ import java.util.List;
import code.name.monkey.appthemehelper.ThemeStore;
import code.name.monkey.appthemehelper.util.ColorUtil;
import code.name.monkey.appthemehelper.util.VersionUtils;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
public class RetroColorUtil {
public static int desaturateColor(int color, float ratio) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
index d741ad649..b998d570e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
@@ -42,8 +42,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import io.github.muntashirakon.music.R;
-import io.github.muntashirakon.music.activities.saf.SAFRequestActivity;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.activities.saf.SAFRequestActivity;
import code.name.monkey.retromusic.model.Song;
public class SAFUtil {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java b/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
index 55ba25c7c..39044f317 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
@@ -35,7 +35,7 @@ import java.util.List;
import code.name.monkey.appthemehelper.util.ATHUtil;
import code.name.monkey.appthemehelper.util.ColorUtil;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
/** A class the processes media notifications and extracts the right text and background colors. */
public class MediaNotificationProcessor {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java
index a2ffad010..83d2a8f74 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java
@@ -37,7 +37,7 @@ import androidx.core.content.ContextCompat;
import java.util.WeakHashMap;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
/**
* Helper class to process legacy (Holo) notifications to make them look like material
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java b/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
index ec1a15674..87d4487f3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
@@ -24,7 +24,7 @@ import androidx.annotation.FontRes;
import com.google.android.material.textview.MaterialTextView;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
public class BaselineGridTextView extends MaterialTextView {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
index 6d9a4e820..4b492a854 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
@@ -37,7 +37,7 @@ import java.util.Iterator;
import java.util.List;
import code.name.monkey.appthemehelper.util.ATHUtil;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
/** @author Aidan Follestad (afollestad), modified for Phonograph by Karim Abou Zeid (kabouzeid) */
public class BreadCrumbLayout extends HorizontalScrollView implements View.OnClickListener {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java b/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java
index 4b7af6e23..a4ccfa1f3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java
@@ -30,7 +30,7 @@ import android.util.Log;
import androidx.appcompat.widget.AppCompatImageView;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
public class CircularImageView extends AppCompatImageView {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java b/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java
index 90e4848fc..f1df03d1a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java
@@ -32,7 +32,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.graphics.drawable.DrawableCompat;
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
public class PopupBackground extends Drawable {
diff --git a/app/src/main/res/navigation/main_graph.xml b/app/src/main/res/navigation/main_graph.xml
index 20f1b1c77..63ecf9dc7 100644
--- a/app/src/main/res/navigation/main_graph.xml
+++ b/app/src/main/res/navigation/main_graph.xml
@@ -11,7 +11,7 @@
tools:layout="@layout/fragment_playlist_detail">
+ app:argType="code.name.monkey.retromusic.model.Genre" />
+ app:argType="code.name.monkey.retromusic.db.PlaylistWithSongs" />