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

minor code style updates

This commit is contained in:
Tibor Kaputa 2022-11-06 10:00:09 +01:00 committed by GitHub
parent 48d22d8aa5
commit d8aaf3e7e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,6 @@ class ThreadActivity : SimpleActivity() {
} }
bus?.post(Events.RefreshMessages()) bus?.post(Events.RefreshMessages())
isActivityVisible = false isActivityVisible = false
} }
@ -220,27 +219,13 @@ class ThreadActivity : SimpleActivity() {
if (resultCode != Activity.RESULT_OK) return if (resultCode != Activity.RESULT_OK) return
val data = resultData?.data val data = resultData?.data
when (requestCode) { if (requestCode == CAPTURE_PHOTO_INTENT && capturedImageUri != null) {
CAPTURE_PHOTO_INTENT -> if (capturedImageUri != null) {
addAttachment(capturedImageUri!!) addAttachment(capturedImageUri!!)
} } else if (data != null) {
CAPTURE_VIDEO_INTENT -> if (data != null) { when (requestCode) {
addAttachment(data) CAPTURE_VIDEO_INTENT, PICK_DOCUMENT_INTENT, CAPTURE_AUDIO_INTENT, PICK_PHOTO_VIDEO_INTENT -> addAttachment(data)
} PICK_CONTACT_INTENT -> addContactAttachment(data)
PICK_DOCUMENT_INTENT -> if (data != null) { PICK_SAVE_FILE_INTENT -> saveAttachment(resultData)
addAttachment(data)
}
CAPTURE_AUDIO_INTENT -> if (data != null) {
addAttachment(data)
}
PICK_PHOTO_VIDEO_INTENT -> if (data != null) {
addAttachment(data)
}
PICK_CONTACT_INTENT -> if (data != null) {
addContactAttachment(data)
}
PICK_SAVE_FILE_INTENT -> if (data != null) {
saveAttachment(resultData)
} }
} }
} }
@ -450,6 +435,7 @@ class ThreadActivity : SimpleActivity() {
setTextColor(textColor) setTextColor(textColor)
compoundDrawables.forEach { it?.applyColorFilter(textColor) } compoundDrawables.forEach { it?.applyColorFilter(textColor) }
} }
confirm_manage_contacts.applyColorFilter(textColor) confirm_manage_contacts.applyColorFilter(textColor)
thread_add_attachment.applyColorFilter(textColor) thread_add_attachment.applyColorFilter(textColor)
@ -463,6 +449,7 @@ class ThreadActivity : SimpleActivity() {
thread_send_message.setOnClickListener { thread_send_message.setOnClickListener {
sendMessage() sendMessage()
} }
thread_send_message.setOnLongClickListener { thread_send_message.setOnLongClickListener {
if (!isScheduledMessage) { if (!isScheduledMessage) {
launchScheduleSendDialog() launchScheduleSendDialog()
@ -849,7 +836,6 @@ class ThreadActivity : SimpleActivity() {
addCategory(Intent.CATEGORY_OPENABLE) addCategory(Intent.CATEGORY_OPENABLE)
type = "*/*" type = "*/*"
putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes) putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
launchActivityForResult(this, PICK_PHOTO_VIDEO_INTENT) launchActivityForResult(this, PICK_PHOTO_VIDEO_INTENT)
} }
} }
@ -860,16 +846,15 @@ class ThreadActivity : SimpleActivity() {
addCategory(Intent.CATEGORY_OPENABLE) addCategory(Intent.CATEGORY_OPENABLE)
type = "*/*" type = "*/*"
putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes) putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
launchActivityForResult(this, PICK_DOCUMENT_INTENT) launchActivityForResult(this, PICK_DOCUMENT_INTENT)
} }
} }
private fun launchPickContactIntent() { private fun launchPickContactIntent() {
val intent = Intent(Intent.ACTION_PICK).apply { Intent(Intent.ACTION_PICK).apply {
type = ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE type = ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE
launchActivityForResult(this, PICK_CONTACT_INTENT)
} }
launchActivityForResult(intent, PICK_CONTACT_INTENT)
} }
private fun addContactAttachment(contactUri: Uri) { private fun addContactAttachment(contactUri: Uri) {
@ -936,7 +921,6 @@ class ThreadActivity : SimpleActivity() {
isPending = mimeType.isImageMimeType() && !mimeType.isGifMimeType() isPending = mimeType.isImageMimeType() && !mimeType.isGifMimeType()
) )
adapter.addAttachment(attachment) adapter.addAttachment(attachment)
checkSendMessageAvailability() checkSendMessageAvailability()
} }
@ -1178,7 +1162,6 @@ class ThreadActivity : SimpleActivity() {
type = mimeType type = mimeType
addCategory(Intent.CATEGORY_OPENABLE) addCategory(Intent.CATEGORY_OPENABLE)
putExtra(Intent.EXTRA_TITLE, path.split("/").last()) putExtra(Intent.EXTRA_TITLE, path.split("/").last())
launchActivityForResult(this, PICK_SAVE_FILE_INTENT, error = R.string.system_service_disabled) launchActivityForResult(this, PICK_SAVE_FILE_INTENT, error = R.string.system_service_disabled)
} }
} }
@ -1449,11 +1432,9 @@ class ThreadActivity : SimpleActivity() {
if (insets.isVisible(typeMask)) { if (insets.isVisible(typeMask)) {
config.keyboardHeight = insets.getInsets(typeMask).bottom config.keyboardHeight = insets.getInsets(typeMask).bottom
hideAttachmentPicker() hideAttachmentPicker()
} else { } else if (isAttachmentPickerVisible) {
if (isAttachmentPickerVisible) {
showAttachmentPicker() showAttachmentPicker()
} }
}
insets insets
} }