Merge branch 'master' into add-pin-conversation

This commit is contained in:
Agnieszka C 2021-09-21 07:30:00 +02:00 committed by GitHub
commit 0f12365fc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 6 deletions

View File

@ -1,6 +1,14 @@
Changelog
==========
Version 5.10.1 *(2021-09-16)*
----------------------------
* Automatically resize sent MMS image attachments by default, allow customizing the limit
* Added Draft support
* Allow marking conversations un/read from the main screen
* Some other stability, UX and translation improvements
Version 5.10.0 *(2021-08-27)*
----------------------------

View File

@ -16,8 +16,8 @@ android {
applicationId "com.simplemobiletools.smsmessenger"
minSdkVersion 22
targetSdkVersion 30
versionCode 35
versionName "5.10.0"
versionCode 36
versionName "5.10.1"
setProperty("archivesBaseName", "sms-messenger")
}

View File

@ -40,12 +40,15 @@ class ConversationsAdapter(
override fun getActionMenuId() = R.menu.cab_conversations
override fun prepareActionMode(menu: Menu) {
val selectedItems = getSelectedItems()
menu.apply {
findItem(R.id.cab_block_number).isVisible = isNougatPlus()
findItem(R.id.cab_add_number_to_contact).isVisible = isOneItemSelected() && getSelectedItems().firstOrNull()?.isGroupConversation == false
findItem(R.id.cab_dial_number).isVisible = isOneItemSelected() && getSelectedItems().firstOrNull()?.isGroupConversation == false
findItem(R.id.cab_copy_number).isVisible = isOneItemSelected() && getSelectedItems().firstOrNull()?.isGroupConversation == false
findItem(R.id.cab_add_number_to_contact).isVisible = isOneItemSelected() && selectedItems.firstOrNull()?.isGroupConversation == false
findItem(R.id.cab_dial_number).isVisible = isOneItemSelected() && selectedItems.firstOrNull()?.isGroupConversation == false
findItem(R.id.cab_copy_number).isVisible = isOneItemSelected() && selectedItems.firstOrNull()?.isGroupConversation == false
findItem(R.id.cab_mark_as_read).isVisible = selectedItems.any { !it.read }
findItem(R.id.cab_mark_as_unread).isVisible = selectedItems.any { it.read }
checkPinBtnVisibility(this)
}
}

View File

@ -0,0 +1,4 @@
* Automatically resize sent MMS image attachments by default, allow customizing the limit
* Added Draft support
* Allow marking conversations un/read from the main screen
* Some other stability, UX and translation improvements