user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing files

Browse Source
This commit is contained in:
tom5079
2019-08-29 11:39:01 +09:00
parent 28703e9bf2 5ad2a538bc
commit 9b99baf4bc
13 changed files with 165 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)
}

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

@@ -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

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

@@ -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)
}

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

@@ -46,7 +46,14 @@ 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() {
@@ -218,6 +225,7 @@ 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) {
@@ -235,6 +243,8 @@ class ReaderActivity : AppCompatActivity() {
}
}
=======
>>>>>>> origin/development:app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt
private fun initDownloader() {
var d: GalleryDownloader? = GalleryDownloader.get(galleryID)
@@ -277,12 +287,16 @@ 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 ->
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 = {
@@ -330,7 +344,11 @@ 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) {
@@ -360,7 +378,11 @@ 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
}
}
}
@@ -368,6 +390,7 @@ 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 {
@@ -381,6 +404,21 @@ 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()
}

35
app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
View File

@@ -43,7 +43,6 @@ import xyz.quaver.pupil.util.Lock
import xyz.quaver.pupil.util.LockManager
import xyz.quaver.pupil.util.getDownloadDirectory
import java.io.File
import java.util.*
class SettingsActivity : AppCompatActivity() {
@@ -279,7 +278,7 @@ class SettingsActivity : AppCompatActivity() {
s ?: return
if (s.any { it.isUpperCase() })
s.replace(0, s.length, s.toString().toLowerCase(Locale.getDefault()))
s.replace(0, s.length, s.toString().toLowerCase())
}
})
}
@@ -353,38 +352,6 @@ class SettingsActivity : AppCompatActivity() {
true
}
}
with(findPreference<Preference>("nomedia")) {
this!!
onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
val directories = listOf(
context.cacheDir,
getDownloadDirectory(context)
)
when (newValue as Boolean) {
true -> {
directories.forEach {
it ?: return@forEach
if (it.exists())
File(it, ".nomedia").createNewFile()
}
}
false -> {
directories.forEach {
it ?: return@forEach
if (it.exists())
File(it, ".nomedia").delete()
}
}
}
true
}
}
}
}

20
app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
View File

@@ -63,15 +63,24 @@ class GalleryDownloader(
field = true
notificationManager.notify(galleryID, notificationBuilder.build())
<<<<<<< HEAD
if (reader?.isActive == false && downloadJob?.isActive != true) {
val data = File(getDownloadDirectory(this), galleryID.toString())
val cache = File(cacheDir, "imageCache/$galleryID")
=======
val data = getCachedGallery(this, galleryID)
val cache = File(cacheDir, "imageCache/$galleryID")
>>>>>>> origin/development
if (File(cache, "images").exists() && !data.exists()) {
cache.copyRecursively(data, true)
cache.deleteRecursively()
}
<<<<<<< HEAD
=======
if (reader?.isActive == false && downloadJob?.isActive != true)
>>>>>>> origin/development
field = false
}
@@ -170,8 +179,11 @@ class GalleryDownloader(
downloadJob = CoroutineScope(Dispatchers.Default).launch {
val reader = reader!!.await()
<<<<<<< HEAD
notificationBuilder.setContentTitle(reader.title)
=======
>>>>>>> origin/development
if (reader.readerItems.isEmpty()) {
onErrorHandler?.invoke(IOException(getString(R.string.unable_to_connect)))
return@launch
@@ -320,6 +332,14 @@ class GalleryDownloader(
setProgress(0, 0, true)
priority = NotificationCompat.PRIORITY_LOW
}
<<<<<<< HEAD
=======
CoroutineScope(Dispatchers.Default).launch {
while (reader == null) ;
notificationBuilder.setContentTitle(reader.await().title)
}
>>>>>>> origin/development
}
}