From f28a4d524bd1607a189fb91408e251ff69e6b9f9 Mon Sep 17 00:00:00 2001 From: Muntashir Al-Islam Date: Wed, 22 Jul 2020 02:02:06 +0600 Subject: [PATCH] Update package names of new files --- .../java/io/github/muntashirakon/music/App.kt | 8 ++++++++ .../github/muntashirakon/music/MainModule.kt | 18 +++++++++--------- .../music/PeekingLinearLayoutManager.kt | 2 +- .../activities/genre/GenreDetailsViewModel.kt | 10 +++++----- .../playlist/PlaylistDetailsViewModel.kt | 18 +++++++++--------- .../music/activities/search/SearchViewModel.kt | 4 ++-- .../dialogs/RetroSingleCheckedListAdapter.kt | 4 ++-- .../music/extensions/DialogExtension.kt | 4 ++-- .../music/network/RetrofitClient.kt | 6 +++--- .../music/providers/ProviderModule.kt | 2 +- .../muntashirakon/music/util/DensityUtil.kt | 2 +- 11 files changed, 43 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/io/github/muntashirakon/music/App.kt b/app/src/main/java/io/github/muntashirakon/music/App.kt index b209f6a09..a088e18ab 100644 --- a/app/src/main/java/io/github/muntashirakon/music/App.kt +++ b/app/src/main/java/io/github/muntashirakon/music/App.kt @@ -18,6 +18,10 @@ import androidx.multidex.MultiDexApplication import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.VersionUtils import io.github.muntashirakon.music.appshortcuts.DynamicShortcutManager +import io.github.muntashirakon.music.network.networkModule +import io.github.muntashirakon.music.providers.provideModules +import org.koin.android.ext.koin.androidContext +import org.koin.core.context.startKoin class App : MultiDexApplication() { @@ -25,6 +29,10 @@ class App : MultiDexApplication() { super.onCreate() instance = this + startKoin { + androidContext(this@App) + modules(listOf(mainModule, provideModules, networkModule)) + } // default theme if (!ThemeStore.isConfigured(this, 3)) { ThemeStore.editTheme(this) diff --git a/app/src/main/java/io/github/muntashirakon/music/MainModule.kt b/app/src/main/java/io/github/muntashirakon/music/MainModule.kt index cc13de3d1..e61de46f2 100644 --- a/app/src/main/java/io/github/muntashirakon/music/MainModule.kt +++ b/app/src/main/java/io/github/muntashirakon/music/MainModule.kt @@ -1,13 +1,13 @@ -package code.name.monkey.retromusic +package io.github.muntashirakon.music -import code.name.monkey.retromusic.activities.albums.AlbumDetailsViewModel -import code.name.monkey.retromusic.activities.artists.ArtistDetailsViewModel -import code.name.monkey.retromusic.activities.genre.GenreDetailsViewModel -import code.name.monkey.retromusic.activities.playlist.PlaylistDetailsViewModel -import code.name.monkey.retromusic.activities.search.SearchViewModel -import code.name.monkey.retromusic.fragments.LibraryViewModel -import code.name.monkey.retromusic.model.Genre -import code.name.monkey.retromusic.model.Playlist +import io.github.muntashirakon.music.activities.albums.AlbumDetailsViewModel +import io.github.muntashirakon.music.activities.artists.ArtistDetailsViewModel +import io.github.muntashirakon.music.activities.genre.GenreDetailsViewModel +import io.github.muntashirakon.music.activities.playlist.PlaylistDetailsViewModel +import io.github.muntashirakon.music.activities.search.SearchViewModel +import io.github.muntashirakon.music.fragments.LibraryViewModel +import io.github.muntashirakon.music.model.Genre +import io.github.muntashirakon.music.model.Playlist import org.koin.android.viewmodel.dsl.viewModel import org.koin.dsl.module diff --git a/app/src/main/java/io/github/muntashirakon/music/PeekingLinearLayoutManager.kt b/app/src/main/java/io/github/muntashirakon/music/PeekingLinearLayoutManager.kt index a7961ffd3..e4de44b12 100644 --- a/app/src/main/java/io/github/muntashirakon/music/PeekingLinearLayoutManager.kt +++ b/app/src/main/java/io/github/muntashirakon/music/PeekingLinearLayoutManager.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic +package io.github.muntashirakon.music import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/github/muntashirakon/music/activities/genre/GenreDetailsViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/activities/genre/GenreDetailsViewModel.kt index 03aba809a..4d56466cc 100644 --- a/app/src/main/java/io/github/muntashirakon/music/activities/genre/GenreDetailsViewModel.kt +++ b/app/src/main/java/io/github/muntashirakon/music/activities/genre/GenreDetailsViewModel.kt @@ -1,13 +1,13 @@ -package code.name.monkey.retromusic.activities.genre +package io.github.muntashirakon.music.activities.genre import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import code.name.monkey.retromusic.interfaces.MusicServiceEventListener -import code.name.monkey.retromusic.model.Genre -import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.providers.RepositoryImpl +import io.github.muntashirakon.music.interfaces.MusicServiceEventListener +import io.github.muntashirakon.music.model.Genre +import io.github.muntashirakon.music.model.Song +import io.github.muntashirakon.music.providers.RepositoryImpl import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/github/muntashirakon/music/activities/playlist/PlaylistDetailsViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/activities/playlist/PlaylistDetailsViewModel.kt index 0ea4bc037..830388fea 100644 --- a/app/src/main/java/io/github/muntashirakon/music/activities/playlist/PlaylistDetailsViewModel.kt +++ b/app/src/main/java/io/github/muntashirakon/music/activities/playlist/PlaylistDetailsViewModel.kt @@ -1,17 +1,17 @@ -package code.name.monkey.retromusic.activities.playlist +package io.github.muntashirakon.music.activities.playlist import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import code.name.monkey.retromusic.App -import code.name.monkey.retromusic.interfaces.MusicServiceEventListener -import code.name.monkey.retromusic.loaders.PlaylistLoader -import code.name.monkey.retromusic.model.AbsCustomPlaylist -import code.name.monkey.retromusic.model.Playlist -import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.providers.RepositoryImpl -import code.name.monkey.retromusic.util.PlaylistsUtil +import io.github.muntashirakon.music.App +import io.github.muntashirakon.music.interfaces.MusicServiceEventListener +import io.github.muntashirakon.music.loaders.PlaylistLoader +import io.github.muntashirakon.music.model.AbsCustomPlaylist +import io.github.muntashirakon.music.model.Playlist +import io.github.muntashirakon.music.model.Song +import io.github.muntashirakon.music.providers.RepositoryImpl +import io.github.muntashirakon.music.util.PlaylistsUtil import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/io/github/muntashirakon/music/activities/search/SearchViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/activities/search/SearchViewModel.kt index 550a8d237..9431b638c 100644 --- a/app/src/main/java/io/github/muntashirakon/music/activities/search/SearchViewModel.kt +++ b/app/src/main/java/io/github/muntashirakon/music/activities/search/SearchViewModel.kt @@ -1,10 +1,10 @@ -package code.name.monkey.retromusic.activities.search +package io.github.muntashirakon.music.activities.search import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import code.name.monkey.retromusic.providers.RepositoryImpl +import io.github.muntashirakon.music.providers.RepositoryImpl import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.launch diff --git a/app/src/main/java/io/github/muntashirakon/music/dialogs/RetroSingleCheckedListAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/RetroSingleCheckedListAdapter.kt index c8fa03cdd..151961214 100644 --- a/app/src/main/java/io/github/muntashirakon/music/dialogs/RetroSingleCheckedListAdapter.kt +++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/RetroSingleCheckedListAdapter.kt @@ -1,8 +1,8 @@ -package code.name.monkey.retromusic.dialogs +package io.github.muntashirakon.music.dialogs import android.content.Context import android.widget.ArrayAdapter -import code.name.monkey.retromusic.R +import io.github.muntashirakon.music.R class RetroSingleCheckedListAdapter( context: Context, diff --git a/app/src/main/java/io/github/muntashirakon/music/extensions/DialogExtension.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/DialogExtension.kt index d2c383101..fd375c107 100644 --- a/app/src/main/java/io/github/muntashirakon/music/extensions/DialogExtension.kt +++ b/app/src/main/java/io/github/muntashirakon/music/extensions/DialogExtension.kt @@ -1,8 +1,8 @@ -package code.name.monkey.retromusic.extensions +package io.github.muntashirakon.music.extensions import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment -import code.name.monkey.retromusic.R +import io.github.muntashirakon.music.R import com.google.android.material.dialog.MaterialAlertDialogBuilder fun DialogFragment.materialDialog(title: Int): MaterialAlertDialogBuilder { diff --git a/app/src/main/java/io/github/muntashirakon/music/network/RetrofitClient.kt b/app/src/main/java/io/github/muntashirakon/music/network/RetrofitClient.kt index afaaeb67c..ab8f425e4 100644 --- a/app/src/main/java/io/github/muntashirakon/music/network/RetrofitClient.kt +++ b/app/src/main/java/io/github/muntashirakon/music/network/RetrofitClient.kt @@ -1,7 +1,7 @@ -package code.name.monkey.retromusic.network +package io.github.muntashirakon.music.network -import code.name.monkey.retromusic.App -import code.name.monkey.retromusic.Constants.BASE_URL +import io.github.muntashirakon.music.App +import io.github.muntashirakon.music.Constants.BASE_URL import com.google.gson.Gson import okhttp3.Cache import okhttp3.ConnectionPool diff --git a/app/src/main/java/io/github/muntashirakon/music/providers/ProviderModule.kt b/app/src/main/java/io/github/muntashirakon/music/providers/ProviderModule.kt index a5874e77a..397b87263 100644 --- a/app/src/main/java/io/github/muntashirakon/music/providers/ProviderModule.kt +++ b/app/src/main/java/io/github/muntashirakon/music/providers/ProviderModule.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.providers +package io.github.muntashirakon.music.providers import org.eclipse.egit.github.core.Repository import org.koin.dsl.bind diff --git a/app/src/main/java/io/github/muntashirakon/music/util/DensityUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/DensityUtil.kt index 2e36de9a7..b25a853b5 100644 --- a/app/src/main/java/io/github/muntashirakon/music/util/DensityUtil.kt +++ b/app/src/main/java/io/github/muntashirakon/music/util/DensityUtil.kt @@ -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.util +package io.github.muntashirakon.music.util import android.app.Activity import android.content.Context