Download Bug fix

Added favorite to TagChip
Improved eyeblink recognition

app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt

@@ -118,7 +118,6 @@ class ReaderActivity : BaseActivity() {
 
     private var cameraEnabled = false
     private var eyeType: Eye? = null
-    private var eyeCount: Int = 0
     private var eyeTime: Long = 0L
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -248,6 +247,8 @@ class ReaderActivity : BaseActivity() {
     override fun onResume() {
         super.onResume()
 
+        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
+
         if (cameraEnabled)
             startCamera(this, cameraCallback)
     }
@@ -255,6 +256,9 @@ class ReaderActivity : BaseActivity() {
     override fun onPause() {
         super.onPause()
         closeCamera()
+
+        if (downloader != null)
+            unbindService(conn)
     }
 
     override fun onDestroy() {
@@ -265,9 +269,6 @@ class ReaderActivity : BaseActivity() {
 
         if (!DownloadManager.getInstance(this).isDownloading(galleryID))
             DownloadService.cancel(this, galleryID)
-
-        if (downloader != null)
-            unbindService(conn)
     }
 
     override fun onBackPressed() {
@@ -304,7 +305,6 @@ class ReaderActivity : BaseActivity() {
 
     private fun initDownloader() {
         DownloadService.download(this, galleryID, true)
-        bindService(Intent(this, DownloadService::class.java), conn, BIND_AUTO_CREATE)
 
         timer.schedule(1000, 1000) {
             val downloader = downloader ?: return@schedule
@@ -564,28 +564,23 @@ class ReaderActivity : BaseActivity() {
             // Both closed / opened
             !left.xor(right) -> {
                 eyeType = null
-                eyeCount = 0
                 eyeTime = 0L
             }
             !left -> {
                 if (eyeType != Eye.LEFT) {
                     eyeType = Eye.LEFT
-                    eyeCount = 0
                     eyeTime = System.currentTimeMillis()
                 }
-                eyeCount++
             }
             !right -> {
                 if (eyeType != Eye.RIGHT) {
                     eyeType = Eye.RIGHT
-                    eyeCount = 0
                     eyeTime = System.currentTimeMillis()
                 }
-                eyeCount++
             }
         }
 
-        if (eyeCount > 3 && System.currentTimeMillis() - eyeTime > 500) {
+        if (eyeType != null && System.currentTimeMillis() - eyeTime > 100) {
             (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
                 it.scrollToPositionWithOffset(when(eyeType!!) {
                     Eye.RIGHT -> {
@@ -597,9 +592,7 @@ class ReaderActivity : BaseActivity() {
                 }, 0)
             }
 
-            eyeType = null
-            eyeCount = 0
-            eyeTime = 0L
+            eyeTime = System.currentTimeMillis() + 500
         }
     }
 

app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt

@@ -37,6 +37,7 @@ import kotlinx.android.synthetic.main.item_download_folder.view.*
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import net.rdrei.android.dirchooser.DirectoryChooserConfig
 import xyz.quaver.io.FileX
+import xyz.quaver.io.util.toFile
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.byteToString
@@ -62,7 +63,7 @@ class DownloadLocationDialogFragment : DialogFragment() {
                     context.contentResolver.takePersistableUriPermission(uri, takeFlags)
 
                 if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false)) {
-                    entries[null]?.message?.text = uri.toString()
+                    entries[null]?.location_available?.text = uri.toFile(context)?.canonicalPath
                     Preferences["download_folder"] = uri.toString()
                 } else {
                     Snackbar.make(

app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt

@@ -45,6 +45,7 @@ import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
+import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
@@ -141,7 +142,18 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private
                     listOf(gallery.language).map { Tag("language", it) },
                     gallery.series.map { Tag("series", it) },
                     gallery.characters.map { Tag("character", it) },
-                    gallery.tags.map {
+                    gallery.tags.sortedBy {
+                        val tag = Tag.parse(it)
+
+                        if (favoriteTags.contains(tag))
+                            -1
+                        else
+                            when(Tag.parse(it).area) {
+                                "female" -> 0
+                                "male" -> 1
+                                else -> 2
+                            }
+                    }.map {
                         Tag.parse(it).let { tag ->
                             when {
                                 tag.area != null -> tag