Minor code cleanup

app/src/main/java/eu/kanade/tachiyomi/widget/AutofitRecyclerView.kt

@@ -1,9 +1,10 @@
 package eu.kanade.tachiyomi.widget
 
 import android.content.Context
+import android.util.AttributeSet
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import android.util.AttributeSet
+import kotlin.math.max
 
 class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
         RecyclerView(context, attrs) {
@@ -37,7 +38,7 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att
     override fun onMeasure(widthSpec: Int, heightSpec: Int) {
         super.onMeasure(widthSpec, heightSpec)
         if (spanCount == 0 && columnWidth > 0) {
-            val count = Math.max(1, measuredWidth / columnWidth)
+            val count = max(1, measuredWidth / columnWidth)
             spanCount = count
         }
     }

app/src/main/java/eu/kanade/tachiyomi/widget/CustomLayoutPicker.kt

@@ -22,12 +22,12 @@ class CustomLayoutPickerActivity : FilePickerActivity() {
 
 class CustomLayoutFilePickerFragment : FilePickerFragment() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        when (viewType) {
+        return when (viewType) {
             LogicHandler.VIEWTYPE_DIR -> {
                 val view = parent.inflate(R.layout.common_listitem_dir)
-                return DirViewHolder(view)
+                DirViewHolder(view)
             }
-            else -> return super.onCreateViewHolder(parent, viewType)
+            else -> super.onCreateViewHolder(parent, viewType)
         }
     }
 }

app/src/main/java/eu/kanade/tachiyomi/widget/ExtendedNavigationView.kt

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.getResourceColor
 
 /**
- * An alternative implementation of [android.support.design.widget.NavigationView], without menu
+ * An alternative implementation of [com.google.android.material.navigation.NavigationView], without menu
  * inflation and allowing customizable items (multiple selections, custom views, etc).
  */
 open class ExtendedNavigationView @JvmOverloads constructor(
@@ -179,8 +179,7 @@ open class ExtendedNavigationView @JvmOverloads constructor(
 
         @CallSuper
         override fun getItemViewType(position: Int): Int {
-            val item = items[position]
-            return when (item) {
+            return when (items[position]) {
                 is Item.Header -> VIEW_TYPE_HEADER
                 is Item.Separator -> VIEW_TYPE_SEPARATOR
                 is Item.Radio -> VIEW_TYPE_RADIO

app/src/main/java/eu/kanade/tachiyomi/widget/FABAnimationBase.kt

@@ -20,6 +20,7 @@ abstract class FABAnimationBase : FloatingActionButton.Behavior() {
                                 target: View, dxConsumed: Int, dyConsumed: Int, dxUnconsumed: Int,
                                 dyUnconsumed: Int, type: Int) {
         super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, type)
+
         if (dyConsumed > 0 && !isAnimatingOut && child.visibility == View.VISIBLE) {
             // User scrolled down and the FAB is currently visible -> hide the FAB
             animateOut(child)

app/src/main/java/eu/kanade/tachiyomi/widget/NegativeSeekBar.kt

@@ -5,6 +5,7 @@ import android.os.Parcelable
 import android.util.AttributeSet
 import android.widget.SeekBar
 import eu.kanade.tachiyomi.R
+import kotlin.math.abs
 
 
 class NegativeSeekBar @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
@@ -28,21 +29,21 @@ class NegativeSeekBar @JvmOverloads constructor(context: Context, attrs: Attribu
 
         super.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, value: Int, fromUser: Boolean) {
-                listener?.let { it.onProgressChanged(seekBar, minValue + value, fromUser) }
+                listener?.onProgressChanged(seekBar, minValue + value, fromUser)
             }
 
             override fun onStartTrackingTouch(p0: SeekBar?) {
-                listener?.let { it.onStartTrackingTouch(p0) }
+                listener?.onStartTrackingTouch(p0)
             }
 
             override fun onStopTrackingTouch(p0: SeekBar?) {
-                listener?.let { it.onStopTrackingTouch(p0) }
+                listener?.onStopTrackingTouch(p0)
             }
         })
     }
 
     override fun setProgress(progress: Int) {
-        super.setProgress(Math.abs(minValue) + progress)
+        super.setProgress(abs(minValue) + progress)
     }
 
     fun setMinSeek(minValue: Int) {
@@ -66,4 +67,4 @@ class NegativeSeekBar @JvmOverloads constructor(context: Context, attrs: Attribu
         super.setProgress(origProgress)
     }
 
-}
+}

app/src/main/java/eu/kanade/tachiyomi/widget/PTSansTextView.kt

@@ -30,7 +30,7 @@ class PTSansTextView @JvmOverloads constructor(context: Context, attrs: Attribut
                 Typeface.createFromAsset(context.assets, when (typeface) {
                     PTSANS_NARROW -> "fonts/PTSans-Narrow.ttf"
                     PTSANS_NARROW_BOLD -> "fonts/PTSans-NarrowBold.ttf"
-                    else -> throw IllegalArgumentException("Font not found " + typeface)
+                    else -> throw IllegalArgumentException("Font not found $typeface")
                 })
             })
 

app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt

@@ -2,18 +2,19 @@ package eu.kanade.tachiyomi.widget
 
 import android.annotation.SuppressLint
 import android.content.Context
-import com.google.android.material.R
-import com.google.android.material.textfield.TextInputLayout
-import androidx.core.view.ViewCompat
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.appcompat.widget.TintTypedArray
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.appcompat.widget.TintTypedArray
+import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.R
 import com.google.android.material.internal.ScrimInsetsFrameLayout
+import com.google.android.material.textfield.TextInputLayout
 import eu.kanade.tachiyomi.util.inflate
+import kotlin.math.min
 import eu.kanade.tachiyomi.R as TR
 
 @Suppress("LeakingThis")
@@ -66,7 +67,7 @@ open class SimpleNavigationView @JvmOverloads constructor(
     override fun onMeasure(widthSpec: Int, heightSpec: Int) {
         val width = when (MeasureSpec.getMode(widthSpec)) {
             MeasureSpec.AT_MOST -> MeasureSpec.makeMeasureSpec(
-                    Math.min(MeasureSpec.getSize(widthSpec), maxWidth), MeasureSpec.EXACTLY)
+                    min(MeasureSpec.getSize(widthSpec), maxWidth), MeasureSpec.EXACTLY)
             MeasureSpec.UNSPECIFIED -> MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.EXACTLY)
             else -> widthSpec
         }

app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt

@@ -25,7 +25,7 @@ abstract class LoginDialogPreference(bundle: Bundle? = null) : DialogController(
 
     var requestSubscription: Subscription? = null
 
-    override fun onCreateDialog(savedState: Bundle?): Dialog {
+    override fun onCreateDialog(savedViewState: Bundle?): Dialog {
         val dialog = MaterialDialog.Builder(activity!!)
                 .customView(R.layout.pref_account_login, false)
                 .negativeText(android.R.string.cancel)