Added quick download/delete

app/build.gradle

@@ -26,7 +26,7 @@ android {
         }
         buildTypes.each {
             it.buildConfigField('boolean', 'PRERELEASE', 'false')
-            it.buildConfigField('boolean', 'CENSOR', 'false')
+            it.buildConfigField('boolean', 'CENSOR', 'true')
         }
     }
     kotlinOptions {
@@ -56,6 +56,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.android.support:multidex:1.0.3'
+    implementation "com.daimajia.swipelayout:library:1.2.0@aar"
     implementation 'com.google.android.material:material:1.1.0-alpha09'
     implementation 'com.google.firebase:firebase-core:17.1.0'
     implementation 'com.google.firebase:firebase-perf:19.0.0'
@@ -67,7 +68,6 @@ dependencies {
         transitive = false
     }
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
-    implementation 'com.jsibbold:zoomage:1.3.0'
     implementation "ru.noties.markwon:core:${markwonVersion}"
     kapt 'com.github.bumptech.glide:compiler:4.9.0'
     testImplementation 'junit:junit:4.12'

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -31,6 +31,9 @@ import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.daimajia.swipe.SwipeLayout
+import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
+import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.item_galleryblock.view.*
 import kotlinx.coroutines.CoroutineScope
@@ -45,6 +48,7 @@ import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
+import xyz.quaver.pupil.util.GalleryDownloader
 import xyz.quaver.pupil.util.Histories
 import xyz.quaver.pupil.util.getCachedGallery
 import xyz.quaver.pupil.util.wordCapitalize
@@ -54,7 +58,7 @@ import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.concurrent.schedule
 
-class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Pair<GalleryBlock, Deferred<String>>>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<Pair<GalleryBlock, Deferred<String>>>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
 
     enum class ViewType {
         NEXT,
@@ -64,7 +68,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
 
     private lateinit var favorites: Histories
 
-    inner class GalleryViewHolder(val view: CardView) : RecyclerView.ViewHolder(view) {
+    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         fun bind(item: Pair<GalleryBlock, Deferred<String>>) {
             with(view) {
                 val resources = context.resources
@@ -276,6 +280,8 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
     val completeFlag = SparseBooleanArray()
 
     val onChipClickedHandler = ArrayList<((Tag) -> Unit)>()
+    var onDownloadClickedHandler: ((Int) -> Unit)? = null
+    var onDeleteClickedHandler: ((Int) -> Unit)? = null
 
     var showNext = false
     var showPrev = false
@@ -301,8 +307,47 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (holder is GalleryViewHolder)
-            holder.bind(galleries[position-(if (showPrev) 1 else 0)])
+        if (holder is GalleryViewHolder) {
+            val gallery = galleries[position-(if (showPrev) 1 else 0)]
+
+            holder.bind(gallery)
+
+            with(holder.view.galleryblock_primary) {
+                setOnClickListener {
+                    holder.view.performClick()
+                }
+                setOnLongClickListener {
+                    holder.view.performLongClick()
+                }
+            }
+
+            holder.view.galleryblock_download.setOnClickListener {
+                onDownloadClickedHandler?.invoke(position)
+            }
+
+            holder.view.galleryblock_delete.setOnClickListener {
+                onDeleteClickedHandler?.invoke(position)
+            }
+
+            mItemManger.bindView(holder.view, position)
+
+            holder.view.galleryblock_swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
+                override fun onStartOpen(layout: SwipeLayout?) {
+                    mItemManger.closeAllExcept(layout)
+
+                    holder.view.galleryblock_download.text = when(GalleryDownloader.get(gallery.first.id)) {
+                        null -> holder.view.context.getString(R.string.main_download)
+                        else -> holder.view.context.getString(R.string.main_cancel_download)
+                    }
+                }
+
+                override fun onClose(layout: SwipeLayout?) {}
+                override fun onHandRelease(layout: SwipeLayout?, xvel: Float, yvel: Float) {}
+                override fun onOpen(layout: SwipeLayout?) {}
+                override fun onStartClose(layout: SwipeLayout?) {}
+                override fun onUpdate(layout: SwipeLayout?, leftOffset: Int, topOffset: Int) {}
+            })
+        }
     }
 
     override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
@@ -328,4 +373,6 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
             else -> ViewType.GALLERY
         }.ordinal
     }
+
+    override fun getSwipeLayoutResourceId(position: Int) = R.id.galleryblock_swipe_layout
 }

app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt

@@ -18,18 +18,13 @@
 
 package xyz.quaver.pupil.adapters
 
-import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.getCachedGallery
@@ -40,7 +35,6 @@ class ReaderAdapter(private val glide: RequestManager,
                     private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
 
     var isFullScreen = false
-    private var prev : Drawable? = null
 
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
@@ -64,29 +58,7 @@ class ReaderAdapter(private val glide: RequestManager,
             .apply {
                 if (BuildConfig.CENSOR)
                     override(5, 8)
-                if (isFullScreen)
-                    placeholder(prev)
             }
-            .listener(object: RequestListener<Drawable> {
-                override fun onLoadFailed(
-                    e: GlideException?,
-                    model: Any?,
-                    target: Target<Drawable>?,
-                    isFirstResource: Boolean
-                ) = false
-
-                override fun onResourceReady(
-                    resource: Drawable?,
-                    model: Any?,
-                    target: Target<Drawable>?,
-                    dataSource: DataSource?,
-                    isFirstResource: Boolean
-                ): Boolean {
-                    prev = resource?.constantState?.newDrawable()?.mutate()
-
-                    return false
-                }
-            })
             .into(holder.view)
     }
 

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

@@ -22,19 +22,14 @@ import android.app.Dialog
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.LinearLayout.LayoutParams
 import androidx.core.content.ContextCompat
-import androidx.gridlayout.widget.GridLayout
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.bumptech.glide.RequestManager
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.dialog_galleryblock.*
@@ -45,6 +40,7 @@ import xyz.quaver.hitomi.Gallery
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.getGallery
 import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
@@ -114,7 +110,10 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
 
                     Glide.with(context)
                         .load(gallery.thumbnails.firstOrNull())
-                        .into(gallery_thumbnail)
+                        .apply {
+                            if (BuildConfig.CENSOR)
+                                override(5, 8)
+                        }.into(gallery_thumbnail)
 
                     addDetails(gallery)
                     addThumbnails(gallery)

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

@@ -535,6 +535,52 @@ class MainActivity : AppCompatActivity() {
                         loadBlocks()
                     }
                 }
+                onDownloadClickedHandler = { position ->
+                    val galleryID = galleries[position].first.id
+
+                    if (!completeFlag.get(galleryID, false)) {
+                        val downloader = GalleryDownloader.get(galleryID)
+
+                        if (downloader == null)
+                            GalleryDownloader(context, galleryID, true).start()
+                        else {
+                            downloader.cancel()
+                            downloader.clearNotification()
+                        }
+                    }
+
+                    closeAllItems()
+                }
+
+                onDeleteClickedHandler = { position ->
+                    val galleryID = galleries[position].first.id
+
+                    CoroutineScope(Dispatchers.Default).launch {
+                        with(GalleryDownloader[galleryID]) {
+                            this?.cancelAndJoin()
+                            this?.clearNotification()
+                        }
+                        val cache = File(cacheDir, "imageCache/${galleryID}")
+                        val data = getCachedGallery(context, galleryID)
+                        cache.deleteRecursively()
+                        data.deleteRecursively()
+
+                        downloads.remove(galleryID)
+
+                        if (this@MainActivity.mode == Mode.DOWNLOAD) {
+                            runOnUiThread {
+                                cancelFetch()
+                                clearGalleries()
+                                fetchGalleries(query, sortMode)
+                                loadBlocks()
+                            }
+                        }
+
+                        completeFlag.put(galleryID, false)
+                    }
+
+                    closeAllItems()
+                }
             }
             ItemClickSupport.addTo(this)
                 .setOnItemClickListener { _, position, v ->

app/src/main/res/layout/activity_lock.xml

@@ -29,7 +29,29 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/lock_button_layout"/>
+        app:layout_constraintBottom_toTopOf="@id/lock_fingerprint_layout"/>
+
+    <LinearLayout
+        android:id="@+id/lock_fingerprint_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="32dp"
+        android:gravity="center"
+        app:layout_constraintTop_toBottomOf="@id/lock_content"
+        app:layout_constraintBottom_toTopOf="@id/lock_button_layout">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/lock_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:srcCompat="@drawable/fingerprint"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            app:backgroundTint="@color/dark_gray"
+            app:fabSize="mini"/>
+
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/lock_button_layout"
@@ -37,7 +59,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="32dp"
-        app:layout_constraintTop_toBottomOf="@id/lock_content"
+        app:layout_constraintTop_toBottomOf="@id/lock_fingerprint_layout"
         app:layout_constraintBottom_toBottomOf="parent"
         android:gravity="center">
 
@@ -59,16 +81,6 @@
             app:backgroundTint="@color/dark_gray"
             app:fabSize="mini"/>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/lock_fingerprint"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:srcCompat="@drawable/fingerprint"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            app:backgroundTint="@color/dark_gray"
-            app:fabSize="mini"/>
-
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/lock_password"
             android:layout_width="wrap_content"

app/src/main/res/layout/item_galleryblock.xml

@@ -23,20 +23,58 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_margin="8dp"
-	android:paddingStart="0dp"
-	android:paddingLeft="0dp"
-	android:paddingEnd="8dp"
-	android:paddingRight="8dp"
 	app:cardCornerRadius="8dp"
+	android:clipChildren="true">
+
+	<com.daimajia.swipe.SwipeLayout
+		android:id="@+id/galleryblock_swipe_layout"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:drag_edge="right"
+		app:show_mode="pull_out">
+
+		<LinearLayout
+			android:id="@+id/galleryblock_secondary"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent">
+
+			<TextView
+				android:id="@+id/galleryblock_download"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:padding="8dp"
+				android:gravity="center"
+				android:background="@android:color/holo_blue_dark"
+				android:textColor="@android:color/white"
+				android:text="@string/main_download"
+				android:foreground="?attr/selectableItemBackground"
+				android:focusable="true"
+				android:clickable="true"/>
+
+			<TextView
+				android:id="@+id/galleryblock_delete"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:padding="8dp"
+				android:gravity="center"
+				android:background="@android:color/holo_red_dark"
+				android:textColor="@android:color/white"
+				android:text="@string/main_delete"
+				android:foreground="?attr/selectableItemBackground"
+				android:focusable="true"
+				android:clickable="true"/>
+
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/galleryblock_primary"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
 			android:foreground="?attr/selectableItemBackground"
 			android:focusable="true"
 			android:clickable="true">
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
-
 			<androidx.constraintlayout.widget.ConstraintLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
@@ -180,4 +218,6 @@
 
 		</LinearLayout>
 
+	</com.daimajia.swipe.SwipeLayout>
+
 </androidx.cardview.widget.CardView>

app/src/main/res/values-ja/strings.xml

@@ -99,7 +99,10 @@
     <string name="gallery_tags">タグ</string>
     <string name="gallery_thumbnails">サムネイル</string>
     <string name="gallery_related">おすすめ</string>
-    <string name="settings_nomedia_summary">イメージを隠す</string>
-    <string name="settings_nomedia_title">イメージをギャラリーから見えなくする</string>
+    <string name="settings_nomedia_summary">イメージをギャラリーから見えなくする</string>
+    <string name="settings_nomedia_title">イメージを隠す</string>
     <string name="reader_help">ヘルプ</string>
+    <string name="main_delete">削除</string>
+    <string name="main_download">ダウンロード</string>
+    <string name="main_cancel_download">キャンセル</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -99,7 +99,10 @@
     <string name="gallery_tags">태그</string>
     <string name="gallery_related">관련 갤러리</string>
     <string name="gallery_thumbnails">미리보기</string>
-    <string name="settings_nomedia_summary">이미지 숨기기</string>
-    <string name="settings_nomedia_title">갤러리에서 이미지 검색이 되지 않도록 합니다</string>
+    <string name="settings_nomedia_summary">갤러리에서 이미지 검색이 되지 않도록 합니다</string>
+    <string name="settings_nomedia_title">이미지 숨기기</string>
     <string name="reader_help">도움말</string>
+    <string name="main_delete">삭제</string>
+    <string name="main_download">다운로드</string>
+    <string name="main_cancel_download">취소</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -71,6 +71,10 @@
     <string name="main_export_open_folder">Open Folder</string>
     <string name="main_export_error">Error occurred during export</string>
 
+    <string name="main_download">DOWNLOAD</string>
+    <string name="main_cancel_download">CANCEL</string>
+    <string name="main_delete">DELETE</string>
+
     <string name="update_title">Update available</string>
     <string name="update_download_started">Download started</string>
     <string name="update_notification_description">Downloading apk&#8230;</string>