Added missing files

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

@@ -41,7 +41,10 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
+<<<<<<< HEAD
 import xyz.quaver.pupil.BuildConfig
+=======
+>>>>>>> origin/development
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
@@ -87,10 +90,13 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri
                         .skipMemoryCache(true)
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .error(R.drawable.image_broken_variant)
+<<<<<<< HEAD
                         .apply {
                             if (BuildConfig.CENSOR)
                                 override(5, 8)
                         }
+=======
+>>>>>>> origin/development
                         .into(galleryblock_thumbnail)
                 }
 

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

@@ -18,19 +18,30 @@
 
 package xyz.quaver.pupil.adapters
 
+<<<<<<< HEAD
 import android.graphics.drawable.Drawable
+=======
+>>>>>>> origin/development
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
+<<<<<<< HEAD
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
 import xyz.quaver.pupil.BuildConfig
+=======
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+>>>>>>> origin/development
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.getCachedGallery
 import java.io.File
@@ -39,8 +50,14 @@ class ReaderAdapter(private val glide: RequestManager,
                     private val galleryID: Int,
                     private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
 
+<<<<<<< HEAD
     var isFullScreen = false
     private var prev : Drawable? = null
+=======
+class ReaderAdapter(private val glide: RequestManager, private val images: List<String>) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
+
+    var isFullScreen = false
+>>>>>>> origin/development
 
     class ViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
@@ -53,6 +70,7 @@ class ReaderAdapter(private val glide: RequestManager,
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+<<<<<<< HEAD
         holder.view as ImageView
 
         glide
@@ -88,6 +106,21 @@ class ReaderAdapter(private val glide: RequestManager,
                 }
             })
             .into(holder.view)
+=======
+        runBlocking {
+            CoroutineScope(Dispatchers.Default).launch {
+                val image = glide
+                    .load(images[position])
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .skipMemoryCache(true)
+                    .error(R.drawable.image_broken_variant)
+                    .submit()
+                    .get()
+
+                (holder.view as ImageView).setImageDrawable(image)
+            }.join()
+        }
+>>>>>>> origin/development
     }
 
     override fun getItemCount() = images.size

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

@@ -22,7 +22,10 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
+<<<<<<< HEAD
 import xyz.quaver.pupil.BuildConfig
+=======
+>>>>>>> origin/development
 
 class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails: List<String>) : RecyclerView.Adapter<ThumbnailAdapter.ViewHolder>() {
 
@@ -35,10 +38,13 @@ class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         glide
             .load(thumbnails[position])
+<<<<<<< HEAD
             .apply {
                 if (BuildConfig.CENSOR)
                     override(5, 8)
             }
+=======
+>>>>>>> origin/development
             .into(holder.view)
     }