From f12d5ba68984ff352ab9b0f3d15287525813dad1 Mon Sep 17 00:00:00 2001
From: inorichi <len@kanade.eu>
Date: Fri, 22 Mar 2019 23:06:05 +0100
Subject: [PATCH] Storio imported from Jitpack. Also fix an issue with the
 progress bar animation on the reader

---
 app/build.gradle                              |  4 +++-
 .../ui/reader/viewer/ReaderProgressBar.kt     | 22 +++++++------------
 build.gradle                                  |  1 -
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7ca90752be..d6385802fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -161,7 +161,9 @@ dependencies {
     implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
 
     // Database
-    implementation 'eu.kanade.storio:storio:1.13.0'
+    implementation 'android.arch.persistence:db:1.0.0'
+    implementation 'com.github.inorichi.storio:storio-common:8be19de@aar'
+    implementation 'com.github.inorichi.storio:storio-sqlite:8be19de@aar'
     implementation 'io.requery:sqlite-android:3.25.2'
 
     // Model View Presenter
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt
index e097c50638..a251b0c8ab 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressBar.kt
@@ -116,21 +116,15 @@ class ReaderProgressBar @JvmOverloads constructor(
     }
 
     /**
-     * Called when the aggregated visibility of this view changes. It also starts of stops the
-     * rotation animation according to [isVisible].
+     * Called when the visibility of this view changes.
      */
-    override fun onVisibilityAggregated(isVisible: Boolean) {
-        super.onVisibilityAggregated(isVisible)
-
-        if (isVisible != aggregatedIsVisible) {
-            aggregatedIsVisible = isVisible
-
-            // let's be nice with the UI thread
-            if (isVisible) {
-                startAnimation()
-            } else {
-                stopAnimation()
-            }
+    override fun setVisibility(visibility: Int) {
+        super.setVisibility(visibility)
+        val isVisible = visibility == View.VISIBLE
+        if (isVisible) {
+            startAnimation()
+        } else {
+            stopAnimation()
         }
     }
 
diff --git a/build.gradle b/build.gradle
index cef1ec0007..2885a88fc1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,5 @@ allprojects {
         maven { url "https://jitpack.io" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
-        maven { url "https://dl.bintray.com/inorichi/maven" }
     }
 }