mirror of
https://github.com/mihonapp/mihon.git
synced 2024-11-21 20:47:03 -05:00
fixes
This commit is contained in:
parent
c2b113ac0a
commit
93f90b5a62
3 changed files with 39 additions and 30 deletions
|
@ -188,7 +188,7 @@ class DownloadManager(
|
||||||
DiskUtils.createDirectory(download.directory)
|
DiskUtils.createDirectory(download.directory)
|
||||||
|
|
||||||
val pageListObservable: Observable<List<Page>> = if (download.pages == null)
|
val pageListObservable: Observable<List<Page>> = if (download.pages == null)
|
||||||
// Pull page list from network and add them to download object
|
// Pull page list from network and add them to download object
|
||||||
download.source.fetchPageListFromNetwork(download.chapter)
|
download.source.fetchPageListFromNetwork(download.chapter)
|
||||||
.doOnNext { pages ->
|
.doOnNext { pages ->
|
||||||
download.pages = pages
|
download.pages = pages
|
||||||
|
|
|
@ -384,9 +384,7 @@ class ReaderPresenter : BasePresenter<ReaderActivity>() {
|
||||||
val removeAfterReadSlots = prefs.removeAfterReadSlots()
|
val removeAfterReadSlots = prefs.removeAfterReadSlots()
|
||||||
when (removeAfterReadSlots) {
|
when (removeAfterReadSlots) {
|
||||||
// Setting disabled
|
// Setting disabled
|
||||||
-1 -> {
|
-1 -> { /**Empty function**/ }
|
||||||
/**Empty function**/
|
|
||||||
}
|
|
||||||
// Remove current read chapter
|
// Remove current read chapter
|
||||||
0 -> deleteChapter(chapter, manga)
|
0 -> deleteChapter(chapter, manga)
|
||||||
// Remove previous chapter specified by user in settings.
|
// Remove previous chapter specified by user in settings.
|
||||||
|
|
|
@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.reader.notification
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.Bitmap
|
import android.graphics.Bitmap
|
||||||
|
import android.media.Image
|
||||||
import android.support.v4.app.NotificationCompat
|
import android.support.v4.app.NotificationCompat
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
||||||
|
@ -32,34 +33,44 @@ class ImageNotifier(private val context: Context) {
|
||||||
* @param file image file containing downloaded page image
|
* @param file image file containing downloaded page image
|
||||||
*/
|
*/
|
||||||
fun onComplete(file: File) {
|
fun onComplete(file: File) {
|
||||||
with(notificationBuilder) {
|
|
||||||
Glide.with(context).load(file).asBitmap().diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).into(object : SimpleTarget<Bitmap>(720, 1280) {
|
|
||||||
/**
|
|
||||||
* The method that will be called when the resource load has finished.
|
|
||||||
* @param resource the loaded resource.
|
|
||||||
*/
|
|
||||||
override fun onResourceReady(resource: Bitmap?, glideAnimation: GlideAnimation<in Bitmap>?) {
|
|
||||||
setContentTitle(context.getString(R.string.picture_saved))
|
|
||||||
setSmallIcon(R.drawable.ic_insert_photo_white_24dp)
|
|
||||||
setStyle(NotificationCompat.BigPictureStyle().bigPicture(resource))
|
|
||||||
setLargeIcon(resource)
|
|
||||||
setAutoCancel(true)
|
|
||||||
// Clear old actions if they exist
|
|
||||||
if (!mActions.isEmpty())
|
|
||||||
mActions.clear()
|
|
||||||
|
|
||||||
setContentIntent(ImageNotificationReceiver.showImageIntent(context, file.absolutePath))
|
Glide.with(context).load(file).asBitmap().diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).into(object : SimpleTarget<Bitmap>(720, 1280) {
|
||||||
// Share action
|
/**
|
||||||
addAction(R.drawable.ic_share_grey_24dp,
|
* The method that will be called when the resource load has finished.
|
||||||
context.getString(R.string.action_share),
|
* @param resource the loaded resource.
|
||||||
ImageNotificationReceiver.shareImageIntent(context, file.absolutePath, notificationId))
|
*/
|
||||||
// Delete action
|
override fun onResourceReady(resource: Bitmap?, glideAnimation: GlideAnimation<in Bitmap>?) {
|
||||||
addAction(R.drawable.ic_delete_grey_24dp,
|
if (resource!= null){
|
||||||
context.getString(R.string.action_delete),
|
showCompleteNotification(file, resource)
|
||||||
ImageNotificationReceiver.deleteImageIntent(context, file.absolutePath, notificationId))
|
}else{
|
||||||
updateNotification()
|
onError(null)
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun showCompleteNotification(file: File, image: Bitmap) {
|
||||||
|
with(notificationBuilder) {
|
||||||
|
setContentTitle(context.getString(R.string.picture_saved))
|
||||||
|
setSmallIcon(R.drawable.ic_insert_photo_white_24dp)
|
||||||
|
setStyle(NotificationCompat.BigPictureStyle().bigPicture(image))
|
||||||
|
setLargeIcon(image)
|
||||||
|
setAutoCancel(true)
|
||||||
|
// Clear old actions if they exist
|
||||||
|
if (!mActions.isEmpty())
|
||||||
|
mActions.clear()
|
||||||
|
|
||||||
|
setContentIntent(ImageNotificationReceiver.showImageIntent(context, file.absolutePath))
|
||||||
|
// Share action
|
||||||
|
addAction(R.drawable.ic_share_grey_24dp,
|
||||||
|
context.getString(R.string.action_share),
|
||||||
|
ImageNotificationReceiver.shareImageIntent(context, file.absolutePath, notificationId))
|
||||||
|
// Delete action
|
||||||
|
addAction(R.drawable.ic_delete_grey_24dp,
|
||||||
|
context.getString(R.string.action_delete),
|
||||||
|
ImageNotificationReceiver.deleteImageIntent(context, file.absolutePath, notificationId))
|
||||||
|
updateNotification()
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue