fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crop too tall mms attachments

This commit is contained in:
tibbi 2020-04-12 21:43:42 +02:00
parent 8827e21178
commit aecaec8773
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View File

@ -5,6 +5,7 @@ import android.app.PendingIntent
import android.content.Intent
import android.graphics.BitmapFactory
import android.graphics.drawable.Drawable
import android.media.MediaMetadataRetriever
import android.net.Uri
import android.os.Bundle
import android.provider.MediaStore
@ -88,17 +89,24 @@ class ThreadActivity : SimpleActivity() {
messages.filter { it.attachment != null }.forEach {
it.attachment!!.attachments.forEach {
try {
val fileOptions = BitmapFactory.Options()
fileOptions.inJustDecodeBounds = true
BitmapFactory.decodeStream(contentResolver.openInputStream(it.uri), null, fileOptions)
it.width = fileOptions.outWidth
it.height = fileOptions.outHeight
if (it.type.startsWith("image/")) {
val fileOptions = BitmapFactory.Options()
fileOptions.inJustDecodeBounds = true
BitmapFactory.decodeStream(contentResolver.openInputStream(it.uri), null, fileOptions)
it.width = fileOptions.outWidth
it.height = fileOptions.outHeight
} else if (it.type.startsWith("video/")) {
val metaRetriever = MediaMetadataRetriever()
metaRetriever.setDataSource(this, it.uri)
it.width = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH).toInt()
it.height = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT).toInt()
}
if (it.width == -1) {
if (it.width < 0) {
it.width = 0
}
if (it.height == -1) {
if (it.height < 0) {
it.height = 0
}
} catch (ignored: Exception) {

14
app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
View File

@ -9,6 +9,7 @@ import com.bumptech.glide.Glide
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.bumptech.glide.load.engine.GlideException
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.FitCenter
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
@ -198,11 +199,13 @@ class ThreadAdapter(
val type = attachment.type
if (type.startsWith("image/") || type.startsWith("video/")) {
val uri = attachment.uri
val isTallImage = attachment.height > attachment.width
val transformation = if (isTallImage) CenterCrop() else FitCenter()
val options = RequestOptions()
.diskCacheStrategy(DiskCacheStrategy.NONE)
.transform(FitCenter(), RoundedCorners(roundedCornersRadius))
.transform(transformation, RoundedCorners(roundedCornersRadius))
Glide.with(context)
var builder = Glide.with(context)
.load(uri)
.transition(DrawableTransitionOptions.withCrossFade())
.apply(options)
@ -215,10 +218,13 @@ class ThreadAdapter(
override fun onResourceReady(dr: Drawable?, a: Any?, t: Target<Drawable>?, d: DataSource?, i: Boolean) =
false
})
.into(imageView.attachment_image)
if (isTallImage) {
builder = builder.override(attachment.width, attachment.width)
}
builder.into(imageView.attachment_image)
attachment_image.setOnClickListener {
Intent().apply {
action = Intent.ACTION_VIEW

3
app/src/main/res/layout/item_received_message.xml
View File

@ -38,7 +38,8 @@
android:layout_height="@dimen/play_outline_size"
android:layout_alignEnd="@+id/thread_mesage_attachments_holder"
android:layout_alignBottom="@+id/thread_mesage_attachments_holder"
android:layout_margin="@dimen/medium_margin"
android:layout_marginStart="@dimen/medium_margin"
android:layout_marginBottom="@dimen/activity_margin"
android:src="@drawable/ic_play_outline"
android:visibility="gone" />

3
app/src/main/res/layout/item_sent_message.xml
View File

@ -29,7 +29,8 @@
android:layout_height="@dimen/play_outline_size"
android:layout_alignEnd="@+id/thread_mesage_attachments_holder"
android:layout_alignBottom="@+id/thread_mesage_attachments_holder"
android:layout_margin="@dimen/medium_margin"
android:layout_marginEnd="@dimen/medium_margin"
android:layout_marginBottom="@dimen/activity_margin"
android:src="@drawable/ic_play_outline"
android:visibility="gone" />