From d346cf431f60b086dd58cd4c8c7882111b2a7fae Mon Sep 17 00:00:00 2001 From: tom5079 Date: Thu, 29 Aug 2019 11:47:01 +0900 Subject: [PATCH] Merge conflicts --- .../pupil/adapters/GalleryBlockAdapter.kt | 6 --- .../quaver/pupil/adapters/ReaderAdapter.kt | 33 ----------------- .../quaver/pupil/adapters/ThumbnailAdapter.kt | 6 --- .../xyz/quaver/pupil/ui/ReaderActivity.kt | 37 +------------------ app/src/main/res/xml/lock_preferences.xml | 4 -- app/src/main/res/xml/root_preferences.xml | 4 -- 6 files changed, 1 insertion(+), 89 deletions(-) diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt index c851e19d..415913db 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -41,10 +41,7 @@ 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 @@ -90,13 +87,10 @@ 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) } diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt index de01b381..9b4781a8 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt @@ -18,30 +18,19 @@ 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 @@ -50,14 +39,8 @@ class ReaderAdapter(private val glide: RequestManager, private val galleryID: Int, private val images: List) : RecyclerView.Adapter() { -<<<<<<< HEAD var isFullScreen = false private var prev : Drawable? = null -======= -class ReaderAdapter(private val glide: RequestManager, private val images: List) : RecyclerView.Adapter() { - - var isFullScreen = false ->>>>>>> origin/development class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) @@ -70,7 +53,6 @@ class ReaderAdapter(private val glide: RequestManager, private val images: List< } override fun onBindViewHolder(holder: ViewHolder, position: Int) { -<<<<<<< HEAD holder.view as ImageView glide @@ -106,21 +88,6 @@ class ReaderAdapter(private val glide: RequestManager, private val images: List< } }) .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 diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt index 96a02b7d..db85c79d 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt @@ -22,10 +22,7 @@ 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) : RecyclerView.Adapter() { @@ -38,13 +35,10 @@ 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) } diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt index 04ca0be6..d88a7eef 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt @@ -46,14 +46,10 @@ import kotlinx.serialization.ImplicitReflectionSerializer import xyz.quaver.pupil.Pupil import xyz.quaver.pupil.R import xyz.quaver.pupil.adapters.ReaderAdapter -<<<<<<< HEAD:app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt -import xyz.quaver.pupil.util.* -======= import xyz.quaver.pupil.util.GalleryDownloader import xyz.quaver.pupil.util.Histories import xyz.quaver.pupil.util.ItemClickSupport import xyz.quaver.pupil.util.hasPermission ->>>>>>> origin/development:app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt class ReaderActivity : AppCompatActivity() { @@ -225,7 +221,6 @@ class ReaderActivity : AppCompatActivity() { } } -<<<<<<< HEAD:app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { //currentPage is 1-based return when(keyCode) { @@ -243,8 +238,6 @@ class ReaderActivity : AppCompatActivity() { } } -======= ->>>>>>> origin/development:app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt private fun initDownloader() { var d: GalleryDownloader? = GalleryDownloader.get(galleryID) @@ -287,16 +280,12 @@ class ReaderActivity : AppCompatActivity() { } } onErrorHandler = { -<<<<<<< HEAD:app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt Snackbar .make(reader_layout, it.message ?: it.javaClass.name, Snackbar.LENGTH_INDEFINITE) - .setAction(R.string.reader_help) { view -> + .setAction(R.string.reader_help) { _ -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.error_help)))) } .show() -======= - Snackbar.make(reader_layout, it.message ?: it.javaClass.name, Snackbar.LENGTH_INDEFINITE).show() ->>>>>>> origin/development:app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt downloader.download = false } onCompleteHandler = { @@ -344,11 +333,7 @@ class ReaderActivity : AppCompatActivity() { private fun initView() { with(reader_recyclerview) { -<<<<<<< HEAD:app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt adapter = ReaderAdapter(Glide.with(this@ReaderActivity), galleryID, images) -======= - adapter = ReaderAdapter(Glide.with(this@ReaderActivity), images) ->>>>>>> origin/development:app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt addOnScrollListener(object: RecyclerView.OnScrollListener() { override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { @@ -378,11 +363,7 @@ class ReaderActivity : AppCompatActivity() { scrollMode(false) fullscreen(true) } else { -<<<<<<< HEAD:app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing -======= - (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) ->>>>>>> origin/development:app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt } } } @@ -390,7 +371,6 @@ class ReaderActivity : AppCompatActivity() { with(reader_fab_download) { setImageResource(R.drawable.ic_download) setOnClickListener { -<<<<<<< HEAD:app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt if (!this@ReaderActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { AlertDialog.Builder(this@ReaderActivity).apply { @@ -404,21 +384,6 @@ class ReaderActivity : AppCompatActivity() { downloader.download = !downloader.download -======= - - if (!this@ReaderActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { - AlertDialog.Builder(this@ReaderActivity).apply { - setTitle(R.string.warning) - setMessage(R.string.update_no_permission) - setPositiveButton(android.R.string.ok) { _, _ -> } - }.show() - - return@setOnClickListener - } - - downloader.download = !downloader.download - ->>>>>>> origin/development:app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt if (!downloader.download) downloader.clearNotification() } diff --git a/app/src/main/res/xml/lock_preferences.xml b/app/src/main/res/xml/lock_preferences.xml index 9498db02..3c3baab3 100644 --- a/app/src/main/res/xml/lock_preferences.xml +++ b/app/src/main/res/xml/lock_preferences.xml @@ -15,11 +15,7 @@ app:key="lock_password"/> -======= - app:title="@string/settings_lock_biomatrics"> ->>>>>>> origin/development -<<<<<<< HEAD - -======= ->>>>>>> origin/development