Fix package names after a merge

This commit is contained in:
Muntashir Al-Islam 2020-10-16 00:14:02 +06:00
parent 3c0fc790d1
commit 3265af2086
17 changed files with 38 additions and 56 deletions

View file

@ -56,7 +56,7 @@
-keepclassmembers enum * { *; } -keepclassmembers enum * { *; }
-keepattributes *Annotation*, Signature, Exception -keepattributes *Annotation*, Signature, Exception
-keepnames class androidx.navigation.fragment.NavHostFragment -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{} -keep class * extends androidx.fragment.app.Fragment{}
-keepnames class * extends android.os.Parcelable -keepnames class * extends android.os.Parcelable
-keepnames class * extends java.io.Serializable -keepnames class * extends java.io.Serializable

View file

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

View file

@ -22,6 +22,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import com.bumptech.glide.Glide
import io.github.muntashirakon.music.R import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder 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.MusicUtil
import io.github.muntashirakon.music.util.PreferenceUtil import io.github.muntashirakon.music.util.PreferenceUtil
import io.github.muntashirakon.music.util.color.MediaNotificationProcessor 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 import me.zhanghai.android.fastscroll.PopupTextProvider
open class AlbumAdapter( open class AlbumAdapter(

View file

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

View file

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

View file

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

View file

@ -12,7 +12,7 @@
* See the GNU General Public License for more details. * 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 import android.view.View

View file

@ -12,7 +12,7 @@
* See the GNU General Public License for more details. * 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 import android.view.View

View file

@ -12,7 +12,7 @@
* See the GNU General Public License for more details. * 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.MenuItem
import android.view.View import android.view.View

View file

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

View file

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

View file

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

View file

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

View file

@ -1,7 +1,7 @@
package code.name.monkey.retromusic.repository package io.github.muntashirakon.music.repository
import android.content.Context 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.GsonBuilder
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken

View file

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

View file

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

View file

@ -80,37 +80,37 @@
<fragment <fragment
android:id="@+id/action_album" 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" /> tools:layout="@layout/fragment_main_activity_recycler_view" />
<fragment <fragment
android:id="@+id/action_artist" 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" /> tools:layout="@layout/fragment_main_activity_recycler_view" />
<fragment <fragment
android:id="@+id/action_song" 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" /> tools:layout="@layout/fragment_main_activity_recycler_view" />
<fragment <fragment
android:id="@+id/action_genre" 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" /> tools:layout="@layout/fragment_main_activity_recycler_view" />
<fragment <fragment
android:id="@+id/action_playlist" 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" /> tools:layout="@layout/fragment_main_activity_recycler_view" />
<fragment <fragment
android:id="@+id/action_folder" 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" /> tools:layout="@layout/fragment_folder" />
<fragment <fragment
android:id="@+id/action_home" 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="" android:label=""
tools:layout="@layout/fragment_banner_home" /> tools:layout="@layout/fragment_banner_home" />