Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Apply package name changes after merge

Browse source
This commit is contained in:
Muntashir Al-Islam 2020-09-22 15:37:45 +06:00
parent 6df00b3e3a
commit 2d0419d48c
41 changed files with 103 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -29,7 +29,7 @@
android:theme="@style/Theme.RetroMusic.FollowSystem"
android:usesCleartextTraffic="false"
tools:ignore="AllowBackup,GoogleAppIndexingWarning"
tools:targetApi="m">
tools:targetApi="q">
<activity
android:name=".activities.MainActivity"
android:label="@string/app_name"

8
app/src/main/java/io/github/muntashirakon/music/MainModule.kt
View file

@ -3,10 +3,10 @@ package io.github.muntashirakon.music
import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.sqlite.db.SupportSQLiteDatabase
import code.name.monkey.retromusic.db.BlackListStoreDao
import code.name.monkey.retromusic.db.BlackListStoreEntity
import code.name.monkey.retromusic.db.PlaylistWithSongs
import code.name.monkey.retromusic.db.RetroDatabase
import io.github.muntashirakon.music.db.BlackListStoreDao
import io.github.muntashirakon.music.db.BlackListStoreEntity
import io.github.muntashirakon.music.db.PlaylistWithSongs
import io.github.muntashirakon.music.db.RetroDatabase
import io.github.muntashirakon.music.fragments.LibraryViewModel
import io.github.muntashirakon.music.fragments.albums.AlbumDetailsViewModel
import io.github.muntashirakon.music.fragments.artists.ArtistDetailsViewModel

13
app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.activities
package io.github.muntashirakon.music.activities
import android.content.Intent
import android.net.Uri
@ -7,13 +7,12 @@ import android.provider.Settings
import androidx.core.text.HtmlCompat
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.appthemehelper.util.VersionUtils
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
import code.name.monkey.retromusic.extensions.accentBackgroundColor
import code.name.monkey.retromusic.extensions.show
import code.name.monkey.retromusic.util.RingtoneManager
import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
import io.github.muntashirakon.music.extensions.accentBackgroundColor
import io.github.muntashirakon.music.extensions.show
import io.github.muntashirakon.music.util.RingtoneManager
import kotlinx.android.synthetic.main.activity_permission.*
import kotlinx.android.synthetic.main.fragment_library.appNameText
class PermissionActivity : AbsMusicServiceActivity() {

8
app/src/main/java/io/github/muntashirakon/music/adapter/playlist/LegacyPlaylistAdapter.kt
View file

@ -1,13 +1,13 @@
package code.name.monkey.retromusic.adapter.playlist
package io.github.muntashirakon.music.adapter.playlist
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.FragmentActivity
import androidx.recyclerview.widget.RecyclerView
import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
import code.name.monkey.retromusic.model.Playlist
import code.name.monkey.retromusic.util.MusicUtil
import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
import io.github.muntashirakon.music.model.Playlist
import io.github.muntashirakon.music.util.MusicUtil
class LegacyPlaylistAdapter(
private val activity: FragmentActivity,

20
app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt
View file

@ -3,16 +3,16 @@ package io.github.muntashirakon.music.adapter.song
import android.view.MenuItem
import android.view.View
import androidx.fragment.app.FragmentActivity
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.R.menu
import code.name.monkey.retromusic.db.PlaylistEntity
import code.name.monkey.retromusic.db.toSongEntity
import code.name.monkey.retromusic.db.toSongs
import code.name.monkey.retromusic.dialogs.RemoveSongFromPlaylistDialog
import code.name.monkey.retromusic.interfaces.CabHolder
import code.name.monkey.retromusic.model.PlaylistSong
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.util.ViewUtil
import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.R.menu
import io.github.muntashirakon.music.db.PlaylistEntity
import io.github.muntashirakon.music.db.toSongEntity
import io.github.muntashirakon.music.db.toSongs
import io.github.muntashirakon.music.dialogs.RemoveSongFromPlaylistDialog
import io.github.muntashirakon.music.interfaces.CabHolder
import io.github.muntashirakon.music.model.PlaylistSong
import io.github.muntashirakon.music.model.Song
import io.github.muntashirakon.music.util.ViewUtil
import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemViewHolder
import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange

2
app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreDao.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.room.*

2
app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreEntity.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.room.Entity
import androidx.room.PrimaryKey

2
app/src/main/java/io/github/muntashirakon/music/db/HistoryDao.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.lifecycle.LiveData
import androidx.room.*

2
app/src/main/java/io/github/muntashirakon/music/db/HistoryEntity.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.room.ColumnInfo
import androidx.room.Entity

2
app/src/main/java/io/github/muntashirakon/music/db/LyricsDao.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.room.*

2
app/src/main/java/io/github/muntashirakon/music/db/LyricsEntity.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.room.Entity
import androidx.room.PrimaryKey

2
app/src/main/java/io/github/muntashirakon/music/db/PlayCountDao.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.room.*

2
app/src/main/java/io/github/muntashirakon/music/db/PlayCountEntity.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.room.ColumnInfo
import androidx.room.Entity

5
app/src/main/java/io/github/muntashirakon/music/db/PlaylistDao.kt
View file

@ -1,7 +1,10 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.lifecycle.LiveData
import androidx.room.*
import io.github.muntashirakon.music.db.PlaylistEntity
import io.github.muntashirakon.music.db.PlaylistWithSongs
import io.github.muntashirakon.music.db.SongEntity
@Dao
interface PlaylistDao {

2
app/src/main/java/io/github/muntashirakon/music/db/PlaylistEntity.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import android.os.Parcelable
import androidx.room.ColumnInfo

2
app/src/main/java/io/github/muntashirakon/music/db/PlaylistWithSongs.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import android.os.Parcelable
import androidx.room.Embedded

2
app/src/main/java/io/github/muntashirakon/music/db/RetroDatabase.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import androidx.room.Database
import androidx.room.RoomDatabase

2
app/src/main/java/io/github/muntashirakon/music/db/SongEntity.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import android.os.Parcelable
import androidx.room.ColumnInfo

4
app/src/main/java/io/github/muntashirakon/music/db/SongExtension.kt
View file

@ -1,6 +1,6 @@
package code.name.monkey.retromusic.db
package io.github.muntashirakon.music.db
import code.name.monkey.retromusic.model.Song
import io.github.muntashirakon.music.model.Song
fun List<SongEntity>.toSongs(): List<Song> {
return map {

10
app/src/main/java/io/github/muntashirakon/music/dialogs/ImportPlaylistDialog.kt
View file

@ -1,12 +1,12 @@
package code.name.monkey.retromusic.dialogs
package io.github.muntashirakon.music.dialogs
import android.app.Dialog
import android.os.Bundle
import androidx.fragment.app.DialogFragment
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.extensions.colorButtons
import code.name.monkey.retromusic.extensions.materialDialog
import code.name.monkey.retromusic.fragments.LibraryViewModel
import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.extensions.colorButtons
import io.github.muntashirakon.music.extensions.materialDialog
import io.github.muntashirakon.music.fragments.LibraryViewModel
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
class ImportPlaylistDialog : DialogFragment() {

14
app/src/main/java/io/github/muntashirakon/music/dialogs/LyricsDialog.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.dialogs
package io.github.muntashirakon.music.dialogs
import android.os.Bundle
import android.view.LayoutInflater
@ -6,12 +6,12 @@ import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.extensions.accentTextColor
import code.name.monkey.retromusic.extensions.hide
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.network.Result
import code.name.monkey.retromusic.repository.Repository
import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.extensions.accentTextColor
import io.github.muntashirakon.music.extensions.hide
import io.github.muntashirakon.music.helper.MusicPlayerRemote
import io.github.muntashirakon.music.network.Result
import io.github.muntashirakon.music.repository.Repository
import kotlinx.android.synthetic.main.lyrics_dialog.*
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main

18
app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveSongFromPlaylistDialog.kt
View file

@ -1,18 +1,18 @@
package code.name.monkey.retromusic.dialogs
package io.github.muntashirakon.music.dialogs
import android.app.Dialog
import android.os.Bundle
import androidx.core.os.bundleOf
import androidx.core.text.HtmlCompat
import androidx.fragment.app.DialogFragment
import code.name.monkey.retromusic.EXTRA_SONG
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.db.SongEntity
import code.name.monkey.retromusic.extensions.colorButtons
import code.name.monkey.retromusic.extensions.extraNotNull
import code.name.monkey.retromusic.extensions.materialDialog
import code.name.monkey.retromusic.fragments.LibraryViewModel
import code.name.monkey.retromusic.fragments.ReloadType.Playlists
import io.github.muntashirakon.music.EXTRA_SONG
import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.db.SongEntity
import io.github.muntashirakon.music.extensions.colorButtons
import io.github.muntashirakon.music.extensions.extraNotNull
import io.github.muntashirakon.music.extensions.materialDialog
import io.github.muntashirakon.music.fragments.LibraryViewModel
import io.github.muntashirakon.music.fragments.ReloadType.Playlists
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
class RemoveSongFromPlaylistDialog : DialogFragment() {

18
app/src/main/java/io/github/muntashirakon/music/dialogs/SavePlaylistDialog.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.dialogs
package io.github.muntashirakon.music.dialogs
import android.app.Dialog
import android.os.Bundle
@ -6,14 +6,14 @@ import android.widget.Toast
import androidx.core.os.bundleOf
import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.EXTRA_PLAYLIST
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.db.PlaylistWithSongs
import code.name.monkey.retromusic.extensions.colorButtons
import code.name.monkey.retromusic.extensions.extraNotNull
import code.name.monkey.retromusic.extensions.materialDialog
import code.name.monkey.retromusic.util.PlaylistsUtil
import io.github.muntashirakon.music.App
import io.github.muntashirakon.music.EXTRA_PLAYLIST
import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.db.PlaylistWithSongs
import io.github.muntashirakon.music.extensions.colorButtons
import io.github.muntashirakon.music.extensions.extraNotNull
import io.github.muntashirakon.music.extensions.materialDialog
import io.github.muntashirakon.music.util.PlaylistsUtil
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

2
app/src/main/java/io/github/muntashirakon/music/extensions/CursorExtensions.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.extensions
package io.github.muntashirakon.music.extensions
import android.database.Cursor

2
app/src/main/java/io/github/muntashirakon/music/fragments/CoroutineViewModel.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.fragments
package io.github.muntashirakon.music.fragments
import androidx.lifecycle.ViewModel
import kotlinx.coroutines.*

10
app/src/main/java/io/github/muntashirakon/music/glide/SingleColorTarget.kt
View file

@ -1,12 +1,12 @@
package code.name.monkey.retromusic.glide
package io.github.muntashirakon.music.glide
import android.graphics.drawable.Drawable
import android.widget.ImageView
import code.name.monkey.appthemehelper.util.ATHUtil
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget
import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
import code.name.monkey.retromusic.util.ColorUtil
import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.glide.palette.BitmapPaletteTarget
import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
import io.github.muntashirakon.music.util.ColorUtil
import com.bumptech.glide.request.animation.GlideAnimation

4
app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.kt
View file

@ -11,12 +11,12 @@
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*/
package code.name.monkey.retromusic.model
package io.github.muntashirakon.music.model
import android.os.Parcelable
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import code.name.monkey.retromusic.R
import io.github.muntashirakon.music.R
import kotlinx.android.parcel.Parcelize
@Parcelize

2
app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.kt
View file

@ -11,7 +11,7 @@
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*/
package code.name.monkey.retromusic.model
package io.github.muntashirakon.music.model
import kotlinx.android.parcel.Parcelize

2
app/src/main/java/io/github/muntashirakon/music/model/Song.kt
View file

@ -14,8 +14,6 @@
package io.github.muntashirakon.music.model
import android.os.Parcelable
import code.name.monkey.retromusic.db.HistoryEntity
import code.name.monkey.retromusic.db.SongEntity
import kotlinx.android.parcel.Parcelize
// update equals and hashcode if fields changes

2
app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/PlaylistIdGenerator.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.model.smartplaylist
package io.github.muntashirakon.music.model.smartplaylist
import androidx.annotation.DrawableRes
import kotlin.math.abs

2
app/src/main/java/io/github/muntashirakon/music/network/LyricsService.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.network
package io.github.muntashirakon.music.network
import retrofit2.http.GET
import retrofit2.http.Headers

2
app/src/main/java/io/github/muntashirakon/music/network/conversion/LyricsConverterFactory.kt
View file

@ -12,7 +12,7 @@
* See the GNU General Public License for more details.
*
*/
package code.name.monkey.retromusic.network.conversion
package io.github.muntashirakon.music.network.conversion
import okhttp3.MediaType
import okhttp3.RequestBody

7
app/src/main/java/io/github/muntashirakon/music/repository/RoomRepository.kt
View file

@ -1,9 +1,10 @@
package code.name.monkey.retromusic.repository
package io.github.muntashirakon.music.repository
import androidx.annotation.WorkerThread
import androidx.lifecycle.LiveData
import code.name.monkey.retromusic.db.*
import code.name.monkey.retromusic.model.Song
import io.github.muntashirakon.music.db.*
import io.github.muntashirakon.music.model.Song
import io.github.muntashirakon.music.db.*
interface RoomRepository {

2
app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt
View file

@ -150,7 +150,7 @@ class RealSongRepository(private val context: Context) : SongRepository {
selectionFinal + " AND " + Media.DURATION + ">= " + (PreferenceUtil.filterLength * 1000)
return context.contentResolver.query(
Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY),
Media.getContentUri(MediaStore.VOLUME_EXTERNAL),
baseProjection,
selectionFinal,
selectionValuesFinal,

2
app/src/main/java/io/github/muntashirakon/music/util/ColorUtil.java
View file

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

2
app/src/main/java/io/github/muntashirakon/music/util/FilePathUtil.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.util
package io.github.muntashirakon.music.util
import android.os.Environment
import java.io.File

4
app/src/main/java/io/github/muntashirakon/music/views/AccentIcon.kt
View file

@ -1,10 +1,10 @@
package code.name.monkey.retromusic.views
package io.github.muntashirakon.music.views
import android.content.Context
import android.content.res.ColorStateList
import android.util.AttributeSet
import androidx.appcompat.widget.AppCompatImageView
import code.name.monkey.retromusic.extensions.accentColor
import io.github.muntashirakon.music.extensions.accentColor
class AccentIcon @JvmOverloads constructor(
context: Context,

6
app/src/main/java/io/github/muntashirakon/music/views/PermissionItem.kt
View file

@ -1,4 +1,4 @@
package code.name.monkey.retromusic.views
package io.github.muntashirakon.music.views
import android.content.Context
import android.content.res.ColorStateList
@ -6,8 +6,8 @@ import android.util.AttributeSet
import android.widget.FrameLayout
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.appthemehelper.util.ColorUtil
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.extensions.accentOutlineColor
import io.github.muntashirakon.music.R
import io.github.muntashirakon.music.extensions.accentOutlineColor
import kotlinx.android.synthetic.main.item_permission.view.*
class PermissionItem @JvmOverloads constructor(

6
app/src/main/res/layout/activity_permission.xml
View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="?attr/colorSurface">
<code.name.monkey.retromusic.views.BaselineGridTextView
<io.github.muntashirakon.music.views.BaselineGridTextView
android:id="@+id/appNameText"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -28,7 +28,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/appNameText" />
<code.name.monkey.retromusic.views.PermissionItem
<io.github.muntashirakon.music.views.PermissionItem
android:id="@+id/storagePermission"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -41,7 +41,7 @@
app:permissionTitleNumber="1"
app:permissionTitleSubTitle="The app needs permission to access your device storage for music files playing music" />
<code.name.monkey.retromusic.views.PermissionItem
<io.github.muntashirakon.music.views.PermissionItem
android:id="@+id/audioPermission"
android:layout_width="0dp"
android:layout_height="wrap_content"

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

@ -38,7 +38,7 @@
tools:maxLines="@string/grid_size_1"
tools:text="@tools:sample/lorem/random" />
<code.name.monkey.retromusic.views.BaselineGridTextView
<io.github.muntashirakon.music.views.BaselineGridTextView
android:id="@+id/summary"
android:layout_width="0dp"
android:layout_height="wrap_content"

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

@ -29,7 +29,7 @@
android:textStyle="bold"
tools:text="@tools:sample/full_names" />
<code.name.monkey.retromusic.views.AccentIcon
<io.github.muntashirakon.music.views.AccentIcon
android:id="@+id/arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"