From 0f8b64534f25431f33c23f1bc77517c602a2bb93 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Sat, 4 Jul 2020 23:05:36 +0530 Subject: [PATCH] Remove dagger --- app/build.gradle | 10 +-- .../java/code/name/monkey/retromusic/App.kt | 14 +---- .../code/name/monkey/retromusic/Constants.kt | 2 +- .../activities/GenreDetailsActivity.kt | 10 +-- .../activities/PlaylistDetailActivity.kt | 17 +++-- .../retromusic/activities/PurchaseActivity.kt | 3 +- .../retromusic/activities/SearchActivity.kt | 17 +++-- .../retromusic/dagger/MusicComponent.kt | 63 ------------------- .../retromusic/dagger/module/AppModule.kt | 33 ---------- .../dagger/module/PresenterModile.kt | 55 ---------------- .../fragments/genres/GenresFragment.kt | 6 -- .../mvp/presenter/GenreDetailsPresenter.kt | 2 +- .../retromusic/mvp/presenter/HomePresenter.kt | 2 +- .../mvp/presenter/PlaylistSongsPresenter.kt | 2 +- .../mvp/presenter/SearchPresenter.kt | 2 +- .../retromusic/providers/RepositoryImpl.kt | 3 +- .../util/SliderReadTimeLabelFormatter.kt | 30 --------- .../name/monkey/retromusic/util/ViewUtil.kt | 11 ---- 18 files changed, 33 insertions(+), 249 deletions(-) delete mode 100644 app/src/main/java/code/name/monkey/retromusic/dagger/MusicComponent.kt delete mode 100644 app/src/main/java/code/name/monkey/retromusic/dagger/module/AppModule.kt delete mode 100644 app/src/main/java/code/name/monkey/retromusic/dagger/module/PresenterModile.kt delete mode 100644 app/src/main/java/code/name/monkey/retromusic/util/SliderReadTimeLabelFormatter.kt diff --git a/app/build.gradle b/app/build.gradle index 47ce9a5d3..2bbc4493e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -124,14 +124,14 @@ dependencies { implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.core:core-ktx:1.2.0' - implementation 'androidx.fragment:fragment-ktx:1.2.4' + implementation 'androidx.core:core-ktx:1.3.0' + implementation 'androidx.fragment:fragment-ktx:1.2.5' implementation 'androidx.palette:palette-ktx:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'com.google.android.material:material:1.2.0-alpha06' + implementation 'com.google.android.material:material:1.3.0-alpha01' def retrofit_version = '2.8.1' implementation "com.squareup.retrofit2:retrofit:$retrofit_version" @@ -170,10 +170,6 @@ dependencies { implementation 'com.heinrichreimersoftware:material-intro:1.6' implementation 'me.zhanghai.android.fastscroll:library:1.1.0' - def dagger_version = '2.27' - implementation "com.google.dagger:dagger:$dagger_version" - kapt "com.google.dagger:dagger-compiler:$dagger_version" - def lifecycle_version = "2.2.0" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" diff --git a/app/src/main/java/code/name/monkey/retromusic/App.kt b/app/src/main/java/code/name/monkey/retromusic/App.kt index b40633ce8..3d1d4ccf7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/App.kt +++ b/app/src/main/java/code/name/monkey/retromusic/App.kt @@ -18,10 +18,8 @@ import android.widget.Toast import androidx.multidex.MultiDexApplication import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.VersionUtils +import code.name.monkey.retromusic.Constants.PRO_VERSION_PRODUCT_ID import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager -import code.name.monkey.retromusic.dagger.DaggerMusicComponent -import code.name.monkey.retromusic.dagger.MusicComponent -import code.name.monkey.retromusic.dagger.module.AppModule import com.anjlab.android.iab.v3.BillingProcessor import com.anjlab.android.iab.v3.TransactionDetails @@ -32,7 +30,6 @@ class App : MultiDexApplication() { override fun onCreate() { super.onCreate() instance = this - musicComponent = initDagger(this) // default theme if (!ThemeStore.isConfigured(this, 3)) { @@ -64,11 +61,6 @@ class App : MultiDexApplication() { }) } - private fun initDagger(app: App): MusicComponent = - DaggerMusicComponent.builder() - .appModule(AppModule(app)) - .build() - override fun onTerminate() { super.onTerminate() billingProcessor.release() @@ -86,9 +78,5 @@ class App : MultiDexApplication() { PRO_VERSION_PRODUCT_ID ) } - - lateinit var musicComponent: MusicComponent - - const val PRO_VERSION_PRODUCT_ID = "pro_version" } } diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/code/name/monkey/retromusic/Constants.kt index 8dfe51121..8ae0d4036 100644 --- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt +++ b/app/src/main/java/code/name/monkey/retromusic/Constants.kt @@ -18,7 +18,7 @@ import android.provider.BaseColumns import android.provider.MediaStore object Constants { - + const val PRO_VERSION_PRODUCT_ID = "pro_version" const val RATE_ON_GOOGLE_PLAY = "https://play.google.com/store/apps/details?id=code.name.monkey.retromusic" const val TRANSLATE = "https://github.com/h4h13/RetroMusicPlayer" diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt index 809fbaaec..b305c3d89 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt @@ -8,7 +8,6 @@ import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.util.ATHUtil -import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter @@ -18,13 +17,14 @@ import code.name.monkey.retromusic.interfaces.CabHolder import code.name.monkey.retromusic.model.Genre import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter +import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter.GenreDetailsPresenterImpl import code.name.monkey.retromusic.mvp.presenter.GenreDetailsView +import code.name.monkey.retromusic.providers.RepositoryImpl import code.name.monkey.retromusic.util.DensityUtil import code.name.monkey.retromusic.util.RetroColorUtil import com.afollestad.materialcab.MaterialCab import kotlinx.android.synthetic.main.activity_playlist_detail.* import java.util.* -import javax.inject.Inject /** * @author Hemanth S (h4h13). @@ -32,9 +32,8 @@ import javax.inject.Inject class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDetailsView { - @Inject - lateinit var genreDetailsPresenter: GenreDetailsPresenter + private lateinit var genreDetailsPresenter: GenreDetailsPresenter private lateinit var genre: Genre private lateinit var songAdapter: ShuffleButtonSongAdapter private var cab: MaterialCab? = null @@ -71,7 +70,8 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet setUpToolBar() setupRecyclerView() - App.musicComponent.inject(this) + genreDetailsPresenter = + GenreDetailsPresenterImpl(RepositoryImpl(this)) genreDetailsPresenter.attachView(this) } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt index 6ef54ffe9..e4b569cc3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt @@ -7,7 +7,6 @@ import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.util.ATHUtil -import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter @@ -21,7 +20,9 @@ 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.mvp.presenter.PlaylistSongsPresenter +import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter.PlaylistSongsPresenterImpl import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsView +import code.name.monkey.retromusic.providers.RepositoryImpl import code.name.monkey.retromusic.util.DensityUtil import code.name.monkey.retromusic.util.PlaylistsUtil import code.name.monkey.retromusic.util.RetroColorUtil @@ -30,13 +31,11 @@ import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemA import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils import kotlinx.android.synthetic.main.activity_playlist_detail.* -import javax.inject.Inject class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, PlaylistSongsView { - @Inject - lateinit var playlistSongsPresenter: PlaylistSongsPresenter + private lateinit var presenter: PlaylistSongsPresenter private lateinit var playlist: Playlist private var cab: MaterialCab? = null private lateinit var adapter: SongAdapter @@ -52,8 +51,8 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli setLightNavigationBar(true) setBottomBarVisibility(View.GONE) - App.musicComponent.inject(this) - playlistSongsPresenter.attachView(this) + presenter = PlaylistSongsPresenterImpl(RepositoryImpl(this)) + presenter.attachView(this) if (intent.extras != null) { playlist = intent.extras!!.getParcelable(EXTRA_PLAYLIST)!! @@ -114,7 +113,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli override fun onResume() { super.onResume() - playlistSongsPresenter.loadPlaylistSongs(playlist) + presenter.loadPlaylistSongs(playlist) } private fun setUpToolBar() { @@ -181,7 +180,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli setToolbarTitle(playlist.name) } } - playlistSongsPresenter.loadPlaylistSongs(playlist) + presenter.loadPlaylistSongs(playlist) } private fun setToolbarTitle(title: String) { @@ -227,7 +226,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli wrappedAdapter = null } super.onDestroy() - playlistSongsPresenter.detachView() + presenter.detachView() } override fun showEmptyView() { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt index 20f187498..410d68143 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt @@ -12,6 +12,7 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.MaterialUtil import code.name.monkey.retromusic.App import code.name.monkey.retromusic.BuildConfig +import code.name.monkey.retromusic.Constants.PRO_VERSION_PRODUCT_ID import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsBaseActivity import com.anjlab.android.iab.v3.BillingProcessor @@ -49,7 +50,7 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler { } purchaseButton.setOnClickListener { - billingProcessor.purchase(this@PurchaseActivity, App.PRO_VERSION_PRODUCT_ID) + billingProcessor.purchase(this@PurchaseActivity, PRO_VERSION_PRODUCT_ID) } bannerContainer.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this)) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt index d198bd5ca..b62bc5e2e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt @@ -21,23 +21,22 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper -import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity import code.name.monkey.retromusic.adapter.SearchAdapter import code.name.monkey.retromusic.mvp.presenter.SearchPresenter +import code.name.monkey.retromusic.mvp.presenter.SearchPresenter.SearchPresenterImpl import code.name.monkey.retromusic.mvp.presenter.SearchView +import code.name.monkey.retromusic.providers.RepositoryImpl import code.name.monkey.retromusic.util.RetroUtil import com.google.android.material.textfield.TextInputEditText import kotlinx.android.synthetic.main.activity_search.* import java.util.* -import javax.inject.Inject import kotlin.collections.ArrayList class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatcher, SearchView { - @Inject - lateinit var searchPresenter: SearchPresenter + private lateinit var presenter: SearchPresenter private var searchAdapter: SearchAdapter? = null private var query: String? = null @@ -50,8 +49,8 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch setTaskDescriptionColorAuto() setLightNavigationBar(true) - App.musicComponent.inject(this) - searchPresenter.attachView(this) + presenter = SearchPresenterImpl(RepositoryImpl(this)) + presenter.attachView(this) setupRecyclerView() setUpToolBar() @@ -117,7 +116,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch override fun onDestroy() { super.onDestroy() - searchPresenter.detachView() + presenter.detachView() } override fun onSaveInstanceState(outState: Bundle) { @@ -134,7 +133,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch TransitionManager.beginDelayedTransition(appBarLayout) voiceSearch.visibility = if (query.isNotEmpty()) View.GONE else View.VISIBLE clearText.visibility = if (query.isNotEmpty()) View.VISIBLE else View.GONE - searchPresenter.search(query) + presenter.search(query) } override fun onMediaStoreChanged() { @@ -176,7 +175,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) query = result?.get(0) searchView.setText(query, BufferType.EDITABLE) - searchPresenter.search(query!!) + presenter.search(query!!) } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/MusicComponent.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/MusicComponent.kt deleted file mode 100644 index 42a6584fd..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/dagger/MusicComponent.kt +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2019 Hemanth Savarala. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by - * the Free Software Foundation either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * 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.dagger - -import code.name.monkey.retromusic.activities.artists.ArtistDetailActivity -import code.name.monkey.retromusic.activities.GenreDetailsActivity -import code.name.monkey.retromusic.activities.PlaylistDetailActivity -import code.name.monkey.retromusic.activities.SearchActivity -import code.name.monkey.retromusic.dagger.module.AppModule -import code.name.monkey.retromusic.dagger.module.PresenterModule -import code.name.monkey.retromusic.fragments.albums.AlbumsFragment -import code.name.monkey.retromusic.fragments.artists.ArtistsFragment -import code.name.monkey.retromusic.fragments.genres.GenresFragment -import code.name.monkey.retromusic.fragments.home.BannerHomeFragment -import code.name.monkey.retromusic.fragments.playlists.PlaylistsFragment -import code.name.monkey.retromusic.fragments.songs.SongsFragment -import dagger.Component -import javax.inject.Singleton - -/** - * Created by hemanths on 2019-09-04. - */ -@Singleton -@Component( - modules = [ - AppModule::class, - PresenterModule::class - ] -) -interface MusicComponent { - - fun inject(songsFragment: SongsFragment) - - fun inject(albumsFragment: AlbumsFragment) - - fun inject(artistsFragment: ArtistsFragment) - - fun inject(genresFragment: GenresFragment) - - fun inject(playlistsFragment: PlaylistsFragment) - - fun inject(artistDetailActivity: ArtistDetailActivity) - - fun inject(playlistDetailActivity: PlaylistDetailActivity) - - fun inject(genreDetailsActivity: GenreDetailsActivity) - - fun inject(searchActivity: SearchActivity) - - fun inject(bannerHomeFragment: BannerHomeFragment) -} diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/AppModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/AppModule.kt deleted file mode 100644 index 31707bb0d..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/dagger/module/AppModule.kt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2019 Hemanth Savarala. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by - * the Free Software Foundation either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * 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.dagger.module - -import android.app.Application -import android.content.Context - -import dagger.Module -import dagger.Provides -import javax.inject.Singleton - -/** - * Created by hemanths on 2019-09-04. - */ -@Module -class AppModule(private val application: Application) { - - @Provides - @Singleton - fun provideContext(): Context = application -} diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/PresenterModile.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/PresenterModile.kt deleted file mode 100644 index 8e29057c6..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/dagger/module/PresenterModile.kt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2019 Hemanth Savarala. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by - * the Free Software Foundation either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * 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.dagger.module - -import android.content.Context -import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter -import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter.GenreDetailsPresenterImpl -import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter -import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter.PlaylistSongsPresenterImpl -import code.name.monkey.retromusic.mvp.presenter.SearchPresenter -import code.name.monkey.retromusic.mvp.presenter.SearchPresenter.SearchPresenterImpl -import code.name.monkey.retromusic.providers.RepositoryImpl -import code.name.monkey.retromusic.providers.interfaces.Repository -import dagger.Module -import dagger.Provides - -/** - * Created by hemanths on 2019-12-30. - */ - -@Module -class PresenterModule { - - @Provides - fun providesRepository(context: Context): Repository { - return RepositoryImpl(context) - } - - @Provides - fun providesGenreDetailsPresenter(presenter: GenreDetailsPresenterImpl): GenreDetailsPresenter { - return presenter - } - - @Provides - fun providesPlaylistSongPresenter(presenter: PlaylistSongsPresenterImpl): PlaylistSongsPresenter { - return presenter - } - - @Provides - fun providesSearchPresenter(presenter: SearchPresenterImpl): SearchPresenter { - return presenter - } -} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt index 6c10551c4..8767ff7a2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt @@ -18,7 +18,6 @@ import android.os.Bundle import android.view.View import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.GenreAdapter import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment @@ -27,11 +26,6 @@ import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks class GenresFragment : AbsLibraryPagerRecyclerViewFragment(), MainActivityFragmentCallbacks { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - App.musicComponent.inject(this) - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) mainActivity.libraryViewModel.allGenres().observe( diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt index 3db4517e6..3a2b359fc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt @@ -38,7 +38,7 @@ interface GenreDetailsView : BaseView { interface GenreDetailsPresenter : Presenter { fun loadGenreSongs(genreId: Int) - class GenreDetailsPresenterImpl @Inject constructor( + class GenreDetailsPresenterImpl constructor( private val repository: Repository ) : PresenterImpl(), GenreDetailsPresenter, CoroutineScope { diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt index 8ea312d8a..dd55ad8f5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt @@ -30,7 +30,7 @@ interface HomeView : BaseView { interface HomePresenter : Presenter { fun loadSections() - class HomePresenterImpl @Inject constructor( + class HomePresenterImpl constructor( private val repository: Repository ) : PresenterImpl(), HomePresenter, CoroutineScope { diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt index 494e0d66f..86834dcf1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt @@ -38,7 +38,7 @@ interface PlaylistSongsView : BaseView { interface PlaylistSongsPresenter : Presenter { fun loadPlaylistSongs(playlist: Playlist) - class PlaylistSongsPresenterImpl @Inject constructor( + class PlaylistSongsPresenterImpl constructor( private val repository: Repository ) : PresenterImpl(), PlaylistSongsPresenter, CoroutineScope { diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt index ed4a4df7e..a6b5b9621 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt @@ -35,7 +35,7 @@ interface SearchPresenter : Presenter { fun search(query: String?) - class SearchPresenterImpl @Inject constructor( + class SearchPresenterImpl constructor( private val repository: Repository ) : PresenterImpl(), SearchPresenter, CoroutineScope { diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt index 9f60056f7..55c00ce26 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt +++ b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt @@ -23,9 +23,8 @@ import code.name.monkey.retromusic.providers.interfaces.Repository import code.name.monkey.retromusic.rest.LastFmClient import code.name.monkey.retromusic.rest.model.LastFmAlbum import code.name.monkey.retromusic.rest.model.LastFmArtist -import javax.inject.Inject -class RepositoryImpl @Inject constructor(private val context: Context) : Repository { +class RepositoryImpl constructor(private val context: Context) : Repository { override suspend fun allAlbums(): List = AlbumLoader.getAllAlbums(context) diff --git a/app/src/main/java/code/name/monkey/retromusic/util/SliderReadTimeLabelFormatter.kt b/app/src/main/java/code/name/monkey/retromusic/util/SliderReadTimeLabelFormatter.kt deleted file mode 100644 index 6822c1a8c..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/util/SliderReadTimeLabelFormatter.kt +++ /dev/null @@ -1,30 +0,0 @@ -package code.name.monkey.retromusic.util - -import com.google.android.material.slider.Slider -import java.util.* - -class SliderReadTimeLabelFormatter : Slider.LabelFormatter { - - override fun getFormattedValue(value: Float): String { - var minutes: Long = value.toLong() / 1000 / 60 - val seconds: Long = value.toLong() / 1000 % 60 - return if (minutes < 60) { - String.format( - Locale.getDefault(), - "%01d:%02d", - minutes, - seconds - ) - } else { - val hours = minutes / 60 - minutes %= 60 - String.format( - Locale.getDefault(), - "%d:%02d:%02d", - hours, - minutes, - seconds - ) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt index d20338fbf..fd64db15c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt @@ -27,7 +27,6 @@ import androidx.core.view.ViewCompat import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper -import com.google.android.material.slider.Slider object ViewUtil { @@ -48,16 +47,6 @@ object ViewUtil { } } - fun setProgressDrawable(progressSlider: Slider, color: Int, thumbTint: Boolean = false) { - if (thumbTint) { - progressSlider.thumbColor = ColorStateList.valueOf(color) - } - val colorWithAlpha = ColorUtil.withAlpha(color, 0.25f) - progressSlider.haloColor = ColorStateList.valueOf(colorWithAlpha) - progressSlider.haloRadius = 0 - progressSlider.trackColorActive = ColorStateList.valueOf(color) - progressSlider.trackColorInactive = ColorStateList.valueOf(colorWithAlpha) - } fun setProgressDrawable(progressSlider: ProgressBar, newColor: Int) {