Remove dagger

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)
     }
 

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() {

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))

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!!)
                 }
             }
         }