admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert all SY specific things to use ViewBindings instead of synthetics

Browse Source
This commit is contained in:
Jobobby04
2020-10-29 23:43:24 -04:00
parent 528f6c7f65
commit 95c331b8b4
13 changed files with 203 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/exh/ui/batchadd/BatchAddController.kt
+18 -20
View File
@@ -10,8 +10,6 @@ import eu.kanade.tachiyomi.databinding.EhFragmentBatchAddBinding
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.util.lang.combineLatest
import eu.kanade.tachiyomi.util.lang.plusAssign
import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.galleries_box
import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.progress_log
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import reactivecircus.flowbinding.android.view.clicks
@@ -55,7 +53,7 @@ class BatchAddController : NucleusController<EhFragmentBatchAddBinding, BatchAdd
.subscribeUntilDestroy {
progressSubscriptions.clear()
if (it == BatchAddPresenter.STATE_INPUT_TO_PROGRESS) {
showProgress(this)
showProgress(binding)
progressSubscriptions += presenter.progressRelay
.onBackpressureBuffer()
.observeOn(AndroidSchedulers.mainThread())
@@ -96,45 +94,45 @@ class BatchAddController : NucleusController<EhFragmentBatchAddBinding, BatchAdd
progressSubscriptions += it
}
} else if (it == BatchAddPresenter.STATE_PROGRESS_TO_INPUT) {
hideProgress(this)
hideProgress(binding)
presenter.currentlyAddingRelay.call(BatchAddPresenter.STATE_IDLE)
}
}
}
}
private val View.progressViews
private val EhFragmentBatchAddBinding.progressViews
get() = listOf(
binding.progressTitleView,
binding.progressLogWrapper,
binding.progressBar,
binding.progressText,
binding.progressDismissBtn
progressTitleView,
progressLogWrapper,
progressBar,
progressText,
progressDismissBtn
)
private val View.inputViews
private val EhFragmentBatchAddBinding.inputViews
get() = listOf(
binding.inputTitleView,
binding.galleriesBox,
binding.btnAddGalleries
inputTitleView,
galleriesBox,
btnAddGalleries
)
private var List<View>.visibility: Int
get() = throw UnsupportedOperationException()
set(v) { forEach { it.visibility = v } }
private fun showProgress(target: View? = view) {
target?.apply {
private fun showProgress(target: EhFragmentBatchAddBinding = binding) {
target.apply {
progressViews.visibility = View.VISIBLE
inputViews.visibility = View.GONE
}?.progress_log?.text = ""
}.progressLog.text = ""
}
private fun hideProgress(target: View? = view) {
target?.apply {
private fun hideProgress(target: EhFragmentBatchAddBinding = binding) {
target.apply {
progressViews.visibility = View.GONE
inputViews.visibility = View.VISIBLE
}?.galleries_box?.setText("", TextView.BufferType.EDITABLE)
}.galleriesBox.setText("", TextView.BufferType.EDITABLE)
}
private fun formatProgress(progress: Int, total: Int) = "$progress/$total"
app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt
+35 -33
View File
@@ -15,6 +15,7 @@ import com.afollestad.materialdialogs.MaterialDialog
import com.elvishew.xlog.XLog
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.EhActivityCaptchaBinding
import eu.kanade.tachiyomi.network.NetworkHelper
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.source.Source
@@ -23,8 +24,6 @@ import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.util.system.setDefaultSettings
import exh.source.DelegatedHttpSource
import exh.util.melt
import kotlinx.android.synthetic.main.eh_activity_captcha.toolbar
import kotlinx.android.synthetic.main.eh_activity_captcha.webview
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
@@ -59,11 +58,14 @@ class BrowserActionActivity : AppCompatActivity() {
private var strictValidationStartTime: Long? = null
private lateinit var credentialsObservable: Observable<String>
private lateinit var binding: EhActivityCaptchaBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.eh_activity_captcha)
binding = EhActivityCaptchaBinding.inflate(layoutInflater)
setContentView(binding.root)
val sourceId = intent.getLongExtra(SOURCE_ID_EXTRA, -1)
val originalSource = if (sourceId != -1L) sourceManager.get(sourceId) else null
@@ -102,7 +104,7 @@ class BrowserActionActivity : AppCompatActivity() {
val actionStr = actionName ?: "Solve captcha"
toolbar.title = if (source != null) {
binding.toolbar.title = if (source != null) {
"${source.name}: $actionStr"
} else actionStr
@@ -115,14 +117,14 @@ class BrowserActionActivity : AppCompatActivity() {
cm.setCookie(url, cookieString)
}
webview.setDefaultSettings()
binding.webview.setDefaultSettings()
headers.entries.find { it.key.equals("user-agent", true) }?.let {
webview.settings.userAgentString = it.value
binding.webview.settings.userAgentString = it.value
}
var loadedInners = 0
webview.webChromeClient = object : WebChromeClient() {
binding.webview.webChromeClient = object : WebChromeClient() {
override fun onJsAlert(view: WebView?, url: String?, message: String, result: JsResult): Boolean {
if (message.startsWith("exh-")) {
loadedInners++
@@ -130,13 +132,13 @@ class BrowserActionActivity : AppCompatActivity() {
if (loadedInners >= 2) {
// Attempt to autosolve captcha
if (preferencesHelper.eh_autoSolveCaptchas().get()) {
webview.post {
binding.webview.post {
// 10 seconds to auto-solve captcha
strictValidationStartTime = System.currentTimeMillis() + 1000 * 10
beginSolveLoop()
beginValidateCaptchaLoop()
webview.evaluateJavascript(SOLVE_UI_SCRIPT_HIDE) {
webview.evaluateJavascript(SOLVE_UI_SCRIPT_SHOW, null)
binding.webview.evaluateJavascript(SOLVE_UI_SCRIPT_HIDE) {
binding.webview.evaluateJavascript(SOLVE_UI_SCRIPT_SHOW, null)
}
}
}
@@ -148,7 +150,7 @@ class BrowserActionActivity : AppCompatActivity() {
}
}
webview.webViewClient = if (actionName == null && preferencesHelper.eh_autoSolveCaptchas().get()) {
binding.webview.webViewClient = if (actionName == null && preferencesHelper.eh_autoSolveCaptchas().get()) {
// Fetch auto-solve credentials early for speed
credentialsObservable = httpClient.newCall(
Request.Builder()
@@ -164,15 +166,15 @@ class BrowserActionActivity : AppCompatActivity() {
json["token"]!!.jsonPrimitive.content
}.melt()
webview.addJavascriptInterface(this@BrowserActionActivity, "exh")
binding.webview.addJavascriptInterface(this@BrowserActionActivity, "exh")
AutoSolvingWebViewClient(this, verifyComplete, script, headers)
} else {
HeadersInjectingWebViewClient(this, verifyComplete, script, headers)
}
webview.loadUrl(url, headers)
binding.webview.loadUrl(url, headers)
setSupportActionBar(toolbar)
setSupportActionBar(binding.toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
@@ -187,7 +189,7 @@ class BrowserActionActivity : AppCompatActivity() {
validateCurrentLoopId = null
XLog.e(IllegalStateException("Captcha solve failure!"))
withContext(Dispatchers.Main) {
webview.evaluateJavascript(SOLVE_UI_SCRIPT_HIDE, null)
binding.webview.evaluateJavascript(SOLVE_UI_SCRIPT_HIDE, null)
MaterialDialog(this@BrowserActionActivity)
.title(R.string.captcha_solve_failure)
.message(R.string.captcha_solve_failure_message)
@@ -205,14 +207,14 @@ class BrowserActionActivity : AppCompatActivity() {
when (stage) {
STAGE_CHECKBOX -> {
if (result!!.toBoolean()) {
webview.postDelayed(
binding.webview.postDelayed(
{
getAudioButtonLocation(loopId)
},
250
)
} else {
webview.postDelayed(
binding.webview.postDelayed(
{
doStageCheckbox(loopId)
},
@@ -227,15 +229,15 @@ class BrowserActionActivity : AppCompatActivity() {
val origY = splitResult[1]
val iw = splitResult[2]
val ih = splitResult[3]
val x = webview.x + origX / iw * webview.width
val y = webview.y + origY / ih * webview.height
val x = binding.webview.x + origX / iw * binding.webview.width
val y = binding.webview.y + origY / ih * binding.webview.height
XLog.nst().d("Found audio button coords: %f %f", x, y)
simulateClick(x + 50, y + 50)
webview.post {
binding.webview.post {
doStageDownloadAudio(loopId)
}
} else {
webview.postDelayed(
binding.webview.postDelayed(
{
getAudioButtonLocation(loopId)
},
@@ -251,7 +253,7 @@ class BrowserActionActivity : AppCompatActivity() {
.subscribe(
{
XLog.nst().d("Got audio transcript: $it")
webview.post {
binding.webview.post {
typeResult(
loopId,
it!!
@@ -266,7 +268,7 @@ class BrowserActionActivity : AppCompatActivity() {
}
)
} else {
webview.postDelayed(
binding.webview.postDelayed(
{
doStageDownloadAudio(loopId)
},
@@ -330,7 +332,7 @@ class BrowserActionActivity : AppCompatActivity() {
private fun doStageCheckbox(loopId: String) {
if (loopId != currentLoopId) return
webview.evaluateJavascript(
binding.webview.evaluateJavascript(
"""
(function() {
$CROSS_WINDOW_SCRIPT_OUTER
@@ -359,7 +361,7 @@ class BrowserActionActivity : AppCompatActivity() {
}
private fun getAudioButtonLocation(loopId: String) {
webview.evaluateJavascript(
binding.webview.evaluateJavascript(
"""
(function() {
$CROSS_WINDOW_SCRIPT_OUTER
@@ -394,7 +396,7 @@ class BrowserActionActivity : AppCompatActivity() {
}
private fun doStageDownloadAudio(loopId: String) {
webview.evaluateJavascript(
binding.webview.evaluateJavascript(
"""
(function() {
$CROSS_WINDOW_SCRIPT_OUTER
@@ -422,7 +424,7 @@ class BrowserActionActivity : AppCompatActivity() {
}
private fun typeResult(loopId: String, result: String) {
webview.evaluateJavascript(
binding.webview.evaluateJavascript(
"""
(function() {
$CROSS_WINDOW_SCRIPT_OUTER
@@ -464,13 +466,13 @@ class BrowserActionActivity : AppCompatActivity() {
if (result) {
XLog.nst().d("Captcha solved!")
webview.post {
webview.evaluateJavascript(SOLVE_UI_SCRIPT_HIDE, null)
binding.webview.post {
binding.webview.evaluateJavascript(SOLVE_UI_SCRIPT_HIDE, null)
}
val asbtn = intent.getStringExtra(ASBTN_EXTRA)
if (asbtn != null) {
webview.post {
webview.evaluateJavascript("(function() {document.querySelector('$asbtn').click();})();", null)
binding.webview.post {
binding.webview.evaluateJavascript("(function() {document.querySelector('$asbtn').click();})();", null)
}
}
} else {
@@ -480,7 +482,7 @@ class BrowserActionActivity : AppCompatActivity() {
) {
captchaSolveFail()
} else {
webview.postDelayed(
binding.webview.postDelayed(
{
runValidateCaptcha(loopId)
},
@@ -493,7 +495,7 @@ class BrowserActionActivity : AppCompatActivity() {
private fun runValidateCaptcha(loopId: String) {
if (loopId != validateCurrentLoopId) return
webview.evaluateJavascript(
binding.webview.evaluateJavascript(
"""
(function() {
$CROSS_WINDOW_SCRIPT_OUTER
app/src/main/java/exh/widget/preference/MangaDexLoginPreference.kt
+9 -6
View File
@@ -6,9 +6,9 @@ import androidx.core.view.isVisible
import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.PrefItemMangadexBinding
import eu.kanade.tachiyomi.source.online.all.MangaDex
import eu.kanade.tachiyomi.util.system.getResourceColor
import kotlinx.android.synthetic.main.pref_item_mangadex.view.*
class MangaDexLoginPreference @JvmOverloads constructor(
context: Context,
@@ -20,25 +20,28 @@ class MangaDexLoginPreference @JvmOverloads constructor(
layoutResource = R.layout.pref_item_mangadex
}
var binding: PrefItemMangadexBinding? = null
private var onLoginClick: () -> Unit = {}
override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
binding = PrefItemMangadexBinding.bind(holder.itemView)
holder.itemView.setOnClickListener {
onLoginClick()
}
val loginFrame = holder.itemView.login_frame
val loginFrame = binding?.loginFrame
val color = if (source.isLogged()) {
context.getResourceColor(R.attr.colorAccent)
} else {
context.getResourceColor(R.attr.colorSecondary)
}
holder.itemView.login.setImageResource(R.drawable.ic_outline_people_alt_24dp)
holder.itemView.login.drawable.setTint(color)
binding?.login?.setImageResource(R.drawable.ic_outline_people_alt_24dp)
binding?.login?.drawable?.setTint(color)
loginFrame.isVisible = true
loginFrame.setOnClickListener {
loginFrame?.isVisible = true
loginFrame?.setOnClickListener {
onLoginClick()
}
}
app/src/main/java/exh/widget/preference/MangadexLoginDialog.kt
+17 -19
View File
@@ -9,18 +9,13 @@ import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.customview.customView
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.databinding.PrefSiteLoginTwoFactorAuthBinding
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.online.all.MangaDex
import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.widget.preference.LoginDialogPreference
import exh.source.getMainSource
import kotlinx.android.synthetic.main.pref_site_login_two_factor_auth.view.login
import kotlinx.android.synthetic.main.pref_site_login_two_factor_auth.view.password
import kotlinx.android.synthetic.main.pref_site_login_two_factor_auth.view.two_factor_check
import kotlinx.android.synthetic.main.pref_site_login_two_factor_auth.view.two_factor_edit
import kotlinx.android.synthetic.main.pref_site_login_two_factor_auth.view.two_factor_holder
import kotlinx.android.synthetic.main.pref_site_login_two_factor_auth.view.username
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
@@ -36,6 +31,8 @@ class MangadexLoginDialog(bundle: Bundle? = null) : LoginDialogPreference(bundle
val scope = CoroutineScope(Job() + Dispatchers.Main)
var binding: PrefSiteLoginTwoFactorAuthBinding? = null
constructor(source: MangaDex) : this(
bundleOf(
"key" to source.id
@@ -54,23 +51,24 @@ class MangadexLoginDialog(bundle: Bundle? = null) : LoginDialogPreference(bundle
override fun onViewCreated(view: View) {
super.onViewCreated(view)
v?.apply {
two_factor_check?.setOnCheckedChangeListener { _, isChecked ->
two_factor_holder.isVisible = isChecked
v?.let { binding = PrefSiteLoginTwoFactorAuthBinding.bind(it) }
binding?.apply {
twoFactorCheck.setOnCheckedChangeListener { _, isChecked ->
twoFactorHolder.isVisible = isChecked
}
}
}
override fun setCredentialsOnView(view: View) = with(view) {
username.setText(service.getUsername())
password.setText(service.getPassword())
override fun setCredentialsOnView(view: View) {
binding?.username?.setText(service.getUsername())
binding?.password?.setText(service.getPassword())
}
override fun checkLogin() {
v?.apply {
if (username.text.isNullOrBlank() || password.text.isNullOrBlank() || (two_factor_check.isChecked && two_factor_edit.text.isNullOrBlank())) {
binding?.apply {
if (username.text.isNullOrBlank() || password.text.isNullOrBlank() || (twoFactorCheck.isChecked && twoFactorEdit.text.isNullOrBlank())) {
errorResult()
context.toast(R.string.fields_cannot_be_blank)
root.context.toast(R.string.fields_cannot_be_blank)
return
}
@@ -84,25 +82,25 @@ class MangadexLoginDialog(bundle: Bundle? = null) : LoginDialogPreference(bundle
val result = source?.login(
username.text.toString(),
password.text.toString(),
two_factor_edit.text.toString()
twoFactorEdit.text.toString()
) ?: false
if (result) {
dialog?.dismiss()
preferences.setTrackCredentials(Injekt.get<TrackManager>().mdList, username.toString(), password.toString())
context.toast(R.string.login_success)
root.context.toast(R.string.login_success)
} else {
errorResult()
}
} catch (error: Exception) {
errorResult()
error.message?.let { context.toast(it) }
error.message?.let { root.context.toast(it) }
}
}
}
}
private fun errorResult() {
v?.apply {
binding?.apply {
dialog?.setCancelable(true)
dialog?.setCanceledOnTouchOutside(true)
login.progress = -1