Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lint fixes, likely no visible changes

Browse Source
This commit is contained in:
Jobobby04 2020-04-21 17:18:31 -04:00
parent 03502f6533
commit b4ade8c15d
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
View File

@ -37,7 +37,7 @@ class TrackSearchAdapter(context: Context) :
} else { } else {
holder = v.tag as TrackSearchHolder holder = v.tag as TrackSearchHolder
} }
holder.onSetValues(track) holder.onSetValues(track!!)
return v return v
} }

8
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
View File

@ -62,15 +62,15 @@ class PreMigrationController(bundle: Bundle? = null) : BaseController<PreMigrati
ourAdapter.itemTouchHelperCallback = null // Reset adapter touch adapter to fix drag after rotation ourAdapter.itemTouchHelperCallback = null // Reset adapter touch adapter to fix drag after rotation
ourAdapter.isHandleDragEnabled = true ourAdapter.isHandleDragEnabled = true
dialog = null dialog = null
val fabBaseMarginBottom = binding.fab?.marginBottom ?: 0 val fabBaseMarginBottom = binding.fab.marginBottom
binding.recycler.doOnApplyWindowInsets { v, insets, padding -> binding.recycler.doOnApplyWindowInsets { v, insets, padding ->
binding.fab?.updateLayoutParams<ViewGroup.MarginLayoutParams> { binding.fab.updateLayoutParams<ViewGroup.MarginLayoutParams> {
bottomMargin = fabBaseMarginBottom + insets.systemWindowInsetBottom bottomMargin = fabBaseMarginBottom + insets.systemWindowInsetBottom
} }
// offset the recycler by the fab's inset + some inset on top // offset the recycler by the fab's inset + some inset on top
v.updatePaddingRelative(bottom = padding.bottom + (binding.fab?.marginBottom ?: 0) + v.updatePaddingRelative(bottom = padding.bottom + (binding.fab.marginBottom) +
fabBaseMarginBottom + (binding.fab?.height ?: 0)) fabBaseMarginBottom + (binding.fab.height))
} }
binding.fab.setOnClickListener { binding.fab.setOnClickListener {

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt
View File

@ -84,7 +84,7 @@ class MigrationProcessAdapter(
fun removeManga(position: Int) { fun removeManga(position: Int) {
val item = getItem(position) ?: return val item = getItem(position) ?: return
menuItemListener.removeManga(item) menuItemListener.removeManga(item)
item?.manga?.migrationJob?.cancel() item.manga.migrationJob.cancel()
removeItem(position) removeItem(position)
items = currentItems items = currentItems
sourceFinished() sourceFinished()

3
app/src/main/java/exh/debug/SettingsDebugController.kt
View File

@ -6,6 +6,7 @@ import android.text.Html
import android.util.Log import android.util.Log
import android.widget.HorizontalScrollView import android.widget.HorizontalScrollView
import android.widget.TextView import android.widget.TextView
import androidx.core.text.HtmlCompat
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import eu.kanade.tachiyomi.ui.setting.SettingsController import eu.kanade.tachiyomi.ui.setting.SettingsController
@ -76,6 +77,6 @@ class SettingsDebugController : SettingsController() {
} }
companion object { companion object {
private val MODIFIED_TEXT = Html.fromHtml("<font color='red'>MODIFIED</font>") private val MODIFIED_TEXT = HtmlCompat.fromHtml("<font color='red'>MODIFIED</font>", HtmlCompat.FROM_HTML_MODE_LEGACY)
} }
} }

3
app/src/main/java/exh/favorites/FavoritesIntroDialog.kt
View File

@ -2,6 +2,7 @@ package exh.favorites
import android.content.Context import android.content.Context
import android.text.Html import android.text.Html
import androidx.core.text.HtmlCompat
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -11,7 +12,7 @@ class FavoritesIntroDialog {
fun show(context: Context) = MaterialDialog.Builder(context) fun show(context: Context) = MaterialDialog.Builder(context)
.title("IMPORTANT FAVORITES SYNC NOTES") .title("IMPORTANT FAVORITES SYNC NOTES")
.content(Html.fromHtml(FAVORITES_INTRO_TEXT)) .content(HtmlCompat.fromHtml(FAVORITES_INTRO_TEXT, HtmlCompat.FROM_HTML_MODE_LEGACY))
.positiveText("Ok") .positiveText("Ok")
.onPositive { _, _ -> .onPositive { _, _ ->
prefs.eh_showSyncIntro().set(false) prefs.eh_showSyncIntro().set(false)

5
app/src/main/java/exh/log/EHDebugModeOverlay.kt
View File

@ -6,6 +6,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.core.text.HtmlCompat
import com.ms_square.debugoverlay.DataObserver import com.ms_square.debugoverlay.DataObserver
import com.ms_square.debugoverlay.OverlayModule import com.ms_square.debugoverlay.OverlayModule
import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.BuildConfig
@ -26,7 +27,7 @@ class EHDebugModeOverlay(private val context: Context) : OverlayModule<String>(n
} }
override fun removeObserver(observer: DataObserver<Any>) {} override fun removeObserver(observer: DataObserver<Any>) {}
override fun onDataAvailable(data: String?) { override fun onDataAvailable(data: String?) {
textView?.text = Html.fromHtml(data) textView?.text = HtmlCompat.fromHtml(data!!, HtmlCompat.FROM_HTML_MODE_LEGACY)
} }
override fun createView(root: ViewGroup, textColor: Int, textSize: Float, textAlpha: Float): View { override fun createView(root: ViewGroup, textColor: Int, textSize: Float, textAlpha: Float): View {
@ -40,7 +41,7 @@ class EHDebugModeOverlay(private val context: Context) : OverlayModule<String>(n
textView.setTextColor(textColor) textView.setTextColor(textColor)
textView.textSize = textSize textView.textSize = textSize
textView.alpha = textAlpha textView.alpha = textAlpha
textView.text = Html.fromHtml(buildInfo()) textView.text = HtmlCompat.fromHtml(buildInfo(), HtmlCompat.FROM_HTML_MODE_LEGACY)
textView.layoutParams = LinearLayout.LayoutParams( textView.layoutParams = LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT ViewGroup.LayoutParams.WRAP_CONTENT