Fix package names after a merge

app/proguard-rules.pro

@@ -56,7 +56,7 @@
 -keepclassmembers enum * { *; }
 -keepattributes *Annotation*, Signature, Exception
 -keepnames class androidx.navigation.fragment.NavHostFragment
--keepnames class code.name.monkey.retromusic.model.Home
+-keepnames class io.github.muntashirakon.music.model.Home
 -keep class * extends androidx.fragment.app.Fragment{}
 -keepnames class * extends android.os.Parcelable
 -keepnames class * extends java.io.Serializable

app/src/main/java/io/github/muntashirakon/music/activities/bugreport/model/DeviceInfo.java

@@ -6,10 +6,14 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import androidx.annotation.IntRange;
-import code.name.monkey.retromusic.util.PreferenceUtil;
+
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Arrays;
 import java.util.Locale;
 
+import io.github.muntashirakon.music.util.PreferenceUtil;
+
 public class DeviceInfo {
 
   @SuppressLint("NewApi")
@@ -59,7 +63,7 @@ public class DeviceInfo {
   private final String versionName;
   private final String selectedLang;
 
-  public DeviceInfo(Context context) {
+  public DeviceInfo(@NotNull Context context) {
     PackageInfo packageInfo;
     try {
       packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
@@ -136,7 +140,7 @@ public class DeviceInfo {
   }
 
   @NotNull
-    @Override
+  @Override
   public String toString() {
     return "App version: "
         + versionName

app/src/main/java/io/github/muntashirakon/music/adapter/album/AlbumAdapter.kt

@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.FragmentActivity
+import com.bumptech.glide.Glide
 import io.github.muntashirakon.music.R
 import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
 import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
@@ -37,22 +38,6 @@ import io.github.muntashirakon.music.model.Song
 import io.github.muntashirakon.music.util.MusicUtil
 import io.github.muntashirakon.music.util.PreferenceUtil
 import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
-import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
-import io.github.muntashirakon.music.fragments.albums.AlbumClickListener
-import io.github.muntashirakon.music.glide.AlbumGlideRequest
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.helper.SortOrder
-import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
-import io.github.muntashirakon.music.interfaces.CabHolder
-import io.github.muntashirakon.music.model.Album
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 open class AlbumAdapter(

app/src/main/java/io/github/muntashirakon/music/dialogs/BlacklistFolderChooserDialog.java

@@ -10,7 +10,7 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.DialogFragment;
-import code.name.monkey.retromusic.R;
+import io.github.muntashirakon.music.R;
 import com.afollestad.materialdialogs.MaterialDialog;
 import java.io.File;
 import java.util.ArrayList;

app/src/main/java/io/github/muntashirakon/music/dialogs/CreatePlaylistDialog.kt

@@ -18,29 +18,22 @@ import android.app.Dialog
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.LayoutInflater
-import android.widget.Toast
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import androidx.lifecycle.lifecycleScope
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
 import io.github.muntashirakon.music.EXTRA_SONG
 import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.db.PlaylistEntity
-import io.github.muntashirakon.music.db.toSongEntity
 import io.github.muntashirakon.music.extensions.colorButtons
 import io.github.muntashirakon.music.extensions.extra
 import io.github.muntashirakon.music.extensions.materialDialog
 import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.fragments.ReloadType.Playlists
 import io.github.muntashirakon.music.model.Song
-import com.google.android.material.textfield.TextInputEditText
-import com.google.android.material.textfield.TextInputLayout
 import kotlinx.android.synthetic.main.dialog_playlist.view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class CreatePlaylistDialog : DialogFragment() {
-    private val io.github.muntashirakon.music by sharedViewModel<LibraryViewModel>()
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     companion object {
         fun create(song: Song): CreatePlaylistDialog {
@@ -68,7 +61,7 @@ class CreatePlaylistDialog : DialogFragment() {
             ) { _, _ ->
                 val playlistName = playlistView.text.toString()
                 if (!TextUtils.isEmpty(playlistName)) {
-                    io.github.muntashirakon.music.addToPlaylist(playlistName, songs)
+                    libraryViewModel.addToPlaylist(playlistName, songs)
 
                 } else {
                     playlistContainer.error = "Playlist is can't be empty"

app/src/main/java/io/github/muntashirakon/music/fragments/settings/NowPlayingSettingsFragment.kt

@@ -19,8 +19,8 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 /**
  * @author Hemanth S (h4h13).

app/src/main/java/io/github/muntashirakon/music/interfaces/IAlbumClickListener.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.View
 

app/src/main/java/io/github/muntashirakon/music/interfaces/IArtistClickListener.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.View
 

app/src/main/java/io/github/muntashirakon/music/interfaces/ICallbacks.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.MenuItem
 import android.view.View

app/src/main/java/io/github/muntashirakon/music/interfaces/IPlaylistClickListener.kt

@@ -1,7 +1,7 @@
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.View
-import code.name.monkey.retromusic.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.PlaylistWithSongs
 
 interface IPlaylistClickListener {
     fun onPlaylistClick(playlistWithSongs: PlaylistWithSongs, view: View)

app/src/main/java/io/github/muntashirakon/music/model/Artist.kt

@@ -15,7 +15,7 @@
 package io.github.muntashirakon.music.model
 
 import io.github.muntashirakon.music.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import java.util.*
 
 data class Artist(

app/src/main/java/io/github/muntashirakon/music/model/ArtworkInfo.kt

@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import android.graphics.Bitmap
 

app/src/main/java/io/github/muntashirakon/music/model/LoadingInfo.kt

@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import org.jaudiotagger.tag.FieldKey
 

app/src/main/java/io/github/muntashirakon/music/repository/LocalDataRepository.kt

@@ -1,7 +1,7 @@
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.Context
-import code.name.monkey.retromusic.model.Contributor
+import io.github.muntashirakon.music.model.Contributor
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 

app/src/main/java/io/github/muntashirakon/music/state/NowPlayingPanelState.kt

@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.state
+package io.github.muntashirakon.music.state
 
 enum class NowPlayingPanelState {
     EXPAND,

app/src/main/java/io/github/muntashirakon/music/util/NavigationUtil.java

@@ -17,24 +17,24 @@ package io.github.muntashirakon.music.util;
 import android.app.Activity;
 import android.app.ActivityOptions;
 import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.Intent;
 import android.media.audiofx.AudioEffect;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
+
+import org.jetbrains.annotations.NotNull;
+
 import io.github.muntashirakon.music.R;
 import io.github.muntashirakon.music.activities.DriveModeActivity;
 import io.github.muntashirakon.music.activities.LicenseActivity;
 import io.github.muntashirakon.music.activities.LyricsActivity;
 import io.github.muntashirakon.music.activities.PlayingQueueActivity;
-import io.github.muntashirakon.music.activities.PurchaseActivity;
-import io.github.muntashirakon.music.activities.SupportDevelopmentActivity;
 import io.github.muntashirakon.music.activities.UserInfoActivity;
 import io.github.muntashirakon.music.activities.WhatsNewActivity;
 import io.github.muntashirakon.music.activities.bugreport.BugReportActivity;
 import io.github.muntashirakon.music.helper.MusicPlayerRemote;
-import org.jetbrains.annotations.NotNull;
 
 public class NavigationUtil {
 

app/src/main/res/navigation/main_graph.xml

@@ -80,37 +80,37 @@
 
     <fragment
         android:id="@+id/action_album"
-        android:name="code.name.monkey.retromusic.fragments.albums.AlbumsFragment"
+        android:name="io.github.muntashirakon.music.fragments.albums.AlbumsFragment"
         tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_artist"
-        android:name="code.name.monkey.retromusic.fragments.artists.ArtistsFragment"
+        android:name="io.github.muntashirakon.music.fragments.artists.ArtistsFragment"
         tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_song"
-        android:name="code.name.monkey.retromusic.fragments.songs.SongsFragment"
+        android:name="io.github.muntashirakon.music.fragments.songs.SongsFragment"
         tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_genre"
-        android:name="code.name.monkey.retromusic.fragments.genres.GenresFragment"
+        android:name="io.github.muntashirakon.music.fragments.genres.GenresFragment"
         tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_playlist"
-        android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistsFragment"
+        android:name="io.github.muntashirakon.music.fragments.playlists.PlaylistsFragment"
         tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_folder"
-        android:name="code.name.monkey.retromusic.fragments.folder.FoldersFragment"
+        android:name="io.github.muntashirakon.music.fragments.folder.FoldersFragment"
         tools:layout="@layout/fragment_folder" />
 
     <fragment
         android:id="@+id/action_home"
-        android:name="code.name.monkey.retromusic.fragments.home.HomeFragment"
+        android:name="io.github.muntashirakon.music.fragments.home.HomeFragment"
         android:label=""
         tools:layout="@layout/fragment_banner_home" />