Fixed typo & Built apk

# Conflicts:
#	app/build.gradle

README.md

@@ -2,7 +2,7 @@
 *Pupil, Hitomi.la viewer for Android*  
 
 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.7-hotfix1/Pupil-v5.1.7-hotfix1.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.7-hotfix1/Pupil-v5.1.7-hotfix1.apk)
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.6-hotfix7/Pupil-v5.1.6-hotfix7.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.6-hotfix7/Pupil-v5.1.6-hotfix7.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
 
 # Features

app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
-apply plugin: "kotlin-parcelize"
+apply plugin: "kotlin-android-extensions"
 apply plugin: "kotlinx-serialization"
 apply plugin: "com.google.android.gms.oss-licenses-plugin"
 
@@ -38,7 +38,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 64
-        versionName "5.1.7-hotfix1"
+        versionName "5.1.7-beta1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -63,9 +63,6 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
-    buildFeatures {
-        viewBinding true
-    }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
         freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
@@ -135,4 +132,8 @@ dependencies {
     androidTestImplementation "androidx.test:rules:1.3.0"
     androidTestImplementation "androidx.test:runner:1.3.0"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
+}
+
+androidExtensions {
+    experimental = true
 }

app/release/output-metadata.json

@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "versionCode": 64,
-      "versionName": "5.1.7-hotfix1",
+      "versionName": "5.1.7-beta1",
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -125,13 +125,8 @@ class Pupil : Application() {
         favoriteTags = SavedSet(File(ContextCompat.getDataDir(this), "favorites_tags.json"), Tag.parse(""))
         searchHistory = SavedSet(File(ContextCompat.getDataDir(this), "search_histories.json"), "")
 
-        favoriteTags.filter { it.tag.contains('_') }.forEach {
-            favoriteTags.remove(it)
-        }
-
-        /*
         if (BuildConfig.DEBUG)
-            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)*/
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false)
 
         try {
             ProviderInstaller.installIfNeeded(this)

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

@@ -25,6 +25,7 @@ import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -34,12 +35,13 @@ import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface
 import com.github.piasy.biv.loader.ImageLoader
+import kotlinx.android.synthetic.main.item_galleryblock.view.*
+import kotlinx.android.synthetic.main.view_progress_card.view.*
 import kotlinx.coroutines.*
 import xyz.quaver.hitomi.getGallery
 import xyz.quaver.hitomi.getReader
 import xyz.quaver.io.util.getChild
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.GalleryblockItemBinding
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.types.Tag
@@ -55,20 +57,20 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
     var updateAll = true
     var thin: Boolean = Preferences["thin"]
 
-    inner class GalleryViewHolder(val binding: GalleryblockItemBinding) : RecyclerView.ViewHolder(binding.root) {
+    inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         private var galleryID: Int = 0
 
         init {
             CoroutineScope(Dispatchers.Main).launch {
                 while (updateAll) {
-                    updateProgress(itemView.context)
+                    updateProgress(view.context)
                     delay(1000)
                 }
             }
         }
 
         private fun updateProgress(context: Context) = CoroutineScope(Dispatchers.Main).launch {
-            with(binding.galleryblockCard) {
+            with(view.galleryblock_card) {
                 val imageList = Cache.getInstance(context, galleryID).metadata.imageList
 
                 if (imageList == null) {
@@ -79,7 +81,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                 progress = imageList.count { it != null }
                 max = imageList.size
 
-                this@GalleryViewHolder.binding.galleryblockId.setOnClickListener {
+                view.galleryblock_id.setOnClickListener {
                     (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
                         ClipData.newPlainText("gallery_id", galleryID.toString())
                     )
@@ -100,175 +102,177 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
 
         fun bind(galleryID: Int) {
             this.galleryID = galleryID
-            updateProgress(itemView.context)
+            updateProgress(view.context)
 
-            val cache = Cache.getInstance(itemView.context, galleryID)
+            val cache = Cache.getInstance(view.context, galleryID)
 
             val galleryBlock = runBlocking {
                 cache.getGalleryBlock()
             } ?: return
 
-            val resources = itemView.context.resources
-            val languages = resources.getStringArray(R.array.languages).map {
-                it.split("|").let { split ->
-                    Pair(split[0], split[1])
-                }
-            }.toMap()
+            with(view) {
+                val resources = context.resources
+                val languages = resources.getStringArray(R.array.languages).map {
+                    it.split("|").let { split ->
+                        Pair(split[0], split[1])
+                    }
+                }.toMap()
 
-            val artists = galleryBlock.artists
-            val series = galleryBlock.series
+                val artists = galleryBlock.artists
+                val series = galleryBlock.series
 
-            binding.galleryblockThumbnail.apply {
-                setOnClickListener {
-                    itemView.performClick()
+                galleryblock_thumbnail.apply {
+                    setOnClickListener {
+                        view.performClick()
+                    }
+                    setOnLongClickListener {
+                        view.performLongClick()
+                    }
+                    setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
+                    setImageLoaderCallback(object: ImageLoader.Callback {
+                        override fun onFail(error: Exception?) {
+                            Cache.getInstance(context, galleryID).let { cache ->
+                                cache.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
+                                cache.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
+                            }
+                        }
+
+                        override fun onCacheHit(imageType: Int, image: File?) {}
+                        override fun onCacheMiss(imageType: Int, image: File?) {}
+                        override fun onFinish() {}
+                        override fun onProgress(progress: Int) {}
+                        override fun onStart() {}
+                        override fun onSuccess(image: File?) {}
+                    })
+                    ssiv?.recycle()
+                    CoroutineScope(Dispatchers.IO).launch {
+                        cache.getThumbnail().let { launch(Dispatchers.Main) {
+                            showImage(it)
+                        } }
+                    }
                 }
-                setOnLongClickListener {
-                    itemView.performLongClick()
+
+                galleryblock_title.text = galleryBlock.title
+                with(galleryblock_artist) {
+                    text = artists.joinToString { it.wordCapitalize() }
+                    visibility = when {
+                        artists.isNotEmpty() -> View.VISIBLE
+                        else -> View.GONE
+                    }
+
+                    CoroutineScope(Dispatchers.IO).launch {
+                        val gallery = runCatching {
+                            getGallery(galleryID)
+                        }.getOrNull()
+
+                        if (gallery?.groups?.isNotEmpty() != true)
+                            return@launch
+
+                        launch(Dispatchers.Main) {
+                            text = context.getString(
+                                R.string.galleryblock_artist_with_group,
+                                artists.joinToString { it.wordCapitalize() },
+                                gallery.groups.joinToString { it.wordCapitalize() }
+                            )
+                        }
+                    }
                 }
-                setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
-                setImageLoaderCallback(object: ImageLoader.Callback {
-                    override fun onFail(error: Exception?) {
-                        Cache.getInstance(context, galleryID).let { cache ->
-                            cache.cacheFolder.getChild(".thumbnail").let { if (it.exists()) it.delete() }
-                            cache.downloadFolder?.getChild(".thumbnail")?.let { if (it.exists()) it.delete() }
+                with(galleryblock_series) {
+                    text =
+                        resources.getString(
+                            R.string.galleryblock_series,
+                            series.joinToString(", ") { it.wordCapitalize() })
+                    visibility = when {
+                        series.isNotEmpty() -> View.VISIBLE
+                        else -> View.GONE
+                    }
+                }
+                galleryblock_type.text = resources.getString(R.string.galleryblock_type, galleryBlock.type).wordCapitalize()
+                with(galleryblock_language) {
+                    text =
+                        resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
+                    visibility = when {
+                        galleryBlock.language.isNotEmpty() -> View.VISIBLE
+                        else -> View.GONE
+                    }
+                }
+
+                with(galleryblock_tag_group) {
+                    onClickListener = {
+                        onChipClickedHandler.forEach { callback ->
+                            callback.invoke(it)
                         }
                     }
 
-                    override fun onCacheHit(imageType: Int, image: File?) {}
-                    override fun onCacheMiss(imageType: Int, image: File?) {}
-                    override fun onFinish() {}
-                    override fun onProgress(progress: Int) {}
-                    override fun onStart() {}
-                    override fun onSuccess(image: File?) {}
-                })
-                ssiv?.recycle()
-                CoroutineScope(Dispatchers.IO).launch {
-                    cache.getThumbnail().let { launch(Dispatchers.Main) {
-                        showImage(it)
-                    } }
-                }
-            }
+                    tags.clear()
 
-            binding.galleryblockTitle.text = galleryBlock.title
-            with(binding.galleryblockArtist) {
-                text = artists.joinToString { it.wordCapitalize() }
-                visibility = when {
-                    artists.isNotEmpty() -> View.VISIBLE
-                    else -> View.GONE
-                }
+                    CoroutineScope(Dispatchers.IO).launch {
+                        tags.addAll(
+                            galleryBlock.relatedTags.sortedBy {
+                                val tag = Tag.parse(it)
 
-                CoroutineScope(Dispatchers.IO).launch {
-                    val gallery = runCatching {
-                        getGallery(galleryID)
-                    }.getOrNull()
-
-                    if (gallery?.groups?.isNotEmpty() != true)
-                        return@launch
-
-                    launch(Dispatchers.Main) {
-                        text = context.getString(
-                            R.string.galleryblock_artist_with_group,
-                            artists.joinToString { it.wordCapitalize() },
-                            gallery.groups.joinToString { it.wordCapitalize() }
-                        )
-                    }
-                }
-            }
-            with(binding.galleryblockSeries) {
-                text =
-                    resources.getString(
-                        R.string.galleryblock_series,
-                        series.joinToString(", ") { it.wordCapitalize() })
-                visibility = when {
-                    series.isNotEmpty() -> View.VISIBLE
-                    else -> View.GONE
-                }
-            }
-            binding.galleryblockType.text = resources.getString(R.string.galleryblock_type, galleryBlock.type).wordCapitalize()
-            with(binding.galleryblockLanguage) {
-                text =
-                    resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
-                visibility = when {
-                    galleryBlock.language.isNotEmpty() -> View.VISIBLE
-                    else -> View.GONE
-                }
-            }
-
-            with(binding.galleryblockTagGroup) {
-                onClickListener = {
-                    onChipClickedHandler.forEach { callback ->
-                        callback.invoke(it)
-                    }
-                }
-
-                tags.clear()
-
-                CoroutineScope(Dispatchers.IO).launch {
-                    tags.addAll(
-                        galleryBlock.relatedTags.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)
-                        }
-                    )
-
-                    launch(Dispatchers.Main) {
-                        refresh()
-                    }
-                }
-            }
-
-            binding.galleryblockId.text = galleryBlock.id.toString()
-            binding.galleryblockPagecount.text = "-"
-            CoroutineScope(Dispatchers.IO).launch {
-                val pageCount = kotlin.runCatching {
-                    getReader(galleryBlock.id).galleryInfo.files.size
-                }.getOrNull() ?: return@launch
-                withContext(Dispatchers.Main) {
-                    binding.galleryblockPagecount.text = itemView.context.getString(R.string.galleryblock_pagecount, pageCount)
-                }
-            }
-
-            with(binding.galleryblockFavorite) {
-                setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
-                setOnClickListener {
-                    when {
-                        favorites.contains(galleryBlock.id) -> {
-                            favorites.remove(galleryBlock.id)
-
-                            setImageResource(R.drawable.ic_star_empty)
-                        }
-                        else -> {
-                            favorites.add(galleryBlock.id)
-
-                            setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
-                                this ?: return@apply
-
-                                registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
-                                    override fun onAnimationEnd(drawable: Drawable?) {
-                                        setImageResource(R.drawable.ic_star_filled)
+                                if (favoriteTags.contains(tag))
+                                    -1
+                                else
+                                    when(Tag.parse(it).area) {
+                                        "female" -> 0
+                                        "male" -> 1
+                                        else -> 2
                                     }
-                                })
-                                start()
-                            })
+                            }.map {
+                                Tag.parse(it)
+                            }
+                        )
+
+                        launch(Dispatchers.Main) {
+                            refresh()
+                        }
+                    }
+                }
+
+                galleryblock_id.text = galleryBlock.id.toString()
+                galleryblock_pagecount.text = "-"
+                CoroutineScope(Dispatchers.IO).launch {
+                    val pageCount = kotlin.runCatching {
+                        getReader(galleryBlock.id).galleryInfo.files.size
+                    }.getOrNull() ?: return@launch
+                    withContext(Dispatchers.Main) {
+                        galleryblock_pagecount.text = context.getString(R.string.galleryblock_pagecount, pageCount)
+                    }
+                }
+
+                with(galleryblock_favorite) {
+                    setImageResource(if (favorites.contains(galleryBlock.id)) R.drawable.ic_star_filled else R.drawable.ic_star_empty)
+                    setOnClickListener {
+                        when {
+                            favorites.contains(galleryBlock.id) -> {
+                                favorites.remove(galleryBlock.id)
+
+                                setImageResource(R.drawable.ic_star_empty)
+                            }
+                            else -> {
+                                favorites.add(galleryBlock.id)
+
+                                setImageDrawable(AnimatedVectorDrawableCompat.create(context, R.drawable.avd_star).apply {
+                                    this ?: return@apply
+
+                                    registerAnimationCallback(object: Animatable2Compat.AnimationCallback() {
+                                        override fun onAnimationEnd(drawable: Drawable?) {
+                                            setImageResource(R.drawable.ic_star_filled)
+                                        }
+                                    })
+                                    start()
+                                })
+                            }
                         }
                     }
                 }
-            }
 
 
-            // Make some views invisible to make it thinner
-            if (thin) {
-                binding.galleryblockTagGroup.visibility = View.GONE
+                // Make some views invisible to make it thinner
+                if (thin) {
+                    galleryblock_tag_group.visibility = View.GONE
+                }
             }
         }
     }
@@ -278,7 +282,9 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
     var onDeleteClickedHandler: ((Int) -> Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return GalleryViewHolder(GalleryblockItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+        return GalleryViewHolder(
+            LayoutInflater.from(parent.context).inflate(R.layout.item_galleryblock, parent, false)
+        )
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
@@ -287,25 +293,25 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
 
             holder.bind(galleryID)
 
-            holder.binding.galleryblockCard.binding.download.setOnClickListener {
+            holder.view.galleryblock_card.download.setOnClickListener {
                 onDownloadClickedHandler?.invoke(position)
             }
 
-            holder.binding.galleryblockCard.binding.delete.setOnClickListener {
+            holder.view.galleryblock_card.delete.setOnClickListener {
                 onDeleteClickedHandler?.invoke(position)
             }
 
-            mItemManger.bindView(holder.binding.root, position)
+            mItemManger.bindView(holder.view, position)
 
-            holder.binding.galleryblockCard.binding.swipeLayout.addSwipeListener(object: SwipeLayout.SwipeListener {
+            holder.view.galleryblock_card.swipe_layout.addSwipeListener(object: SwipeLayout.SwipeListener {
                 override fun onStartOpen(layout: SwipeLayout?) {
                     mItemManger.closeAllExcept(layout)
 
-                    holder.binding.galleryblockCard.binding.download.text =
-                        if (DownloadManager.getInstance(holder.binding.root.context).isDownloading(galleryID))
-                            holder.binding.root.context.getString(android.R.string.cancel)
+                    holder.view.galleryblock_card.download.text =
+                        if (DownloadManager.getInstance(holder.view.context).isDownloading(galleryID))
+                            holder.view.context.getString(android.R.string.cancel)
                         else
-                            holder.binding.root.context.getString(R.string.main_download)
+                            holder.view.context.getString(R.string.main_download)
                 }
 
                 override fun onClose(layout: SwipeLayout?) {}

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

@@ -22,29 +22,17 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.MotionEvent
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.item_mirrors.view.*
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.MirrorsItemBinding
 import xyz.quaver.pupil.util.Preferences
 import java.util.*
 
 class MirrorAdapter(context: Context) : RecyclerView.Adapter<MirrorAdapter.ViewHolder>() {
 
-    @SuppressLint("ClickableViewAccessibility")
-    inner class ViewHolder(val binding: MirrorsItemBinding) : RecyclerView.ViewHolder(binding.root) {
-        init {
-            binding.mirrorButton.setOnTouchListener { _, event ->
-                if (event.action == MotionEvent.ACTION_DOWN)
-                    onStartDrag?.invoke(this)
-
-                true
-            }
-        }
-        fun bind(mirror: String) {
-            binding.mirrorName.text = mirror
-        }
-    }
+    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
     val mirrors = context.resources.getStringArray(R.array.mirrors).map {
         it.split('|').let { split ->
@@ -74,11 +62,23 @@ class MirrorAdapter(context: Context) : RecyclerView.Adapter<MirrorAdapter.ViewH
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bind(mirrors[list.elementAt(position)] ?: error(""))
+        with(holder.view) {
+            mirror_name.text = mirrors[list.elementAt(position)]
+            mirror_button.setOnTouchListener { _, event ->
+                if (event.action == MotionEvent.ACTION_DOWN)
+                    onStartDrag?.invoke(holder)
+
+                true
+            }
+        }
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(MirrorsItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+        return LayoutInflater.from(parent.context).inflate(
+            R.layout.item_mirrors, parent, false
+        ).let {
+            ViewHolder(it)
+        }
     }
 
     override fun getItemCount() = mirrors.size

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

@@ -39,10 +39,10 @@ import com.facebook.imagepipeline.image.ImageInfo
 import com.github.piasy.biv.view.BigImageView
 import com.github.piasy.biv.view.ImageShownCallback
 import com.github.piasy.biv.view.ImageViewFactory
+import kotlinx.android.synthetic.main.item_reader.view.*
 import kotlinx.coroutines.*
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.ReaderItemBinding
 import xyz.quaver.pupil.ui.ReaderActivity
 import xyz.quaver.pupil.util.downloader.Cache
 import java.io.File
@@ -52,93 +52,16 @@ class ReaderAdapter(
     private val activity: ReaderActivity,
     private val galleryID: Int
 ) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+
     var reader: Reader? = null
 
     var isFullScreen = false
 
     var onItemClickListener : (() -> (Unit))? = null
 
-    inner class ViewHolder(private val binding: ReaderItemBinding) : RecyclerView.ViewHolder(binding.root) {
-        init {
-            with (binding.image) {
-                setImageViewFactory(FrescoImageViewFactory().apply {
-                    updateView = { imageInfo ->
-                        binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
-                        }
-                    }
-                })
-                setImageShownCallback(object : ImageShownCallback {
-                    override fun onMainImageShown() {
-                        binding.image.mainView.let { v ->
-                            when (v) {
-                                is SubsamplingScaleImageView ->
-                                    if (!isFullScreen) binding.image.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
-                            }
-                        }
-                    }
-
-                    override fun onThumbnailShown() {}
-                })
-
-                setFailureImage(ContextCompat.getDrawable(itemView.context, R.drawable.image_broken_variant))
-                setOnClickListener {
-                    onItemClickListener?.invoke()
-                }
-            }
-
-            binding.root.setOnClickListener {
-                onItemClickListener?.invoke()
-            }
-        }
-
-        fun bind(position: Int) {
-            if (cache == null)
-                cache = Cache.getInstance(itemView.context, galleryID)
-
-            if (!isFullScreen) {
-                binding.root.setBackgroundResource(R.drawable.reader_item_boundary)
-                binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    height = 0
-                    dimensionRatio =
-                        "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
-                }
-            } else {
-                binding.root.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-                binding.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    height = ConstraintLayout.LayoutParams.MATCH_PARENT
-                    dimensionRatio = null
-                }
-                binding.root.background = null
-            }
-
-            binding.readerIndex.text = (position+1).toString()
-
-            val image = cache!!.getImage(position)
-            val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
-
-            if (progress?.isInfinite() == true && image != null) {
-                binding.progressGroup.visibility = View.INVISIBLE
-                binding.image.showImage(image.uri)
-            } else {
-                binding.progressGroup.visibility = View.VISIBLE
-                binding.readerItemProgressbar.progress =
-                    if (progress?.isInfinite() == true)
-                        100
-                    else
-                        progress?.roundToInt() ?: 0
-
-                clear()
-
-                CoroutineScope(Dispatchers.Main).launch {
-                    delay(1000)
-                    notifyItemChanged(position)
-                }
-            }
-        }
-
+    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         fun clear() {
-            binding.image.mainView.let {
+            view.image.mainView.let {
                 when (it) {
                     is SubsamplingScaleImageView ->
                         it.recycle()
@@ -150,12 +73,88 @@ class ReaderAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(ReaderItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+        return LayoutInflater.from(parent.context).inflate(
+            R.layout.item_reader, parent, false
+        ).let {
+            with(it) {
+                image.setImageViewFactory(FrescoImageViewFactory().apply {
+                    updateView = { imageInfo ->
+                        it.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                            dimensionRatio = "${imageInfo.width}:${imageInfo.height}"
+                        }
+                    }
+                })
+                image.setImageShownCallback(object : ImageShownCallback {
+                    override fun onMainImageShown() {
+                        it.image.mainView.let { v ->
+                            when (v) {
+                                is SubsamplingScaleImageView ->
+                                    if (!isFullScreen) it.image.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                            }
+                        }
+                    }
+
+                    override fun onThumbnailShown() {}
+                })
+                image.setFailureImage(ContextCompat.getDrawable(context, R.drawable.image_broken_variant))
+                image.setOnClickListener {
+                    this.performClick()
+                }
+                setOnClickListener {
+                    onItemClickListener?.invoke()
+                }
+            }
+
+            ViewHolder(it)
+        }
     }
 
     private var cache: Cache? = null
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bind(position)
+        holder.view as ConstraintLayout
+
+        if (cache == null)
+            cache = Cache.getInstance(holder.view.context, galleryID)
+
+        if (!isFullScreen) {
+            holder.view.setBackgroundResource(R.drawable.reader_item_boundary)
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = 0
+                dimensionRatio =
+                    "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
+            }
+        } else {
+            holder.view.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            holder.view.image.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                height = ConstraintLayout.LayoutParams.MATCH_PARENT
+                dimensionRatio = null
+            }
+            holder.view.background = null
+        }
+
+        holder.view.reader_index.text = (position+1).toString()
+
+        val image = cache!!.getImage(position)
+        val progress = activity.downloader?.progress?.get(galleryID)?.get(position)
+
+        if (progress?.isInfinite() == true && image != null) {
+            holder.view.progress_group.visibility = View.INVISIBLE
+            holder.view.image.showImage(image.uri)
+        } else {
+            holder.view.progress_group.visibility = View.VISIBLE
+            holder.view.reader_item_progressbar.progress =
+                if (progress?.isInfinite() == true)
+                    100
+                else
+                    progress?.roundToInt() ?: 0
+
+            holder.clear()
+
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(1000)
+                notifyItemChanged(position)
+            }
+        }
     }
 
     override fun getItemCount() = reader?.galleryInfo?.files?.size ?: 0

app/src/main/java/xyz/quaver/pupil/types/Suggestions.kt

@@ -18,8 +18,8 @@
 
 package xyz.quaver.pupil.types
 
-import kotlinx.parcelize.IgnoredOnParcel
-import kotlinx.parcelize.Parcelize
+import kotlinx.android.parcel.IgnoredOnParcel
+import kotlinx.android.parcel.Parcelize
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
 import xyz.quaver.hitomi.Suggestion
 import xyz.quaver.pupil.util.translations

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

@@ -29,8 +29,10 @@ import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import com.andrognito.patternlockview.PatternLockView
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.activity_lock.*
+import kotlinx.android.synthetic.main.fragment_pattern_lock.*
+import kotlinx.android.synthetic.main.fragment_pin_lock.*
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.LockActivityBinding
 import xyz.quaver.pupil.ui.fragment.PINLockFragment
 import xyz.quaver.pupil.ui.fragment.PatternLockFragment
 import xyz.quaver.pupil.util.Lock
@@ -43,8 +45,6 @@ class LockActivity : AppCompatActivity() {
     private lateinit var lockManager: LockManager
     private var mode: String? = null
 
-    private lateinit var binding: LockActivityBinding
-
     private val patternLockFragment = PatternLockFragment().apply {
         var lastPass = ""
         onPatternDrawn = {
@@ -57,7 +57,7 @@ class LockActivity : AppCompatActivity() {
                         setResult(Activity.RESULT_OK)
                         finish()
                     } else
-                        binding.patternLockView.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                        lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
                 }
                 "add_lock" -> {
                     if (lastPass.isEmpty()) {
@@ -69,7 +69,7 @@ class LockActivity : AppCompatActivity() {
                             LockManager(context!!).add(Lock.generate(Lock.Type.PATTERN, it))
                             finish()
                         } else {
-                            binding.patternLockView.setViewMode(PatternLockView.PatternViewMode.WRONG)
+                            lock_pattern_view.setViewMode(PatternLockView.PatternViewMode.WRONG)
                             lastPass = ""
 
                             Snackbar.make(view!!, R.string.settings_lock_wrong_confirm, Snackbar.LENGTH_LONG).show()
@@ -92,15 +92,15 @@ class LockActivity : AppCompatActivity() {
                         setResult(Activity.RESULT_OK)
                         finish()
                     } else {
-                        binding.indicatorDots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                        indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
                             setAnimationListener(object: Animation.AnimationListener {
                                 override fun onAnimationEnd(animation: Animation?) {
-                                    binding.pinLockView.resetPinLockView()
-                                    binding.pinLockView.isEnabled = true
+                                    pin_lock_view.resetPinLockView()
+                                    pin_lock_view.isEnabled = true
                                 }
 
                                 override fun onAnimationStart(animation: Animation?) {
-                                    binding.pinLockView.isEnabled = false
+                                    pin_lock_view.isEnabled = false
                                 }
 
                                 override fun onAnimationRepeat(animation: Animation?) {
@@ -114,22 +114,22 @@ class LockActivity : AppCompatActivity() {
                     if (lastPass.isEmpty()) {
                         lastPass = it
 
-                        binding.pinLockView.resetPinLockView()
+                        pin_lock_view.resetPinLockView()
                         Snackbar.make(view!!, R.string.settings_lock_confirm, Snackbar.LENGTH_LONG).show()
                     } else {
                         if (lastPass == it) {
                             LockManager(context!!).add(Lock.generate(Lock.Type.PIN, it))
                             finish()
                         } else {
-                            binding.indicatorDots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
+                            indicator_dots.startAnimation(AnimationUtils.loadAnimation(context, R.anim.shake).apply {
                                 setAnimationListener(object: Animation.AnimationListener {
                                     override fun onAnimationEnd(animation: Animation?) {
-                                        binding.pinLockView.resetPinLockView()
-                                        binding.pinLockView.isEnabled = true
+                                        pin_lock_view.resetPinLockView()
+                                        pin_lock_view.isEnabled = true
                                     }
 
                                     override fun onAnimationStart(animation: Animation?) {
-                                        binding.pinLockView.isEnabled = false
+                                        pin_lock_view.isEnabled = false
                                     }
 
                                     override fun onAnimationRepeat(animation: Animation?) {
@@ -173,8 +173,7 @@ class LockActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = LockActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.activity_lock)
 
         lockManager = try {
             LockManager(this)
@@ -211,7 +210,7 @@ class LockActivity : AppCompatActivity() {
                     Preferences["lock_fingerprint"]
                     && BiometricManager.from(this).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS
                 ) {
-                    binding.fingerprintBtn.apply {
+                    lock_fingerprint.apply {
                         isEnabled = true
                         setOnClickListener {
                             showBiometricPrompt()
@@ -220,7 +219,7 @@ class LockActivity : AppCompatActivity() {
                     showBiometricPrompt()
                 }
 
-                binding.patternBtn.apply {
+                lock_pattern.apply {
                     isEnabled = lockManager.contains(Lock.Type.PATTERN)
                     setOnClickListener {
                         supportFragmentManager.beginTransaction().replace(
@@ -228,7 +227,7 @@ class LockActivity : AppCompatActivity() {
                         ).commit()
                     }
                 }
-                binding.pinBtn.apply {
+                lock_pin.apply {
                     isEnabled = lockManager.contains(Lock.Type.PIN)
                     setOnClickListener {
                         supportFragmentManager.beginTransaction().replace(
@@ -236,7 +235,7 @@ class LockActivity : AppCompatActivity() {
                         ).commit()
                     }
                 }
-                binding.passwordBtn.isEnabled = false
+                lock_password.isEnabled = false
 
                 when (lockManager.locks!!.first().type) {
                     Lock.Type.PIN -> {
@@ -254,20 +253,20 @@ class LockActivity : AppCompatActivity() {
                 }
             }
             "add_lock" -> {
-                binding.patternBtn.isEnabled = false
-                binding.pinBtn.isEnabled = false
-                binding.fingerprintBtn.isEnabled = false
-                binding.passwordBtn.isEnabled = false
+                lock_pattern.isEnabled = false
+                lock_pin.isEnabled = false
+                lock_fingerprint.isEnabled = false
+                lock_password.isEnabled = false
 
                 when(intent.getStringExtra("type")!!) {
                     "pattern" -> {
-                        binding.patternBtn.isEnabled = true
+                        lock_pattern.isEnabled = true
                         supportFragmentManager.beginTransaction().add(
                             R.id.lock_content, patternLockFragment
                         ).commit()
                     }
                     "pin" -> {
-                        binding.pinBtn.isEnabled = true
+                        lock_pin.isEnabled = true
                         supportFragmentManager.beginTransaction().add(
                             R.id.lock_content, pinLockFragment
                         ).commit()

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

@@ -21,7 +21,6 @@ package xyz.quaver.pupil.ui
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.text.util.Linkify
@@ -32,14 +31,16 @@ import android.view.animation.DecelerateInterpolator
 import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.cardview.widget.CardView
-import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.activity_main_content.*
 import kotlinx.coroutines.*
 import xyz.quaver.floatingsearchview.FloatingSearchView
 import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
@@ -50,7 +51,6 @@ import xyz.quaver.hitomi.getGalleryIDsFromNozomi
 import xyz.quaver.hitomi.getSuggestionsForQuery
 import xyz.quaver.pupil.*
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
-import xyz.quaver.pupil.databinding.MainActivityBinding
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.types.*
 import xyz.quaver.pupil.ui.dialog.DownloadLocationDialogFragment
@@ -103,20 +103,18 @@ class MainActivity :
     private var loadingJob: Job? = null
     private var currentPage = 0
 
-    private lateinit var binding: MainActivityBinding
-
     override fun onCreate(savedInstanceState: Bundle?) {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         super.onCreate(savedInstanceState)
-        binding = MainActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.activity_main)
 
         if (intent.action == Intent.ACTION_VIEW) {
             intent.dataString?.let { url ->
                 restore(url,
                     onFailure = {
-                        Snackbar.make(binding.contents.recyclerview, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(this.main_recyclerview, R.string.settings_backup_failed, Snackbar.LENGTH_LONG).show()
                     }, onSuccess = {
-                        Snackbar.make(binding.contents.recyclerview, getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(this.main_recyclerview, getString(R.string.settings_restore_success, it.size), Snackbar.LENGTH_LONG).show()
                     }
                 )
             }
@@ -127,28 +125,13 @@ class MainActivity :
 
         checkUpdate(this)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
-            !Preferences["download_folder_ignore_warning", false] &&
-            ContextCompat.getExternalFilesDirs(this, null).map { Uri.fromFile(it).toString() }
-                .contains(Preferences["download_folder", ""])
-        ) {
-            AlertDialog.Builder(this)
-                .setTitle(R.string.warning)
-                .setMessage(R.string.unaccessible_download_folder)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
-                }.setNegativeButton(R.string.ignore) { _, _ ->
-                    Preferences["download_folder_ignore_warning"] = true
-                }.show()
-        }
-
         initView()
     }
 
     @OptIn(ExperimentalStdlibApi::class)
     override fun onBackPressed() {
         when {
-            binding.drawer.isDrawerOpen(GravityCompat.START) -> binding.drawer.closeDrawer(GravityCompat.START)
+            main_drawer_layout.isDrawerOpen(GravityCompat.START) -> main_drawer_layout.closeDrawer(GravityCompat.START)
             queryStack.removeLastOrNull() != null && queryStack.isNotEmpty() -> runOnUiThread {
                 query = queryStack.last()
 
@@ -164,7 +147,7 @@ class MainActivity :
     override fun onDestroy() {
         super.onDestroy()
 
-        (binding.contents.recyclerview.adapter as? GalleryBlockAdapter)?.updateAll = false
+        (main_recyclerview?.adapter as? GalleryBlockAdapter)?.updateAll = false
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
@@ -205,36 +188,36 @@ class MainActivity :
     }
 
     private fun initView() {
-        binding.contents.recyclerview.addOnScrollListener(object: RecyclerView.OnScrollListener() {
+        main_recyclerview.addOnScrollListener(object: RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 // -height of the search view < translationY < 0
-                binding.contents.searchview.translationY =
+                main_searchview.translationY =
                     min(
                         max(
-                        binding.contents.searchview.translationY - dy,
-                        -binding.contents.searchview.findViewById<CardView>(R.id.search_query_section).height.toFloat()
+                        main_searchview.translationY - dy,
+                        -main_searchview.findViewById<CardView>(R.id.search_query_section).height.toFloat()
                     ), 0F)
 
                 if (dy > 0)
-                    binding.contents.fab.hideMenuButton(true)
+                    main_fab.hideMenuButton(true)
                 else if (dy < 0)
-                    binding.contents.fab.showMenuButton(true)
+                    main_fab.showMenuButton(true)
             }
         })
 
-        Linkify.addLinks(binding.contents.noresult, Pattern.compile(getString(R.string.https_text)), null, null, { _, _ -> getString(R.string.https) })
+        Linkify.addLinks(main_noresult, Pattern.compile(getString(R.string.https_text)), null, null, { _, _ -> getString(R.string.https) })
 
         //NavigationView
-        binding.navView.setNavigationItemSelectedListener(this)
+        main_nav_view.setNavigationItemSelectedListener(this)
 
-        with(binding.contents.cancelFab) {
+        with(main_fab_cancel) {
             setImageResource(R.drawable.cancel)
             setOnClickListener {
                 DownloadService.cancel(this@MainActivity)
             }
         }
 
-        with(binding.contents.jumpFab) {
+        with(main_fab_jump) {
             setImageResource(R.drawable.ic_jump)
             setOnClickListener {
                 val perPage = Preferences["per_page", "25"].toInt()
@@ -262,7 +245,7 @@ class MainActivity :
             }
         }
 
-        with(binding.contents.randomFab) {
+        with(main_fab_random) {
             setImageResource(R.drawable.shuffle_variant)
             setOnClickListener {
                 runBlocking {
@@ -292,7 +275,7 @@ class MainActivity :
             }
         }
 
-        with(binding.contents.idFab) {
+        with(main_fab_id) {
             setImageResource(R.drawable.numeric)
             setOnClickListener {
                 val editText = EditText(context).apply {
@@ -325,7 +308,7 @@ class MainActivity :
             }
         }
 
-        with(binding.contents.view) {
+        with(main_view) {
             setOnPageTurnListener(object: MainView.OnPageTurnListener {
                 override fun onPrev(page: Int) {
                     currentPage--
@@ -333,7 +316,7 @@ class MainActivity :
                     // disable pageturn until the contents are loaded
                     setCurrentPage(1, false)
 
-                    ViewCompat.animate(binding.contents.searchview)
+                    ViewCompat.animate(main_searchview)
                         .setDuration(100)
                         .setInterpolator(DecelerateInterpolator())
                         .translationY(0F)
@@ -350,7 +333,7 @@ class MainActivity :
                     // disable pageturn until the contents are loaded
                     setCurrentPage(1, false)
 
-                    ViewCompat.animate(binding.contents.searchview)
+                    ViewCompat.animate(main_searchview)
                         .setDuration(100)
                         .setInterpolator(DecelerateInterpolator())
                         .translationY(0F)
@@ -371,7 +354,7 @@ class MainActivity :
 
     @SuppressLint("ClickableViewAccessibility")
     private fun setupRecyclerView() {
-        with(binding.contents.recyclerview) {
+        with(main_recyclerview) {
             adapter = GalleryBlockAdapter(galleries).apply {
                 onChipClickedHandler.add {
                     runOnUiThread {
@@ -471,10 +454,10 @@ class MainActivity :
 
     private var suggestionJob : Job? = null
     private fun setupSearchBar() {
-        with(binding.contents.searchview) {
+        with(main_searchview as xyz.quaver.pupil.ui.view.FloatingSearchView) {
             onMenuStatusChangeListener = object: FloatingSearchView.OnMenuStatusChangeListener {
                 override fun onMenuOpened() {
-                    (binding.contents.recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
+                    (this@MainActivity.main_recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
                 }
 
                 override fun onMenuClosed() {
@@ -558,7 +541,7 @@ class MainActivity :
                 }
             }
 
-            attachNavigationDrawerToMenuButton(binding.drawer)
+            attachNavigationDrawerToMenuButton(main_drawer_layout)
         }
     }
 
@@ -569,7 +552,7 @@ class MainActivity :
                 val thin = !item.isChecked
 
                 item.isChecked = thin
-                binding.contents.recyclerview.apply {
+                main_recyclerview.apply {
                     (adapter as GalleryBlockAdapter).apply {
                         this.thin = thin
 
@@ -610,7 +593,7 @@ class MainActivity :
 
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
         runOnUiThread {
-            binding.drawer.closeDrawers()
+            main_drawer_layout.closeDrawers()
 
             when(item.itemId) {
                 R.id.main_drawer_home -> {
@@ -682,14 +665,14 @@ class MainActivity :
     private fun clearGalleries() = CoroutineScope(Dispatchers.Main).launch {
         galleries.clear()
 
-        with(binding.contents.recyclerview.adapter as GalleryBlockAdapter?) {
+        with(main_recyclerview.adapter as GalleryBlockAdapter?) {
             this ?: return@with
 
             this.notifyDataSetChanged()
         }
 
-        binding.contents.noresult.visibility = View.INVISIBLE
-        binding.contents.progressbar.show()
+        main_noresult.visibility = View.INVISIBLE
+        main_progressbar.show()
     }
 
     private fun fetchGalleries(query: String, sortMode: SortMode) {
@@ -704,7 +687,7 @@ class MainActivity :
         }
 
         if (query.isNotEmpty() && mode != Mode.SEARCH) {
-            Snackbar.make(binding.contents.recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT).apply {
+            Snackbar.make(this@MainActivity.main_recyclerview, R.string.search_all, Snackbar.LENGTH_SHORT).apply {
                 setAction(android.R.string.ok) {
                     cancelFetch()
                     clearGalleries()
@@ -801,15 +784,15 @@ class MainActivity :
                     FirebaseCrashlytics.getInstance().recordException(e)
 
                 withContext(Dispatchers.Main) {
-                    binding.contents.noresult.visibility = View.VISIBLE
-                    binding.contents.progressbar.hide()
+                    main_noresult.visibility = View.VISIBLE
+                    main_progressbar.hide()
                 }
 
                 return@launch
             }
 
             launch(Dispatchers.Main) {
-                binding.contents.view.setCurrentPage(currentPage + 1, galleryIDs.size > (currentPage+1)*perPage)
+                main_view.setCurrentPage(currentPage + 1, galleryIDs.size > (currentPage+1)*perPage)
             }
 
             galleryIDs.slice(currentPage*perPage until min(currentPage*perPage+perPage, galleryIDs.size)).chunked(5).let { chunks ->
@@ -823,10 +806,10 @@ class MainActivity :
                     }.forEach {
                         it.await()?.also {
                             withContext(Dispatchers.Main) {
-                                binding.contents.progressbar.hide()
+                                main_progressbar.hide()
 
                                 galleries.add(it)
-                                binding.contents.recyclerview.adapter!!.notifyItemInserted(galleries.size - 1)
+                                main_recyclerview.adapter!!.notifyItemInserted(galleries.size - 1)
                             }
                         }
                     }

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

@@ -45,6 +45,10 @@ import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.mlkit.vision.face.Face
 import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
+import kotlinx.android.synthetic.main.activity_reader.*
+import kotlinx.android.synthetic.main.activity_reader.view.*
+import kotlinx.android.synthetic.main.dialog_numberpicker.view.*
+import kotlinx.android.synthetic.main.reader_eye_card.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -52,8 +56,6 @@ import kotlinx.coroutines.launch
 import xyz.quaver.Code
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
-import xyz.quaver.pupil.databinding.NumberpickerDialogBinding
-import xyz.quaver.pupil.databinding.ReaderActivityBinding
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.services.DownloadService
 import xyz.quaver.pupil.util.Preferences
@@ -73,7 +75,7 @@ class ReaderActivity : BaseActivity() {
     set(value) {
         field = value
 
-        (binding.recyclerview.adapter as ReaderAdapter).isFullScreen = value
+        (reader_recyclerview.adapter as ReaderAdapter).isFullScreen = value
     }
 
     private lateinit var cache: Cache
@@ -116,12 +118,9 @@ class ReaderActivity : BaseActivity() {
     private var eyeType: Eye? = null
     private var eyeTime: Long = 0L
 
-    private lateinit var binding: ReaderActivityBinding
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ReaderActivityBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.activity_reader)
 
         title = getString(R.string.reader_loading)
         supportActionBar?.setDisplayHomeAsUpEnabled(false)
@@ -179,19 +178,17 @@ class ReaderActivity : BaseActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when(item.itemId) {
             R.id.reader_menu_page_indicator -> {
-                // TODO: Switch to DialogFragment
-                val binding = NumberpickerDialogBinding.inflate(layoutInflater, binding.root, false)
-
-                with(binding.numberPicker) {
+                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, reader_layout, false)
+                with(view.dialog_number_picker) {
                     minValue = 1
                     maxValue = cache.metadata.reader?.galleryInfo?.files?.size ?: 0
                     value = currentPage
                 }
                 val dialog = AlertDialog.Builder(this).apply {
-                    setView(binding.root)
+                    setView(view)
                 }.create()
-                binding.okButton.setOnClickListener {
-                    (this@ReaderActivity.binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(binding.numberPicker.value-1, 0)
+                view.dialog_ok.setOnClickListener {
+                    (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(view.dialog_number_picker.value-1, 0)
                     dialog.dismiss()
                 }
 
@@ -261,12 +258,12 @@ class ReaderActivity : BaseActivity() {
         //currentPage is 1-based
         return when(keyCode) {
             KeyEvent.KEYCODE_VOLUME_UP -> {
-                (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-2, 0)
+                (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-2, 0)
 
                 true
             }
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                (binding.recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)
+                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage, 0)
 
                 true
             }
@@ -288,21 +285,21 @@ class ReaderActivity : BaseActivity() {
                 if (downloader.progress[galleryID]?.isEmpty() == true) {      //Gallery not found
                     update = false
                     Snackbar
-                        .make(binding.root, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
+                        .make(reader_layout, R.string.reader_failed_to_find_gallery, Snackbar.LENGTH_INDEFINITE)
                         .show()
 
                     return@launch
                 }
 
-                binding.downloadProgressbar.max = binding.recyclerview.adapter?.itemCount ?: 0
-                binding.downloadProgressbar.progress =
+                reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
+                reader_download_progressbar.progress =
                     downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0
 
                 if (title == getString(R.string.reader_loading)) {
                     val reader = cache.metadata.reader
 
                     if (reader != null) {
-                        with(binding.recyclerview.adapter as ReaderAdapter) {
+                        with(reader_recyclerview.adapter as ReaderAdapter) {
                             this.reader = reader
                             notifyDataSetChanged()
                         }
@@ -323,7 +320,7 @@ class ReaderActivity : BaseActivity() {
                 }
 
                 if (downloader.isCompleted(galleryID)) {   //Download finished
-                    binding.downloadProgressbar.visibility = View.GONE
+                    reader_download_progressbar.visibility = View.GONE
 
                     animateDownloadFAB(false)
                 }
@@ -332,7 +329,7 @@ class ReaderActivity : BaseActivity() {
     }
 
     private fun initView() {
-        with(binding.recyclerview) {
+        with(reader_recyclerview) {
             adapter = ReaderAdapter(this@ReaderActivity, galleryID).apply {
                 onItemClickListener = {
                     if (isScroll) {
@@ -342,7 +339,7 @@ class ReaderActivity : BaseActivity() {
                         scrollMode(false)
                         fullscreen(true)
                     } else {
-                        (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage, 0) //Moves to next page because currentPage is 1-based indexing
+                        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage, 0) //Moves to next page because currentPage is 1-based indexing
                     }
                 }
             }
@@ -352,9 +349,9 @@ class ReaderActivity : BaseActivity() {
                     super.onScrolled(recyclerView, dx, dy)
 
                     if (dy < 0)
-                        binding.fab.showMenuButton(true)
+                        this@ReaderActivity.reader_fab.showMenuButton(true)
                     else if (dy > 0)
-                        binding.fab.hideMenuButton(true)
+                        this@ReaderActivity.reader_fab.hideMenuButton(true)
 
                     val layoutManager = recyclerView.layoutManager as LinearLayoutManager
 
@@ -366,7 +363,7 @@ class ReaderActivity : BaseActivity() {
             })
         }
 
-        with(binding.downloadFab) {
+        with(reader_fab_download) {
             animateDownloadFAB(DownloadManager.getInstance(this@ReaderActivity).getDownloadFolder(galleryID) != null) //If download in progress, animate button
 
             setOnClickListener {
@@ -383,14 +380,14 @@ class ReaderActivity : BaseActivity() {
             }
         }
 
-        with(binding.retryFab) {
+        with(reader_fab_retry) {
             setImageResource(R.drawable.refresh)
             setOnClickListener {
                 DownloadService.download(context, galleryID)
             }
         }
 
-        with(binding.autoFab) {
+        with(reader_fab_auto) {
             setImageResource(R.drawable.eye_white)
             setOnClickListener {
                 when {
@@ -410,13 +407,13 @@ class ReaderActivity : BaseActivity() {
             }
         }
 
-        with(binding.fullscreenFab) {
+        with(reader_fab_fullscreen) {
             setImageResource(R.drawable.ic_fullscreen)
             setOnClickListener {
                 isFullscreen = true
                 fullscreen(isFullscreen)
 
-                binding.fab.close(true)
+                this@ReaderActivity.reader_fab.close(true)
             }
         }
     }
@@ -426,8 +423,8 @@ class ReaderActivity : BaseActivity() {
             if (isFullscreen) {
                 flags = flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
                 supportActionBar?.hide()
-                binding.fab.visibility = View.INVISIBLE
-                binding.scroller.let {
+                this@ReaderActivity.reader_fab.visibility = View.INVISIBLE
+                this@ReaderActivity.scroller.let {
                     it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_height)
                     it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_width)
                     it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb_horizontal)
@@ -436,8 +433,8 @@ class ReaderActivity : BaseActivity() {
             } else {
                 flags = flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
                 supportActionBar?.show()
-                binding.fab.visibility = View.VISIBLE
-                binding.scroller.let {
+                this@ReaderActivity.reader_fab.visibility = View.VISIBLE
+                this@ReaderActivity.scroller.let {
                     it.handleWidth = resources.getDimensionPixelSize(R.dimen.thumb_width)
                     it.handleHeight = resources.getDimensionPixelSize(R.dimen.thumb_height)
                     it.handleDrawable = ContextCompat.getDrawable(this@ReaderActivity, R.drawable.thumb)
@@ -448,27 +445,27 @@ class ReaderActivity : BaseActivity() {
             window.attributes = this
         }
 
-        binding.recyclerview.adapter = binding.recyclerview.adapter   // Force to redraw
+        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
     }
 
     private fun scrollMode(isScroll: Boolean) {
         if (isScroll) {
             snapHelper.attachToRecyclerView(null)
-            binding.recyclerview.layoutManager = LinearLayoutManager(this)
+            reader_recyclerview.layoutManager = LinearLayoutManager(this)
         } else {
-            snapHelper.attachToRecyclerView(binding.recyclerview)
-            binding.recyclerview.layoutManager = object: LinearLayoutManager(this, HORIZONTAL, Preferences["rtl", false]) {
+            snapHelper.attachToRecyclerView(reader_recyclerview)
+            reader_recyclerview.layoutManager = object: LinearLayoutManager(this, HORIZONTAL, Preferences["rtl", false]) {
                 override fun calculateExtraLayoutSpace(state: RecyclerView.State, extraLayoutSpace: IntArray) {
                     extraLayoutSpace.fill(600)
                 }
             }
         }
 
-        (binding.recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
+        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)
     }
 
     private fun animateDownloadFAB(animate: Boolean) {
-        with(binding.downloadFab) {
+        with(reader_fab_download) {
             if (animate) {
                 val icon = AnimatedVectorDrawableCompat.create(context, R.drawable.ic_downloading)
 
@@ -497,7 +494,7 @@ class ReaderActivity : BaseActivity() {
     }
 
     val cameraCallback: (List<Face>) -> Unit = callback@{ faces ->
-        binding.eyeCard.dot.let {
+        eye_card.dot.let {
             it.visibility = View.VISIBLE
             CoroutineScope(Dispatchers.Main).launch {
                 delay(50)
@@ -507,9 +504,9 @@ class ReaderActivity : BaseActivity() {
 
         if (faces.size != 1)
             ContextCompat.getDrawable(this, R.drawable.eye_off).let {
-                with(binding.eyeCard) {
-                    leftEye.setImageDrawable(it)
-                    rightEye.setImageDrawable(it)
+                with(eye_card) {
+                    left_eye.setImageDrawable(it)
+                    right_eye.setImageDrawable(it)
                 }
 
                 return@callback
@@ -520,16 +517,16 @@ class ReaderActivity : BaseActivity() {
             faces[0].leftEyeOpenProbability?.let { it > 0.4 } == true
         )
 
-        with(binding.eyeCard) {
-            leftEye.setImageDrawable(
+        with(eye_card) {
+            left_eye.setImageDrawable(
                 ContextCompat.getDrawable(
-                    leftEye.context,
+                    context,
                     if (left) R.drawable.eye else R.drawable.eye_closed
                 )
             )
-            rightEye.setImageDrawable(
+            right_eye.setImageDrawable(
                 ContextCompat.getDrawable(
-                    rightEye.context,
+                    context,
                     if (right) R.drawable.eye else R.drawable.eye_closed
                 )
             )
@@ -556,7 +553,7 @@ class ReaderActivity : BaseActivity() {
         }
 
         if (eyeType != null && System.currentTimeMillis() - eyeTime > 100) {
-            (binding.recyclerview.layoutManager as LinearLayoutManager).let {
+            (this@ReaderActivity.reader_recyclerview.layoutManager as LinearLayoutManager).let {
                 it.scrollToPositionWithOffset(when(eyeType!!) {
                     Eye.RIGHT -> {
                         if (it.reverseLayout) currentPage - 2 else currentPage
@@ -572,11 +569,11 @@ class ReaderActivity : BaseActivity() {
     }
 
     private fun toggleCamera() {
-        val eyes = binding.eyeCard.root
+        val eyes = this@ReaderActivity.eye_card
         when (camera) {
             null -> {
-                binding.autoFab.labelText = getString(R.string.reader_fab_auto_cancel)
-                binding.autoFab.setImageResource(R.drawable.eye_off_white)
+                reader_fab_auto.labelText = getString(R.string.reader_fab_auto_cancel)
+                reader_fab_auto.setImageResource(R.drawable.eye_off_white)
                 eyes.apply {
                     visibility = View.VISIBLE
                     TranslateAnimation(0F, 0F, -100F, 0F).apply {
@@ -589,8 +586,8 @@ class ReaderActivity : BaseActivity() {
                 cameraEnabled = true
             }
             else -> {
-                binding.autoFab.labelText = getString(R.string.reader_fab_auto)
-                binding.autoFab.setImageResource(R.drawable.eye_white)
+                reader_fab_auto.labelText = getString(R.string.reader_fab_auto)
+                reader_fab_auto.setImageResource(R.drawable.eye_white)
                 eyes.apply {
                     TranslateAnimation(0F, 0F, 0F, -100F).apply {
                         duration = 500

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

@@ -18,30 +18,30 @@
 
 package xyz.quaver.pupil.ui.dialog
 
+import android.annotation.SuppressLint
 import android.app.Dialog
+import android.content.Context
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
 import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
+import kotlinx.android.synthetic.main.dialog_default_query.*
+import kotlinx.android.synthetic.main.dialog_default_query.view.*
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.DefaultQueryDialogBinding
 import xyz.quaver.pupil.types.Tags
 import xyz.quaver.pupil.util.Preferences
 
-class DefaultQueryDialog : DialogFragment() {
+class DefaultQueryDialog(context : Context) : AlertDialog(context) {
 
-    private val languages: Map<String, String> by lazy {
-        requireContext().resources.getStringArray(R.array.languages).map {
-            it.split("|").let { split ->
-                Pair(split[0], split[1])
-            }
-        }.toMap()
-    }
-    private val reverseLanguages: Map<String, String> by lazy {
-        languages.entries.associate { (k, v) -> v to k }
-    }
+    private val languages = context.resources.getStringArray(R.array.languages).map {
+        it.split("|").let { split ->
+            Pair(split[0], split[1])
+        }
+    }.toMap()
+    private val reverseLanguages = languages.entries.associate { (k, v) -> v to k }
 
     private val excludeBL = "-male:yaoi"
     private val excludeGuro = listOf("-female:guro", "-male:guro")
@@ -49,15 +49,46 @@ class DefaultQueryDialog : DialogFragment() {
 
     var onPositiveButtonClickListener : ((Tags) -> (Unit))? = null
 
-    private var _binding: DefaultQueryDialogBinding? = null
-    private val binding get() = _binding!!
+    @SuppressLint("InflateParams")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTitle(R.string.default_query_dialog_title)
+        setView(build())
+        setButton(Dialog.BUTTON_POSITIVE, context.getString(android.R.string.ok)) { _, _ ->
+            val newTags = Tags.parse(default_query_dialog_edittext.text.toString())
 
-    private fun initView() {
+            with(default_query_dialog_language_selector) {
+                if (selectedItemPosition != 0)
+                    newTags.add("language:${reverseLanguages[selectedItem]}")
+            }
+
+            if (default_query_dialog_BL_checkbox.isChecked)
+                newTags.add(excludeBL)
+
+            if (default_query_dialog_guro_checkbox.isChecked)
+                excludeGuro.forEach { tag ->
+                    newTags.add(tag)
+                }
+
+            if (default_query_dialog_loli_checkbox.isChecked)
+                excludeLoli.forEach { tag ->
+                    newTags.add(tag)
+                }
+
+            onPositiveButtonClickListener?.invoke(newTags)
+        }
+
+        super.onCreate(savedInstanceState)
+    }
+
+    @SuppressLint("InflateParams")
+    private fun build() : View {
         val tags = Tags.parse(
             Preferences["default_query"]
         )
 
-        with(binding.languageSelector) {
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)
+
+        with(view.default_query_dialog_language_selector) {
             adapter =
                 ArrayAdapter(
                     context,
@@ -80,13 +111,13 @@ class DefaultQueryDialog : DialogFragment() {
             }
         }
 
-        with(binding.BLCheckbox) {
+        with(view.default_query_dialog_BL_checkbox) {
             isChecked = tags.contains(excludeBL)
             if (tags.contains(excludeBL))
                 tags.remove(excludeBL)
         }
 
-        with(binding.guroCheckbox) {
+        with(view.default_query_dialog_guro_checkbox) {
             isChecked = excludeGuro.all { tags.contains(it) }
             if (excludeGuro.all { tags.contains(it) })
                 excludeGuro.forEach {
@@ -94,7 +125,7 @@ class DefaultQueryDialog : DialogFragment() {
                 }
         }
 
-        with(binding.loliCheckbox) {
+        with(view.default_query_dialog_loli_checkbox) {
             isChecked = excludeLoli.all { tags.contains(it) }
             if (excludeLoli.all { tags.contains(it) })
                 excludeLoli.forEach {
@@ -102,7 +133,7 @@ class DefaultQueryDialog : DialogFragment() {
                 }
         }
 
-        with(binding.edittext) {
+        with(view.default_query_dialog_edittext) {
             setText(tags.toString(), android.widget.TextView.BufferType.EDITABLE)
             addTextChangedListener(object : TextWatcher {
                 override fun beforeTextChanged(
@@ -127,45 +158,8 @@ class DefaultQueryDialog : DialogFragment() {
                 }
             })
         }
-    }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DefaultQueryDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return AlertDialog.Builder(requireContext()).apply {
-            setTitle(R.string.default_query_dialog_title)
-            setView(binding.root)
-            setPositiveButton(android.R.string.ok) { _, _ ->
-                val newTags = Tags.parse(binding.edittext.text.toString())
-
-                with(binding.languageSelector) {
-                    if (selectedItemPosition != 0)
-                        newTags.add("language:${reverseLanguages[selectedItem]}")
-                }
-
-                if (binding.BLCheckbox.isChecked)
-                    newTags.add(excludeBL)
-
-                if (binding.guroCheckbox.isChecked)
-                    excludeGuro.forEach { tag ->
-                        newTags.add(tag)
-                    }
-
-                if (binding.loliCheckbox.isChecked)
-                    excludeLoli.forEach { tag ->
-                        newTags.add(tag)
-                    }
-
-                onPositiveButtonClickListener?.invoke(newTags)
-            }
-        }.create()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
+        return view
     }
 
 }

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

@@ -18,15 +18,17 @@
 
 package xyz.quaver.pupil.ui.dialog
 
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.os.Bundle
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.dialog_download_folder_name.view.*
 import kotlinx.coroutines.runBlocking
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.DownloadFolderNameDialogBinding
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.formatDownloadFolder
@@ -35,48 +37,38 @@ import xyz.quaver.pupil.util.formatMap
 
 class DownloadFolderNameDialogFragment : DialogFragment() {
 
-    private var _binding: DownloadFolderNameDialogBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DownloadFolderNameDialogBinding.inflate(layoutInflater)
-
-        initView()
-
-        return Dialog(requireContext()).apply {
-            setContentView(binding.root)
-            window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-
-    private fun initView() {
+    @SuppressLint("InflateParams")
+    private fun build(): View {
         val galleryID = Cache.instances.let { if (it.size == 0) 1199708 else it.keys.elementAt((0 until it.size).random()) }
         val galleryBlock = runBlocking {
             Cache.getInstance(requireContext(), galleryID).getGalleryBlock()
         }
 
-        binding.message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
-        binding.edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
-        binding.edittext.addTextChangedListener {
-            binding.message.text = requireContext().getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
-        }
-        binding.okButton.setOnClickListener {
-            val newValue = binding.edittext.text.toString()
-
-            if ((newValue as? String)?.contains("/") != false) {
-                Snackbar.make(binding.root, R.string.settings_invalid_download_folder_name, Snackbar.LENGTH_SHORT).show()
-                return@setOnClickListener
+        return layoutInflater.inflate(R.layout.dialog_download_folder_name, null).apply {
+            message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolder() ?: "")
+            edittext.setText(Preferences["download_folder_name", "[-id-] -title-"])
+            edittext.addTextChangedListener {
+                message.text = getString(R.string.settings_download_folder_name_message, formatMap.keys.toString(), galleryBlock?.formatDownloadFolderTest(it.toString()) ?: "")
             }
+            ok_button.setOnClickListener {
+                val newValue = edittext.text.toString()
 
-            Preferences["download_folder_name"] = binding.edittext.text.toString()
+                if ((newValue as? String)?.contains("/") != false) {
+                    Snackbar.make(this, R.string.settings_invalid_download_folder_name, Snackbar.LENGTH_SHORT).show()
+                    return@setOnClickListener
+                }
 
-            dismiss()
+                Preferences["download_folder_name"] = edittext.text.toString()
+
+                dismiss()
+            }
         }
     }
 
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
+       Dialog(requireContext()).apply {
+           setContentView(build())
+           window?.attributes?.width = ViewGroup.LayoutParams.MATCH_PARENT
+       }
+
 }

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

@@ -18,24 +18,27 @@
 
 package xyz.quaver.pupil.ui.dialog
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.view.View
+import android.widget.LinearLayout
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.dialog_download_folder_name.view.*
+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.databinding.DownloadLocationDialogBinding
-import xyz.quaver.pupil.databinding.DownloadLocationItemBinding
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.byteToString
 import xyz.quaver.pupil.util.downloader.DownloadManager
@@ -43,25 +46,24 @@ import xyz.quaver.pupil.util.migrate
 import java.io.File
 
 class DownloadLocationDialogFragment : DialogFragment() {
-
-    private var _binding: DownloadLocationDialogBinding? = null
-    private val binding get() = _binding!!
-
-    private val entries = mutableMapOf<File?, DownloadLocationItemBinding>()
+    private val entries = mutableMapOf<File?, View>()
 
     private val requestDownloadFolderLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == Activity.RESULT_OK) {
+            val activity = activity ?: return@registerForActivityResult
             val context = context ?: return@registerForActivityResult
             val dialog = dialog ?: return@registerForActivityResult
 
             it.data?.data?.also { uri ->
-                val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                val takeFlags: Int =
+                    activity.intent.flags and
+                            (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
                     context.contentResolver.takePersistableUriPermission(uri, takeFlags)
 
                 if (kotlin.runCatching { FileX(context, uri).canWrite() }.getOrDefault(false)) {
-                    entries[null]?.locationAvailable?.text = uri.toFile(context)?.canonicalPath
+                    entries[null]?.location_available?.text = uri.toFile(context)?.canonicalPath
                     Preferences["download_folder"] = uri.toString()
                 } else {
                     Snackbar.make(
@@ -73,7 +75,7 @@ class DownloadLocationDialogFragment : DialogFragment() {
                     val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
                     val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
                     entries[key]!!.button.isChecked = true
-                    if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
+                    if (key == null) entries[key]!!.location_available.text = downloadFolder
                 }
             }
         }
@@ -96,44 +98,49 @@ class DownloadLocationDialogFragment : DialogFragment() {
                 val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
                 val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
                 entries[key]!!.button.isChecked = true
-                if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
+                if (key == null) entries[key]!!.location_available.text = downloadFolder
             }
             else {
-                entries[null]?.locationAvailable?.text = directory
+                entries[null]?.location_available?.text = directory
                 Preferences["download_folder"] = File(directory).toURI().toString()
             }
         }
     }
 
-    private fun initView() {
-        val externalFilesDirs = ContextCompat.getExternalFilesDirs(requireContext(), null)
+    @SuppressLint("InflateParams")
+    private fun build() : View? {
+        val context = context ?: return null
+
+        val view = layoutInflater.inflate(R.layout.dialog_download_folder, null) as LinearLayout
+
+        val externalFilesDirs = ContextCompat.getExternalFilesDirs(context, null)
 
         externalFilesDirs.forEachIndexed { index, dir ->
             dir ?: return@forEachIndexed
 
-            DownloadLocationItemBinding.inflate(layoutInflater, binding.root, true).apply {
-                locationType.text = requireContext().getString(when (index) {
+            view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
+                location_type.text = context.getString(when (index) {
                     0 -> R.string.settings_download_folder_internal
                     else -> R.string.settings_download_folder_removable
                 })
-                locationAvailable.text = requireContext().getString(
+                location_available.text = context.getString(
                     R.string.settings_download_folder_available,
                     byteToString(dir.freeSpace)
                 )
-                root.setOnClickListener {
-                    entries.values.forEach { _ ->
-                        button.isChecked = false
+                setOnClickListener {
+                    entries.values.forEach {
+                        it.button.isChecked = false
                     }
                     button.performClick()
                     Preferences["download_folder"] = dir.toUri().toString()
                 }
                 entries[dir] = this
-            }
+            })
         }
 
-        DownloadLocationItemBinding.inflate(layoutInflater, binding.root, true).apply {
-            locationType.text = requireContext().getString(R.string.settings_download_folder_custom)
-            root.setOnClickListener {
+        view.addView(layoutInflater.inflate(R.layout.item_download_folder, view, false).apply {
+            location_type.text = context.getString(R.string.settings_download_folder_custom)
+            setOnClickListener {
                 entries.values.forEach {
                     it.button.isChecked = false
                 }
@@ -159,35 +166,31 @@ class DownloadLocationDialogFragment : DialogFragment() {
                 }
             }
             entries[null] = this
-        }
+        })
 
-        val downloadFolder = DownloadManager.getInstance(requireContext()).downloadFolder.canonicalPath
+        val downloadFolder = DownloadManager.getInstance(context).downloadFolder.canonicalPath
         val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
         entries[key]!!.button.isChecked = true
-        if (key == null) entries[key]!!.locationAvailable.text = downloadFolder
+        if (key == null) entries[key]!!.location_available.text = downloadFolder
+
+        return view
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DownloadLocationDialogBinding.inflate(layoutInflater)
+        val builder = AlertDialog.Builder(requireContext())
 
-        initView()
-
-        return AlertDialog.Builder(requireContext()).apply {
-            setTitle(R.string.settings_download_folder)
-            setView(binding.root)
-            setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
+        builder
+            .setTitle(R.string.settings_download_folder)
+            .setView(build())
+            .setPositiveButton(requireContext().getText(android.R.string.ok)) { _, _ ->
                 if (Preferences["download_folder", ""].isEmpty())
-                    Preferences["download_folder"] = context.getExternalFilesDir(null)?.toUri()?.toString() ?: ""
+                    Preferences["download_folder"] = context?.getExternalFilesDir(null)?.toUri()?.toString() ?: ""
 
                 DownloadManager.getInstance(requireContext()).migrate()
             }
 
-            isCancelable = false
-        }.create()
-    }
+        isCancelable = false
 
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
+        return builder.create()
     }
 }

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

@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout.LayoutParams
@@ -31,6 +32,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.dialog_gallery.*
+import kotlinx.android.synthetic.main.dialog_gallery_details.view.*
+import kotlinx.android.synthetic.main.dialog_gallery_dotindicator.view.*
+import kotlinx.android.synthetic.main.item_gallery_details.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -40,7 +45,6 @@ import xyz.quaver.hitomi.getGallery
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.GalleryBlockAdapter
 import xyz.quaver.pupil.adapters.ThumbnailPageAdapter
-import xyz.quaver.pupil.databinding.*
 import xyz.quaver.pupil.favoriteTags
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.ui.ReaderActivity
@@ -55,12 +59,9 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
 
     val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
 
-    private lateinit var binding: GalleryDialogBinding
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = GalleryDialogBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.dialog_gallery)
 
         window?.attributes.apply {
             this ?: return@apply
@@ -69,7 +70,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
             height = LayoutParams.MATCH_PARENT
         }
 
-        with(binding.fab) {
+        with(gallery_fab) {
             setImageDrawable(ContextCompat.getDrawable(context, R.drawable.arrow_right))
             setOnClickListener {
                 context.startActivity(Intent(context, ReaderActivity::class.java).apply {
@@ -82,12 +83,12 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
             try {
                 val gallery = getGallery(galleryID)
 
-                launch (Dispatchers.Main) {
-                    binding.progressbar.visibility = View.GONE
-                    binding.title.text = gallery.title
-                    binding.artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
+                gallery_cover.post {
+                    gallery_progressbar.visibility = View.GONE
+                    gallery_title.text = gallery.title
+                    gallery_artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
 
-                    with(binding.type) {
+                    with(gallery_type) {
                         text = gallery.type.wordCapitalize()
                         setOnClickListener {
                             gallery.type.let {
@@ -104,14 +105,14 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                         }
                     }
 
-                    binding.cover.showImage(Uri.parse(gallery.cover))
+                    gallery_cover.showImage(Uri.parse(gallery.cover))
 
                     addDetails(gallery)
                     addThumbnails(gallery)
                     addRelated(gallery)
                 }
             } catch (e: Exception) {
-                Snackbar.make(binding.root, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).apply {
+                Snackbar.make(gallery_layout, R.string.unable_to_connect, Snackbar.LENGTH_INDEFINITE).apply {
                     if (Locale.getDefault().language == "ko")
                         setAction(context.getText(R.string.https_text)) {
                             context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.https))))
@@ -122,8 +123,10 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
     }
 
     private fun addDetails(gallery: Gallery) {
-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_details)
+        val inflater = LayoutInflater.from(context)
+
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
+            gallery_details.setText(R.string.gallery_details)
 
             listOf(
                 R.string.gallery_artists,
@@ -160,13 +163,13 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                     }
                 )
             ).filter {
-                    (_, content) -> content.isNotEmpty()
+                (_, content) -> content.isNotEmpty()
             }.forEach { (title, content) ->
-                GalleryDialogTagsBinding.inflate(layoutInflater, contents, true).apply {
-                    type.setText(title)
+                inflater.inflate(R.layout.item_gallery_details, gallery_details_contents, false).apply {
+                    gallery_details_type.setText(title)
 
                     content.forEach { tag ->
-                        tags.addView(
+                        gallery_details_tags.addView(
                             TagChip(context, tag).apply {
                                 setOnClickListener {
                                     onChipClickedHandler.forEach { handler ->
@@ -176,34 +179,42 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                             }
                         )
                     }
+                }.let {
+                    gallery_details_contents.addView(it)
                 }
             }
+        }.let {
+            gallery_contents.addView(it)
         }
     }
 
     private fun addThumbnails(gallery: Gallery) {
-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_thumbnails)
+        val inflater = LayoutInflater.from(context)
+
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
+            gallery_details.setText(R.string.gallery_thumbnails)
 
             val pager = ViewPager2(context).apply {
                 adapter = ThumbnailPageAdapter(gallery.thumbnails)
                 layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
             }
 
-            contents.addView(
+            gallery_details_contents.addView(
                 pager,
                 LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
             )
 
-            // TODO: Change to direct allocation
-            GalleryDialogDotindicatorBinding.inflate(layoutInflater, contents, true).apply {
-                dotindicator.setViewPager2(pager)
-            }
+            LayoutInflater.from(context).inflate(R.layout.dialog_gallery_dotindicator, gallery_details_contents)
+
+            gallery_dotindicator.setViewPager2(pager)
+        }.let {
+            gallery_contents.addView(it)
         }
     }
 
     private fun addRelated(gallery: Gallery) {
-        val galleries = mutableListOf<Int>()
+        val inflater = LayoutInflater.from(context)
+        val galleries = ArrayList<Int>()
 
         val adapter = GalleryBlockAdapter(galleries).apply {
             onChipClickedHandler.add { tag ->
@@ -213,10 +224,10 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
             }
         }
 
-        GalleryDialogDetailsBinding.inflate(layoutInflater, binding.contents, true).apply {
-            type.setText(R.string.gallery_related)
+        inflater.inflate(R.layout.dialog_gallery_details, gallery_contents, false).apply {
+            gallery_details.setText(R.string.gallery_related)
 
-            contents.addView(RecyclerView(context).apply {
+            RecyclerView(context).apply {
                 layoutManager = LinearLayoutManager(context)
                 this.adapter = adapter
 
@@ -236,18 +247,22 @@ class GalleryDialog(context: Context, private val galleryID: Int) : AlertDialog(
                         true
                     }
                 }
-            })
+            }.let {
+                gallery_details_contents.addView(it, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
+            }
+        }.let {
+            gallery_contents.addView(it)
+        }
 
-            CoroutineScope(Dispatchers.IO).launch {
-                gallery.related.forEach { galleryID ->
-                    Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
-                        galleries.add(galleryID)
-                    }
+        CoroutineScope(Dispatchers.IO).launch {
+            gallery.related.forEach { galleryID ->
+                Cache.getInstance(context, galleryID).getGalleryBlock()?.let {
+                    galleries.add(galleryID)
                 }
+            }
 
-                withContext(Dispatchers.Main) {
-                    adapter.notifyDataSetChanged()
-                }
+            withContext(Dispatchers.Main) {
+                adapter.notifyDataSetChanged()
             }
         }
     }

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

@@ -18,19 +18,23 @@
 
 package xyz.quaver.pupil.ui.dialog
 
+import android.annotation.SuppressLint
+import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
+import kotlinx.android.synthetic.main.dialog_proxy.view.*
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.clientBuilder
 import xyz.quaver.pupil.clientHolder
-import xyz.quaver.pupil.databinding.ProxyDialogBinding
 import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.ProxyInfo
 import xyz.quaver.pupil.util.getProxyInfo
@@ -39,35 +43,33 @@ import java.net.Proxy
 
 class ProxyDialog(context: Context) : AlertDialog(context) {
 
-    private lateinit var binding: ProxyDialogBinding
-
     override fun onCreate(savedInstanceState: Bundle?) {
+        setView(build())
+
         super.onCreate(savedInstanceState)
-
-        binding = ProxyDialogBinding.inflate(layoutInflater)
-        setView(binding.root)
-
-        initView()
     }
 
-    private fun initView() {
+    @SuppressLint("InflateParams")
+    private fun build() : View {
         val proxyInfo = getProxyInfo()
 
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_proxy, null)
+
         val enabler = { enable: Boolean ->
-            binding.addr.isEnabled = enable
-            binding.port.isEnabled = enable
-            binding.username.isEnabled = enable
-            binding.password.isEnabled = enable
+            view?.proxy_addr?.isEnabled = enable
+            view?.proxy_port?.isEnabled = enable
+            view?.proxy_username?.isEnabled = enable
+            view?.proxy_password?.isEnabled = enable
 
             if (!enable) {
-                binding.addr.text = null
-                binding.port.text = null
-                binding.username.text = null
-                binding.password.text = null
+                view?.proxy_addr?.text = null
+                view?.proxy_port?.text = null
+                view?.proxy_username?.text = null
+                view?.proxy_password?.text = null
             }
         }
 
-        with(binding.typeSelector) {
+        with(view.proxy_type_selector) {
             adapter = ArrayAdapter(
                 context,
                 android.R.layout.simple_spinner_dropdown_item,
@@ -85,29 +87,29 @@ class ProxyDialog(context: Context) : AlertDialog(context) {
             }
         }
 
-        binding.addr.setText(proxyInfo.host)
-        binding.port.setText(proxyInfo.port?.toString())
-        binding.username.setText(proxyInfo.username)
-        binding.password.setText(proxyInfo.password)
+        view.proxy_addr.setText(proxyInfo.host)
+        view.proxy_port.setText(proxyInfo.port?.toString())
+        view.proxy_username.setText(proxyInfo.username)
+        view.proxy_password.setText(proxyInfo.password)
 
         enabler.invoke(proxyInfo.type != Proxy.Type.DIRECT)
 
-        binding.cancelButton.setOnClickListener {
+        view.proxy_cancel.setOnClickListener {
             dismiss()
         }
 
-        binding.okButton.setOnClickListener {
-            val type = Proxy.Type.values()[binding.typeSelector.selectedItemPosition]
-            val addr = binding.addr.text?.toString()
-            val port = binding.port.text?.toString()?.toIntOrNull()
-            val username = binding.username.text?.toString()
-            val password = binding.password.text?.toString()
+        view.proxy_ok.setOnClickListener {
+            val type = Proxy.Type.values()[view.proxy_type_selector.selectedItemPosition]
+            val addr = view.proxy_addr.text?.toString()
+            val port = view.proxy_port.text?.toString()?.toIntOrNull()
+            val username = view.proxy_username.text?.toString()
+            val password = view.proxy_password.text?.toString()
 
             if (type != Proxy.Type.DIRECT) {
                 if (addr == null || addr.isEmpty())
-                    binding.addr.error = context.getText(R.string.proxy_dialog_error)
+                    view.proxy_addr.error = context.getText(R.string.proxy_dialog_error)
                 if (port == null)
-                    binding.port.error = context.getText(R.string.proxy_dialog_error)
+                    view.proxy_port.error = context.getText(R.string.proxy_dialog_error)
 
                 if (addr == null || addr.isEmpty() || port == null)
                     return@setOnClickListener
@@ -124,6 +126,8 @@ class ProxyDialog(context: Context) : AlertDialog(context) {
 
             dismiss()
         }
+
+        return view
     }
 
 }

app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageStorageFragment.kt

@@ -94,12 +94,7 @@ class ManageStorageFragment : PreferenceFragmentCompat(), Preference.OnPreferenc
                                 }
 
                                 if (dir.exists())
-                                    dir.listFiles()?.forEach {
-                                        when (it) {
-                                            is FileX -> it.deleteRecursively()
-                                            else -> it.deleteRecursively()
-                                        }
-                                    }
+                                    dir.listFiles()?.forEach { (it as? FileX)?.deleteRecursively() }
 
                                 job = launch {
                                     var size = 0L

app/src/main/java/xyz/quaver/pupil/ui/fragment/PINLockFragment.kt

@@ -24,34 +24,30 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.andrognito.pinlockview.PinLockListener
-import xyz.quaver.pupil.databinding.PinLockFragmentBinding
+import kotlinx.android.synthetic.main.fragment_pin_lock.view.*
+import xyz.quaver.pupil.R
 
-class PINLockFragment : Fragment() {
-
-    private var _binding: PinLockFragmentBinding? = null
-    val binding get() = _binding!!
+class PINLockFragment : Fragment(), PinLockListener {
 
     var onPINEntered: ((String) -> Unit)? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = PinLockFragmentBinding.inflate(inflater, container, false)
-
-        binding.pinLockView.attachIndicatorDots(binding.indicatorDots)
-        binding.pinLockView.setPinLockListener(object: PinLockListener {
-            override fun onComplete(p0: String?) {
-                onPINEntered?.invoke(p0 ?: "")
-            }
-
-            override fun onEmpty() {}
-            override fun onPinChange(p0: Int, p1: String?) {}
-        })
-
-        return binding.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_pin_lock, container, false).apply {
+            pin_lock_view.attachIndicatorDots(indicator_dots)
+            pin_lock_view.setPinLockListener(this@PINLockFragment)
+        }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
+    override fun onComplete(pin: String?) {
+        onPINEntered?.invoke(pin!!)
+    }
+
+    override fun onEmpty() {
+
+    }
+
+    override fun onPinChange(pinLength: Int, intermediatePin: String?) {
+
     }
 
 }

app/src/main/java/xyz/quaver/pupil/ui/fragment/PatternLockFragment.kt

@@ -26,36 +26,38 @@ import androidx.fragment.app.Fragment
 import com.andrognito.patternlockview.PatternLockView
 import com.andrognito.patternlockview.listener.PatternLockViewListener
 import com.andrognito.patternlockview.utils.PatternLockUtils
-import xyz.quaver.pupil.databinding.PatternLockFragmentBinding
+import kotlinx.android.synthetic.main.fragment_pattern_lock.*
+import kotlinx.android.synthetic.main.fragment_pattern_lock.view.*
+import xyz.quaver.pupil.R
 
-class PatternLockFragment : Fragment() {
-
-    private var _binding: PatternLockFragmentBinding? = null
-    val binding get() = _binding!!
+class PatternLockFragment : Fragment(), PatternLockViewListener {
 
     var onPatternDrawn: ((String) -> Unit)? = null
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View {
-        _binding = PatternLockFragmentBinding.inflate(inflater, container, false)
-        binding.patternLockView.addPatternLockListener(object: PatternLockViewListener {
-            override fun onComplete(pattern: MutableList<PatternLockView.Dot>?) {
-                val password = PatternLockUtils.patternToMD5(binding.patternLockView, pattern)
-                onPatternDrawn?.invoke(password)
-            }
-
-            override fun onCleared() {}
-            override fun onProgress(progressPattern: MutableList<PatternLockView.Dot>?) {}
-            override fun onStarted() {}
-        })
-        return binding.root
+    ): View? {
+        return inflater.inflate(R.layout.fragment_pattern_lock, container, false).apply {
+            lock_pattern_view.addPatternLockListener(this@PatternLockFragment)
+        }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
+    override fun onCleared() {
+
+    }
+
+    override fun onComplete(pattern: MutableList<PatternLockView.Dot>?) {
+        val password = PatternLockUtils.patternToMD5(lock_pattern_view, pattern)
+        onPatternDrawn?.invoke(password)
+    }
+
+    override fun onProgress(progressPattern: MutableList<PatternLockView.Dot>?) {
+
+    }
+
+    override fun onStarted() {
+
     }
 
 }

app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt

@@ -85,12 +85,12 @@ class SettingsFragment :
                     DownloadLocationDialogFragment().show(parentFragmentManager, "Download Location Dialog")
                 }
                 "default_query" -> {
-                    DefaultQueryDialog().apply {
+                    DefaultQueryDialog(requireContext()).apply {
                         onPositiveButtonClickListener = { newTags ->
                             Preferences["default_query"] = newTags.toString()
                             summary = newTags.toString()
                         }
-                    }.show(parentFragmentManager, "Default Query Dialog")
+                    }.show()
                 }
                 "app_lock" -> {
                     val intent = Intent(requireContext(), LockActivity::class.java).apply {

app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt

@@ -25,7 +25,6 @@ import android.graphics.drawable.Animatable
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.EditorInfo
@@ -111,7 +110,7 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
     ) {
       when(item) {
             is TagSuggestion -> {
-                val tag = "${item.n}:${item.s}"
+                val tag = "${item.n}:${item.s.replace(Regex("\\s"), "_")}"
 
                 leftIcon?.setImageDrawable(
                     ResourcesCompat.getDrawable(

app/src/main/java/xyz/quaver/pupil/ui/view/ProgressCard.kt

@@ -2,14 +2,14 @@ package xyz.quaver.pupil.ui.view
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.cardview.widget.CardView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
+import kotlinx.android.synthetic.main.view_progress_card.view.*
 import xyz.quaver.pupil.R
-import xyz.quaver.pupil.databinding.ProgressCardViewBinding
 
 class ProgressCard @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, defStyle: Int = R.attr.cardViewStyle) : CardView(context, attr, defStyle) {
 
@@ -29,35 +29,35 @@ class ProgressCard @JvmOverloads constructor(context: Context, attr: AttributeSe
                 Type.DOWNLOAD -> R.color.material_green_a700
             }.let {
                 val color = ContextCompat.getColor(context, it)
-                DrawableCompat.setTint(binding.progressbar.progressDrawable, color)
+                DrawableCompat.setTint(progressbar.progressDrawable, color)
             }
         }
 
     var progress: Int
-        get() = binding.progressbar.progress
+        get() = progressbar?.progress ?: 0
         set(value) {
-            binding.progressbar.progress = value
+            progressbar?.progress = value
         }
     var max: Int
-        get() = binding.progressbar.max
+        get() = progressbar?.max ?: 0
         set(value) {
-            binding.progressbar.max = value
+            progressbar?.max = value
 
-            binding.progressbar.visibility =
+            progressbar.visibility =
                 if (value == 0)
                     GONE
                 else
                     VISIBLE
         }
 
-    val binding = ProgressCardViewBinding.inflate(LayoutInflater.from(context), this)
-
     init {
-        binding.content.setOnClickListener {
+        inflate(context, R.layout.view_progress_card, this)
+
+        content.setOnClickListener {
             performClick()
         }
 
-        binding.content.setOnLongClickListener {
+        content.setOnLongClickListener {
             performLongClick()
         }
     }
@@ -66,7 +66,7 @@ class ProgressCard @JvmOverloads constructor(context: Context, attr: AttributeSe
         if (childCount == 0)
             super.addView(child, index, params)
         else
-            binding.content.addView(child, index, params)
+            content.addView(child, index, params)
     }
 
 }

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -137,9 +137,5 @@ operator fun JsonElement.get(index: Int) =
 operator fun JsonElement.get(tag: String) =
     this.jsonObject[tag]
 
-fun JsonElement.getOrNull(tag: String) = kotlin.runCatching {
-    this.jsonObject.getOrDefault(tag, null)
-}.getOrNull()
-
 val JsonElement.content
     get() = this.jsonPrimitive.contentOrNull

app/src/main/java/xyz/quaver/pupil/util/update.kt

@@ -32,6 +32,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.preference.PreferenceManager
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -181,7 +182,7 @@ fun checkUpdate(context: Context, force: Boolean = false) {
                     Preferences["update_download_id"] = it
                 }
             }
-            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore) { _, _ ->
+            setNegativeButton(if (force) android.R.string.cancel else R.string.ignore_update) { _, _ ->
                 if (!force)
                     preferences.edit()
                         .putLong("ignore_update_until", System.currentTimeMillis() + 604800000)
@@ -284,11 +285,11 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
                 folder.getChild(".metadata").readText()?.let { Json.parseToJsonElement(it) }
             }.getOrNull()
 
-            val galleryID = metadata?.getOrNull("reader")?.getOrNull("galleryInfo")?.getOrNull("id")?.content?.toIntOrNull()
+            val galleryID = metadata?.get("reader")?.get("galleryInfo")?.get("id")?.content?.toIntOrNull()
                 ?: folder.name.toIntOrNull() ?: return@forEachIndexed
 
             val galleryBlock: GalleryBlock? = kotlin.runCatching {
-                metadata?.getOrNull("galleryBlock")?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
+                metadata?.get("galleryBlock")?.let { Json.decodeFromJsonElement<GalleryBlock>(it) }
             }.getOrNull() ?: kotlin.runCatching {
                 getGalleryBlock(galleryID)
             }.getOrNull() ?: kotlin.runCatching {
@@ -296,14 +297,14 @@ fun xyz.quaver.pupil.util.downloader.DownloadManager.migrate() {
             }.getOrNull()
 
             val reader: Reader? = kotlin.runCatching {
-                metadata?.getOrNull("reader")?.let { Json.decodeFromJsonElement<Reader>(it) }
+                metadata?.get("reader")?.let { Json.decodeFromJsonElement<Reader>(it) }
             }.getOrNull() ?: kotlin.runCatching {
                 getReader(galleryID)
             }.getOrNull() ?: kotlin.runCatching {
                 xyz.quaver.hiyobi.getReader(galleryID)
             }.getOrNull()
 
-            metadata?.getOrNull("thumbnail")?.jsonPrimitive?.contentOrNull?.also { thumbnail ->
+            metadata?.get("thumbnail")?.jsonPrimitive?.contentOrNull?.also { thumbnail ->
                 val file = folder.getChild(".thumbnail").also {
                     if (it.exists())
                         it.delete()

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

@@ -41,7 +41,7 @@
         app:layout_constraintBottom_toTopOf="@id/lock_button_layout">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fingerprint_btn"
+            android:id="@+id/lock_fingerprint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/fingerprint"
@@ -64,7 +64,7 @@
         android:gravity="center">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/pattern_btn"
+            android:id="@+id/lock_pattern"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:tint="@null"
@@ -73,7 +73,7 @@
             app:fabSize="mini"/>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/pin_btn"
+            android:id="@+id/lock_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:tint="@null"
@@ -84,7 +84,7 @@
             app:fabSize="mini"/>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/password_btn"
+            android:id="@+id/lock_password"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:tint="@null"

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

@@ -21,18 +21,17 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/drawer"
+	android:id="@+id/main_drawer_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:openDrawer="start">
 
-	<include android:id="@+id/contents"
-		layout="@layout/main_activity_content"
+	<include layout="@layout/activity_main_content"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>
 
 	<com.google.android.material.navigation.NavigationView
-		android:id="@+id/nav_view"
+		android:id="@+id/main_nav_view"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
 		android:layout_gravity="start"

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

@@ -25,7 +25,7 @@
     tools:context=".ui.MainActivity">
 
     <xyz.quaver.pupil.ui.view.MainView
-        android:id="@+id/view"
+        android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -43,7 +43,7 @@
             app:popupDrawable="@android:color/transparent">
 
             <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerview"
+                android:id="@+id/main_recyclerview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingTop="64dp"
@@ -56,14 +56,14 @@
 
     <androidx.core.widget.ContentLoadingProgressBar
         style="?android:attr/progressBarStyle"
-        android:id="@+id/progressbar"
+        android:id="@+id/main_progressbar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:indeterminate="true"/>
 
     <TextView
-        android:id="@+id/noresult"
+        android:id="@+id/main_noresult"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -72,7 +72,7 @@
         android:visibility="invisible"/>
 
     <com.github.clans.fab.FloatingActionMenu
-        android:id="@+id/fab"
+        android:id="@+id/main_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
@@ -80,28 +80,28 @@
         app:menu_colorNormal="@color/colorAccent">
 
         <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/cancel_fab"
+            android:id="@+id/main_fab_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:fab_label="@string/main_fab_cancel"
             app:fab_size="mini"/>
 
         <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/jump_fab"
+            android:id="@+id/main_fab_jump"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:fab_label="@string/main_jump_title"
             app:fab_size="mini"/>
 
         <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/random_fab"
+            android:id="@+id/main_fab_random"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:fab_label="@string/main_fab_random"
             app:fab_size="mini"/>
 
         <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/id_fab"
+            android:id="@+id/main_fab_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:fab_label="@string/main_open_gallery_by_id"
@@ -110,7 +110,7 @@
     </com.github.clans.fab.FloatingActionMenu>
 
     <xyz.quaver.pupil.ui.view.FloatingSearchView
-        android:id="@+id/searchview"
+        android:id="@+id/main_searchview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:searchBarMarginLeft="6dp"

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

@@ -18,6 +18,7 @@
   -->
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/reader_layout"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -39,7 +40,7 @@
         app:popupDrawable="@android:color/transparent">
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerview"
+            android:id="@+id/reader_recyclerview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
@@ -55,13 +56,13 @@
         android:layout_margin="8dp"/>
 
     <ProgressBar
-        android:id="@+id/download_progressbar"
+        android:id="@+id/reader_download_progressbar"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="4dp"/>
     
     <com.github.clans.fab.FloatingActionMenu
-        android:id="@+id/fab"
+        android:id="@+id/reader_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
@@ -69,7 +70,7 @@
         app:menu_colorNormal="@color/colorAccent">
 
         <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/download_fab"
+            android:id="@+id/reader_fab_download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/ic_download"
@@ -77,7 +78,7 @@
             app:fab_size="mini"/>
 
         <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/retry_fab"
+            android:id="@+id/reader_fab_retry"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/refresh"
@@ -85,7 +86,7 @@
             app:fab_size="mini"/>
 
         <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/auto_fab"
+            android:id="@+id/reader_fab_auto"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/eye_white"
@@ -93,7 +94,7 @@
             app:fab_size="mini"/>
 
         <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fullscreen_fab"
+            android:id="@+id/reader_fab_fullscreen"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/ic_fullscreen"

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

@@ -28,7 +28,7 @@
         tools:ignore="Autofill"
         android:inputType="text"
         android:hint="@string/settings_default_query"
-        android:id="@+id/edittext"
+        android:id="@+id/default_query_dialog_edittext"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
@@ -36,10 +36,10 @@
         app:layout_constraintEnd_toEndOf="parent"/>
 
     <LinearLayout
-        android:id="@+id/language_layout"
+        android:id="@+id/default_query_dialog_language_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/edittext"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_edittext"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
 
@@ -49,14 +49,14 @@
             android:text="@string/default_query_dialog_language"/>
 
         <Spinner
-            android:id="@+id/language_selector"
+            android:id="@+id/default_query_dialog_language_selector"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/BL_layout"
+        android:id="@+id/default_query_dialog_BL_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -64,7 +64,7 @@
         android:paddingStart="0dp"
         android:paddingEnd="8dp"
         android:paddingRight="8dp"
-        app:layout_constraintTop_toBottomOf="@id/language_layout"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_language_layout"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
 
@@ -75,14 +75,14 @@
             android:text="@string/default_query_dialog_filter_BL"/>
 
         <CheckBox
-            android:id="@+id/BL_checkbox"
+            android:id="@+id/default_query_dialog_BL_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/guro_layout"
+        android:id="@+id/default_query_dialog_guro_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -90,7 +90,7 @@
         android:paddingStart="0dp"
         android:paddingEnd="8dp"
         android:paddingRight="8dp"
-        app:layout_constraintTop_toBottomOf="@id/BL_layout"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_BL_layout"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
 
@@ -101,7 +101,7 @@
             android:text="@string/default_query_dialog_filter_guro"/>
 
         <CheckBox
-            android:id="@+id/guro_checkbox"
+            android:id="@+id/default_query_dialog_guro_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
@@ -115,7 +115,7 @@
         android:paddingStart="0dp"
         android:paddingEnd="8dp"
         android:paddingRight="8dp"
-        app:layout_constraintTop_toBottomOf="@id/guro_layout"
+        app:layout_constraintTop_toBottomOf="@id/default_query_dialog_guro_layout"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
 
@@ -126,7 +126,7 @@
             android:text="@string/default_query_dialog_filter_loli"/>
 
         <CheckBox
-            android:id="@+id/loli_checkbox"
+            android:id="@+id/default_query_dialog_loli_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 

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

@@ -19,13 +19,14 @@
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gallery_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/toolbar"
+        android:id="@+id/gallery_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -40,34 +41,34 @@
                 android:padding="8dp">
 
                 <com.github.piasy.biv.view.BigImageView
-                    android:id="@+id/cover"
+                    android:id="@+id/gallery_cover"
                     android:layout_width="150dp"
                     android:layout_height="wrap_content"
                     android:adjustViewBounds="true"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toLeftOf="@id/title"
+                    app:layout_constraintRight_toLeftOf="@id/gallery_title"
                     tools:ignore="ContentDescription" />
 
                 <TextView
-                    android:id="@+id/title"
+                    android:id="@+id/gallery_title"
                     style="@style/TextAppearance.AppCompat.Headline"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/cover"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
                     app:layout_constraintRight_toRightOf="parent"
                     android:layout_marginLeft="8dp"
                     android:layout_marginStart="8dp"/>
 
                 <TextView
                     style="@style/TextAppearance.AppCompat.Medium"
-                    android:id="@+id/artist"
+                    android:id="@+id/gallery_artist"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@id/title"
-                    app:layout_constraintLeft_toRightOf="@id/cover"
+                    app:layout_constraintTop_toBottomOf="@id/gallery_title"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
                     app:layout_constraintRight_toRightOf="parent"
                     android:layout_marginLeft="8dp"
                     android:layout_marginStart="8dp"/>
@@ -75,15 +76,15 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    app:layout_constraintTop_toBottomOf="@id/artist"
-                    app:layout_constraintBottom_toTopOf="@id/type"/>
+                    app:layout_constraintTop_toBottomOf="@id/gallery_artist"
+                    app:layout_constraintBottom_toTopOf="@id/gallery_type"/>
 
                 <com.google.android.material.chip.Chip
-                    android:id="@+id/type"
+                    android:id="@+id/gallery_type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/cover"
+                    app:layout_constraintLeft_toRightOf="@id/gallery_cover"
                     android:layout_marginLeft="8dp"
                     android:layout_marginStart="8dp"/>
 
@@ -99,7 +100,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
-            android:id="@+id/contents"
+            android:id="@+id/gallery_contents"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"/>
@@ -111,7 +112,7 @@
         android:layout_height="match_parent">
 
         <ProgressBar
-            android:id="@+id/progressbar"
+            android:id="@+id/gallery_progressbar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -122,11 +123,11 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
+        android:id="@+id/gallery_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        app:layout_anchor="@id/toolbar"
+        app:layout_anchor="@id/gallery_toolbar"
         app:layout_anchorGravity="bottom|end"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -25,14 +25,14 @@
     android:padding="8dp">
 
     <TextView
-        android:id="@+id/type"
+        android:id="@+id/gallery_details"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/TextAppearance.MaterialComponents.Body1"
         android:textColor="@color/colorAccent"/>
 
     <LinearLayout
-        android:id="@+id/contents"
+        android:id="@+id/gallery_details_contents"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"/>

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

@@ -25,7 +25,7 @@
     android:layout_margin="8dp">
 
     <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
-        android:id="@+id/dotindicator"
+        android:id="@+id/gallery_dotindicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"

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

@@ -25,7 +25,7 @@
 
     <TextView
         style="?android:textAppearanceLarge"
-        android:id="@+id/title"
+        android:id="@+id/dialog_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/reader_go_to_page"
@@ -33,20 +33,20 @@
         app:layout_constraintStart_toStartOf="parent"/>
 
     <NumberPicker
-        android:id="@+id/number_picker"
+        android:id="@+id/dialog_number_picker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/dialog_title"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
     <Button
-        android:id="@+id/ok_button"
+        android:id="@+id/dialog_ok"
         style="?borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@android:string/ok"
-        app:layout_constraintTop_toBottomOf="@id/number_picker"
+        app:layout_constraintTop_toBottomOf="@id/dialog_number_picker"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 

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

@@ -24,7 +24,7 @@
     android:padding="16dp">
 
     <TextView
-        android:id="@+id/title"
+        android:id="@+id/proxy_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingBottom="16dp"
@@ -35,46 +35,46 @@
         app:layout_constraintLeft_toLeftOf="parent"/>
 
     <TextView
-        android:id="@+id/type_text"
+        android:id="@+id/proxy_type_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/proxy_title"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         android:text="@string/proxy_dialog_type"
         android:textAppearance="?android:attr/listSeparatorTextViewStyle"/>
 
     <Spinner
-        android:id="@+id/type_selector"
+        android:id="@+id/proxy_type_selector"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/type_text"/>
+        app:layout_constraintTop_toBottomOf="@id/proxy_type_text"/>
 
     <TextView
-        android:id="@+id/server_text"
+        android:id="@+id/proxy_server_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/type_selector"
+        app:layout_constraintTop_toBottomOf="@id/proxy_type_selector"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         android:text="@string/proxy_dialog_server"
         android:textAppearance="?android:attr/listSeparatorTextViewStyle"/>
 
     <LinearLayout
-        android:id="@+id/address_layout"
+        android:id="@+id/proxy_address_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/server_text">
+        app:layout_constraintTop_toBottomOf="@id/proxy_server_text">
 
         <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/addr"
+            android:id="@+id/proxy_addr"
             android:layout_width="0dp"
             android:layout_weight="2"
             android:layout_height="wrap_content"
             android:hint="@string/proxy_dialog_addr_hint"/>
 
         <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/port"
+            android:id="@+id/proxy_port"
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
@@ -83,39 +83,39 @@
     </LinearLayout>
 
     <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/username"
+        android:id="@+id/proxy_username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/address_layout"
+        app:layout_constraintTop_toBottomOf="@id/proxy_address_layout"
         android:hint="@string/proxy_dialog_username_hint"
         android:enabled="false"/>
 
     <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/password"
+        android:id="@+id/proxy_password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/username"
+        app:layout_constraintTop_toBottomOf="@id/proxy_username"
         android:hint="@string/proxy_dialog_password_hint"
         android:enabled="false"/>
 
     <Button
-        android:id="@+id/cancel_button"
+        android:id="@+id/proxy_cancel"
         style="?borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@android:string/cancel"
-        app:layout_constraintTop_toBottomOf="@id/password"
+        app:layout_constraintTop_toBottomOf="@id/proxy_password"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/ok_button"
-        app:layout_constraintRight_toLeftOf="@id/ok_button"/>
+        app:layout_constraintEnd_toStartOf="@id/proxy_ok"
+        app:layout_constraintRight_toLeftOf="@id/proxy_ok"/>
 
     <Button
-        android:id="@+id/ok_button"
+        android:id="@+id/proxy_ok"
         style="?borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@android:string/ok"
-        app:layout_constraintTop_toBottomOf="@id/password"
+        app:layout_constraintTop_toBottomOf="@id/proxy_password"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>

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

@@ -25,7 +25,7 @@
     tools:context=".ui.fragment.PatternLockFragment">
 
     <com.andrognito.patternlockview.PatternLockView
-        android:id="@+id/pattern_lock_view"
+        android:id="@+id/lock_pattern_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"

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

@@ -26,13 +26,13 @@
 
     <TextView
         style="@style/TextAppearance.MaterialComponents.Body2"
-        android:id="@+id/type"
+        android:id="@+id/gallery_details_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingBottom="8dp"/>
 
     <com.google.android.material.chip.ChipGroup
-        android:id="@+id/tags"
+        android:id="@+id/gallery_details_tags"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:chipSpacingVertical="4dp"/>

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

@@ -73,7 +73,7 @@
     <string name="main_menu_sort">ソート</string>
     <string name="main_menu_sort_newest">投稿日時順</string>
     <string name="main_menu_sort_popular">人気順</string>
-    <string name="ignore">無視</string>
+    <string name="ignore_update">無視</string>
     <string name="lock_corrupted">ロックファイルが破損されています。Pupilを再再インストールしてください。</string>
     <string name="settings_dark_mode_title">ダークモード</string>
     <string name="settings_dark_mode_summary">夜にシコりたい方々へ</string>
@@ -155,5 +155,4 @@
     <string name="settings_tag_translation">タグ言語</string>
     <string name="settings_tag_translation_message">Githubにて翻訳に参加できます</string>
     <string name="settings_concurrent_download">並列ダウンロード</string>
-    <string name="unaccessible_download_folder">アンドロイド11以上では外部からのアプリ内部空間接近が不可能です。ダウンロードフォルダを変更しますか？</string>
 </resources>

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

@@ -71,7 +71,7 @@
     <string name="main_menu_sort">정렬</string>
     <string name="main_menu_sort_popular">인기순</string>
     <string name="main_menu_sort_newest">시간순</string>
-    <string name="ignore">무시</string>
+    <string name="ignore_update">무시</string>
     <string name="lock_corrupted">잠금 파일이 손상되었습니다! 앱을 재설치 해 주시기 바랍니다.</string>
     <string name="settings_dark_mode_title">다크 모드</string>
     <string name="settings_dark_mode_summary">딥 다크한 모오드</string>
@@ -155,5 +155,4 @@
     <string name="settings_tag_translation">태그 언어</string>
     <string name="settings_tag_translation_message">Github에서 번역에 참여하세요</string>
     <string name="settings_concurrent_download">병렬 다운로드</string>
-    <string name="unaccessible_download_folder">안드로이드 11 이상에서는 외부에서 현재 다운로드 폴더에 접근할 수 없습니다. 변경하시겠습니까?</string>
 </resources>

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

@@ -28,7 +28,7 @@
     <string name="warning">Warning</string>
     <string name="error">Error</string>
 
-    <string name="ignore">Ignore</string>
+    <string name="ignore_update">Ignore</string>
 
     <string name="copied_to_clipboard">Copied to clipboard</string>
 
@@ -47,8 +47,6 @@
 
     <string name="main_no_result">No result</string>
 
-    <string name="unaccessible_download_folder">From Android 11 and above, current Download folder cannot be accessed by outside apps. Would you like to change the download folder?</string>
-
     <string name="main_drawer_home">Home</string>
     <string name="main_drawer_history">History</string>
     <string name="main_drawer_downloads">Downloads</string>