Migrate to ViewBinding

app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt

@@ -9,29 +9,29 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import androidx.core.view.isVisible
-import kotlinx.android.synthetic.main.activity_browser.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 
 @SuppressLint("SetJavaScriptEnabled")
-class BrowserActivity : BaseActivity(), BrowserCallback {
+class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		setContentView(R.layout.activity_browser)
+		setContentView(ActivityBrowserBinding.inflate(layoutInflater))
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(R.drawable.ic_cross)
 		}
-		with(webView.settings) {
+		with(binding.webView.settings) {
 			javaScriptEnabled = true
 		}
-		webView.webViewClient = BrowserClient(this)
+		binding.webView.webViewClient = BrowserClient(this)
 		val url = intent?.dataString
 		if (url.isNullOrEmpty()) {
 			finishAfterTransition()
 		} else {
-			webView.loadUrl(url)
+			binding.webView.loadUrl(url)
 		}
 	}
 
@@ -42,13 +42,13 @@ class BrowserActivity : BaseActivity(), BrowserCallback {
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
 		android.R.id.home -> {
-			webView.stopLoading()
+			binding.webView.stopLoading()
 			finishAfterTransition()
 			true
 		}
 		R.id.action_browser -> {
 			val intent = Intent(Intent.ACTION_VIEW)
-			intent.data = Uri.parse(webView.url)
+			intent.data = Uri.parse(binding.webView.url)
 			try {
 				startActivity(Intent.createChooser(intent, item.title))
 			} catch (_: ActivityNotFoundException) {
@@ -59,25 +59,25 @@ class BrowserActivity : BaseActivity(), BrowserCallback {
 	}
 
 	override fun onBackPressed() {
-		if (webView.canGoBack()) {
-			webView.goBack()
+		if (binding.webView.canGoBack()) {
+			binding.webView.goBack()
 		} else {
 			super.onBackPressed()
 		}
 	}
 
 	override fun onPause() {
-		webView.onPause()
+		binding.webView.onPause()
 		super.onPause()
 	}
 
 	override fun onResume() {
 		super.onResume()
-		webView.onResume()
+		binding.webView.onResume()
 	}
 
 	override fun onLoadingStateChanged(isLoading: Boolean) {
-		progressBar.isVisible = isLoading
+		binding.progressBar.isVisible = isLoading
 	}
 
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
@@ -87,7 +87,6 @@ class BrowserActivity : BaseActivity(), BrowserCallback {
 
 	companion object {
 
-		@JvmStatic
 		fun newIntent(context: Context, url: String) = Intent(context, BrowserActivity::class.java)
 			.setData(Uri.parse(url))
 	}

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt

@@ -2,44 +2,50 @@ package org.koitharu.kotatsu.browser.cloudflare
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.webkit.CookieManager
 import android.webkit.WebSettings
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isInvisible
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import kotlinx.android.synthetic.main.fragment_cloudflare.*
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
 import org.koitharu.kotatsu.core.network.UserAgentInterceptor
+import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
 import org.koitharu.kotatsu.utils.ext.stringArgument
 import org.koitharu.kotatsu.utils.ext.withArgs
 
-class CloudFlareDialog : AlertDialogFragment(R.layout.fragment_cloudflare), CloudFlareCallback {
+class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
 
 	private val url by stringArgument(ARG_URL)
 
+	override fun onInflateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?
+	) = FragmentCloudflareBinding.inflate(inflater, container, false)
+
 	@SuppressLint("SetJavaScriptEnabled")
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		with(webView.settings) {
+		with(binding.webView.settings) {
 			javaScriptEnabled = true
 			cacheMode = WebSettings.LOAD_DEFAULT
 			domStorageEnabled = true
 			databaseEnabled = true
 			userAgentString = UserAgentInterceptor.userAgent
 		}
-		webView.webViewClient = CloudFlareClient(this, url.orEmpty())
-		CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true)
+		binding.webView.webViewClient = CloudFlareClient(this, url.orEmpty())
+		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
 		if (url.isNullOrEmpty()) {
 			dismissAllowingStateLoss()
 		} else {
-			webView.loadUrl(url.orEmpty())
+			binding.webView.loadUrl(url.orEmpty())
 		}
 	}
 
 	override fun onDestroyView() {
-		webView.stopLoading()
+		binding.webView.stopLoading()
 		super.onDestroyView()
 	}
 
@@ -49,16 +55,16 @@ class CloudFlareDialog : AlertDialogFragment(R.layout.fragment_cloudflare), Clou
 
 	override fun onResume() {
 		super.onResume()
-		webView.onResume()
+		binding.webView.onResume()
 	}
 
 	override fun onPause() {
-		webView.onPause()
+		binding.webView.onPause()
 		super.onPause()
 	}
 
 	override fun onPageLoaded() {
-		progressBar?.isInvisible = true
+		binding.progressBar.isInvisible = true
 	}
 
 	override fun onCheckPassed() {