Migrate to Tachiyomi 6.1

Rewrite batch add UI
Rewrite lock UI

app/src/main/java/exh/ui/lock/LockActivity.kt

@@ -1,60 +0,0 @@
-package exh.ui.lock
-
-import android.os.Bundle
-import com.afollestad.materialdialogs.MaterialDialog
-import com.andrognito.pinlockview.PinLockListener
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
-import kotlinx.android.synthetic.main.activity_lock.*
-import uy.kohesive.injekt.injectLazy
-
-class LockActivity : BaseActivity() {
-
-    val prefs: PreferencesHelper by injectLazy()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        disableLock = true
-
-        setTheme(R.style.Theme_Tachiyomi_Dark)
-        super.onCreate(savedInstanceState)
-
-        if(!lockEnabled(prefs)) {
-            finish()
-            return
-        }
-
-        setContentView(R.layout.activity_lock)
-
-        pin_lock_view.attachIndicatorDots(indicator_dots)
-
-        pin_lock_view.pinLength = prefs.lockLength().getOrDefault()
-        pin_lock_view.setPinLockListener(object : PinLockListener {
-            override fun onEmpty() {}
-
-            override fun onComplete(pin: String) {
-                if(sha512(pin, prefs.lockSalt().get()!!) == prefs.lockHash().get()) {
-                    //Yay!
-                    finish()
-                } else {
-                    MaterialDialog.Builder(this@LockActivity)
-                            .title("PIN code incorrect")
-                            .content("The PIN code you entered is incorrect. Please try again.")
-                            .cancelable(true)
-                            .canceledOnTouchOutside(true)
-                            .positiveText("Ok")
-                            .autoDismiss(true)
-                            .show()
-                    pin_lock_view.resetPinLockView()
-                }
-            }
-
-            override fun onPinChange(pinLength: Int, intermediatePin: String?) {}
-        })
-    }
-
-    override fun onBackPressed() {
-        moveTaskToBack(true)
-    }
-}

app/src/main/java/exh/ui/lock/LockChangeHandler.kt

@@ -0,0 +1,41 @@
+package exh.ui.lock
+
+import android.animation.Animator
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.view.View
+import android.view.ViewGroup
+import com.bluelinelabs.conductor.ControllerChangeHandler
+import com.bluelinelabs.conductor.changehandler.AnimatorChangeHandler
+import java.util.ArrayList
+
+class LockChangeHandler : AnimatorChangeHandler {
+    constructor(): super()
+
+    constructor(removesFromViewOnPush: Boolean) : super(removesFromViewOnPush)
+
+    constructor(duration: Long) : super(duration)
+
+    constructor(duration: Long, removesFromViewOnPush: Boolean) : super(duration, removesFromViewOnPush)
+
+    override fun getAnimator(container: ViewGroup, from: View?, to: View?, isPush: Boolean, toAddedToContainer: Boolean): Animator {
+        val animator = AnimatorSet()
+        val viewAnimators = ArrayList<Animator>()
+
+        if (!isPush && from != null) {
+            viewAnimators.add(ObjectAnimator.ofFloat(from, View.SCALE_X, 5f))
+            viewAnimators.add(ObjectAnimator.ofFloat(from, View.SCALE_Y, 5f))
+            viewAnimators.add(ObjectAnimator.ofFloat(from, View.ALPHA, 0f))
+        }
+
+        animator.playTogether(viewAnimators)
+        return animator
+    }
+
+    override fun resetFromView(from: View) {}
+
+    override fun copy(): ControllerChangeHandler =
+            LockChangeHandler(animationDuration, removesFromViewOnPush())
+
+}
+

app/src/main/java/exh/ui/lock/LockController.kt

@@ -0,0 +1,68 @@
+package exh.ui.lock
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.afollestad.materialdialogs.MaterialDialog
+import com.andrognito.pinlockview.PinLockListener
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import kotlinx.android.synthetic.main.activity_lock.view.*
+import uy.kohesive.injekt.injectLazy
+
+class LockController : NucleusController<LockPresenter>() {
+    override fun inflateView(inflater: LayoutInflater, container: ViewGroup)
+        = inflater.inflate(R.layout.activity_lock, container, false)!!
+
+    override fun createPresenter() = LockPresenter()
+
+    override fun getTitle() = "Application locked"
+
+    val prefs: PreferencesHelper by injectLazy()
+
+    override fun onViewCreated(view: View, savedViewState: Bundle?) {
+        super.onViewCreated(view, savedViewState)
+
+        if(!lockEnabled(prefs)) {
+            closeLock()
+            return
+        }
+
+        with(view) {
+            pin_lock_view.attachIndicatorDots(indicator_dots)
+
+            pin_lock_view.pinLength = prefs.lockLength().getOrDefault()
+            pin_lock_view.setPinLockListener(object : PinLockListener {
+                override fun onEmpty() {}
+
+                override fun onComplete(pin: String) {
+                    if (sha512(pin, prefs.lockSalt().get()!!) == prefs.lockHash().get()) {
+                        //Yay!
+                        closeLock()
+                    } else {
+                        MaterialDialog.Builder(context)
+                                .title("PIN code incorrect")
+                                .content("The PIN code you entered is incorrect. Please try again.")
+                                .cancelable(true)
+                                .canceledOnTouchOutside(true)
+                                .positiveText("Ok")
+                                .autoDismiss(true)
+                                .show()
+                        pin_lock_view.resetPinLockView()
+                    }
+                }
+
+                override fun onPinChange(pinLength: Int, intermediatePin: String?) {}
+            })
+        }
+    }
+
+    fun closeLock() {
+        router.popCurrentController()
+    }
+
+    override fun handleBack() = true
+}

app/src/main/java/exh/ui/lock/LockPreference.kt

@@ -17,7 +17,7 @@ import java.security.SecureRandom
 class LockPreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
         Preference(context, attrs) {
 
-    val secureRandom by lazy { SecureRandom() }
+    private val secureRandom by lazy { SecureRandom() }
 
     val prefs: PreferencesHelper by injectLazy()
 
@@ -26,12 +26,11 @@ class LockPreference @JvmOverloads constructor(context: Context, attrs: Attribut
         updateSummary()
     }
 
-    fun updateSummary() {
-        if(lockEnabled(prefs)) {
-            summary = "Application is locked"
-        } else {
-            summary = "Application is not locked, tap to lock"
-        }
+    private fun updateSummary() {
+        summary = if(lockEnabled(prefs))
+            "Application is locked"
+        else
+            "Application is not locked, tap to lock"
     }
 
     override fun onClick() {
@@ -65,7 +64,7 @@ class LockPreference @JvmOverloads constructor(context: Context, attrs: Attribut
         }
     }
 
-    fun savePassword(password: String) {
+    private fun savePassword(password: String) {
         val salt: String?
         val hash: String?
         val length: Int

app/src/main/java/exh/ui/lock/LockPresenter.kt

@@ -0,0 +1,6 @@
+package exh.ui.lock
+
+import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
+
+class LockPresenter: BasePresenter<LockController>()
+

app/src/main/java/exh/ui/lock/LockUtils.kt

@@ -44,13 +44,6 @@ fun lockEnabled(prefs: PreferencesHelper = Injekt.get())
             && prefs.lockSalt().get() != null
             && prefs.lockLength().getOrDefault() != -1
 
-/**
- * Lock the screen
- */
-fun showLockActivity(activity: Activity) {
-    activity.startActivity(Intent(activity, LockActivity::class.java))
-}
-
 /**
  * Check if the lock will function properly
  *