jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'SimpleMobileTools:master' into feature_schedule_send

Browse source
This commit is contained in:
Naveen Singh 2022-10-06 01:47:52 +05:30 • committed by GitHub
commit 6f07d6971a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 145 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
View file

@ -93,7 +93,6 @@ class SearchActivity : SimpleActivity() {
val conversations = conversationsDB.getConversationsWithText(searchQuery)
if (text == mLastSearchedText) {
showSearchResults(messages, conversations, text)
}
}
} else {

2
app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/SearchResultsAdapter.kt
View file

@ -14,7 +14,6 @@ import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.activities.SimpleActivity
import com.simplemobiletools.smsmessenger.models.SearchResult
import kotlinx.android.synthetic.main.item_search_result.view.*
import java.util.*
class SearchResultsAdapter(
activity: SimpleActivity, var searchResults: ArrayList<SearchResult>, recyclerView: MyRecyclerView, highlightText: String, itemClick: (Any) -> Unit
@ -80,6 +79,7 @@ class SearchResultsAdapter(
search_result_date.apply {
text = searchResult.date
setTextColor(textColor)
setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.8f)
}

82
app/src/main/res/layout/activity_search.xml
View file

@ -21,57 +21,49 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:id="@+id/search_nested_scrollview"
<RelativeLayout
android:id="@+id/search_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:scrollbars="none"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<RelativeLayout
android:id="@+id/search_holder"
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/search_placeholder"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.8"
android:gravity="center"
android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin"
android:text="@string/no_items_found"
android:textSize="@dimen/bigger_text_size"
android:textStyle="italic" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/search_placeholder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.8"
android:gravity="center"
android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin"
android:text="@string/no_items_found"
android:textSize="@dimen/bigger_text_size"
android:textStyle="italic" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/search_placeholder_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/search_placeholder"
android:layout_centerHorizontal="true"
android:alpha="0.8"
android:gravity="center"
android:paddingStart="@dimen/activity_margin"
android:paddingTop="@dimen/medium_margin"
android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/medium_margin"
android:text="@string/type_2_characters"
android:textSize="@dimen/bigger_text_size"
android:textStyle="italic" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/search_placeholder_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/search_placeholder"
android:layout_centerHorizontal="true"
android:alpha="0.8"
android:gravity="center"
android:paddingStart="@dimen/activity_margin"
android:paddingTop="@dimen/medium_margin"
android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/medium_margin"
android:text="@string/type_2_characters"
android:textSize="@dimen/bigger_text_size"
android:textStyle="italic" />
<com.simplemobiletools.commons.views.MyRecyclerView
android:id="@+id/search_results_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="vertical"
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
<com.simplemobiletools.commons.views.MyRecyclerView
android:id="@+id/search_results_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:scrollbars="vertical"
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

14
app/src/main/res/values-ca/strings.xml
View file

@ -30,13 +30,13 @@
<string name="add_contact_or_number">Afegeix un contacte o número…</string>
<string name="suggestions">Suggeriments</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="scheduled_message">Missatge programat</string>
<string name="schedule_send">Programa l\'enviament</string>
<string name="cancel_schedule_send">Cancel·la la programació de l\'enviament</string>
<string name="must_pick_time_in_the_future">Cal triar una hora futura</string>
<string name="schedule_send_warning">Mantingueu el telèfon engegat i assegureu-vos que no hi hagi res que mati les aplicacions en segon pla</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="send_now">Envia ara</string>
<!-- Notifications -->
<string name="channel_received_sms">SMS rebut</string>
<string name="new_message">Missatge nou</string>
@ -84,4 +84,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

14
app/src/main/res/values-es/strings.xml
View file

@ -31,13 +31,13 @@
<string name="add_contact_or_number">Escribe contacto o número…</string>
<string name="suggestions">Sugerencias</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="scheduled_message">Mensaje programado</string>
<string name="schedule_send">Programar envío</string>
<string name="cancel_schedule_send">Cancelar el envío programado</string>
<string name="must_pick_time_in_the_future">Debes elegir un momento en el futuro</string>
<string name="schedule_send_warning">Mantenga el teléfono encendido y asegúrese de que no hay nada que mate la aplicación en segundo plano</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="send_now">Enviar ahora</string>
<!-- Notifications -->
<string name="channel_received_sms">Mensaje recibido</string>
<string name="new_message">Nuevo mensaje</string>
@ -87,4 +87,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

14
app/src/main/res/values-fr/strings.xml
View file

@ -31,13 +31,13 @@
<string name="add_contact_or_number">Ajouter un contact ou un numéro…</string>
<string name="suggestions">Suggestions</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="scheduled_message">Message planifié</string>
<string name="schedule_send">Envoi planifié</string>
<string name="cancel_schedule_send">Annuler l\'envoi planifié</string>
<string name="must_pick_time_in_the_future">Vous devez choisir une date dans le futur</string>
<string name="schedule_send_warning">Gardez le téléphone allumé et assurez-vous que l\'application ne soit pas fermée en arrière-plan</string>
<string name="update_message">Mettre à jour le message</string>
<string name="send_now">Envoyer maintenant</string>
<!-- Notifications -->
<string name="channel_received_sms">SMS reçu</string>
<string name="new_message">Nouveau message</string>

14
app/src/main/res/values-gl/strings.xml
View file

@ -30,13 +30,13 @@
<string name="add_contact_or_number">Engadir contacto ou número…</string>
<string name="suggestions">Suxerencias</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="scheduled_message">Mensaxe programada</string>
<string name="schedule_send">Programar envío</string>
<string name="cancel_schedule_send">Cancelar o envío programado</string>
<string name="must_pick_time_in_the_future">Debes escoller un momento no futuro</string>
<string name="schedule_send_warning">Mantén o teléfono acendido e asegúrate de que non hai nada que mate a aplicación en segundo plano</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="send_now">Enviar agora</string>
<!-- Notifications -->
<string name="channel_received_sms">SMS recibida</string>
<string name="new_message">Nova mensaxe</string>
@ -84,4 +84,4 @@
Non atopaches algunhas cadeas? Hai máis en
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

16
app/src/main/res/values-it/strings.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Messaggi SMS</string>
<string name="app_name">Messaggi SMS Semplici</string>
<string name="app_launcher_name">Messaggi SMS</string>
<string name="type_a_message">Componi un messaggio…</string>
<string name="message_not_sent_short">Messaggio non inviato</string>
@ -31,13 +31,13 @@
<string name="add_contact_or_number">Inserisci contatto o numero…</string>
<string name="suggestions">Suggerimenti</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="scheduled_message">Messaggio programmato</string>
<string name="schedule_send">Invio programmato</string>
<string name="cancel_schedule_send">Annulla l\'invio programmato</string>
<string name="must_pick_time_in_the_future">Devi scegliere un momento del futuro</string>
<string name="schedule_send_warning">Tieni il telefono acceso e assicurati che non ci sia nulla che chiuda l\'app in background</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="send_now">Invia ora</string>
<!-- Notifications -->
<string name="channel_received_sms">SMS ricevuto</string>
<string name="new_message">Nuovo messaggio</string>
@ -87,4 +87,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

16
app/src/main/res/values-nl/strings.xml
View file

@ -30,13 +30,13 @@
<string name="add_contact_or_number">Contact of nummer toevoegen…</string>
<string name="suggestions">Suggesties</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="scheduled_message">Ingepland bericht</string>
<string name="schedule_send">Verzending inplannen</string>
<string name="cancel_schedule_send">Geplande verzending annuleren</string>
<string name="must_pick_time_in_the_future">Kies een tijd in de toekomst</string>
<string name="schedule_send_warning">Zorg ervoor dat het toestel blijft ingeschakeld en dat de app niet op de achtergrond wordt afgesloten</string>
<string name="update_message">Bericht aanpassen</string>
<string name="send_now">Nu versturen</string>
<!-- Notifications -->
<string name="channel_received_sms">Ontvangen berichten</string>
<string name="new_message">Nieuw bericht</string>
@ -84,4 +84,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

16
app/src/main/res/values-pl/strings.xml
View file

@ -32,13 +32,13 @@
<string name="add_contact_or_number">Dodaj kontakt lub numer…</string>
<string name="suggestions">Propozycje</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="scheduled_message">Zaplanowana wiadomość</string>
<string name="schedule_send">Zaplanuj wysłanie</string>
<string name="cancel_schedule_send">Anuluj zaplanowane wysłanie</string>
<string name="must_pick_time_in_the_future">Musisz wybrać czas w przyszłości</string>
<string name="schedule_send_warning">Pozostaw telefon włączony i upewnij się, że nic nie wyłącza aplikacji w tle</string>
<string name="update_message">Zaktualizuj wiadomość</string>
<string name="send_now">Wyślij teraz</string>
<!-- Notifications -->
<string name="channel_received_sms">Otrzymany SMS</string>
<string name="new_message">Nowa wiadomość</string>
@ -90,4 +90,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

14
app/src/main/res/values-ru/strings.xml
View file

@ -32,13 +32,13 @@
<string name="add_contact_or_number">Добавить контакт или номер…</string>
<string name="suggestions">Предложения</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="scheduled_message">Отложенная отправка</string>
<string name="schedule_send">Отложенная отправка</string>
<string name="cancel_schedule_send">Отменить отложенную отправку</string>
<string name="must_pick_time_in_the_future">Время должно быть в будущем</string>
<string name="schedule_send_warning">Держите устройство включённым и убедитесь, что ничто не завершает принудительно приложение в фоновом режиме</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="send_now">Отправить сейчас</string>
<!-- Notifications -->
<string name="channel_received_sms">Получено сообщение</string>
<string name="new_message">Новое сообщение</string>
@ -90,4 +90,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

18
app/src/main/res/values-tr/strings.xml
View file

@ -30,19 +30,19 @@
<string name="add_contact_or_number">Kişi veya Numara Ekle…</string>
<string name="suggestions">Öneriler</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="scheduled_message">Zamanlanan mesaj</string>
<string name="schedule_send">Göndermeyi zamanla</string>
<string name="cancel_schedule_send">Gönderme zamanlamasını iptal et</string>
<string name="must_pick_time_in_the_future">Gelecekte bir zaman seçmelisiniz</string>
<string name="schedule_send_warning">Telefonu açık tutun ve arka planda uygulamayı sonlandıran hiçbir şey olmadığından emin olun</string>
<string name="update_message">Mesajı güncelle</string>
<string name="send_now">Şimdi gönder</string>
<!-- Notifications -->
<string name="channel_received_sms">SMS alındı</string>
<string name="new_message">Yeni mesaj</string>
<string name="mark_as_read">Okundu olarak işaretle</string>
<string name="mark_as_unread">Okunmadı olarak işaretle</string>
<string name="me">Me</string>
<string name="me">Ben</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">Bu görüşmenin tüm mesajlarını silmek istediğinizden emin misiniz\?</string>
<!-- Are you sure you want to delete 5 conversations? -->
@ -84,4 +84,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>

14
app/src/main/res/values-zh-rCN/strings.xml
View file

@ -29,13 +29,13 @@
<string name="add_contact_or_number">添加联系人或者号码…</string>
<string name="suggestions">建议</string>
<!-- Schedule send -->
<string name="scheduled_message">Scheduled message</string>
<string name="schedule_send">Schedule send</string>
<string name="cancel_schedule_send">Cancel schedule send</string>
<string name="must_pick_time_in_the_future">You must pick a time in the future</string>
<string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app in background</string>
<string name="scheduled_message">定时消息</string>
<string name="schedule_send">定时发送</string>
<string name="cancel_schedule_send">取消定时发送</string>
<string name="must_pick_time_in_the_future">必须选择未来的时间</string>
<string name="schedule_send_warning">保持手机开机，并确保应用后台不被终止</string>
<string name="update_message">Update message</string>
<string name="send_now">Send now</string>
<string name="send_now">立即发送</string>
<!-- Notifications -->
<string name="channel_received_sms">接收到的短信</string>
<string name="new_message">新消息</string>
@ -81,4 +81,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>