Merge pull request #254 from gavine99/mms-attachment-share-242

fixes for mms attachment view/share is suboptimal (#242) and other small fixups
This commit is contained in:
octoshrimpy
2025-02-06 17:00:37 -07:00
committed by GitHub
14 changed files with 285 additions and 93 deletions
@@ -90,6 +90,8 @@ class AttachmentAdapter @Inject constructor(
return
}
holder.fileName.visibility = View.GONE
// if attachment uri is missing
if (!attachment.getUri().resourceExists(context)) {
holder.thumbnail.setImageResource(android.R.drawable.ic_delete)
@@ -24,6 +24,7 @@ import android.os.Vibrator
import android.provider.ContactsContract
import android.telephony.SmsMessage
import androidx.core.content.getSystemService
import com.moez.QKSMS.contentproviders.MmsPartProvider
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.Navigator
import dev.octoshrimpy.quik.common.base.QkViewModel
@@ -470,12 +471,11 @@ class ComposeViewModel @Inject constructor(
.mapNotNull(messageRepo::getPart)
.filter { part -> !part.isImage() && !part.isVideo() }
.autoDisposable(view.scope())
.subscribe { part ->
if (permissionManager.hasStorage()) {
messageRepo.savePart(part.id)?.let { navigator.viewFile(it, part.type) }
} else {
view.requestStoragePermission()
}
.subscribe {
navigator.viewFile(
MmsPartProvider.getUriForMmsPartId(it.id, it.getBestFilename()),
it.type
)
}
// Update the State when the message selected count changes
@@ -25,7 +25,9 @@ import android.media.MediaMetadataRetriever
import android.view.View
import android.widget.SeekBar
import com.moez.QKSMS.common.QkMediaPlayer
import com.moez.QKSMS.contentproviders.MmsPartProvider
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.Navigator
import dev.octoshrimpy.quik.common.base.QkViewHolder
import dev.octoshrimpy.quik.common.util.Colors
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
@@ -49,6 +51,12 @@ import javax.inject.Inject
class AudioBinder @Inject constructor(colors: Colors, private val context: Context) :
PartBinder() {
companion object {
const val DEFAULT_SHARE_FILENAME = "quik-audio-attachment.mp3"
}
@Inject lateinit var navigator: Navigator
override val partLayout = R.layout.mms_audio_preview_list_item
override var theme = colors.theme()
@@ -169,7 +177,13 @@ class AudioBinder @Inject constructor(colors: Colors, private val context: Conte
}
}
holder.containerView.setOnClickListener { clicks.onNext(part.id) }
// share button click handling
holder.share.setOnClickListener {
navigator.shareFile(
MmsPartProvider.getUriForMmsPartId(part.id, part.getBestFilename()),
part.type
)
}
// if this item is the active active audio item update the active view holder
if (audioState.partId == part.id)
@@ -224,6 +238,10 @@ class AudioBinder @Inject constructor(colors: Colors, private val context: Conte
setBackgroundTint(primaryColor)
}
// share button
holder.share.setTint(secondaryColor)
holder.share.setBackgroundTint(primaryColor)
MediaMetadataRetriever().use {
it.setDataSource(context, part.getUri())
@@ -22,7 +22,9 @@ import android.annotation.SuppressLint
import android.content.Context
import android.view.Gravity
import android.widget.FrameLayout
import com.moez.QKSMS.contentproviders.MmsPartProvider
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.Navigator
import dev.octoshrimpy.quik.common.base.QkViewHolder
import dev.octoshrimpy.quik.common.util.Colors
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
@@ -34,11 +36,14 @@ import dev.octoshrimpy.quik.model.MmsPart
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.mms_audio_preview_list_item.share
import kotlinx.android.synthetic.main.mms_file_list_item.*
import javax.inject.Inject
class FileBinder @Inject constructor(colors: Colors, private val context: Context) : PartBinder() {
@Inject lateinit var navigator: Navigator
override val partLayout = R.layout.mms_file_list_item
override var theme = colors.theme()
@@ -56,8 +61,6 @@ class FileBinder @Inject constructor(colors: Colors, private val context: Contex
BubbleUtils.getBubble(false, canGroupWithPrevious, canGroupWithNext, message.isMe())
.let(holder.fileBackground::setBackgroundResource)
holder.containerView.setOnClickListener { clicks.onNext(part.id) }
Observable.just(part.getUri())
.map(context.contentResolver::openInputStream)
.map { inputStream -> inputStream.use { it.available() } }
@@ -73,6 +76,14 @@ class FileBinder @Inject constructor(colors: Colors, private val context: Contex
.observeOn(AndroidSchedulers.mainThread())
.subscribe { size -> holder.size.text = size }
// share button click handling
holder.share.setOnClickListener {
navigator.shareFile(
MmsPartProvider.getUriForMmsPartId(part.id, part.getBestFilename()),
part.type
)
}
holder.filename.text = part.name
val params = holder.fileBackground.layoutParams as FrameLayout.LayoutParams
@@ -82,12 +93,16 @@ class FileBinder @Inject constructor(colors: Colors, private val context: Contex
holder.icon.setTint(theme.textPrimary)
holder.filename.setTextColor(theme.textPrimary)
holder.size.setTextColor(theme.textTertiary)
holder.share.setTint(theme.theme)
holder.share.setBackgroundTint(theme.textPrimary)
} else {
holder.fileBackground.layoutParams = params.apply { gravity = Gravity.END }
holder.fileBackground.setBackgroundTint(holder.containerView.context.resolveThemeColor(R.attr.bubbleColor))
holder.icon.setTint(holder.containerView.context.resolveThemeColor(android.R.attr.textColorSecondary))
holder.filename.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorPrimary))
holder.size.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorTertiary))
holder.share.setTint(holder.containerView.context.resolveThemeColor(R.attr.bubbleColor))
holder.share.setBackgroundTint(holder.containerView.context.resolveThemeColor(android.R.attr.textColorTertiary))
}
}
@@ -19,6 +19,7 @@
package dev.octoshrimpy.quik.feature.gallery
import android.content.Context
import com.moez.QKSMS.contentproviders.MmsPartProvider
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.Navigator
import dev.octoshrimpy.quik.common.base.QkViewModel
@@ -45,6 +46,9 @@ class GalleryViewModel @Inject constructor(
private val saveImage: SaveImage,
private val permissions: PermissionManager
) : QkViewModel<GalleryView, GalleryState>(GalleryState()) {
companion object {
const val DEFAULT_SHARE_FILENAME = "quik-media-attachment.jpg"
}
init {
disposables += Flowable.just(partId)
@@ -80,11 +84,13 @@ class GalleryViewModel @Inject constructor(
// Share image externally
view.optionsItemSelected()
.filter { itemId -> itemId == R.id.share }
.filter { permissions.hasStorage().also { if (!it) view.requestStoragePermission() } }
.withLatestFrom(view.pageChanged()) { _, part -> part }
.autoDisposable(view.scope())
.subscribe { part ->
messageRepo.savePart(part.id)?.let { navigator.shareFile(it, part.type) }
.subscribe {
navigator.shareFile(
MmsPartProvider.getUriForMmsPartId(it.id, it.getBestFilename()),
it.type
)
}
}