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

Merge conflicts

Browse Source
This commit is contained in:
tom5079
2019-08-29 11:47:01 +09:00
parent c0bce4f3b1
commit d346cf431f
6 changed files with 1 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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