Migrate to ViewBinding from Kotlin synthetics in controllers
This commit is contained in:
@@ -19,11 +19,11 @@ import eu.davidea.flexibleadapter.items.IFlexible
|
||||
import eu.kanade.tachiyomi.R
|
||||
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
|
||||
import eu.kanade.tachiyomi.data.preference.getOrDefault
|
||||
import eu.kanade.tachiyomi.databinding.ExtensionControllerBinding
|
||||
import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
|
||||
import eu.kanade.tachiyomi.extension.model.Extension
|
||||
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
|
||||
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
|
||||
import kotlinx.android.synthetic.main.extension_controller.*
|
||||
import uy.kohesive.injekt.Injekt
|
||||
import uy.kohesive.injekt.api.get
|
||||
|
||||
@@ -47,6 +47,8 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
|
||||
|
||||
private var query = ""
|
||||
|
||||
private lateinit var binding: ExtensionControllerBinding
|
||||
|
||||
init {
|
||||
setHasOptionsMenu(true)
|
||||
}
|
||||
@@ -60,24 +62,25 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
|
||||
}
|
||||
|
||||
override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
|
||||
return inflater.inflate(R.layout.extension_controller, container, false)
|
||||
binding = ExtensionControllerBinding.inflate(inflater)
|
||||
return binding.root
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View) {
|
||||
super.onViewCreated(view)
|
||||
|
||||
ext_swipe_refresh.isRefreshing = true
|
||||
ext_swipe_refresh.refreshes().subscribeUntilDestroy {
|
||||
binding.extSwipeRefresh.isRefreshing = true
|
||||
binding.extSwipeRefresh.refreshes().subscribeUntilDestroy {
|
||||
presenter.findAvailableExtensions()
|
||||
}
|
||||
|
||||
// Initialize adapter, scroll listener and recycler views
|
||||
adapter = ExtensionAdapter(this)
|
||||
// Create recycler and set adapter.
|
||||
ext_recycler.layoutManager = LinearLayoutManager(view.context)
|
||||
ext_recycler.adapter = adapter
|
||||
ext_recycler.addItemDecoration(ExtensionDividerItemDecoration(view.context))
|
||||
adapter?.fastScroller = fast_scroller
|
||||
binding.extRecycler.layoutManager = LinearLayoutManager(view.context)
|
||||
binding.extRecycler.adapter = adapter
|
||||
binding.extRecycler.addItemDecoration(ExtensionDividerItemDecoration(view.context))
|
||||
adapter?.fastScroller = binding.fastScroller
|
||||
}
|
||||
|
||||
override fun onDestroyView(view: View) {
|
||||
@@ -184,7 +187,7 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
|
||||
}
|
||||
|
||||
fun setExtensions(extensions: List<ExtensionItem>) {
|
||||
ext_swipe_refresh?.isRefreshing = false
|
||||
binding.extSwipeRefresh.isRefreshing = false
|
||||
this.extensions = extensions
|
||||
drawExtensions()
|
||||
}
|
||||
|
||||
@@ -26,21 +26,13 @@ import com.jakewharton.rxbinding.view.clicks
|
||||
import eu.kanade.tachiyomi.R
|
||||
import eu.kanade.tachiyomi.data.preference.EmptyPreferenceDataStore
|
||||
import eu.kanade.tachiyomi.data.preference.SharedPreferencesDataStore
|
||||
import eu.kanade.tachiyomi.databinding.ExtensionDetailControllerBinding
|
||||
import eu.kanade.tachiyomi.source.ConfigurableSource
|
||||
import eu.kanade.tachiyomi.source.Source
|
||||
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
|
||||
import eu.kanade.tachiyomi.util.preference.preferenceCategory
|
||||
import eu.kanade.tachiyomi.util.system.LocaleHelper
|
||||
import eu.kanade.tachiyomi.util.view.visible
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_icon
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_lang
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_obsolete
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_pkg
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_prefs_empty_view
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_prefs_recycler
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_title
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_uninstall_button
|
||||
import kotlinx.android.synthetic.main.extension_detail_controller.extension_version
|
||||
|
||||
@SuppressLint("RestrictedApi")
|
||||
class ExtensionDetailsController(bundle: Bundle? = null) :
|
||||
@@ -52,14 +44,16 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
|
||||
|
||||
private var preferenceScreen: PreferenceScreen? = null
|
||||
|
||||
private lateinit var binding: ExtensionDetailControllerBinding
|
||||
|
||||
constructor(pkgName: String) : this(Bundle().apply {
|
||||
putString(PKGNAME_KEY, pkgName)
|
||||
})
|
||||
|
||||
override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
|
||||
val themedInflater = inflater.cloneInContext(getPreferenceThemeContext())
|
||||
|
||||
return themedInflater.inflate(R.layout.extension_detail_controller, container, false)
|
||||
binding = ExtensionDetailControllerBinding.inflate(themedInflater)
|
||||
return binding.root
|
||||
}
|
||||
|
||||
override fun createPresenter(): ExtensionDetailsPresenter {
|
||||
@@ -77,17 +71,17 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
|
||||
val extension = presenter.extension ?: return
|
||||
val context = view.context
|
||||
|
||||
extension_title.text = extension.name
|
||||
extension_version.text = context.getString(R.string.ext_version_info, extension.versionName)
|
||||
extension_lang.text = context.getString(R.string.ext_language_info, LocaleHelper.getDisplayName(extension.lang, context))
|
||||
extension_pkg.text = extension.pkgName
|
||||
extension.getApplicationIcon(context)?.let { extension_icon.setImageDrawable(it) }
|
||||
extension_uninstall_button.clicks().subscribeUntilDestroy {
|
||||
binding.extensionTitle.text = extension.name
|
||||
binding.extensionVersion.text = context.getString(R.string.ext_version_info, extension.versionName)
|
||||
binding.extensionLang.text = context.getString(R.string.ext_language_info, LocaleHelper.getDisplayName(extension.lang, context))
|
||||
binding.extensionPkg.text = extension.pkgName
|
||||
extension.getApplicationIcon(context)?.let { binding.extensionIcon.setImageDrawable(it) }
|
||||
binding.extensionUninstallButton.clicks().subscribeUntilDestroy {
|
||||
presenter.uninstallExtension()
|
||||
}
|
||||
|
||||
if (extension.isObsolete) {
|
||||
extension_obsolete.visible()
|
||||
binding.extensionObsolete.visible()
|
||||
}
|
||||
|
||||
val themedContext by lazy { getPreferenceThemeContext() }
|
||||
@@ -107,12 +101,12 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
|
||||
|
||||
manager.setPreferences(screen)
|
||||
|
||||
extension_prefs_recycler.layoutManager = LinearLayoutManager(context)
|
||||
extension_prefs_recycler.adapter = PreferenceGroupAdapter(screen)
|
||||
extension_prefs_recycler.addItemDecoration(DividerItemDecoration(context, VERTICAL))
|
||||
binding.extensionPrefsRecycler.layoutManager = LinearLayoutManager(context)
|
||||
binding.extensionPrefsRecycler.adapter = PreferenceGroupAdapter(screen)
|
||||
binding.extensionPrefsRecycler.addItemDecoration(DividerItemDecoration(context, VERTICAL))
|
||||
|
||||
if (screen.preferenceCount == 0) {
|
||||
extension_prefs_empty_view.show(R.string.ext_empty_preferences)
|
||||
binding.extensionPrefsEmptyView.show(R.string.ext_empty_preferences)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user