Bug fixed

2019-05-18 23:20:06 +09:00
parent 8de3eace8a
commit fd83f987dd
13 changed files with 237 additions and 45 deletions
--- a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.preference.PreferenceManager
 import android.text.*
 import android.text.style.AlignmentSpan
+import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager
 import android.widget.TextView
@@ -21,6 +22,7 @@ import com.arlib.floatingsearchview.util.view.SearchInputView
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_main_content.*
+import kotlinx.android.synthetic.main.dialog_galleryblock.view.*
 import kotlinx.coroutines.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
@@ -30,10 +32,7 @@ import ru.noties.markwon.Markwon
 import xyz.quaver.hitomi.*
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.types.TagSuggestion
-import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.ItemClickSupport
-import xyz.quaver.pupil.util.SetLineOverlap
-import xyz.quaver.pupil.util.checkUpdate
+import xyz.quaver.pupil.util.*
 import java.io.File
 import java.io.FileOutputStream
 import java.net.URL
@@ -47,6 +46,8 @@ class MainActivity : AppCompatActivity() {

    private var query = ""

+    private val SETTINGS = 45162
+
    private var galleryIDs: Deferred<List<Int>>? = null
    private var loadingJob: Job? = null

@@ -164,6 +165,20 @@ class MainActivity : AppCompatActivity() {
        super.onResume()
    }

+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when(requestCode) {
+            SETTINGS -> {
+                runOnUiThread {
+                    cancelFetch()
+                    clearGalleries()
+                    fetchGalleries(query)
+                    loadBlocks()
+                }
+            }
+        }
+    }
+
    private fun checkUpdate() {

        fun extractReleaseNote(update: JsonObject, locale: String) : String {
@@ -257,16 +272,63 @@ class MainActivity : AppCompatActivity() {
                    }
                }
            )
-            ItemClickSupport.addTo(this).setOnItemClickListener { _, position, _ ->
-                val intent = Intent(this@MainActivity, ReaderActivity::class.java)
-                val gallery = galleries[position].first
-                intent.putExtra("galleryblock", Json(JsonConfiguration.Stable).stringify(GalleryBlock.serializer(), gallery))
+            ItemClickSupport.addTo(this)
+                .setOnItemClickListener { _, position, _ ->
+                    val intent = Intent(this@MainActivity, ReaderActivity::class.java)
+                    val gallery = galleries[position].first
+                    intent.putExtra("galleryblock", Json(JsonConfiguration.Stable).stringify(GalleryBlock.serializer(), gallery))

-                //TODO: Maybe sprinke some transitions will be nice :D
-                startActivity(intent)
+                    //TODO: Maybe sprinke some transitions will be nice :D
+                    startActivity(intent)

-                Histories.default.add(gallery.id)
-            }
+                    Histories.default.add(gallery.id)
+                }.setOnItemLongClickListener { recyclerView, position, v ->
+                    val galleryBlock = galleries[position].first
+                    val view = LayoutInflater.from(this@MainActivity)
+                        .inflate(R.layout.dialog_galleryblock, recyclerView, false)
+
+                    val dialog = AlertDialog.Builder(this@MainActivity).apply {
+                        setView(view)
+                    }.create()
+
+                    with(view.main_dialog_download) {
+                        text = when(GalleryDownloader.get(galleryBlock.id)) {
+                            null -> getString(R.string.reader_fab_download)
+                            else -> getString(R.string.reader_fab_download_cancel)
+                        }
+                        isEnabled = !(adapter as GalleryBlockAdapter).completeFlag.get(galleryBlock.id, false)
+                        setOnClickListener {
+                            val downloader = GalleryDownloader.get(galleryBlock.id)
+                            if (downloader == null) {
+                                GalleryDownloader(context, galleryBlock, true).start()
+                                Histories.default.add(galleryBlock.id)
+                            } else {
+                                downloader.cancel()
+                                downloader.clearNotification()
+                            }
+
+                            dialog.dismiss()
+                        }
+                    }
+
+                    view.main_dialog_delete.setOnClickListener {
+                        CoroutineScope(Dispatchers.Default).launch {
+                            with(GalleryDownloader[galleryBlock.id]) {
+                                this?.cancelAndJoin()
+                                this?.clearNotification()
+                            }
+                            val cache = File(cacheDir, "imageCache/${galleryBlock.id}/images/")
+                            cache.deleteRecursively()
+
+                            dialog.dismiss()
+                            (adapter as GalleryBlockAdapter).completeFlag.put(galleryBlock.id, false)
+                        }
+                    }
+
+                    dialog.show()
+
+                    true
+                }
        }
    }

@@ -294,7 +356,7 @@ class MainActivity : AppCompatActivity() {
        with(main_searchview as FloatingSearchView) {
            setOnMenuItemClickListener {
                when(it.itemId) {
-                    R.id.main_menu_settings -> startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
+                    R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), SETTINGS)
                    R.id.main_menu_search -> setSearchFocused(true)
                }
            }
@@ -404,7 +466,12 @@ class MainActivity : AppCompatActivity() {
    private fun clearGalleries() {
        galleries.clear()

-        main_recyclerview.adapter?.notifyDataSetChanged()
+        with(main_recyclerview.adapter as GalleryBlockAdapter?) {
+            this ?: return@with
+
+            this.completeFlag.clear()
+            this.notifyDataSetChanged()
+        }

        main_noresult.visibility = View.INVISIBLE
        main_progressbar.show()
--- a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
@@ -2,6 +2,7 @@ package xyz.quaver.pupil

 import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.util.Log
 import android.view.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -1,7 +1,10 @@
 package xyz.quaver.pupil.adapters

 import android.graphics.BitmapFactory
+import android.graphics.PorterDuff
+import android.util.Log
 import android.util.SparseArray
+import android.util.SparseBooleanArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,6 +12,7 @@ import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
 import kotlinx.coroutines.CoroutineScope
@@ -45,6 +49,7 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre

    var noMore = false
    private val refreshTasks = SparseArray<TimerTask>()
+    val completeFlag = SparseBooleanArray()

    val onChipClickedHandler = ArrayList<((Tag) -> Unit)>()

@@ -121,16 +126,46 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre

                if (refreshTasks.get(gallery.id) == null) {
                    val refresh = Timer(false).schedule(0, 1000) {
-                        this@with.post {
-                            val size = imageCache.list()?.size ?: return@post
-
+                        post {
                            with(galleryblock_progressbar) {
-                                progress = size
-                                if (visibility == View.GONE) {
-                                    val reader = Json(JsonConfiguration.Stable)
-                                        .parse(ReaderItem.serializer().list, readerCache.readText())
-                                    max = reader.size
-                                    visibility = View.VISIBLE
+                                progress = imageCache.list()?.size ?: 0
+
+                                if (!readerCache.exists()) {
+                                    visibility = View.GONE
+                                    max = 0
+                                    progress = 0
+
+                                    holder.view.galleryblock_progress_complete.visibility = View.INVISIBLE
+                                } else {
+                                    if (visibility == View.GONE) {
+                                        val reader = Json(JsonConfiguration.Stable)
+                                            .parse(ReaderItem.serializer().list, readerCache.readText())
+                                        max = reader.size
+                                        visibility = View.VISIBLE
+                                    }
+
+                                    if (progress == max) {
+                                        if (completeFlag.get(gallery.id, false)) {
+                                            with(holder.view.galleryblock_progress_complete) {
+                                                setImageResource(R.drawable.ic_progressbar)
+                                                visibility = View.VISIBLE
+                                            }
+                                        } else {
+                                            val drawable = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_progressbar_complete)
+                                            with(holder.view.galleryblock_progress_complete) {
+                                                setImageDrawable(drawable)
+                                                visibility = View.VISIBLE
+                                            }
+                                            drawable?.start()
+                                            completeFlag.put(gallery.id, true)
+                                        }
+                                    } else {
+                                        with(holder.view.galleryblock_progress_complete) {
+                                            visibility = View.INVISIBLE
+                                        }
+                                    }
+
+                                    null
                                }
                            }
                        }
@@ -176,12 +211,12 @@ class GalleryBlockAdapter(private val galleries: List<Pair<GalleryBlock, Deferre

                    val icon = when(tag.area) {
                        "male" -> {
-                            chip.setChipBackgroundColorResource(R.color.material_blue_100)
+                            chip.setChipBackgroundColorResource(R.color.material_blue_700)
                            chip.setTextColor(ContextCompat.getColor(context, android.R.color.white))
                            ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white)
                        }
                        "female" -> {
-                            chip.setChipBackgroundColorResource(R.color.material_pink_100)
+                            chip.setChipBackgroundColorResource(R.color.material_pink_600)
                            chip.setTextColor(ContextCompat.getColor(context, android.R.color.white))
                            ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white)
                        }
--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -20,11 +20,15 @@ import xyz.quaver.pupil.ReaderActivity
 import java.io.File
 import java.io.FileOutputStream
 import java.net.URL
+import java.util.*
 import javax.net.ssl.HttpsURLConnection
+import kotlin.collections.ArrayList
+import kotlin.concurrent.schedule

 class GalleryDownloader(
    base: Context,
-    private val galleryBlock: GalleryBlock
+    private val galleryBlock: GalleryBlock,
+    _notify: Boolean = false
 ) : ContextWrapper(base) {

    var notify: Boolean = false
@@ -33,7 +37,7 @@ class GalleryDownloader(
                field = true
                notificationManager.notify(galleryBlock.id, notificationBuilder.build())

-                if (downloadJob?.isActive != true)
+                if (!reader.isActive && downloadJob?.isActive != true)
                    field = false
            } else {
                field = false
@@ -63,6 +67,7 @@ class GalleryDownloader(
        initNotification()

        reader = CoroutineScope(Dispatchers.IO).async {
+            notify = _notify
            val json = Json(JsonConfiguration.Stable)
            val serializer = ReaderItem.serializer().list
            val preference = PreferenceManager.getDefaultSharedPreferences(this@GalleryDownloader)
@@ -74,8 +79,10 @@ class GalleryDownloader(
            if (cache.exists()) {
                val cached = json.parse(serializer, cache.readText())

-                if (cached.isNotEmpty())
+                if (cached.isNotEmpty()) {
+                    onReaderLoadedHandler?.invoke(cached)
                    return@async cached
+                }
            }

            //Cache doesn't exist. Load from internet
@@ -175,15 +182,17 @@ class GalleryDownloader(

            onCompleteHandler?.invoke()

-            notificationBuilder
-                .setContentTitle(galleryBlock.title)
-                .setContentText(getString(R.string.reader_notification_complete))
-                .setProgress(0, 0, false)
+            Timer(false).schedule(1000) {
+                notificationBuilder
+                    .setContentTitle(galleryBlock.title)
+                    .setContentText(getString(R.string.reader_notification_complete))
+                    .setProgress(0, 0, false)

-            if (notify)
-                notificationManager.notify(galleryBlock.id, notificationBuilder.build())
+                if (notify)
+                    notificationManager.notify(galleryBlock.id, notificationBuilder.build())

-            notify = false
+                notify = false
+            }

            remove(galleryBlock.id)
        }
@@ -195,6 +204,10 @@ class GalleryDownloader(
        remove(galleryBlock.id)
    }

+    suspend fun cancelAndJoin() {
+        downloadJob?.cancelAndJoin()
+    }
+
    fun invokeOnReaderLoaded() {
        CoroutineScope(Dispatchers.Default).launch {
            onReaderLoadedHandler?.invoke(reader.await())
--- a/app/src/main/res/drawable-anydpi/ic_downloading.xml
+++ b/app/src/main/res/drawable-anydpi/ic_downloading.xml
@@ -33,7 +33,7 @@
                    android:valueFrom="0"
                    android:valueTo="0.8"
                    android:valueType="floatType"
-                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"/>
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
                <objectAnimator
                    android:propertyName="trimPathStart"
                    android:startOffset="500"
@@ -41,14 +41,14 @@
                    android:valueFrom="0"
                    android:valueTo="0.8"
                    android:valueType="floatType"
-                    android:interpolator="@android:anim/accelerate_decelerate_interpolator"/>
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
                <objectAnimator
                    android:propertyName="trimPathOffset"
                    android:duration="1000"
                    android:valueFrom="0"
                    android:valueTo="0.2"
                    android:valueType="floatType"
-                    android:interpolator="@android:anim/linear_interpolator"/>
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
            </set>
        </aapt:attr>
    </target>
--- a/app/src/main/res/drawable-anydpi/ic_progressbar_complete.xml
+++ b/app/src/main/res/drawable-anydpi/ic_progressbar_complete.xml
@@ -0,0 +1,18 @@
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:drawable="@drawable/ic_progressbar"
+    tools:ignore="NewApi">
+    <target android:name="path">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="trimPathEnd"
+                android:duration="1000"
+                android:valueFrom="0"
+                android:valueTo="1"
+                android:valueType="floatType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+</animated-vector>
--- a/app/src/main/res/drawable/ic_progressbar.xml
+++ b/app/src/main/res/drawable/ic_progressbar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="path_1"
+        android:pathData="M 0 12 L 24 12"
+        android:fillColor="#000"
+        android:strokeColor="#b9f6ca"
+        android:strokeWidth="24"/>
+    <path
+        android:name="path"
+        android:pathData="M 0 12 L 24 12"
+        android:fillColor="#000"
+        android:strokeColor="#00c853"
+        android:strokeWidth="24"/>
+</vector>
--- a/app/src/main/res/layout/dialog_galleryblock.xml
+++ b/app/src/main/res/layout/dialog_galleryblock.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:padding="16dp">
+
+    <Button
+        android:id="@+id/main_dialog_download"
+        style="?borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <Button
+        android:id="@+id/main_dialog_delete"
+        style="?borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/main_dialog_delete"
+        app:layout_constraintTop_toBottomOf="@id/main_dialog_download"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/item_galleryblock.xml
+++ b/app/src/main/res/layout/item_galleryblock.xml
@@ -26,6 +26,15 @@
 			android:visibility="gone"
 			app:layout_constraintTop_toTopOf="parent"/>

+		<ImageView
+			android:id="@+id/galleryblock_progress_complete"
+			android:layout_width="match_parent"
+			android:layout_height="4dp"
+			android:visibility="invisible"
+			android:scaleType="fitXY"
+			android:contentDescription="@string/reader_imageview_description"
+			app:layout_constraintTop_toTopOf="parent"/>
+
 		<ImageView
 			android:id="@+id/galleryblock_thumbnail"
 			android:layout_width="150dp"
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
    <string name="settings_miscellaneous_title">その他</string>
    <string name="settings_use_hiyobi_summary">ロード速度を向上させるためhiyobi.meからイメージロード</string>
    <string name="settings_use_hiyobi_title">hiyobi.meからロード</string>
-    <string name="settings_clear_history">履歴の削除</string>
+    <string name="settings_clear_history">履歴を削除</string>
    <string name="settings_clear_history_alert_message">履歴を削除しますか？</string>
    <string name="settings_clear_history_summary">履歴数: %1$d</string>
    <string name="main_drawer_history">履歴</string>
@@ -51,4 +51,5 @@
    <string name="reader_notification_complete">ダウンロード完了</string>
    <string name="reader_notification_error">ダウンロードエラー</string>
    <string name="reader_fab_download_cancel">バックグラウンドダウンロード中止</string>
+    <string name="main_dialog_delete">このギャラリーを削除</string>
 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -21,10 +21,10 @@
    <string name="settings_miscellaneous_title">기타</string>
    <string name="settings_use_hiyobi_summary">속도 향상을 위해 가능하면 hiyobi.me에서 이미지 로드</string>
    <string name="settings_use_hiyobi_title">hiyobi.me 사용</string>
-    <string name="settings_clear_history">히스토리 삭제</string>
-    <string name="settings_clear_history_alert_message">히스토리를 삭제하시겠습니까?</string>
-    <string name="settings_clear_history_summary">히스토리 %1$d개 저장됨</string>
-    <string name="main_drawer_history">히스토리</string>
+    <string name="settings_clear_history">기록 삭제</string>
+    <string name="settings_clear_history_alert_message">기록을 삭제하시겠습니까?</string>
+    <string name="settings_clear_history_summary">기록 %1$d개 저장됨</string>
+    <string name="main_drawer_history">기록</string>
    <string name="main_drawer_home">홈</string>
    <string name="update_download_started">다운로드 중</string>
    <string name="update_release_note"># 릴리즈 노트(v%1$s)\n%2$s</string>
@@ -51,4 +51,5 @@
    <string name="reader_notification_complete">다운로드 완료</string>
    <string name="reader_notification_error">다운로드 오류</string>
    <string name="reader_fab_download_cancel">백그라운드 다운로드 취소</string>
+    <string name="main_dialog_delete">갤러리 삭제</string>
 </resources>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,6 +5,7 @@
    <color name="colorAccent">#D81B60</color>
    <color name="appbar">#FFFFFF</color>

-    <color name="material_pink_100">#d81b60</color>
-    <color name="material_blue_100">#1976d2</color>
+    <color name="material_pink_600">#d81b60</color>
+    <color name="material_blue_700">#1976d2</color>
+    <color name="material_green_a700">#00c853</color>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,6 +36,8 @@
    <string name="main_drawer_group_contact_github">Visit github</string>
    <string name="main_drawer_group_contact_email">Email me!</string>

+    <string name="main_dialog_delete">Delete this gallery</string>
+
    <string name="help_dialog_title">WIP</string>
    <string name="help_dialog_message">While in progress!</string>