Fully migrate to AdapterDelegates and cleanup code

app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt

@@ -6,8 +6,8 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import androidx.activity.ComponentActivity
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -68,7 +68,7 @@ class AppUpdateChecker(private val activity: ComponentActivity) {
 	}
 
 	private fun showUpdateDialog(version: AppVersion) {
-		MaterialAlertDialogBuilder(activity)
+		AlertDialog.Builder(activity)
 			.setTitle(R.string.app_update_available)
 			.setMessage(buildString {
 				append(activity.getString(R.string.new_version_s, version.name))

app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesAdapter.kt

@@ -5,20 +5,19 @@ import android.view.MotionEvent
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.item_source_config.*
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 import org.koitharu.kotatsu.base.domain.MangaProviderFactory
-import org.koitharu.kotatsu.base.ui.list.OnRecyclerItemClickListener
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.utils.ext.mapToSet
 import org.koitharu.kotatsu.utils.ext.safe
 
-class SourcesAdapter(private val onItemClickListener: OnRecyclerItemClickListener<MangaSource>) :
-	RecyclerView.Adapter<SourceViewHolder>(), KoinComponent {
+class SourcesAdapter(
+	private val settings: AppSettings,
+	private val onItemClickListener: OnListItemClickListener<MangaSource>,
+) : RecyclerView.Adapter<SourceViewHolder>() {
 
 	private val dataSet = MangaProviderFactory.getSources(includeHidden = true).toMutableList()
-	private val settings by inject<AppSettings>()
 	private val hiddenItems = settings.hiddenSources.mapNotNull {
 		safe {
 			MangaSource.valueOf(it)
@@ -48,14 +47,13 @@ class SourcesAdapter(private val onItemClickListener: OnRecyclerItemClickListene
 			settings.hiddenSources = hiddenItems.mapToSet { x -> x.name }
 		}
 		holder.imageView_config.setOnClickListener { v ->
-			onItemClickListener.onItemClick(holder.requireData(), holder.bindingAdapterPosition, v)
+			onItemClickListener.onItemClick(holder.requireData(), v)
 		}
 		holder.imageView_handle.setOnTouchListener { v, event ->
 			if (event.actionMasked == MotionEvent.ACTION_DOWN) {
 				onItemClickListener.onItemLongClick(
 					holder.requireData(),
-					holder.bindingAdapterPosition,
-					v
+					holder.itemView
 				)
 			} else {
 				false

app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt

@@ -6,14 +6,15 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.fragment_settings_sources.*
+import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
-import org.koitharu.kotatsu.base.ui.list.OnRecyclerItemClickListener
+import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.settings.SettingsActivity
 
 class SourcesSettingsFragment : BaseFragment(R.layout.fragment_settings_sources),
-	OnRecyclerItemClickListener<MangaSource> {
+	OnListItemClickListener<MangaSource> {
 
 	private lateinit var reorderHelper: ItemTouchHelper
 
@@ -30,7 +31,7 @@ class SourcesSettingsFragment : BaseFragment(R.layout.fragment_settings_sources)
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		recyclerView.addItemDecoration(DividerItemDecoration(view.context, RecyclerView.VERTICAL))
-		recyclerView.adapter = SourcesAdapter(this)
+		recyclerView.adapter = SourcesAdapter(get(), this)
 		reorderHelper.attachToRecyclerView(recyclerView)
 	}
 
@@ -39,13 +40,13 @@ class SourcesSettingsFragment : BaseFragment(R.layout.fragment_settings_sources)
 		super.onDestroyView()
 	}
 
-	override fun onItemClick(item: MangaSource, position: Int, view: View) {
+	override fun onItemClick(item: MangaSource, view: View) {
 		(activity as? SettingsActivity)?.openMangaSourceSettings(item)
 	}
 
-	override fun onItemLongClick(item: MangaSource, position: Int, view: View): Boolean {
+	override fun onItemLongClick(item: MangaSource, view: View): Boolean {
 		reorderHelper.startDrag(
-			recyclerView.findViewHolderForAdapterPosition(position) ?: return false
+			recyclerView.findContainingViewHolder(view) ?: return false
 		)
 		return true
 	}