Merge pull request #230 from gavine99/any_file_pe_attachments

changes to allow attaching *any* type of file
This commit is contained in:
octoshrimpy
2025-01-27 09:08:46 -07:00
committed by GitHub
27 changed files with 505 additions and 197 deletions
@@ -143,6 +143,11 @@ public class RetryScheduler implements Observer {
case PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND: case PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND:
errorString = R.string.service_message_not_found; errorString = R.string.service_message_not_found;
break; break;
case PduHeaders.RESPONSE_STATUS_ERROR_CONTENT_NOT_ACCEPTED:
case PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_CONTENT_NOT_ACCEPTED:
errorString = R.string.service_message_content_not_accepted;
break;
} }
if (errorString != 0) { if (errorString != 0) {
DownloadManager.init(mContext.getApplicationContext()); DownloadManager.init(mContext.getApplicationContext());
@@ -20,6 +20,7 @@ limitations under the License.
<string name="invalid_destination">Invalid destination address.</string> <string name="invalid_destination">Invalid destination address.</string>
<string name="service_not_activated">Service not activated on network.</string> <string name="service_not_activated">Service not activated on network.</string>
<string name="service_message_not_found">Message expired or not available.</string> <string name="service_message_not_found">Message expired or not available.</string>
<string name="service_message_content_not_accepted">Message content is not accepted.</string>
<string name="service_network_problem">Couldn\'t send due to network problem.</string> <string name="service_network_problem">Couldn\'t send due to network problem.</string>
<string name="message_queued">Currently can\'t send your message. It will be sent when the service becomes available.</string> <string name="message_queued">Currently can\'t send your message. It will be sent when the service becomes available.</string>
<string name="download_later">Can\'t download right now. Try again later.</string> <string name="download_later">Can\'t download right now. Try again later.</string>
+1
View File
@@ -19,4 +19,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
</manifest> </manifest>
@@ -0,0 +1,36 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package dev.octoshrimpy.quik.extensions
import android.content.Context
import android.net.Uri
fun Uri.resourceExists(context: Context): Boolean {
// check if resource at uri still exists
try {
return context.contentResolver.query(
this, null, null, null, null
)?.use {
it.moveToFirst()
} ?: false
}
catch (e: Exception) { /* nothing */ }
return false
}
@@ -25,7 +25,6 @@ import android.content.ContentValues
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
import android.media.MediaScannerConnection
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Environment import android.os.Environment
@@ -65,14 +64,7 @@ import io.realm.Case
import io.realm.Realm import io.realm.Realm
import io.realm.RealmResults import io.realm.RealmResults
import io.realm.Sort import io.realm.Sort
import okio.buffer
import okio.source
import timber.log.Timber import timber.log.Timber
import java.io.File
import java.io.FileNotFoundException
import java.io.FileOutputStream
import java.io.IOException
import java.util.*
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@@ -376,27 +368,37 @@ class MessageRepositoryImpl @Inject constructor(
parts += MMSPart("text", ContentType.TEXT_PLAIN, bytes) parts += MMSPart("text", ContentType.TEXT_PLAIN, bytes)
} }
// Attach contacts // Attach those that can't be compressed (ie. everything but not images)
parts += attachments parts += attachments
.mapNotNull { attachment -> attachment as? Attachment.Contact } // filter out images
.map { attachment -> attachment.vCard.toByteArray() } .filter { !it.isImage(context) }
.map { vCard -> // filter out items that have no data available (ie user may have deleted
remainingBytes -= vCard.size // the file from storage)
MMSPart("contact", ContentType.TEXT_VCARD, vCard) .filter { it.getResourceBytes(context).isNotEmpty() }
} .map {
remainingBytes -= it.getResourceBytes(context).size
MMSPart(
it.getName(context),
it.getType(context),
it.getResourceBytes(context)
)
}
val imageBytesByAttachment = attachments val imageBytesByAttachment = attachments
.mapNotNull { attachment -> attachment as? Attachment.Image } // filter out non-images
.associateWith { attachment -> .filter { it.isImage(context) }
val uri = attachment.getUri() ?: return@associateWith byteArrayOf() // filter out items that have no data available (ie user may have deleted
when (attachment.isGif(context)) { // the file from storage)
true -> ImageUtils.getScaledGif(context, uri, maxWidth, maxHeight) .filter { it.getResourceBytes(context).isNotEmpty() }
false -> ImageUtils.getScaledImage(context, uri, maxWidth, maxHeight) .associateWith {
} when (it.getType(context) == "image/gif") {
true -> ImageUtils.getScaledGif(context, it.getUri(), maxWidth, maxHeight)
false -> ImageUtils.getScaledImage(context, it.getUri(), maxWidth, maxHeight)
} }
.toMutableMap() }
.toMutableMap()
val imageByteCount = imageBytesByAttachment.values.sumBy { byteArray -> byteArray.size } val imageByteCount = imageBytesByAttachment.values.sumOf { it.size }
if (imageByteCount > remainingBytes) { if (imageByteCount > remainingBytes) {
imageBytesByAttachment.forEach { (attachment, originalBytes) -> imageBytesByAttachment.forEach { (attachment, originalBytes) ->
val uri = attachment.getUri() ?: return@forEach val uri = attachment.getUri() ?: return@forEach
@@ -426,9 +428,9 @@ class MessageRepositoryImpl @Inject constructor(
val newHeight = (newWidth / aspectRatio).toInt() val newHeight = (newWidth / aspectRatio).toInt()
attempts++ attempts++
scaledBytes = when (attachment.isGif(context)) { scaledBytes = when (attachment.getType(context) == "image/gif") {
true -> ImageUtils.getScaledGif(context, uri, newWidth, newHeight, 80) true -> ImageUtils.getScaledGif(context, attachment.getUri(), maxWidth, maxHeight)
false -> ImageUtils.getScaledImage(context, uri, newWidth, newHeight, 80) false -> ImageUtils.getScaledImage(context, attachment.getUri(), maxWidth, maxHeight)
} }
Timber.d("Compression attempt $attempts: ${scaledBytes.size / 1024}/${maxBytes.toInt() / 1024}Kb ($width*$height -> $newWidth*$newHeight)") Timber.d("Compression attempt $attempts: ${scaledBytes.size / 1024}/${maxBytes.toInt() / 1024}Kb ($width*$height -> $newWidth*$newHeight)")
@@ -440,7 +442,7 @@ class MessageRepositoryImpl @Inject constructor(
} }
imageBytesByAttachment.forEach { (attachment, bytes) -> imageBytesByAttachment.forEach { (attachment, bytes) ->
parts += when (attachment.isGif(context)) { parts += when (attachment.getType(context) == "image/gif") {
true -> MMSPart("image", ContentType.IMAGE_GIF, bytes) true -> MMSPart("image", ContentType.IMAGE_GIF, bytes)
false -> MMSPart("image", ContentType.IMAGE_JPEG, bytes) false -> MMSPart("image", ContentType.IMAGE_JPEG, bytes)
} }
@@ -47,7 +47,7 @@ class SendScheduledMessage @Inject constructor(
} }
.map { message -> .map { message ->
val threadId = TelephonyCompat.getOrCreateThreadId(context, message.recipients) val threadId = TelephonyCompat.getOrCreateThreadId(context, message.recipients)
val attachments = message.attachments.mapNotNull(Uri::parse).map { Attachment.Image(it) } val attachments = message.attachments.mapNotNull(Uri::parse).map { Attachment(it) }
SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments) SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments)
} }
.flatMap(sendMessage::buildObservable) .flatMap(sendMessage::buildObservable)
@@ -21,33 +21,106 @@ package dev.octoshrimpy.quik.model
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.provider.OpenableColumns
import androidx.core.view.inputmethod.InputContentInfoCompat import androidx.core.view.inputmethod.InputContentInfoCompat
sealed class Attachment {
data class Image( class Attachment(
private val uri: Uri? = null, private val uri: Uri? = null,
private val inputContent: InputContentInfoCompat? = null private val inputContent: InputContentInfoCompat? = null
) : Attachment() { ) {
private var resourceBytes: ByteArray? = null
fun getUri(): Uri? { fun getUri(): Uri {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { return (
inputContent?.contentUri ?: uri if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
} else { inputContent?.contentUri ?: uri ?: Uri.EMPTY
uri else uri ?: Uri.EMPTY
} )
}
fun isGif(context: Context): Boolean {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && inputContent != null) {
inputContent.description.hasMimeType("image/gif")
} else {
uri?.let(context.contentResolver::getType) == "image/gif"
}
}
} }
data class Contact(val vCard: String) : Attachment() fun getType(context: Context): String {
return context.contentResolver.getType(getUri()) ?: "application/octect-stream"
}
fun getName(context: Context): String {
try {
context.contentResolver.query(
getUri(),
arrayOf(OpenableColumns.DISPLAY_NAME),
null,
null,
null
)
?.use { cursor ->
val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
if (nameIndex == -1)
return "unknown"
cursor.moveToFirst()
return cursor.getString(nameIndex) ?: "unknown"
}
}
catch (e: Exception) { /* nothing*/ }
return "unknown"
}
fun isVCard(context: Context): Boolean {
return (getType(context) == "text/x-vcard")
}
fun hasDisplayableImage(context: Context): Boolean {
val mimeType = getType(context)
return (mimeType.startsWith("image/") || mimeType.startsWith("video/"))
}
fun isAudio(context: Context): Boolean {
val mimeType = getType(context)
return (mimeType.startsWith("audio/"))
}
fun isImage(context: Context): Boolean {
val mimeType = getType(context)
return (mimeType.startsWith("image/"))
}
fun getSize(context: Context): Long {
try {
context.contentResolver.query(
getUri(),
arrayOf(OpenableColumns.SIZE),
null,
null,
null
)
?.use {
val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
if (sizeIndex == -1)
return -1
it.moveToFirst()
return it.getLong(sizeIndex)
}
}
catch (e: Exception) { /* nothing */ }
return -1
}
fun getResourceBytes(context: Context): ByteArray {
if (resourceBytes != null)
return resourceBytes!!
resourceBytes = ByteArray(0)
try {
context.contentResolver.openInputStream(getUri())?.use {
resourceBytes = it.readBytes()
}
} catch (e: Exception) {
}
return resourceBytes!!
}
} }
@@ -40,11 +40,13 @@ open class MmsPart : RealmObject() {
fun getUri() = "content://mms/part/$id".toUri() fun getUri() = "content://mms/part/$id".toUri()
fun getSummary(): String? = when { fun getSummary(): String? = when {
type == "application/smil" -> null
type == "text/plain" -> text type == "text/plain" -> text
type == "text/x-vCard" -> "Contact card" type == "text/x-vcard" -> "Contact card"
type.startsWith("image") -> "Photo" type.startsWith("image") -> "Photo"
type.startsWith("video") -> "Video" type.startsWith("video") -> "Video"
else -> null type.startsWith("audio") -> "Audio"
else -> type.substring(type.indexOf('/') + 1)
} }
} }
+2 -12
View File
@@ -88,22 +88,12 @@
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/plain" /> <data android:mimeType="*/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" /> <action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" /> <data android:mimeType="*/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/x-vcard" />
</intent-filter> </intent-filter>
<meta-data <meta-data
@@ -19,7 +19,11 @@
package dev.octoshrimpy.quik.feature.compose package dev.octoshrimpy.quik.feature.compose
import android.content.Context import android.content.Context
import android.content.Intent
import android.media.MediaMetadataRetriever
import android.provider.MediaStore.MATCH_DEFAULT
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
@@ -27,25 +31,22 @@ import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkAdapter import dev.octoshrimpy.quik.common.base.QkAdapter
import dev.octoshrimpy.quik.common.base.QkViewHolder import dev.octoshrimpy.quik.common.base.QkViewHolder
import dev.octoshrimpy.quik.common.util.extensions.getDisplayName import dev.octoshrimpy.quik.common.util.extensions.getDisplayName
import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.extensions.resourceExists
import dev.octoshrimpy.quik.model.Attachment import dev.octoshrimpy.quik.model.Attachment
import ezvcard.Ezvcard import ezvcard.Ezvcard
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.attachment_file_list_item.*
import kotlinx.android.synthetic.main.attachment_contact_list_item.* import kotlinx.android.synthetic.main.attachment_contact_list_item.*
import kotlinx.android.synthetic.main.attachment_image_list_item.*
import kotlinx.android.synthetic.main.attachment_image_list_item.view.*
import javax.inject.Inject import javax.inject.Inject
class AttachmentAdapter @Inject constructor( class AttachmentAdapter @Inject constructor(
private val context: Context private val context: Context
) : QkAdapter<Attachment>() { ) : QkAdapter<Attachment>() {
companion object { companion object {
private const val VIEW_TYPE_IMAGE = 0 private const val VIEW_TYPE_FILE = 0
private const val VIEW_TYPE_CONTACT = 1 private const val VIEW_TYPE_CONTACT = 1
} }
@@ -53,14 +54,13 @@ class AttachmentAdapter @Inject constructor(
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val inflater = LayoutInflater.from(parent.context) val inflater = LayoutInflater.from(parent.context)
val view = when (viewType) {
VIEW_TYPE_IMAGE -> inflater.inflate(R.layout.attachment_image_list_item, parent, false)
.apply { thumbnailBounds.clipToOutline = true }
VIEW_TYPE_CONTACT -> inflater.inflate(R.layout.attachment_contact_list_item, parent, false) val view = inflater.inflate(
if (viewType == VIEW_TYPE_CONTACT) R.layout.attachment_contact_list_item
else -> null!! // Impossible else R.layout.attachment_file_list_item,
} parent,
false
)
return QkViewHolder(view).apply { return QkViewHolder(view).apply {
view.setOnClickListener { view.setOnClickListener {
@@ -73,26 +73,81 @@ class AttachmentAdapter @Inject constructor(
override fun onBindViewHolder(holder: QkViewHolder, position: Int) { override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
val attachment = getItem(position) val attachment = getItem(position)
when (attachment) { if (attachment.isVCard(context)) {
is Attachment.Image -> Glide.with(context) val displayName = Ezvcard.parse(
.load(attachment.getUri()) String(attachment.getResourceBytes(context))
.into(holder.thumbnail) ).first().getDisplayName() ?: ""
holder.name.text = displayName
is Attachment.Contact -> Observable.just(attachment.vCard) holder.name.isVisible = displayName.isNotEmpty()
.mapNotNull { vCard -> Ezvcard.parse(vCard).first() } return
.map { vcard -> vcard.getDisplayName() ?: "" }
.subscribeOn(Schedulers.computation())
.observeOn(AndroidSchedulers.mainThread())
.subscribe { displayName ->
holder.name?.text = displayName
holder.name?.isVisible = displayName.isNotEmpty()
}
} }
// if attachment uri is missing
if (!attachment.getUri().resourceExists(context)) {
holder.thumbnail.setImageResource(android.R.drawable.ic_delete)
holder.fileName.text = context.getString(R.string.attachment_missing)
holder.fileName.visibility = View.VISIBLE
return
}
val uri = attachment.getUri()
val mimeType = attachment.getType(context)
// if attachment mime type is image/* or video/*, use image/frame
if (attachment.hasDisplayableImage(context)) {
Glide
.with(context)
.load(uri)
.into(holder.thumbnail)
return
}
// if audio mime type, try and use embedded image if one exists
if (attachment.isAudio(context)) {
val metaDataRetriever = MediaMetadataRetriever()
metaDataRetriever.setDataSource(context, uri)
val embeddedPicture = metaDataRetriever.embeddedPicture
if (embeddedPicture != null) {
Glide
.with(context)
.load(embeddedPicture)
.into(holder.thumbnail)
return
}
}
// try and use icon from default app for type
val intent = Intent(Intent.ACTION_VIEW).setDataAndType(uri, mimeType)
val appIcon = context
.packageManager
.resolveActivity(intent, MATCH_DEFAULT)
?.loadIcon(context.packageManager)
if (appIcon != null)
Glide
.with(context)
.load(appIcon)
.into(holder.thumbnail)
else if (mimeType?.startsWith("audio/") == true)
// else, if audio, use default local audio icon
Glide
.with(context)
.load(R.drawable.ic_round_volume_up_24)
.into(holder.thumbnail)
else
// else, use default attachment icon
Glide
.with(context)
.load(R.drawable.ic_attachment_black_24dp)
.into(holder.thumbnail)
// else, show file name
holder.fileName.text = attachment.getName(context)
holder.fileName.visibility = View.VISIBLE
} }
override fun getItemViewType(position: Int) = when (getItem(position)) { override fun getItemViewType(position: Int) = when (getItem(position).isVCard(context)) {
is Attachment.Image -> VIEW_TYPE_IMAGE true -> VIEW_TYPE_CONTACT
is Attachment.Contact -> VIEW_TYPE_CONTACT else -> VIEW_TYPE_FILE
} }
} }
@@ -82,15 +82,6 @@ import javax.inject.Inject
class ComposeActivity : QkThemedActivity(), ComposeView { class ComposeActivity : QkThemedActivity(), ComposeView {
companion object {
private const val SelectContactRequestCode = 0
private const val TakePhotoRequestCode = 1
private const val AttachPhotoRequestCode = 2
private const val AttachContactRequestCode = 3
private const val CameraDestinationKey = "camera_destination"
}
@Inject lateinit var attachmentAdapter: AttachmentAdapter @Inject lateinit var attachmentAdapter: AttachmentAdapter
@Inject lateinit var chipsAdapter: ChipsAdapter @Inject lateinit var chipsAdapter: ChipsAdapter
@Inject lateinit var dateFormatter: DateFormatter @Inject lateinit var dateFormatter: DateFormatter
@@ -112,10 +103,11 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override val textChangedIntent by lazy { message.textChanges() } override val textChangedIntent by lazy { message.textChanges() }
override val attachIntent by lazy { Observable.merge(attach.clicks(), attachingBackground.clicks()) } override val attachIntent by lazy { Observable.merge(attach.clicks(), attachingBackground.clicks()) }
override val cameraIntent by lazy { Observable.merge(camera.clicks(), cameraLabel.clicks()) } override val cameraIntent by lazy { Observable.merge(camera.clicks(), cameraLabel.clicks()) }
override val galleryIntent by lazy { Observable.merge(gallery.clicks(), galleryLabel.clicks()) } override val attachImageFileIntent by lazy { Observable.merge(gallery.clicks(), galleryLabel.clicks()) }
override val attachAnyFileIntent by lazy { Observable.merge(attachAFileIcon.clicks(), attachAFileLabel.clicks()) }
override val scheduleIntent by lazy { Observable.merge(schedule.clicks(), scheduleLabel.clicks()) } override val scheduleIntent by lazy { Observable.merge(schedule.clicks(), scheduleLabel.clicks()) }
override val attachContactIntent by lazy { Observable.merge(contact.clicks(), contactLabel.clicks()) } override val attachContactIntent by lazy { Observable.merge(contact.clicks(), contactLabel.clicks()) }
override val attachmentSelectedIntent: Subject<Uri> = PublishSubject.create() override val attachAnyFileSelectedIntent: Subject<Uri> = PublishSubject.create()
override val contactSelectedIntent: Subject<Uri> = PublishSubject.create() override val contactSelectedIntent: Subject<Uri> = PublishSubject.create()
override val inputContentIntent by lazy { message.inputContentSelected } override val inputContentIntent by lazy { message.inputContentSelected }
override val scheduleSelectedIntent: Subject<Long> = PublishSubject.create() override val scheduleSelectedIntent: Subject<Long> = PublishSubject.create()
@@ -386,7 +378,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
val intent = Intent(Intent.ACTION_PICK) val intent = Intent(Intent.ACTION_PICK)
.setType(ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE) .setType(ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE)
startActivityForResult(Intent.createChooser(intent, null), AttachContactRequestCode) startActivityForResult(Intent.createChooser(intent, null), ComposeView.AttachContactRequestCode)
} }
override fun showContacts(sharing: Boolean, chips: List<Recipient>) { override fun showContacts(sharing: Boolean, chips: List<Recipient>) {
@@ -395,7 +387,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
val intent = Intent(this, ContactsActivity::class.java) val intent = Intent(this, ContactsActivity::class.java)
.putExtra(ContactsActivity.SharingKey, sharing) .putExtra(ContactsActivity.SharingKey, sharing)
.putExtra(ContactsActivity.ChipsKey, serialized) .putExtra(ContactsActivity.ChipsKey, serialized)
startActivityForResult(intent, SelectContactRequestCode) startActivityForResult(intent, ComposeView.SelectContactRequestCode)
} }
override fun themeChanged() { override fun themeChanged() {
@@ -415,17 +407,17 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE) val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
.putExtra(MediaStore.EXTRA_OUTPUT, cameraDestination) .putExtra(MediaStore.EXTRA_OUTPUT, cameraDestination)
startActivityForResult(Intent.createChooser(intent, null), TakePhotoRequestCode) startActivityForResult(Intent.createChooser(intent, null), ComposeView.TakePhotoRequestCode)
} }
override fun requestGallery() { override fun requestGallery(mimeType: String, requestCode: Int) {
val intent = Intent(Intent.ACTION_PICK) val intent = Intent(Intent.ACTION_PICK)
.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true) .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION) .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
.putExtra(Intent.EXTRA_LOCAL_ONLY, false) .putExtra(Intent.EXTRA_LOCAL_ONLY, false)
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
.setType("image/*") .setType(mimeType)
startActivityForResult(Intent.createChooser(intent, null), AttachPhotoRequestCode) startActivityForResult(Intent.createChooser(intent, null), requestCode)
} }
override fun setDraft(draft: String) { override fun setDraft(draft: String) {
@@ -473,36 +465,43 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
when { if (resultCode != Activity.RESULT_OK)
requestCode == SelectContactRequestCode -> { return
when (requestCode) {
ComposeView.SelectContactRequestCode -> {
chipsSelectedIntent.onNext(data?.getSerializableExtra(ContactsActivity.ChipsKey) chipsSelectedIntent.onNext(data?.getSerializableExtra(ContactsActivity.ChipsKey)
?.let { serializable -> serializable as? HashMap<String, String?> } ?.let { serializable -> serializable as? HashMap<String, String?> }
?: hashMapOf()) ?: hashMapOf())
} }
requestCode == TakePhotoRequestCode && resultCode == Activity.RESULT_OK -> {
cameraDestination?.let(attachmentSelectedIntent::onNext) ComposeView.TakePhotoRequestCode -> {
cameraDestination?.let(attachAnyFileSelectedIntent::onNext)
} }
requestCode == AttachPhotoRequestCode && resultCode == Activity.RESULT_OK -> {
ComposeView.AttachAFileRequestCode -> {
data?.clipData?.itemCount data?.clipData?.itemCount
?.let { count -> 0 until count } ?.let { count -> 0 until count }
?.mapNotNull { i -> data.clipData?.getItemAt(i)?.uri } ?.mapNotNull { i -> data.clipData?.getItemAt(i)?.uri }
?.forEach(attachmentSelectedIntent::onNext) ?.forEach(attachAnyFileSelectedIntent::onNext)
?: data?.data?.let(attachmentSelectedIntent::onNext) ?: data?.data?.let(attachAnyFileSelectedIntent::onNext)
} }
requestCode == AttachContactRequestCode && resultCode == Activity.RESULT_OK -> {
ComposeView.AttachContactRequestCode -> {
data?.data?.let(contactSelectedIntent::onNext) data?.data?.let(contactSelectedIntent::onNext)
} }
else -> super.onActivityResult(requestCode, resultCode, data) else -> super.onActivityResult(requestCode, resultCode, data)
} }
} }
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {
outState.putParcelable(CameraDestinationKey, cameraDestination) outState.putParcelable(ComposeView.CameraDestinationKey, cameraDestination)
super.onSaveInstanceState(outState) super.onSaveInstanceState(outState)
} }
override fun onRestoreInstanceState(savedInstanceState: Bundle) { override fun onRestoreInstanceState(savedInstanceState: Bundle) {
cameraDestination = savedInstanceState.getParcelable(CameraDestinationKey) cameraDestination = savedInstanceState.getParcelable(ComposeView.CameraDestinationKey)
super.onRestoreInstanceState(savedInstanceState) super.onRestoreInstanceState(savedInstanceState)
} }
@@ -78,22 +78,8 @@ class ComposeActivityModule {
val uris = mutableListOf<Uri>() val uris = mutableListOf<Uri>()
activity.intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::add) activity.intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::add)
activity.intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::addAll) activity.intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::addAll)
return Attachments(uris.mapNotNull { uri ->
val mimeType = activity.contentResolver.getType(uri)
when {
ContentType.isImageType(mimeType) -> {
Attachment.Image(uri)
}
ContentType.TEXT_VCARD.equals(mimeType, true) -> { return Attachments(uris.mapNotNull { Attachment(it) })
val inputStream = activity.contentResolver.openInputStream(uri)
val text = inputStream?.reader(Charset.forName("utf-8"))?.readText()
text?.let(Attachment::Contact)
}
else -> null
}
})
} }
@Provides @Provides
@@ -29,6 +29,15 @@ import io.reactivex.subjects.Subject
interface ComposeView : QkView<ComposeState> { interface ComposeView : QkView<ComposeState> {
companion object {
const val SelectContactRequestCode = 0
const val TakePhotoRequestCode = 1
const val AttachAFileRequestCode = 4
const val AttachContactRequestCode = 3
const val CameraDestinationKey = "camera_destination"
}
val activityVisibleIntent: Observable<Boolean> val activityVisibleIntent: Observable<Boolean>
val chipsSelectedIntent: Subject<HashMap<String, String?>> val chipsSelectedIntent: Subject<HashMap<String, String?>>
val chipDeletedIntent: Subject<Recipient> val chipDeletedIntent: Subject<Recipient>
@@ -43,10 +52,11 @@ interface ComposeView : QkView<ComposeState> {
val textChangedIntent: Observable<CharSequence> val textChangedIntent: Observable<CharSequence>
val attachIntent: Observable<Unit> val attachIntent: Observable<Unit>
val cameraIntent: Observable<*> val cameraIntent: Observable<*>
val galleryIntent: Observable<*> val attachAnyFileIntent: Observable<*>
val attachImageFileIntent: Observable<*>
val scheduleIntent: Observable<*> val scheduleIntent: Observable<*>
val attachContactIntent: Observable<*> val attachContactIntent: Observable<*>
val attachmentSelectedIntent: Observable<Uri> val attachAnyFileSelectedIntent: Observable<Uri>
val contactSelectedIntent: Observable<Uri> val contactSelectedIntent: Observable<Uri>
val inputContentIntent: Observable<InputContentInfoCompat> val inputContentIntent: Observable<InputContentInfoCompat>
val scheduleSelectedIntent: Observable<Long> val scheduleSelectedIntent: Observable<Long>
@@ -68,7 +78,7 @@ interface ComposeView : QkView<ComposeState> {
fun themeChanged() fun themeChanged()
fun showKeyboard() fun showKeyboard()
fun requestCamera() fun requestCamera()
fun requestGallery() fun requestGallery(mimeType: String, requestCode: Int)
fun requestDatePicker() fun requestDatePicker()
fun requestContact() fun requestContact()
fun setDraft(draft: String) fun setDraft(draft: String)
@@ -536,11 +536,17 @@ class ComposeViewModel @Inject constructor(
} }
} }
// Attach a photo from gallery // pick a photo (specifically) from image provider apps
view.galleryIntent view.attachImageFileIntent
.doOnNext { newState { copy(attaching = false) } } .doOnNext { newState { copy(attaching = false) } }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { view.requestGallery() } .subscribe { view.requestGallery("image/*", ComposeView.AttachAFileRequestCode) }
// pick any file from any provider apps
view.attachAnyFileIntent
.doOnNext { newState { copy(attaching = false) } }
.autoDisposable(view.scope())
.subscribe { view.requestGallery("*/*", ComposeView.AttachAFileRequestCode) }
// Choose a time to schedule the message // Choose a time to schedule the message
view.scheduleIntent view.scheduleIntent
@@ -552,15 +558,15 @@ class ComposeViewModel @Inject constructor(
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { view.requestDatePicker() } .subscribe { view.requestDatePicker() }
// A photo was selected // a file, photo or otherwise, was picked by the user
Observable.merge( Observable.merge(
view.attachmentSelectedIntent.map { uri -> Attachment.Image(uri) }, view.attachAnyFileSelectedIntent.map { uri -> Attachment(uri) },
view.inputContentIntent.map { inputContent -> Attachment.Image(inputContent = inputContent) }) view.inputContentIntent.map { inputContent -> Attachment(inputContent = inputContent) }
.withLatestFrom(attachments) { attachment, attachments -> attachments + attachment } )
.doOnNext(attachments::onNext) .withLatestFrom(attachments) { attachment, attachments -> attachments + attachment }
.autoDisposable(view.scope()) .doOnNext(attachments::onNext)
.subscribe { newState { copy(attaching = false) } } .autoDisposable(view.scope())
.subscribe { newState { copy(attaching = false) } }
// Set the scheduled time // Set the scheduled time
view.scheduleSelectedIntent view.scheduleSelectedIntent
.filter { scheduled -> .filter { scheduled ->
@@ -579,7 +585,7 @@ class ComposeViewModel @Inject constructor(
// Contact was selected for attachment // Contact was selected for attachment
view.contactSelectedIntent view.contactSelectedIntent
.map { uri -> Attachment.Contact(getVCard(uri)!!) } .map { uri -> Attachment(getFullVCardUri(uri)) }
.withLatestFrom(attachments) { attachment, attachments -> attachments + attachment } .withLatestFrom(attachments) { attachment, attachments -> attachments + attachment }
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.autoDisposable(view.scope()) .autoDisposable(view.scope())
@@ -704,7 +710,6 @@ class ComposeViewModel @Inject constructor(
state.scheduled != 0L -> { state.scheduled != 0L -> {
newState { copy(scheduled = 0) } newState { copy(scheduled = 0) }
val uris = attachments val uris = attachments
.mapNotNull { it as? Attachment.Image }
.map { it.getUri() } .map { it.getUri() }
.map { it.toString() } .map { it.toString() }
val params = AddScheduledMessage val params = AddScheduledMessage
@@ -784,17 +789,17 @@ class ComposeViewModel @Inject constructor(
} }
private fun getVCard(contactData: Uri): String? { private fun getFullVCardUri(contactData: Uri): Uri {
val lookupKey = context.contentResolver.query(contactData, null, null, null, null)?.use { cursor -> val lookupKey = context.contentResolver.query(contactData, null, null, null, null)?.use {
cursor.moveToFirst() it.moveToFirst()
cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY)) val index = it.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY)
if (index >= 0)
it.getString(index)
else
""
} }
val vCardUri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey) return Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey)
return context.contentResolver.openAssetFileDescriptor(vCardUri, "r")
?.createInputStream()
?.readBytes()
?.let { bytes -> String(bytes) }
} }
} }
@@ -19,32 +19,112 @@
package dev.octoshrimpy.quik.feature.scheduled package dev.octoshrimpy.quik.feature.scheduled
import android.content.Context import android.content.Context
import android.content.Intent
import android.media.MediaMetadataRetriever
import android.net.Uri import android.net.Uri
import android.provider.MediaStore.MATCH_DEFAULT
import android.provider.OpenableColumns
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.bumptech.glide.Glide
import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkAdapter import dev.octoshrimpy.quik.common.base.QkAdapter
import dev.octoshrimpy.quik.common.base.QkViewHolder import dev.octoshrimpy.quik.common.base.QkViewHolder
import dev.octoshrimpy.quik.util.GlideApp import dev.octoshrimpy.quik.extensions.resourceExists
import kotlinx.android.synthetic.main.attachment_image_list_item.view.* import kotlinx.android.synthetic.main.scheduled_message_image_list_item.fileName
import kotlinx.android.synthetic.main.scheduled_message_image_list_item.* import kotlinx.android.synthetic.main.scheduled_message_image_list_item.thumbnail
import javax.inject.Inject import javax.inject.Inject
class ScheduledMessageAttachmentAdapter @Inject constructor( class ScheduledMessageAttachmentAdapter @Inject constructor(
private val context: Context private val context: Context
) : QkAdapter<Uri>() { ) : QkAdapter<Uri>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_image_list_item, parent, false) return QkViewHolder(
view.thumbnail.clipToOutline = true LayoutInflater
.from(parent.context)
return QkViewHolder(view) .inflate(R.layout.scheduled_message_image_list_item, parent, false)
)
} }
override fun onBindViewHolder(holder: QkViewHolder, position: Int) { override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
val attachment = getItem(position) val uri = getItem(position)
GlideApp.with(context).load(attachment).into(holder.thumbnail) // if uri target doesn't exist anymore
if (!uri.resourceExists(context)) {
holder.thumbnail.setImageResource(android.R.drawable.ic_delete)
holder.fileName.text = context.getString(R.string.attachment_missing)
holder.fileName.visibility = View.VISIBLE
return
}
val mimeType = context.contentResolver.getType(uri)
// if attachment mime type is image/* or video/*, use image/video-frame
if ((mimeType?.startsWith("image/") == true) ||
(mimeType?.startsWith("video/") == true)
) {
Glide
.with(context)
.load(uri)
.into(holder.thumbnail)
return
}
// if audio mime type, try and use embedded image if one exists
if (mimeType?.startsWith("audio/") == true) {
val metaDataRetriever = MediaMetadataRetriever()
metaDataRetriever.setDataSource(context, uri)
val embeddedPicture = metaDataRetriever.embeddedPicture
if (embeddedPicture != null) {
Glide
.with(context)
.load(embeddedPicture)
.into(holder.thumbnail)
return
}
}
// try and use icon from default app for type
val intent = Intent(Intent.ACTION_VIEW).setDataAndType(uri, mimeType)
val appIcon = context
.packageManager
.resolveActivity(intent, MATCH_DEFAULT)
?.loadIcon(context.packageManager)
if (appIcon != null)
Glide
.with(context)
.load(appIcon)
.into(holder.thumbnail)
else if (mimeType?.startsWith("audio/") == true)
// else, if audio, use default local audio icon
Glide
.with(context)
.load(R.drawable.ic_round_volume_up_24)
.into(holder.thumbnail)
else
// else, use default attachment icon
Glide
.with(context)
.load(R.drawable.ic_attachment_black_24dp)
.into(holder.thumbnail)
// else, show file name
val cursor = context.contentResolver.query(
uri, arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null
)
cursor?.use {
try {
cursor.moveToFirst()
holder.fileName.text = cursor.getString(
cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME) ?: 0
)
holder.fileName.visibility = View.VISIBLE
} catch (e: Exception) {
}
}
} }
} }
@@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M3,10v4c0,0.55 0.45,1 1,1h3l3.29,3.29c0.63,0.63 1.71,0.18 1.71,-0.71L12,6.41c0,-0.89 -1.08,-1.34 -1.71,-0.71L7,9L4,9c-0.55,0 -1,0.45 -1,1zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,4.45v0.2c0,0.38 0.25,0.71 0.6,0.85C17.18,6.53 19,9.06 19,12s-1.82,5.47 -4.4,6.5c-0.36,0.14 -0.6,0.47 -0.6,0.85v0.2c0,0.63 0.63,1.07 1.21,0.85C18.6,19.11 21,15.84 21,12s-2.4,-7.11 -5.79,-8.4c-0.58,-0.23 -1.21,0.22 -1.21,0.85z"/>
</vector>
@@ -37,7 +37,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:src="@tools:sample/avatars" /> tools:src="@tools:sample/backgrounds/scenic[0]" />
<TextView
android:id="@+id/fileName"
style="@style/TextPrimary"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ddffffff"
android:gravity="center"
android:visibility="gone"
tools:visibility="visible" />
</FrameLayout> </FrameLayout>
@@ -204,7 +204,7 @@
android:layout_height="56dp" android:layout_height="56dp"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/ic_cancel_black_24dp" android:src="@drawable/ic_cancel_black_24dp"
android:tint="?android:attr/textColorSecondary" app:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toTopOf="@id/scheduledSeparator" app:layout_constraintBottom_toTopOf="@id/scheduledSeparator"
app:layout_constraintEnd_toEndOf="@id/messageBackground" /> app:layout_constraintEnd_toEndOf="@id/messageBackground" />
@@ -230,7 +230,7 @@
app:layout_constraintBottom_toTopOf="@id/message" app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintEnd_toEndOf="@id/messageBackground" app:layout_constraintEnd_toEndOf="@id/messageBackground"
app:layout_constraintStart_toStartOf="@id/messageBackground" app:layout_constraintStart_toStartOf="@id/messageBackground"
tools:listitem="@layout/attachment_image_list_item" /> tools:listitem="@layout/attachment_file_list_item" />
<dev.octoshrimpy.quik.common.widget.QkEditText <dev.octoshrimpy.quik.common.widget.QkEditText
android:id="@+id/message" android:id="@+id/message"
@@ -262,7 +262,7 @@
android:contentDescription="@string/compose_sim_cd" android:contentDescription="@string/compose_sim_cd"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_sim_card_black_24dp" android:src="@drawable/ic_sim_card_black_24dp"
android:tint="?android:attr/textColorSecondary" app:tint="?android:attr/textColorSecondary"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/messageBackground" app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="@id/messageBackground" /> app:layout_constraintEnd_toEndOf="@id/messageBackground" />
@@ -304,7 +304,7 @@
android:contentDescription="@string/compose_send_cd" android:contentDescription="@string/compose_send_cd"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/ic_send_black_24dp" android:src="@drawable/ic_send_black_24dp"
android:tint="?android:textColorSecondary" app:tint="?android:textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/messageBackground" app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
@@ -371,7 +371,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
app:constraint_referenced_ids="contact,contactLabel,schedule,scheduleLabel,gallery,galleryLabel,camera,cameraLabel,attachingBackground" /> app:constraint_referenced_ids="contact,contactLabel,schedule,scheduleLabel,gallery,galleryLabel,attachAFileIcon,attachAFileLabel,camera,cameraLabel,attachingBackground" />
<View <View
android:id="@+id/attachingBackground" android:id="@+id/attachingBackground"
@@ -395,7 +395,7 @@
android:elevation="4dp" android:elevation="4dp"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/ic_person_black_24dp" android:src="@drawable/ic_person_black_24dp"
android:tint="?android:attr/textColorSecondary" app:tint="?android:attr/textColorSecondary"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/schedule" app:layout_constraintBottom_toTopOf="@id/schedule"
app:layout_constraintEnd_toEndOf="@id/attach" app:layout_constraintEnd_toEndOf="@id/attach"
@@ -429,9 +429,9 @@
android:elevation="4dp" android:elevation="4dp"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/ic_event_black_24dp" android:src="@drawable/ic_event_black_24dp"
android:tint="?android:attr/textColorSecondary" app:tint="?android:attr/textColorSecondary"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/gallery" app:layout_constraintBottom_toTopOf="@id/attachAFileIcon"
app:layout_constraintEnd_toEndOf="@id/attach" app:layout_constraintEnd_toEndOf="@id/attach"
app:layout_constraintStart_toStartOf="@id/attach" /> app:layout_constraintStart_toStartOf="@id/attach" />
@@ -452,6 +452,43 @@
app:layout_constraintStart_toEndOf="@id/schedule" app:layout_constraintStart_toEndOf="@id/schedule"
app:layout_constraintTop_toTopOf="@id/schedule" /> app:layout_constraintTop_toTopOf="@id/schedule" />
<ImageView
android:id="@+id/attachAFileIcon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="12dp"
android:background="@drawable/circle"
android:backgroundTint="?attr/bubbleColor"
android:contentDescription="@string/compose_attach_file_cd"
android:elevation="4dp"
android:padding="10dp"
android:rotation="-45"
android:src="@drawable/ic_attachment_black_24dp"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/gallery"
app:layout_constraintEnd_toEndOf="@id/attach"
app:layout_constraintStart_toStartOf="@id/attach"
app:tint="?android:attr/textColorSecondary" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/attachAFileLabel"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_4dp"
android:backgroundTint="?attr/bubbleColor"
android:elevation="4dp"
android:gravity="center_vertical"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:text="@string/compose_attach_file_cd"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintBottom_toBottomOf="@id/attachAFileIcon"
app:layout_constraintStart_toEndOf="@id/attachAFileIcon"
app:layout_constraintTop_toTopOf="@id/attachAFileIcon" />
<ImageView <ImageView
android:id="@+id/gallery" android:id="@+id/gallery"
android:layout_width="40dp" android:layout_width="40dp"
@@ -463,7 +500,7 @@
android:elevation="4dp" android:elevation="4dp"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/ic_insert_photo_black_24dp" android:src="@drawable/ic_insert_photo_black_24dp"
android:tint="?android:attr/textColorSecondary" app:tint="?android:attr/textColorSecondary"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/camera" app:layout_constraintBottom_toTopOf="@id/camera"
app:layout_constraintEnd_toEndOf="@id/attach" app:layout_constraintEnd_toEndOf="@id/attach"
@@ -497,7 +534,7 @@
android:elevation="4dp" android:elevation="4dp"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/ic_camera_alt_black_24dp" android:src="@drawable/ic_camera_alt_black_24dp"
android:tint="?android:attr/textColorSecondary" app:tint="?android:attr/textColorSecondary"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/attach" app:layout_constraintBottom_toTopOf="@id/attach"
app:layout_constraintEnd_toEndOf="@id/attach" app:layout_constraintEnd_toEndOf="@id/attach"
@@ -19,18 +19,27 @@
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="48dp" android:layout_width="56dp"
android:layout_height="48dp" android:layout_height="56dp"
android:layout_marginEnd="8dp"> android:layout_marginEnd="8dp">
<ImageView <ImageView
android:id="@+id/thumbnail" android:id="@+id/thumbnail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:adjustViewBounds="true"
android:background="@drawable/rounded_rectangle_4dp" android:background="@drawable/rounded_rectangle_4dp"
android:backgroundTint="?android:attr/divider" android:backgroundTint="?android:attr/divider"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:src="@tools:sample/backgrounds/scenic" /> tools:src="@tools:sample/backgrounds/scenic" />
<TextView
android:id="@+id/fileName"
style="@style/TextPrimary"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ddffffff"
android:gravity="center"
android:visibility="gone"
tools:visibility="visible" />
</FrameLayout> </FrameLayout>
@@ -250,7 +250,7 @@
</plurals> </plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string> <string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string> <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string> <string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Συγχρονισμός μηνυμάτων</string> <string name="settings_sync_title">Συγχρονισμός μηνυμάτων</string>
<string name="settings_sync_summary">Επανασυγχρονισμός μηνυμάτων με τη βάση δεδομένων SMS του Android</string> <string name="settings_sync_summary">Επανασυγχρονισμός μηνυμάτων με τη βάση δεδομένων SMS του Android</string>
<string name="settings_about_title">Σχετικά με το QUIK</string> <string name="settings_about_title">Σχετικά με το QUIK</string>
@@ -254,7 +254,7 @@
</plurals> </plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string> <string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string> <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string> <string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string> <string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string> <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string> <string name="settings_about_title">About QUIK</string>
@@ -254,7 +254,7 @@
</plurals> </plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string> <string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string> <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string> <string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sinchronizuoti pranešimus</string> <string name="settings_sync_title">Sinchronizuoti pranešimus</string>
<string name="settings_sync_summary">Iš naujo sinchronizuoti Android pranešimų duomenų bazę</string> <string name="settings_sync_summary">Iš naujo sinchronizuoti Android pranešimų duomenų bazę</string>
<string name="settings_about_title">Apie QUIK</string> <string name="settings_about_title">Apie QUIK</string>
@@ -250,7 +250,7 @@
</plurals> </plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string> <string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string> <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string> <string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string> <string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string> <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string> <string name="settings_about_title">About QUIK</string>
@@ -250,7 +250,7 @@
</plurals> </plurals>
<string name="settings_long_as_mms_title">நீண்ட செய்திகளை எம்.எம்.எஸ் ஆக அனுப்பு</string> <string name="settings_long_as_mms_title">நீண்ட செய்திகளை எம்.எம்.எஸ் ஆக அனுப்பு</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string> <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string> <string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">தகவல்களை ஒத்திசை</string> <string name="settings_sync_title">தகவல்களை ஒத்திசை</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string> <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">QUIK பற்றி</string> <string name="settings_about_title">QUIK பற்றி</string>
@@ -250,7 +250,7 @@
</plurals> </plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string> <string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string> <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string> <string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string> <string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string> <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string> <string name="settings_about_title">About QUIK</string>
@@ -250,7 +250,7 @@
</plurals> </plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string> <string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string> <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string> <string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string> <string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string> <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string> <string name="settings_about_title">About QUIK</string>
+3 -1
View File
@@ -141,6 +141,7 @@
<string name="compose_details_delivered">Delivered: %s</string> <string name="compose_details_delivered">Delivered: %s</string>
<string name="compose_details_error_code">Error code: %d</string> <string name="compose_details_error_code">Error code: %d</string>
<string name="compose_attach_cd">Add an attachment</string> <string name="compose_attach_cd">Add an attachment</string>
<string name="compose_attach_file_cd">Attach any file</string>
<string name="compose_gallery_cd">Attach a photo</string> <string name="compose_gallery_cd">Attach a photo</string>
<string name="compose_camera_cd">Take a photo</string> <string name="compose_camera_cd">Take a photo</string>
<string name="compose_schedule_cd">Schedule message</string> <string name="compose_schedule_cd">Schedule message</string>
@@ -211,6 +212,7 @@
<string name="scheduled_empty_message_3_timestamp">Sending on December 23rd&#x200A;</string> <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd&#x200A;</string>
<string name="scheduled_compose_cd">Schedule a message</string> <string name="scheduled_compose_cd">Schedule a message</string>
<string name="scheduled_options_title">Scheduled message</string> <string name="scheduled_options_title">Scheduled message</string>
<string name="attachment_missing">Missing</string>
<string-array name="scheduled_options"> <string-array name="scheduled_options">
<item>Send now</item> <item>Send now</item>
<item>Copy text</item> <item>Copy text</item>
@@ -284,7 +286,7 @@
</plurals> </plurals>
<string name="settings_long_as_mms_title">Send long messages as MMS</string> <string name="settings_long_as_mms_title">Send long messages as MMS</string>
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string> <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
<string name="settings_mms_size_title">Auto-compress MMS attachments</string> <string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
<string name="settings_sync_title">Sync messages</string> <string name="settings_sync_title">Sync messages</string>
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string> <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
<string name="settings_about_title">About QUIK</string> <string name="settings_about_title">About QUIK</string>