From e0a6102d4d5d3e66ceed4f0eb703b1a9e1c5827c Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Wed, 28 Aug 2019 08:56:29 +0900
Subject: [PATCH] Fixed viewer flickering Added moving with volume button Added
 nomedia Added help link to error snackbar

---
 .idea/codeStyles/Project.xml                  |  9 ---
 app/build.gradle                              | 12 ++--
 .../pupil/adapters/GalleryBlockAdapter.kt     |  5 ++
 .../quaver/pupil/adapters/ReaderAdapter.kt    | 57 +++++++++++++------
 .../quaver/pupil/adapters/ThumbnailAdapter.kt |  5 ++
 .../java/xyz/quaver/pupil/ui/MainActivity.kt  | 14 ++---
 .../xyz/quaver/pupil/ui/ReaderActivity.kt     | 32 +++++++++--
 .../xyz/quaver/pupil/ui/SettingsActivity.kt   | 35 +++++++++++-
 .../quaver/pupil/util/GalleryDownloader.kt    |  9 +--
 .../res/drawable-anydpi/ic_downloading.xml    | 55 ------------------
 app/src/main/res/drawable-anydpi/ic_email.xml | 10 ----
 .../main/res/drawable-anydpi/ic_expand.xml    | 10 ----
 .../res/drawable-anydpi/ic_fullscreen.xml     | 10 ----
 app/src/main/res/drawable-anydpi/ic_help.xml  | 10 ----
 .../main/res/drawable-anydpi/ic_history.xml   | 10 ----
 app/src/main/res/drawable-anydpi/ic_home.xml  | 10 ----
 .../res/drawable-anydpi/ic_placeholder.xml    | 10 ----
 .../main/res/drawable-anydpi/ic_search.xml    | 10 ----
 .../main/res/drawable-anydpi/ic_settings.xml  | 10 ----
 app/src/main/res/values-ja/strings.xml        |  5 +-
 app/src/main/res/values-ko/strings.xml        |  5 +-
 app/src/main/res/values/strings.xml           |  7 ++-
 app/src/main/res/xml/lock_preferences.xml     |  2 +-
 app/src/main/res/xml/root_preferences.xml     |  6 +-
 build.gradle                                  |  8 +--
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 26 files changed, 154 insertions(+), 206 deletions(-)
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_downloading.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_email.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_expand.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_fullscreen.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_help.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_history.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_home.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_placeholder.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_search.xml
 delete mode 100644 app/src/main/res/drawable-anydpi/ic_settings.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index cb22ebb7..c33b7e4e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,18 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/app/build.gradle b/app/build.gradle
index 831cfba8..9aecd601 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 26
-        versionName "3.2-beta"
+        versionCode 27
+        versionName "3.2-beta2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -26,6 +26,7 @@ android {
         }
         buildTypes.each {
             it.buildConfigField('boolean', 'PRERELEASE', 'true')
+            it.buildConfigField('boolean', 'CENSOR', 'false')
         }
     }
     kotlinOptions {
@@ -55,9 +56,9 @@ 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.google.android.material:material:1.1.0-alpha08'
-    implementation 'com.google.firebase:firebase-core:17.0.1'
-    implementation 'com.google.firebase:firebase-perf:18.0.1'
+    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'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
@@ -66,6 +67,7 @@ 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'
diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
index 7fe8ef68..415913db 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -41,6 +41,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
+import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
@@ -86,6 +87,10 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                         .skipMemoryCache(true)
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .error(R.drawable.image_broken_variant)
+                        .apply {
+                            if (BuildConfig.CENSOR)
+                                override(5, 8)
+                        }
                         .into(galleryblock_thumbnail)
                 }
 
diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
index c19ee6cc..968c0794 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -18,22 +18,25 @@
 
 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 kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
+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
 
 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)
 
@@ -46,19 +49,41 @@ class ReaderAdapter(private val glide: RequestManager, private val images: List<
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        runBlocking {
-            CoroutineScope(Dispatchers.Default).launch {
-                val image = glide
-                    .load(images[position])
-                    .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    .skipMemoryCache(true)
-                    .error(R.drawable.image_broken_variant)
-                    .submit()
-                    .get()
+        holder.view as ImageView
 
-                (holder.view as ImageView).setImageDrawable(image)
-            }.join()
-        }
+        glide
+            .load(images[position])
+            .dontTransform()
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .skipMemoryCache(true)
+            .error(R.drawable.image_broken_variant)
+            .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)
     }
 
     override fun getItemCount() = images.size
diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
index 1793af1c..db85c79d 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt
@@ -22,6 +22,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
+import xyz.quaver.pupil.BuildConfig
 
 class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
 
@@ -34,6 +35,10 @@ class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         glide
             .load(thumbnails[position])
+            .apply {
+                if (BuildConfig.CENSOR)
+                    override(5, 8)
+            }
             .into(holder.view)
     }
 
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
index 7ded50c8..24fcc389 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -206,10 +206,10 @@ class MainActivity : AppCompatActivity() {
         val maxPage = ceil(totalItems / perPage.toDouble()).roundToInt()
 
         return when(keyCode) {
-            KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                if (currentPage < maxPage) {
+            KeyEvent.KEYCODE_VOLUME_UP -> {
+                if (currentPage > 0) {
                     runOnUiThread {
-                        currentPage++
+                        currentPage--
 
                         cancelFetch()
                         clearGalleries()
@@ -220,10 +220,10 @@ class MainActivity : AppCompatActivity() {
 
                 true
             }
-            KeyEvent.KEYCODE_VOLUME_UP -> {
-                if (currentPage > 0) {
+            KeyEvent.KEYCODE_VOLUME_DOWN -> {
+                if (currentPage < maxPage) {
                     runOnUiThread {
-                        currentPage--
+                        currentPage++
 
                         cancelFetch()
                         clearGalleries()
@@ -796,7 +796,7 @@ class MainActivity : AppCompatActivity() {
                 s ?: return
 
                 if (s.any { it.isUpperCase() })
-                    s.replace(0, s.length, s.toString().toLowerCase())
+                    s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
             }
         })
 
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
index d342f915..0ccd4d60 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -22,6 +22,7 @@ import android.Manifest
 import android.content.Intent
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
+import android.net.Uri
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.app.AlertDialog
@@ -45,10 +46,7 @@ import kotlinx.serialization.ImplicitReflectionSerializer
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.util.GalleryDownloader
-import xyz.quaver.pupil.util.Histories
-import xyz.quaver.pupil.util.ItemClickSupport
-import xyz.quaver.pupil.util.hasPermission
+import xyz.quaver.pupil.util.*
 
 class ReaderActivity : AppCompatActivity() {
 
@@ -220,6 +218,23 @@ class ReaderActivity : AppCompatActivity() {
         }
     }
 
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        //currentPage is 1-based
+        return when(keyCode) {
+            KeyEvent.KEYCODE_VOLUME_UP -> {
+                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage-2, 0)
+
+                true
+            }
+            KeyEvent.KEYCODE_VOLUME_DOWN -> {
+                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)
+
+                true
+            }
+            else -> super.onKeyDown(keyCode, event)
+        }
+    }
+
     private fun initDownloader() {
         var d: GalleryDownloader? = GalleryDownloader.get(galleryID)
 
@@ -262,7 +277,12 @@ class ReaderActivity : AppCompatActivity() {
                 }
             }
             onErrorHandler = {
-                Snackbar.make(reader_layout, it.message ?: it.javaClass.name, Snackbar.LENGTH_INDEFINITE).show()
+                Snackbar
+                    .make(reader_layout, it.message ?: it.javaClass.name, Snackbar.LENGTH_INDEFINITE)
+                    .setAction(R.string.reader_help) { view ->
+                        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.error_help))))
+                    }
+                    .show()
                 downloader.download = false
             }
             onCompleteHandler = {
@@ -340,7 +360,7 @@ class ReaderActivity : AppCompatActivity() {
                         scrollMode(false)
                         fullscreen(true)
                     } else {
-                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage)
+                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
                     }
                 }
         }
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
index 0e28613b..f1dff826 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -43,6 +43,7 @@ import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
 import xyz.quaver.pupil.util.getDownloadDirectory
 import java.io.File
+import java.util.*
 
 class SettingsActivity : AppCompatActivity() {
 
@@ -278,7 +279,7 @@ class SettingsActivity : AppCompatActivity() {
                                 s ?: return
 
                                 if (s.any { it.isUpperCase() })
-                                    s.replace(0, s.length, s.toString().toLowerCase())
+                                    s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
                             }
                         })
                     }
@@ -352,6 +353,38 @@ class SettingsActivity : AppCompatActivity() {
                     true
                 }
             }
+
+            with(findPreference<Preference>("nomedia")) {
+                this!!
+
+                onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                    val directories = listOf(
+                        context.cacheDir,
+                        getDownloadDirectory(context)
+                    )
+
+                    when (newValue as Boolean) {
+                        true -> {
+                            directories.forEach {
+                                it ?: return@forEach
+
+                                if (it.exists())
+                                    File(it, ".nomedia").createNewFile()
+                            }
+                        }
+                        false -> {
+                            directories.forEach {
+                                it ?: return@forEach
+
+                                if (it.exists())
+                                    File(it, ".nomedia").delete()
+                            }
+                        }
+                    }
+
+                    true
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
index f8ab171d..f393f3dc 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -169,6 +169,8 @@ class GalleryDownloader(
         downloadJob = CoroutineScope(Dispatchers.Default).launch {
             val reader = reader!!.await()
 
+            notificationBuilder.setContentTitle(reader.title)
+
             if (reader.readerItems.isEmpty()) {
                 onErrorHandler?.invoke(IOException(getString(R.string.unable_to_connect)))
                 return@launch
@@ -312,16 +314,11 @@ class GalleryDownloader(
         notificationBuilder = NotificationCompat.Builder(this, "download").apply {
             setContentTitle(getString(R.string.reader_loading))
             setContentText(getString(R.string.reader_notification_text))
-            setSmallIcon(R.drawable.ic_download)
+            setSmallIcon(android.R.drawable.stat_sys_download)
             setContentIntent(pendingIntent)
             setProgress(0, 0, true)
             priority = NotificationCompat.PRIORITY_LOW
         }
-
-        CoroutineScope(Dispatchers.Default).launch {
-            while (reader == null) ;
-            notificationBuilder.setContentTitle(reader.await().title)
-        }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi/ic_downloading.xml b/app/src/main/res/drawable-anydpi/ic_downloading.xml
deleted file mode 100644
index ac96e761..00000000
--- a/app/src/main/res/drawable-anydpi/ic_downloading.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<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"
-    tools:ignore="NewApi">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 19 9 L 15 9 L 15 3 L 9 3 L 9 9 L 5 9 L 12 16 L 19 9 Z"
-                android:fillColor="#fff"
-                android:strokeWidth="1"/>
-            <path
-                android:name="path_2"
-                android:pathData="M 5 19 L 19 19"
-                android:fillColor="#fff"
-                android:strokeColor="#fff"
-                android:strokeWidth="2"
-                android:strokeLineCap="butt"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="path_2">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="trimPathEnd"
-                    android:duration="500"
-                    android:valueFrom="0"
-                    android:valueTo="0.8"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="trimPathStart"
-                    android:startOffset="500"
-                    android:duration="500"
-                    android:valueFrom="0"
-                    android:valueTo="0.8"
-                    android:valueType="floatType"
-                    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:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_email.xml b/app/src/main/res/drawable-anydpi/ic_email.xml
deleted file mode 100644
index 4163eb94..00000000
--- a/app/src/main/res/drawable-anydpi/ic_email.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_expand.xml b/app/src/main/res/drawable-anydpi/ic_expand.xml
deleted file mode 100644
index 46ffbc0f..00000000
--- a/app/src/main/res/drawable-anydpi/ic_expand.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_fullscreen.xml b/app/src/main/res/drawable-anydpi/ic_fullscreen.xml
deleted file mode 100644
index f9831623..00000000
--- a/app/src/main/res/drawable-anydpi/ic_fullscreen.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_help.xml b/app/src/main/res/drawable-anydpi/ic_help.xml
deleted file mode 100644
index 785b2478..00000000
--- a/app/src/main/res/drawable-anydpi/ic_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_history.xml b/app/src/main/res/drawable-anydpi/ic_history.xml
deleted file mode 100644
index e5e6c6c8..00000000
--- a/app/src/main/res/drawable-anydpi/ic_history.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_home.xml b/app/src/main/res/drawable-anydpi/ic_home.xml
deleted file mode 100644
index 08ebbdf2..00000000
--- a/app/src/main/res/drawable-anydpi/ic_home.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_placeholder.xml b/app/src/main/res/drawable-anydpi/ic_placeholder.xml
deleted file mode 100644
index 7b74d4b6..00000000
--- a/app/src/main/res/drawable-anydpi/ic_placeholder.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21,5v6.59l-3,-3.01 -4,4.01 -4,-4 -4,4 -3,-3.01L3,5c0,-1.1 0.9,-2 2,-2h14c1.1,0 2,0.9 2,2zM18,11.42l3,3.01L21,19c0,1.1 -0.9,2 -2,2L5,21c-1.1,0 -2,-0.9 -2,-2v-6.58l3,2.99 4,-4 4,4 4,-3.99z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_search.xml b/app/src/main/res/drawable-anydpi/ic_search.xml
deleted file mode 100644
index 4da90631..00000000
--- a/app/src/main/res/drawable-anydpi/ic_search.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
-</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_settings.xml b/app/src/main/res/drawable-anydpi/ic_settings.xml
deleted file mode 100644
index 994eaacb..00000000
--- a/app/src/main/res/drawable-anydpi/ic_settings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
-</vector>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 33c08d47..f9356dd4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -70,7 +70,7 @@
     <string name="settings_app_lock">アプリロック</string>
     <string name="settings_app_lock_type">アップロックの種類</string>
     <string name="settings_app_version_title">バージョン</string>
-    <string name="settings_lock_biomatrics">生体認識</string>
+    <string name="settings_lock_biometrics">生体認識</string>
     <string name="settings_lock_confirm">ロック確認のためもう一回入力してください。</string>
     <string name="settings_lock_enabled">有効</string>
     <string name="settings_lock_fingerprint">指紋</string>
@@ -99,4 +99,7 @@
     <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="reader_help">ヘルプ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 0ed5b83f..6b01b3ee 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -70,7 +70,7 @@
     <string name="settings_app_lock">앱 잠금</string>
     <string name="settings_app_lock_type">앱 잠금 종류</string>
     <string name="settings_app_version_title">앱 버전</string>
-    <string name="settings_lock_biomatrics">생체 인식</string>
+    <string name="settings_lock_biometrics">생체 인식</string>
     <string name="settings_lock_confirm">잠금 확인을 위해 한번 더 입력해주세요</string>
     <string name="settings_lock_enabled">사용 중</string>
     <string name="settings_lock_fingerprint">지문</string>
@@ -99,4 +99,7 @@
     <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="reader_help">도움말</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e397835..40eb0bf9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="github" translatable="false">https://github.com/tom5079/Pupil-issue/issues/new/choose</string>
     <string name="email" translatable="false">mailto:pupil.hentai@gmail.com</string>
     <string name="kakaotalk" translatable="false">https://open.kakao.com/o/gvNrncsb</string>
+    <string name="error_help" translatable="false">http://bit.ly/2KYYhto</string>
 
     <string name="main_settings" translatable="false">Settings</string>
     <string name="galleryblock_thumbnail_description" translatable="false">Thumbnail</string>
@@ -101,6 +102,8 @@
     <string name="reader_notification_complete">Download complete</string>
     <string name="reader_notification_error">Download error</string>
 
+    <string name="reader_help">Help</string>
+
     <string name="settings_title">Settings</string>
     <string name="settings_app_version_title">App version</string>
     <string name="settings_search_title">Search Settings</string>
@@ -124,12 +127,14 @@
     <string name="settings_security_mode_summary">Enable security mode to make the screen invisible on recent app window</string>
     <string name="settings_dark_mode_title">Dark mode</string>
     <string name="settings_dark_mode_summary">Protect yourself against light attacks!</string>
+    <string name="settings_nomedia_title">Hide image from gallery</string>
+    <string name="settings_nomedia_summary">Hides image from gallery</string>
 
     <string name="settings_lock_none">None</string>
     <string name="settings_lock_pattern">Pattern</string>
     <string name="settings_lock_pin" translatable="false">PIN</string>
     <string name="settings_lock_password">Password</string>
-    <string name="settings_lock_biomatrics">Biomatrics</string>
+    <string name="settings_lock_biometrics">Biometrics</string>
     <string name="settings_lock_fingerprint">Fingerprint</string>
     <string name="settings_lock_enabled">Enabled</string>
     <string name="settings_lock_confirm">Input same lock once more to confirm Lock</string>
diff --git a/app/src/main/res/xml/lock_preferences.xml b/app/src/main/res/xml/lock_preferences.xml
index 9fed9fba..3c3baab3 100644
--- a/app/src/main/res/xml/lock_preferences.xml
+++ b/app/src/main/res/xml/lock_preferences.xml
@@ -15,7 +15,7 @@
         app:key="lock_password"/>
 
     <PreferenceCategory
-        app:title="@string/settings_lock_biomatrics">
+        app:title="@string/settings_lock_biometrics">
 
         <Preference
             app:title="@string/settings_lock_fingerprint"
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 9307a2f0..26738748 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -20,7 +20,6 @@
         <Preference
             app:key="default_query"
             app:title="@string/settings_default_query"
-            app:defaultValue=""
             app:useSimpleSummaryProvider="true"/>
 
     </PreferenceCategory>
@@ -70,6 +69,11 @@
             app:title="@string/settings_dark_mode_title"
             app:summary="@string/settings_dark_mode_summary"/>
 
+        <SwitchPreference
+            app:key="nomedia"
+            app:title="@string/settings_nomedia_title"
+            app:summary="@string/settings_nomedia_title"/>
+
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
diff --git a/build.gradle b/build.gradle
index 13892d98..5fcfbacf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
@@ -10,15 +10,15 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.0'
+        classpath 'com.google.gms:google-services:4.3.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'io.fabric.tools:gradle:1.29.0'
-        classpath 'com.google.firebase:perf-plugin:1.3.0'
+        classpath 'com.google.firebase:perf-plugin:1.3.1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2518566d..381916e7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 25 10:57:40 KST 2019
+#Fri Aug 23 08:21:15 KST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip