CodeMirror/ntfy-android
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy-android.git synced 2024-05-17 11:02:36 +12:00
Code Issues Projects Releases Wiki Activity

Merge 746bd63fa7 into c15efff72c

Browse source
This commit is contained in:
Michael Arkhangelskiy 2024-04-24 22:35:46 -04:00 committed by GitHub
parent c15efff72c 746bd63fa7
commit 8c7620b32b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/build.gradle
View file

@ -128,4 +128,9 @@ dependencies {
// Image viewer
implementation 'com.github.stfalcon-studio:StfalconImageViewer:v1.0.1'
//Glide
implementation 'com.github.bumptech.glide:glide:4.16.0'
kapt 'com.github.bumptech.glide:compiler:4.16.0'
}

12
app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
View file

@ -23,6 +23,7 @@ import androidx.core.view.allViews
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.google.android.material.button.MaterialButton
import com.stfalcon.imageviewer.StfalconImageViewer
import io.heckel.ntfy.R
@ -176,7 +177,7 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
val attachment = notification.attachment
val image = attachment.contentUri != null && supportedImage(attachment.type) && previewableImage(attachmentFileStat)
val bitmap = if (image) attachment.contentUri?.readBitmapFromUriOrNull(context) else null
maybeRenderAttachmentImage(context, bitmap)
maybeRenderAttachmentImage(context, bitmap, attachment)
maybeRenderAttachmentBox(context, notification, attachment, attachmentFileStat, bitmap)
}
@ -351,16 +352,17 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
}
}
private fun maybeRenderAttachmentImage(context: Context, bitmap: Bitmap?) {
private fun maybeRenderAttachmentImage(context: Context, bitmap: Bitmap?, attachment: Attachment) {
if (bitmap == null) {
attachmentImageView.visibility = View.GONE
return
}
try {
attachmentImageView.setImageBitmap(bitmap)
Glide.with(context).load(attachment.contentUri).fitCenter().into(attachmentImageView)
attachmentImageView.setOnClickListener {
val loadImage = { view: ImageView, image: Bitmap -> view.setImageBitmap(image) }
StfalconImageViewer.Builder(context, listOf(bitmap), loadImage)
StfalconImageViewer.Builder<Any?>(context, listOf(bitmap)) { imageView, image ->
Glide.with(context).load(attachment.contentUri).into(imageView)
}
.allowZooming(true)
.withTransitionFrom(attachmentImageView)
.withHiddenStatusBar(false)

2
app/src/main/java/io/heckel/ntfy/util/Util.kt
View file

@ -333,7 +333,7 @@ fun mimeTypeToIconResource(mimeType: String?): Int {
}
fun supportedImage(mimeType: String?): Boolean {
return listOf("image/jpeg", "image/png").contains(mimeType)
return listOf("image/jpeg", "image/png", "image/gif").contains(mimeType)
}
// Google Play doesn't allow us to install received .apk files anymore.