diff --git a/app/src/main/java/org/linphone/contacts/ContactLoader.kt b/app/src/main/java/org/linphone/contacts/ContactLoader.kt index a6096c6a7..07abcb678 100644 --- a/app/src/main/java/org/linphone/contacts/ContactLoader.kt +++ b/app/src/main/java/org/linphone/contacts/ContactLoader.kt @@ -291,7 +291,7 @@ class ContactLoader : LoaderManager.LoaderCallbacks { if (core.globalState == GlobalState.Shutdown || core.globalState == GlobalState.Off) { Log.w("$TAG Core is being stopped or already destroyed, abort") - } else if (friends.isEmpty()) { + } else if (friends.isEmpty) { Log.w("$TAG No friend created!") } else { Log.i("$TAG ${friends.size} friends fetched") diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt index 10b210fa0..629817b5d 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt @@ -1276,7 +1276,7 @@ open class ConversationFragment : SlidingPaneChildFragment() { val model = MessageReactionsModel(chatMessageModel.chatMessage) { reactionsModel -> coreContext.postOnMainThread { - if (reactionsModel.allReactions.isEmpty()) { + if (reactionsModel.allReactions.isEmpty) { Log.i("$TAG No reaction to display, closing bottom sheet") val bottomSheetBehavior = BottomSheetBehavior.from( binding.messageBottomSheet.root diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt index 3e4338eea..788346f7e 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt @@ -288,7 +288,7 @@ class ConversationViewModel list.remove(found) eventsList = list updateEvents.postValue(Event(true)) - isEmpty.postValue(eventsList.isEmpty()) + isEmpty.postValue(eventsList.isEmpty) } else { Log.e("$TAG Failed to find matching message in conversation events list") } @@ -428,7 +428,7 @@ class ConversationViewModel list.remove(found) eventsList = list updateEvents.postValue(Event(true)) - isEmpty.postValue(eventsList.isEmpty()) + isEmpty.postValue(eventsList.isEmpty) } else { Log.e( "$TAG Failed to find chat message id [${chatMessageModel.id}] in events list!" @@ -524,7 +524,7 @@ class ConversationViewModel list.addAll(eventsList) eventsList = list updateEvents.postValue(Event(true)) - isEmpty.postValue(eventsList.isEmpty()) + isEmpty.postValue(eventsList.isEmpty) } } } @@ -647,7 +647,7 @@ class ConversationViewModel Log.i("$TAG Extracted [${list.size}] events from conversation history in database") eventsList = list updateEvents.postValue(Event(true)) - isEmpty.postValue(eventsList.isEmpty()) + isEmpty.postValue(eventsList.isEmpty) } @WorkerThread @@ -694,7 +694,7 @@ class ConversationViewModel list.addAll(newList) eventsList = list updateEvents.postValue(Event(true)) - isEmpty.postValue(eventsList.isEmpty()) + isEmpty.postValue(eventsList.isEmpty) } @WorkerThread @@ -726,7 +726,7 @@ class ConversationViewModel list.addAll(eventsList) eventsList = list updateEvents.postValue(Event(true)) - isEmpty.postValue(eventsList.isEmpty()) + isEmpty.postValue(eventsList.isEmpty) } @WorkerThread @@ -784,7 +784,7 @@ class ConversationViewModel eventsList.addAll(processGroupedEvents(arrayListOf(event))) } else { for (event in history) { - if (groupedEventLogs.isEmpty()) { + if (groupedEventLogs.isEmpty) { groupedEventLogs.add(event) continue } diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt index 9702a26bb..cd9d6ccad 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt @@ -409,7 +409,7 @@ class SendMessageInConversationViewModel attachments.value = list maxNumberOfAttachmentsReached.value = list.size >= MAX_FILES_TO_ATTACH - if (list.isEmpty()) { + if (list.isEmpty) { isFileAttachmentsListOpen.value = false } } diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt index 4496aa6d8..c3a2fb6c2 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingsListViewModel.kt @@ -177,7 +177,7 @@ class MeetingsListViewModel val organizerCheck = info.organizer?.asStringUriOnly()?.contains( filter, ignoreCase = true - ) ?: false + ) == true val subjectCheck = info.subject?.contains(filter, ignoreCase = true) == true val descriptionCheck = info.description?.contains(filter, ignoreCase = true) == true val participantsCheck = info.participantInfos.find { diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt index 3b8c83c2c..00eae160b 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt @@ -328,7 +328,7 @@ abstract class AddressSelectionViewModel list.addAll(contactsList) list.addAll(suggestionsList) modelsList.postValue(list) - isEmpty.postValue(list.isEmpty()) + isEmpty.postValue(list.isEmpty) Log.i( "$TAG Processed [${results.size}] results: [${conversationsList.size}] conversations, [${favoritesList.size}] favorites, [${contactsList.size}] contacts and [${suggestionsList.size}] suggestions" ) diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml index c37a87ee4..94a7ff754 100644 --- a/app/src/main/res/layout/account_list_cell.xml +++ b/app/src/main/res/layout/account_list_cell.xml @@ -104,6 +104,7 @@ android:layout_marginEnd="16dp" android:src="@drawable/voicemail" android:visibility="@{model.showMwi ? View.VISIBLE : View.GONE, default=gone}" + android:contentDescription="@string/content_description_voicemail_available" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/voicemail_count" app:layout_constraintEnd_toStartOf="@id/notifications_count"/> diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml index a166d7982..cb6250bbb 100644 --- a/app/src/main/res/layout/chat_list_cell.xml +++ b/app/src/main/res/layout/chat_list_cell.xml @@ -106,6 +106,7 @@ android:layout_marginTop="3dp" android:src="@drawable/forward" android:visibility="@{model.isLastMessageForwarded ? View.VISIBLE : View.GONE, default=gone}" + android:contentDescription="@null" app:layout_constraintStart_toEndOf="@id/last_message_sender" app:layout_constraintEnd_toStartOf="@id/last_message_or_composing" app:layout_constraintTop_toTopOf="@id/last_message_or_composing" diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml index 5450fd7f1..0e7412ce6 100644 --- a/app/src/main/res/layout/help_debug_fragment.xml +++ b/app/src/main/res/layout/help_debug_fragment.xml @@ -193,6 +193,7 @@ android:layout_marginStart="5dp" android:layout_marginEnd="16dp" android:src="@drawable/copy" + android:contentDescription="@string/content_description_copy_text_to_clipboard" app:tint="?attr/color_main2_600" app:layout_constraintTop_toTopOf="@id/app_version_subtitle" app:layout_constraintBottom_toBottomOf="@id/app_version_subtitle" @@ -250,6 +251,7 @@ android:layout_marginStart="5dp" android:layout_marginEnd="16dp" android:src="@drawable/copy" + android:contentDescription="@string/content_description_copy_text_to_clipboard" app:tint="?attr/color_main2_600" app:layout_constraintTop_toTopOf="@id/sdk_version_subtitle" app:layout_constraintBottom_toBottomOf="@id/sdk_version_subtitle" diff --git a/app/src/main/res/layout/meetings_list_decoration.xml b/app/src/main/res/layout/meetings_list_decoration.xml index a4caadb97..174f6edf4 100644 --- a/app/src/main/res/layout/meetings_list_decoration.xml +++ b/app/src/main/res/layout/meetings_list_decoration.xml @@ -1,6 +1,5 @@ - + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1c808a49d..ab6f1f596 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -748,7 +748,7 @@ Favoris Suggestions La permission de poster des notifications n\'est pas donnée ! - + %s message vocal en attente %s messages vocaux en attente diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b85f95d08..10aaf2d1b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,7 +14,6 @@ #FFB266 #FF5E00 #B72D00 - #7F2F00 #EEF6F8 #DFECF2 @@ -64,40 +63,34 @@ #FFE799 #F5BC00 #A37D00 - #806200 #DCF9E7 #80DCF9E7 #A8F0C2 #25D366 #1C9C4B - #136c34 #D6F4FF #80D6F4FF #99E4FF #00aff0 #0078A3 - #005d80 #FBE1DA #80FBE1DA #F5B53A #E14318 #A63211 - #73220c #FFD6F1 #80FFD6F1 #FF99DD #FF00A9 #B8007A - #800055 #FFD6FF #80FFD6FF #FF99FF #800080 #520052 - #80007f \ No newline at end of file diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 544eda04d..e59668806 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -57,7 +57,6 @@ 15dp 20dp - 28dp 70dp 110dp 345dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3dd404c28..0b28e1895 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -863,7 +863,6 @@ Message will no longer be a reply to a previous message Opens emoji picker Opens file picker - Opens camera to take a picture Click to edit the subject of this conversation Silences on/off this conversation Conversation is being removed @@ -889,6 +888,8 @@ Save LDAP configuration Plays the call recording Go to conversation + Copy text to clipboard + Voice message are available