Merge pull request #474 from orange-elephant/enter-to-send

Add option to send on enter pressed

Author: tibbi

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt

@@ -38,6 +38,7 @@ class SettingsActivity : SimpleActivity() {
         setupFontSize()
         setupShowCharacterCounter()
         setupUseSimpleCharacters()
+        setupSendOnEnter()
         setupEnableDeliveryReports()
         setupSendLongMessageAsMMS()
         setupGroupMessageAsMMS()
@@ -174,6 +175,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupSendOnEnter() {
+        settings_send_on_enter.isChecked = config.sendOnEnter
+        settings_send_on_enter_holder.setOnClickListener {
+            settings_send_on_enter.toggle()
+            config.sendOnEnter = settings_send_on_enter.isChecked
+        }
+    }
+
     private fun setupEnableDeliveryReports() {
         settings_enable_delivery_reports.isChecked = config.enableDeliveryReports
         settings_enable_delivery_reports_holder.setOnClickListener {

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

@@ -24,6 +24,7 @@ import android.text.format.DateUtils.FORMAT_SHOW_DATE
 import android.text.format.DateUtils.FORMAT_SHOW_TIME
 import android.util.TypedValue
 import android.view.Gravity
+import android.view.KeyEvent
 import android.view.View
 import android.view.WindowManager
 import android.view.animation.OvershootInterpolator
@@ -461,6 +462,26 @@ class ThreadActivity : SimpleActivity() {
             val messageLength = SmsMessage.calculateLength(messageString, false)
             thread_character_counter.text = "${messageLength[2]}/${messageLength[0]}"
         }
+        
+        if (config.sendOnEnter) {
+            thread_type_message.inputType = EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES
+            thread_type_message.imeOptions = EditorInfo.IME_ACTION_SEND
+
+            thread_type_message.setOnEditorActionListener { _, action, _ ->
+                if (action == EditorInfo.IME_ACTION_SEND) {
+                    dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER))
+                    return@setOnEditorActionListener true
+                }
+                false
+            }
+            thread_type_message.setOnKeyListener { _, keyCode, event ->
+                if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP) {
+                    sendMessage()
+                    return@setOnKeyListener true
+                }
+                false
+            }
+        }
 
         confirm_manage_contacts.setOnClickListener {
             hideKeyboard()

app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Config.kt

@@ -24,6 +24,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(USE_SIMPLE_CHARACTERS, false)
         set(useSimpleCharacters) = prefs.edit().putBoolean(USE_SIMPLE_CHARACTERS, useSimpleCharacters).apply()
 
+    var sendOnEnter: Boolean
+        get() = prefs.getBoolean(SEND_ON_ENTER, false)
+        set(sendOnEnter) = prefs.edit().putBoolean(SEND_ON_ENTER, sendOnEnter).apply()
+
     var enableDeliveryReports: Boolean
         get() = prefs.getBoolean(ENABLE_DELIVERY_REPORTS, false)
         set(enableDeliveryReports) = prefs.edit().putBoolean(ENABLE_DELIVERY_REPORTS, enableDeliveryReports).apply()

app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt

@@ -14,6 +14,7 @@ const val USE_SIM_ID_PREFIX = "use_sim_id_"
 const val NOTIFICATION_CHANNEL = "simple_sms_messenger"
 const val SHOW_CHARACTER_COUNTER = "show_character_counter"
 const val USE_SIMPLE_CHARACTERS = "use_simple_characters"
+const val SEND_ON_ENTER = "send_on_enter"
 const val LOCK_SCREEN_VISIBILITY = "lock_screen_visibility"
 const val ENABLE_DELIVERY_REPORTS = "enable_delivery_reports"
 const val SEND_LONG_MESSAGE_MMS = "send_long_message_mms"

app/src/main/res/layout/activity_settings.xml

@@ -298,6 +298,22 @@
 
                 </RelativeLayout>
 
+                <RelativeLayout
+                    android:id="@+id/settings_send_on_enter_holder"
+                    style="@style/SettingsHolderCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/ripple_background">
+
+                    <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                        android:id="@+id/settings_send_on_enter"
+                        style="@style/SettingsCheckboxStyle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/send_on_enter" />
+
+                </RelativeLayout>
+
                 <RelativeLayout
                     android:id="@+id/settings_enable_delivery_reports_holder"
                     style="@style/SettingsHolderCheckboxStyle"

app/src/main/res/values-ar/strings.xml

@@ -76,6 +76,7 @@
     <string name="sender_only">المرسل فقط</string>
     <string name="enable_delivery_reports">تمكين تقارير التسليم</string>
     <string name="use_simple_characters">إزالة اللهجات والتشكيل عند إرسال الرسائل</string>
+    <string name="send_on_enter">Send message on pressing Enter</string>
     <string name="mms_file_size_limit">تغيير حجم صور MMS المرسلة</string>
     <string name="mms_file_size_limit_none">لا يوجد حد</string>
     <string name="outgoing_messages">الرسائل المرسلة</string>

app/src/main/res/values-az/strings.xml

@@ -64,6 +64,7 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="use_simple_characters">Remove accents and diacritics at sending messages</string>
+    <string name="send_on_enter">Send message on pressing Enter</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
     <string name="mms_file_size_limit_none">No limit</string>
     <string name="outgoing_messages">Outgoing messages</string>

app/src/main/res/values-be/strings.xml

@@ -70,6 +70,7 @@
     <string name="sender_only">Толькі адпраўнік</string>
     <string name="enable_delivery_reports">Уключыць справаздачы аб дастаўцы</string>
     <string name="use_simple_characters">Выдаляць націскі і дыякрытычныя знакі пры адпраўцы паведамленняў</string>
+    <string name="send_on_enter">Send message on pressing Enter</string>
     <string name="mms_file_size_limit">Змяняць памер выяў, якія дасыляюцца ў MMS</string>
     <string name="mms_file_size_limit_none">Без абмежаванняў</string>
     <string name="outgoing_messages">Выходныя паведамленні</string>

app/src/main/res/values-bg/strings.xml

@@ -64,6 +64,7 @@
     <string name="sender_only">Само изпращач</string>
     <string name="enable_delivery_reports">Включи отчети за доставка</string>
     <string name="use_simple_characters">Премахни ударенията и диактричните знаци при изпращане на съобщение</string>
+    <string name="send_on_enter">Send message on pressing Enter</string>
     <string name="mms_file_size_limit">Промяна на размера на изпратените MMS изображения</string>
     <string name="mms_file_size_limit_none">Без ограничения</string>
     <string name="outgoing_messages">Изходящи съобщения</string>

app/src/main/res/values-ca/strings.xml

@@ -64,6 +64,7 @@
     <string name="sender_only">Només el remitent</string>
     <string name="enable_delivery_reports">Activa els informes de lliurament</string>
     <string name="use_simple_characters">Elimina els accents i els diacrítics en enviar missatges</string>
+    <string name="send_on_enter">Send message on pressing Enter</string>
     <string name="mms_file_size_limit">Canvia la mida de les imatges MMS enviades</string>
     <string name="mms_file_size_limit_none">Sense límit</string>
     <string name="outgoing_messages">Missatges sortints</string>