From 6c6b74af5e499e440a9f62e0fb7f7b33bedfd103 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sat, 18 Jun 2022 22:24:12 +0530 Subject: [PATCH 1/7] Add sms, mms string resources --- app/src/main/res/values-ar/strings.xml | 2 ++ app/src/main/res/values-az/strings.xml | 2 ++ app/src/main/res/values-bg/strings.xml | 4 +++- app/src/main/res/values-ca/strings.xml | 4 +++- app/src/main/res/values-cs/strings.xml | 4 +++- app/src/main/res/values-da/strings.xml | 4 +++- app/src/main/res/values-de/strings.xml | 4 +++- app/src/main/res/values-el/strings.xml | 4 +++- app/src/main/res/values-eo/strings.xml | 2 ++ app/src/main/res/values-es/strings.xml | 6 ++++-- app/src/main/res/values-et/strings.xml | 4 +++- app/src/main/res/values-fi/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 4 +++- app/src/main/res/values-gl/strings.xml | 2 ++ app/src/main/res/values-hr/strings.xml | 2 ++ app/src/main/res/values-hu/strings.xml | 2 ++ app/src/main/res/values-in/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 4 +++- app/src/main/res/values-iw/strings.xml | 4 +++- app/src/main/res/values-ja/strings.xml | 4 +++- app/src/main/res/values-lt/strings.xml | 2 ++ app/src/main/res/values-ml/strings.xml | 2 ++ app/src/main/res/values-nb-rNO/strings.xml | 2 ++ app/src/main/res/values-nl/strings.xml | 6 ++++-- app/src/main/res/values-pl/strings.xml | 6 ++++-- app/src/main/res/values-pt-rBR/strings.xml | 4 +++- app/src/main/res/values-pt/strings.xml | 4 +++- app/src/main/res/values-ro/strings.xml | 4 +++- app/src/main/res/values-ru/strings.xml | 4 +++- app/src/main/res/values-sk/strings.xml | 4 +++- app/src/main/res/values-sv/strings.xml | 4 +++- app/src/main/res/values-ta/strings.xml | 2 ++ app/src/main/res/values-tr/strings.xml | 4 +++- app/src/main/res/values-uk/strings.xml | 4 +++- app/src/main/res/values-zh-rCN/strings.xml | 4 +++- app/src/main/res/values-zh-rTW/strings.xml | 4 +++- app/src/main/res/values/strings.xml | 2 ++ 37 files changed, 101 insertions(+), 27 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d56ddee0..98d2abd8 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -20,6 +20,8 @@ ازالة التثبيت اعادة ارسال Unable to compress image to selected size + SMS + MMS محادثة جديدة إضافة جهة اتصال أو رقم … diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 3f3dcbfd..bae992fb 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -20,6 +20,8 @@ Unpin Forward Unable to compress image to selected size + SMS + MMS New conversation Add Contact or Number… diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 523c21df..117e0ad5 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -19,7 +19,9 @@ Закачване отгоре Откачване Препращане - Невъзможно е да се компресира изображението до избрания размер + Unable to compress image to selected size + SMS + MMS Нов разговор Добавете контакт или номер… diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index beae3767..bfa85968 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -19,7 +19,9 @@ Fixa a la part superior No fixis Reenvia - No s\'ha pogut comprimir la imatge a la mida seleccionada + Unable to compress image to selected size + SMS + MMS Conversa nova Afegeix un contacte o número… diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3fddcd65..8ea93616 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -19,7 +19,9 @@ Pin to the top Odepnout konverzaci Přeposlat - Nepodařilo se komprimovat obrázek na požadovanou velikost + Unable to compress image to selected size + SMS + MMS Nová konverzace Přidejte kontakt nebo číslo… diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index db3178cf..8006a6bf 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -19,7 +19,9 @@ Pin to the top Frigør Fremad - Billedet kan ikke komprimeres til den valgte størrelse + Unable to compress image to selected size + SMS + MMS Ny Samtale Tilføj kontakt eller nummer… diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a605213d..87165ba3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -19,7 +19,9 @@ Oben anheften Losheften Weiterleiten - Bild kann nicht auf ausgewählte Größe komprimiert werden + Unable to compress image to selected size + SMS + MMS Neuer Chat Kontakt oder Nummer hinzufügen … diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 852a1f80..f44d6c1f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -18,7 +18,9 @@ Καρφίτσωμα στην κορυφή Ξεκαρφίτσωμα Προώθηση - Αδυναμία συμπίεσης εικόνας στο επιλεγμένο μέγεθος + Unable to compress image to selected size + SMS + MMS Νέα συνομιλία diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index e329906c..9654dd95 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -20,6 +20,8 @@ Depingli Forward Unable to compress image to selected size + SMS + MMS New conversation Add Contact or Number… diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bb2a1c4e..aaffcbcd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -19,7 +19,9 @@ Pin to the top Desanclar Reenviar - Incapaz de comprimir la imagen al tamaño seleccionado + Unable to compress image to selected size + SMS + MMS Nueva conversación Escribe contacto o número… @@ -97,4 +99,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 2907fd88..771feaec 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -19,7 +19,9 @@ Pin to the top Eemalda kinnitus Edasta - Pildi muutmine valitud suurusesse ei õnnestu + Unable to compress image to selected size + SMS + MMS Uus vestlus Add Contact or Number… diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f8885086..8cae7b20 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -20,6 +20,8 @@ Unpin Forward Unable to compress image to selected size + SMS + MMS Uusi keskustelu Lisää yhteystieto tai numero… diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f3cca51d..befa763d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -19,7 +19,9 @@ Épingler en haut Désépingler Transférer - Impossible de compresser l\'image à la taille sélectionnée + Unable to compress image to selected size + SMS + MMS Nouvelle conversation Ajouter un contact ou un numéro… diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 39dfb190..b6ee860c 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -20,6 +20,8 @@ Unpin Forward Unable to compress image to selected size + SMS + MMS Nova conversa Engadir contacto ou número… diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 3f3dcbfd..bae992fb 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -20,6 +20,8 @@ Unpin Forward Unable to compress image to selected size + SMS + MMS New conversation Add Contact or Number… diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 27dcdc32..6223d90c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -20,6 +20,8 @@ Kitűzés megszüntetése Továbbítás Unable to compress image to selected size + SMS + MMS Új beszélgetés Névjegy vagy szám hozzáadása… diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index cd853ec7..62991ed7 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -20,6 +20,8 @@ Unpin Forward Unable to compress image to selected size + SMS + MMS Percakapan baru Tambahkan Kontak atau Nomor… diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1aa284b3..c8e6e8b0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -19,7 +19,9 @@ Fissa in alto Rimuovi Inoltra - Impossibile comprimere l\'immagine alla dimensione selezionata + Unable to compress image to selected size + SMS + MMS Nuova conversazione Inserisci contatto o numero… diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 7a0e9db6..413a4c27 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -19,7 +19,9 @@ הצמד למעלה בטל הצמדה התקדם - לא ניתן לדחוס תמונה לגודל שנבחר + Unable to compress image to selected size + SMS + MMS שיחה חדשה הוסף איש קשר או מספר… diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fbef8b6a..7d9f85b6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -19,7 +19,9 @@ 最上部に固定 固定を外す 転送 - 選択したサイズに画像を圧縮できません + Unable to compress image to selected size + SMS + MMS 新しい会話 連絡先や電話番号を追加… diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 0fcd3984..2d5245f7 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -20,6 +20,8 @@ Unpin Forward Unable to compress image to selected size + SMS + MMS Naujas pokalbis Pridėti kontaktą arba numerį… diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 37c70589..fc553258 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -19,6 +19,8 @@ Unpin Forward Unable to compress image to selected size + SMS + MMS പുതിയ സംഭാഷണം diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index bb4a78a0..75eaa27b 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -20,6 +20,8 @@ Løsne Videresend Unable to compress image to selected size + SMS + MMS Ny samtale Legg til kontakt eller nummer … diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d0e3d8a6..5e585ebc 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -19,7 +19,9 @@ Bovenaan vastzetten Losmaken Doorsturen - Kon de afbeelding niet comprimeren naar de gekozen grootte + Unable to compress image to selected size + SMS + MMS Nieuw gesprek Contact of nummer toevoegen… @@ -97,4 +99,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a21e0d3e..da51c99f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -19,7 +19,9 @@ Przypnij na górze Odepnij Przekaż dalej - Nie udało się skompresować obrazu do wybranego rozmiaru + Unable to compress image to selected size + SMS + MMS Nowa rozmowa Dodaj kontakt lub numer… @@ -99,4 +101,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0eda47d6..7af3d9d3 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -19,7 +19,9 @@ Fixar ao topo Desfixar Encaminhar - Não pôde comprimir imagem ao tamanho selecionado + Unable to compress image to selected size + SMS + MMS Nova conversa Adicionar contato ou número… diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3c2099a5..97860320 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -19,7 +19,9 @@ Fixar no topo Desafixar Reencaminhar - Incapaz de comprimir imagem no tamanho selecionado + Unable to compress image to selected size + SMS + MMS Nova conversa Adicionar contacto ou número… diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a94c6020..2024b10f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -19,7 +19,9 @@ Fixare în vârf Elimină fixarea Redirecţionare - Nu se poate comprima imaginea la dimensiunea selectată + Unable to compress image to selected size + SMS + MMS Conversaţie nouă Adaugă contact sau număr de telefon… diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4cf734bc..426f4042 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,7 +19,9 @@ Закрепить сверху Открепить Переслать - Невозможно сжать изображение до выбранного размера + Unable to compress image to selected size + SMS + MMS Новая переписка Добавить контакт или номер… diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index be6e7cd6..51a502e4 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -19,7 +19,9 @@ Pripnúť na vrch Odopnúť Preposlať - Nepodarilo sa zmenšiť obrázok na požadovanú veľkosť + Unable to compress image to selected size + SMS + MMS Nová konverzácia Pridať kontakt alebo číslo… diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a2621e49..053c63cb 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -19,7 +19,9 @@ Fäst högst upp Lossa Vidarebefordra - Det gick inte att komprimera bilden till den valda storleken + Unable to compress image to selected size + SMS + MMS Ny konversation Lägg till kontakt eller nummer… diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 39b5993f..da0b3236 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -20,6 +20,8 @@ பின் நீக்கு முன்னோக்கி Unable to compress image to selected size + SMS + MMS புதிய உரையாடல் தொடர்பு அல்லது எண்ணைச் சேர்க்கவும்… diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index dda719bc..d42add6c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -19,7 +19,9 @@ En üste sabitle Sabitlemeyi kaldır İlet - Resim seçilen boyuta sıkıştırılamıyor + Unable to compress image to selected size + SMS + MMS Yeni görüşme Kişi veya Numara Ekle… diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a639decc..75fc844f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -19,7 +19,9 @@ Pin to the top Відкріпити Переслати - Не вдається стиснути зображення до вибраного розміру + Unable to compress image to selected size + SMS + MMS Нове листування Додати контакт аба номер… diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ec50ea8e..8c85cb00 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -19,7 +19,9 @@ 置顶固定 取消固定 转发 - 无法将图像压缩到选定的大小 + Unable to compress image to selected size + SMS + MMS 新的对话 添加联系人或者号码… diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ca16481b..dfe29263 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -19,7 +19,9 @@ 釘選在頂部 取消釘選 轉傳 - 無法將圖片壓縮至指定大小 + Unable to compress image to selected size + SMS + MMS 新對話 新增聯絡對象或電話號碼…… diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f3dcbfd..bae992fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,6 +20,8 @@ Unpin Forward Unable to compress image to selected size + SMS + MMS New conversation Add Contact or Number… From 13e7ee1537000f0af549bca287690b4b50791ded Mon Sep 17 00:00:00 2001 From: Naveen Date: Sat, 18 Jun 2022 22:26:23 +0530 Subject: [PATCH 2/7] Add SMS/MMS label under Send button --- .../smsmessenger/activities/ThreadActivity.kt | 18 +++++++++++++++++- app/src/main/res/drawable/ic_send_vector.xml | 4 ++-- app/src/main/res/layout/activity_thread.xml | 8 +++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index fff98d21..3ed5cf2a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -35,6 +35,7 @@ import com.bumptech.glide.request.target.Target import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.klinker.android.send_message.Transaction +import com.klinker.android.send_message.Utils.getNumPages import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* @@ -311,6 +312,7 @@ class ThreadActivity : SimpleActivity() { runOnUiThread { setupThreadTitle() setupSIMSelector() + updateMessageType() } } } @@ -404,7 +406,10 @@ class ThreadActivity : SimpleActivity() { private fun setupButtons() { updateTextColors(thread_holder) val textColor = getProperTextColor() - thread_send_message.applyColorFilter(textColor) + thread_send_message.apply { + setTextColor(textColor) + compoundDrawables.forEach { it?.applyColorFilter(textColor) } + } confirm_manage_contacts.applyColorFilter(textColor) thread_add_attachment.applyColorFilter(textColor) @@ -821,6 +826,7 @@ class ThreadActivity : SimpleActivity() { if (attachmentSelections.isEmpty()) { thread_attachments_holder.beGone() } + checkSendMessageAvailability() } private fun checkSendMessageAvailability() { @@ -831,6 +837,7 @@ class ThreadActivity : SimpleActivity() { thread_send_message.isClickable = false thread_send_message.alpha = 0.4f } + updateMessageType() } private fun sendMessage() { @@ -1059,4 +1066,13 @@ class ThreadActivity : SimpleActivity() { setupAdapter() } + + private fun updateMessageType() { + val settings = getSendMessageSettings() + val text = thread_type_message.text.toString() + val isGroupMms = participants.size > 1 && config.sendGroupMessageMMS + val isLongMmsMessage = getNumPages(settings, text) > settings.sendLongAsMmsAfter && config.sendLongMessageMMS + val res = if (attachmentSelections.isNotEmpty() || isGroupMms || isLongMmsMessage) R.string.mms else R.string.sms + thread_send_message.setText(res) + } } diff --git a/app/src/main/res/drawable/ic_send_vector.xml b/app/src/main/res/drawable/ic_send_vector.xml index 9eb9bd31..84498427 100644 --- a/app/src/main/res/drawable/ic_send_vector.xml +++ b/app/src/main/res/drawable/ic_send_vector.xml @@ -1,6 +1,6 @@ - + android:drawableTop="@drawable/ic_send_vector" + android:paddingVertical="@dimen/small_margin" + android:text="@string/sms" + android:textSize="@dimen/smaller_text_size" /> From 3f80913b2ca000c47a3639417397db60cee60555 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sat, 18 Jun 2022 22:51:05 +0530 Subject: [PATCH 3/7] Update message type on contact add/remove --- .../simplemobiletools/smsmessenger/activities/ThreadActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 3ed5cf2a..3a6d7acf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -646,6 +646,7 @@ class ThreadActivity : SimpleActivity() { participants.add(contact) showSelectedContacts() + updateMessageType() } private fun markAsUnread() { @@ -957,6 +958,7 @@ class ThreadActivity : SimpleActivity() { private fun removeSelectedContact(id: Int) { participants = participants.filter { it.rawId != id }.toMutableList() as ArrayList showSelectedContacts() + updateMessageType() } private fun getPhoneNumbersFromIntent(): ArrayList { From 7695271de35f645b19482c61ae61e893bf9eabdd Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 19 Jun 2022 11:21:51 +0530 Subject: [PATCH 4/7] Move SMS, MMS strings to donottranslate --- app/src/main/res/values-ar/strings.xml | 2 -- app/src/main/res/values-az/strings.xml | 2 -- app/src/main/res/values-bg/strings.xml | 2 -- app/src/main/res/values-ca/strings.xml | 2 -- app/src/main/res/values-cs/strings.xml | 2 -- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-el/strings.xml | 2 -- app/src/main/res/values-eo/strings.xml | 2 -- app/src/main/res/values-es/strings.xml | 2 -- app/src/main/res/values-et/strings.xml | 2 -- app/src/main/res/values-fi/strings.xml | 2 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-gl/strings.xml | 2 -- app/src/main/res/values-hr/strings.xml | 2 -- app/src/main/res/values-hu/strings.xml | 2 -- app/src/main/res/values-in/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 2 -- app/src/main/res/values-iw/strings.xml | 2 -- app/src/main/res/values-ja/strings.xml | 2 -- app/src/main/res/values-lt/strings.xml | 2 -- app/src/main/res/values-ml/strings.xml | 2 -- app/src/main/res/values-nb-rNO/strings.xml | 2 -- app/src/main/res/values-nl/strings.xml | 2 -- app/src/main/res/values-pl/strings.xml | 2 -- app/src/main/res/values-pt-rBR/strings.xml | 2 -- app/src/main/res/values-pt/strings.xml | 2 -- app/src/main/res/values-ro/strings.xml | 2 -- app/src/main/res/values-ru/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 2 -- app/src/main/res/values-sv/strings.xml | 2 -- app/src/main/res/values-ta/strings.xml | 2 -- app/src/main/res/values-tr/strings.xml | 2 -- app/src/main/res/values-uk/strings.xml | 2 -- app/src/main/res/values-zh-rCN/strings.xml | 2 -- app/src/main/res/values-zh-rTW/strings.xml | 2 -- app/src/main/res/values/donottranslate.xml | 2 ++ app/src/main/res/values/strings.xml | 2 -- 38 files changed, 2 insertions(+), 74 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 98d2abd8..d56ddee0 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -20,8 +20,6 @@ ازالة التثبيت اعادة ارسال Unable to compress image to selected size - SMS - MMS محادثة جديدة إضافة جهة اتصال أو رقم … diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index bae992fb..3f3dcbfd 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -20,8 +20,6 @@ Unpin Forward Unable to compress image to selected size - SMS - MMS New conversation Add Contact or Number… diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 117e0ad5..c1423cf0 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -20,8 +20,6 @@ Откачване Препращане Unable to compress image to selected size - SMS - MMS Нов разговор Добавете контакт или номер… diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index bfa85968..c749a3bc 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -20,8 +20,6 @@ No fixis Reenvia Unable to compress image to selected size - SMS - MMS Conversa nova Afegeix un contacte o número… diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 8ea93616..331e5ef6 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -20,8 +20,6 @@ Odepnout konverzaci Přeposlat Unable to compress image to selected size - SMS - MMS Nová konverzace Přidejte kontakt nebo číslo… diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 8006a6bf..c23c1f7e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -20,8 +20,6 @@ Frigør Fremad Unable to compress image to selected size - SMS - MMS Ny Samtale Tilføj kontakt eller nummer… diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 87165ba3..8d015017 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -20,8 +20,6 @@ Losheften Weiterleiten Unable to compress image to selected size - SMS - MMS Neuer Chat Kontakt oder Nummer hinzufügen … diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f44d6c1f..a32dfe25 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -19,8 +19,6 @@ Ξεκαρφίτσωμα Προώθηση Unable to compress image to selected size - SMS - MMS Νέα συνομιλία diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 9654dd95..e329906c 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -20,8 +20,6 @@ Depingli Forward Unable to compress image to selected size - SMS - MMS New conversation Add Contact or Number… diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index aaffcbcd..49060fb6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -20,8 +20,6 @@ Desanclar Reenviar Unable to compress image to selected size - SMS - MMS Nueva conversación Escribe contacto o número… diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 771feaec..351f3b73 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -20,8 +20,6 @@ Eemalda kinnitus Edasta Unable to compress image to selected size - SMS - MMS Uus vestlus Add Contact or Number… diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 8cae7b20..f8885086 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -20,8 +20,6 @@ Unpin Forward Unable to compress image to selected size - SMS - MMS Uusi keskustelu Lisää yhteystieto tai numero… diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index befa763d..93d5fb22 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -20,8 +20,6 @@ Désépingler Transférer Unable to compress image to selected size - SMS - MMS Nouvelle conversation Ajouter un contact ou un numéro… diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index b6ee860c..39dfb190 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -20,8 +20,6 @@ Unpin Forward Unable to compress image to selected size - SMS - MMS Nova conversa Engadir contacto ou número… diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index bae992fb..3f3dcbfd 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -20,8 +20,6 @@ Unpin Forward Unable to compress image to selected size - SMS - MMS New conversation Add Contact or Number… diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6223d90c..27dcdc32 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -20,8 +20,6 @@ Kitűzés megszüntetése Továbbítás Unable to compress image to selected size - SMS - MMS Új beszélgetés Névjegy vagy szám hozzáadása… diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 62991ed7..cd853ec7 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -20,8 +20,6 @@ Unpin Forward Unable to compress image to selected size - SMS - MMS Percakapan baru Tambahkan Kontak atau Nomor… diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c8e6e8b0..7a9b46f8 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -20,8 +20,6 @@ Rimuovi Inoltra Unable to compress image to selected size - SMS - MMS Nuova conversazione Inserisci contatto o numero… diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 413a4c27..29d267bc 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -20,8 +20,6 @@ בטל הצמדה התקדם Unable to compress image to selected size - SMS - MMS שיחה חדשה הוסף איש קשר או מספר… diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7d9f85b6..a5298d34 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -20,8 +20,6 @@ 固定を外す 転送 Unable to compress image to selected size - SMS - MMS 新しい会話 連絡先や電話番号を追加… diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 2d5245f7..0fcd3984 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -20,8 +20,6 @@ Unpin Forward Unable to compress image to selected size - SMS - MMS Naujas pokalbis Pridėti kontaktą arba numerį… diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index fc553258..37c70589 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -19,8 +19,6 @@ Unpin Forward Unable to compress image to selected size - SMS - MMS പുതിയ സംഭാഷണം diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 75eaa27b..bb4a78a0 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -20,8 +20,6 @@ Løsne Videresend Unable to compress image to selected size - SMS - MMS Ny samtale Legg til kontakt eller nummer … diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 5e585ebc..a5ed5922 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -20,8 +20,6 @@ Losmaken Doorsturen Unable to compress image to selected size - SMS - MMS Nieuw gesprek Contact of nummer toevoegen… diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index da51c99f..05c886e6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -20,8 +20,6 @@ Odepnij Przekaż dalej Unable to compress image to selected size - SMS - MMS Nowa rozmowa Dodaj kontakt lub numer… diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7af3d9d3..9b5bb02b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -20,8 +20,6 @@ Desfixar Encaminhar Unable to compress image to selected size - SMS - MMS Nova conversa Adicionar contato ou número… diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 97860320..2566377a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -20,8 +20,6 @@ Desafixar Reencaminhar Unable to compress image to selected size - SMS - MMS Nova conversa Adicionar contacto ou número… diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 2024b10f..3d584e9f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -20,8 +20,6 @@ Elimină fixarea Redirecţionare Unable to compress image to selected size - SMS - MMS Conversaţie nouă Adaugă contact sau număr de telefon… diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 426f4042..286239ba 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -20,8 +20,6 @@ Открепить Переслать Unable to compress image to selected size - SMS - MMS Новая переписка Добавить контакт или номер… diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 51a502e4..fa016a7c 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -20,8 +20,6 @@ Odopnúť Preposlať Unable to compress image to selected size - SMS - MMS Nová konverzácia Pridať kontakt alebo číslo… diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 053c63cb..c42c3072 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -20,8 +20,6 @@ Lossa Vidarebefordra Unable to compress image to selected size - SMS - MMS Ny konversation Lägg till kontakt eller nummer… diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index da0b3236..39b5993f 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -20,8 +20,6 @@ பின் நீக்கு முன்னோக்கி Unable to compress image to selected size - SMS - MMS புதிய உரையாடல் தொடர்பு அல்லது எண்ணைச் சேர்க்கவும்… diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d42add6c..62056d35 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -20,8 +20,6 @@ Sabitlemeyi kaldır İlet Unable to compress image to selected size - SMS - MMS Yeni görüşme Kişi veya Numara Ekle… diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 75fc844f..7f1423d3 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -20,8 +20,6 @@ Відкріпити Переслати Unable to compress image to selected size - SMS - MMS Нове листування Додати контакт аба номер… diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8c85cb00..3233ee67 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -20,8 +20,6 @@ 取消固定 转发 Unable to compress image to selected size - SMS - MMS 新的对话 添加联系人或者号码… diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dfe29263..c8aff526 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -20,8 +20,6 @@ 取消釘選 轉傳 Unable to compress image to selected size - SMS - MMS 新對話 新增聯絡對象或電話號碼…… diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 4cd49a86..cbf72f20 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -8,6 +8,8 @@ 600KB 1MB 2MB + SMS + MMS Disabled delivery reports by default\n diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bae992fb..3f3dcbfd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,8 +20,6 @@ Unpin Forward Unable to compress image to selected size - SMS - MMS New conversation Add Contact or Number… From dd224678357ee74884469f4bccaee80ef0bb25b4 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 19 Jun 2022 13:56:31 +0530 Subject: [PATCH 5/7] Revert translated strings back to 4a35205 Translated strings were replaced by mistake in 6c6b74a --- app/src/main/res/values-bg/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 4 ++-- app/src/main/res/values-et/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 4 ++-- app/src/main/res/values-pl/strings.xml | 4 ++-- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- 24 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index c1423cf0..523c21df 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -19,7 +19,7 @@ Закачване отгоре Откачване Препращане - Unable to compress image to selected size + Невъзможно е да се компресира изображението до избрания размер Нов разговор Добавете контакт или номер… diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index c749a3bc..beae3767 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -19,7 +19,7 @@ Fixa a la part superior No fixis Reenvia - Unable to compress image to selected size + No s\'ha pogut comprimir la imatge a la mida seleccionada Conversa nova Afegeix un contacte o número… diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 331e5ef6..3fddcd65 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -19,7 +19,7 @@ Pin to the top Odepnout konverzaci Přeposlat - Unable to compress image to selected size + Nepodařilo se komprimovat obrázek na požadovanou velikost Nová konverzace Přidejte kontakt nebo číslo… diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c23c1f7e..db3178cf 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -19,7 +19,7 @@ Pin to the top Frigør Fremad - Unable to compress image to selected size + Billedet kan ikke komprimeres til den valgte størrelse Ny Samtale Tilføj kontakt eller nummer… diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8d015017..a605213d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -19,7 +19,7 @@ Oben anheften Losheften Weiterleiten - Unable to compress image to selected size + Bild kann nicht auf ausgewählte Größe komprimiert werden Neuer Chat Kontakt oder Nummer hinzufügen … diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index a32dfe25..852a1f80 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -18,7 +18,7 @@ Καρφίτσωμα στην κορυφή Ξεκαρφίτσωμα Προώθηση - Unable to compress image to selected size + Αδυναμία συμπίεσης εικόνας στο επιλεγμένο μέγεθος Νέα συνομιλία diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 49060fb6..bb2a1c4e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -19,7 +19,7 @@ Pin to the top Desanclar Reenviar - Unable to compress image to selected size + Incapaz de comprimir la imagen al tamaño seleccionado Nueva conversación Escribe contacto o número… @@ -97,4 +97,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - + \ No newline at end of file diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 351f3b73..2907fd88 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -19,7 +19,7 @@ Pin to the top Eemalda kinnitus Edasta - Unable to compress image to selected size + Pildi muutmine valitud suurusesse ei õnnestu Uus vestlus Add Contact or Number… diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 93d5fb22..f3cca51d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -19,7 +19,7 @@ Épingler en haut Désépingler Transférer - Unable to compress image to selected size + Impossible de compresser l\'image à la taille sélectionnée Nouvelle conversation Ajouter un contact ou un numéro… diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7a9b46f8..1aa284b3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -19,7 +19,7 @@ Fissa in alto Rimuovi Inoltra - Unable to compress image to selected size + Impossibile comprimere l\'immagine alla dimensione selezionata Nuova conversazione Inserisci contatto o numero… diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 29d267bc..7a0e9db6 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -19,7 +19,7 @@ הצמד למעלה בטל הצמדה התקדם - Unable to compress image to selected size + לא ניתן לדחוס תמונה לגודל שנבחר שיחה חדשה הוסף איש קשר או מספר… diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a5298d34..fbef8b6a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -19,7 +19,7 @@ 最上部に固定 固定を外す 転送 - Unable to compress image to selected size + 選択したサイズに画像を圧縮できません 新しい会話 連絡先や電話番号を追加… diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a5ed5922..d0e3d8a6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -19,7 +19,7 @@ Bovenaan vastzetten Losmaken Doorsturen - Unable to compress image to selected size + Kon de afbeelding niet comprimeren naar de gekozen grootte Nieuw gesprek Contact of nummer toevoegen… @@ -97,4 +97,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - + \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 05c886e6..a21e0d3e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -19,7 +19,7 @@ Przypnij na górze Odepnij Przekaż dalej - Unable to compress image to selected size + Nie udało się skompresować obrazu do wybranego rozmiaru Nowa rozmowa Dodaj kontakt lub numer… @@ -99,4 +99,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - + \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9b5bb02b..0eda47d6 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -19,7 +19,7 @@ Fixar ao topo Desfixar Encaminhar - Unable to compress image to selected size + Não pôde comprimir imagem ao tamanho selecionado Nova conversa Adicionar contato ou número… diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2566377a..3c2099a5 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -19,7 +19,7 @@ Fixar no topo Desafixar Reencaminhar - Unable to compress image to selected size + Incapaz de comprimir imagem no tamanho selecionado Nova conversa Adicionar contacto ou número… diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 3d584e9f..a94c6020 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -19,7 +19,7 @@ Fixare în vârf Elimină fixarea Redirecţionare - Unable to compress image to selected size + Nu se poate comprima imaginea la dimensiunea selectată Conversaţie nouă Adaugă contact sau număr de telefon… diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 286239ba..4cf734bc 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,7 +19,7 @@ Закрепить сверху Открепить Переслать - Unable to compress image to selected size + Невозможно сжать изображение до выбранного размера Новая переписка Добавить контакт или номер… diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index fa016a7c..be6e7cd6 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -19,7 +19,7 @@ Pripnúť na vrch Odopnúť Preposlať - Unable to compress image to selected size + Nepodarilo sa zmenšiť obrázok na požadovanú veľkosť Nová konverzácia Pridať kontakt alebo číslo… diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index c42c3072..a2621e49 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -19,7 +19,7 @@ Fäst högst upp Lossa Vidarebefordra - Unable to compress image to selected size + Det gick inte att komprimera bilden till den valda storleken Ny konversation Lägg till kontakt eller nummer… diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 62056d35..dda719bc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -19,7 +19,7 @@ En üste sabitle Sabitlemeyi kaldır İlet - Unable to compress image to selected size + Resim seçilen boyuta sıkıştırılamıyor Yeni görüşme Kişi veya Numara Ekle… diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7f1423d3..a639decc 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -19,7 +19,7 @@ Pin to the top Відкріпити Переслати - Unable to compress image to selected size + Не вдається стиснути зображення до вибраного розміру Нове листування Додати контакт аба номер… diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3233ee67..ec50ea8e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -19,7 +19,7 @@ 置顶固定 取消固定 转发 - Unable to compress image to selected size + 无法将图像压缩到选定的大小 新的对话 添加联系人或者号码… diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c8aff526..ca16481b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -19,7 +19,7 @@ 釘選在頂部 取消釘選 轉傳 - Unable to compress image to selected size + 無法將圖片壓縮至指定大小 新對話 新增聯絡對象或電話號碼…… From 52a694a1c4bb8eb6f3973e884107976cb9477e21 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 19 Jun 2022 14:46:18 +0530 Subject: [PATCH 6/7] Update message type after fetching participants --- .../smsmessenger/activities/ThreadActivity.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 3a6d7acf..219daaf5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -15,6 +15,7 @@ import android.provider.Telephony import android.telephony.SmsMessage import android.telephony.SubscriptionManager import android.text.TextUtils +import android.util.Log import android.util.TypedValue import android.view.* import android.view.inputmethod.EditorInfo @@ -244,6 +245,7 @@ class ThreadActivity : SimpleActivity() { setupThreadTitle() setupSIMSelector() + updateMessageType() callback() } } @@ -312,7 +314,6 @@ class ThreadActivity : SimpleActivity() { runOnUiThread { setupThreadTitle() setupSIMSelector() - updateMessageType() } } } @@ -442,8 +443,8 @@ class ThreadActivity : SimpleActivity() { numbers.add(it.normalizedNumber) } } - val newThreadId = getThreadId(numbers) + Log.d(this::class.java.simpleName, "participants: ${numbers.size}") if (threadId != newThreadId) { hideKeyboard() Intent(this, ThreadActivity::class.java).apply { From 0195af61efd6bbbe90478311d6f3dd2c37aa9ced Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 19 Jun 2022 15:39:42 +0530 Subject: [PATCH 7/7] Add braces to if statement --- .../smsmessenger/activities/ThreadActivity.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 219daaf5..60b6284d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -15,7 +15,6 @@ import android.provider.Telephony import android.telephony.SmsMessage import android.telephony.SubscriptionManager import android.text.TextUtils -import android.util.Log import android.util.TypedValue import android.view.* import android.view.inputmethod.EditorInfo @@ -444,7 +443,6 @@ class ThreadActivity : SimpleActivity() { } } val newThreadId = getThreadId(numbers) - Log.d(this::class.java.simpleName, "participants: ${numbers.size}") if (threadId != newThreadId) { hideKeyboard() Intent(this, ThreadActivity::class.java).apply { @@ -1075,7 +1073,11 @@ class ThreadActivity : SimpleActivity() { val text = thread_type_message.text.toString() val isGroupMms = participants.size > 1 && config.sendGroupMessageMMS val isLongMmsMessage = getNumPages(settings, text) > settings.sendLongAsMmsAfter && config.sendLongMessageMMS - val res = if (attachmentSelections.isNotEmpty() || isGroupMms || isLongMmsMessage) R.string.mms else R.string.sms - thread_send_message.setText(res) + val stringId = if (attachmentSelections.isNotEmpty() || isGroupMms || isLongMmsMessage) { + R.string.mms + } else { + R.string.sms + } + thread_send_message.setText(stringId) } }