Skip to content
Snippets Groups Projects
Verified Commit 2c8fdf3d authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes #188

parent 5ac008f5
Branches
Tags
No related merge requests found
...@@ -23,7 +23,7 @@ import androidx.annotation.StyleRes ...@@ -23,7 +23,7 @@ import androidx.annotation.StyleRes
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
data class AppearanceSettings( data class AppearanceSettings(
val inputEnter: InputEnterMode = InputEnterMode.EMOJI, val inputEnter: InputEnterMode = InputEnterMode.NEWLINE,
val showLag: Boolean = true, val showLag: Boolean = true,
val theme: Theme = Theme.MATERIAL_LIGHT, val theme: Theme = Theme.MATERIAL_LIGHT,
val language: String = "", val language: String = "",
...@@ -31,7 +31,8 @@ data class AppearanceSettings( ...@@ -31,7 +31,8 @@ data class AppearanceSettings(
) { ) {
enum class InputEnterMode { enum class InputEnterMode {
EMOJI, EMOJI,
SEND; SEND,
NEWLINE;
companion object { companion object {
private val map = values().associateBy { it.name } private val map = values().associateBy { it.name }
......
...@@ -180,6 +180,10 @@ class EditorHelper( ...@@ -180,6 +180,10 @@ class EditorHelper(
EditorInfo.IME_ACTION_SEND, EditorInfo.IME_ACTION_SEND,
EditorInfo.IME_FLAG_NO_EXTRACT_UI EditorInfo.IME_FLAG_NO_EXTRACT_UI
) )
AppearanceSettings.InputEnterMode.NEWLINE -> listOf(
EditorInfo.IME_ACTION_UNSPECIFIED,
EditorInfo.IME_FLAG_NO_EXTRACT_UI
)
}.fold(0, Int::or) }.fold(0, Int::or)
} }
......
...@@ -290,11 +290,9 @@ class RichEditText : EditTextSelectionChange { ...@@ -290,11 +290,9 @@ class RichEditText : EditTextSelectionChange {
val selectionStart = selectionStart val selectionStart = selectionStart
val selectionEnd = selectionEnd val selectionEnd = selectionEnd
inputType = if (enabled) { inputType =
inputType or InputType.TYPE_TEXT_FLAG_MULTI_LINE if (enabled) inputType or InputType.TYPE_TEXT_FLAG_MULTI_LINE
} else { else inputType and InputType.TYPE_TEXT_FLAG_MULTI_LINE.inv()
inputType and InputType.TYPE_TEXT_FLAG_MULTI_LINE.inv()
}
setSelection(selectionStart, selectionEnd) setSelection(selectionStart, selectionEnd)
} }
......
...@@ -69,10 +69,12 @@ ...@@ -69,10 +69,12 @@
<string-array name="preference_input_enter_entries" translatable="false"> <string-array name="preference_input_enter_entries" translatable="false">
<item>@string/preference_input_enter_entry_emoji</item> <item>@string/preference_input_enter_entry_emoji</item>
<item>@string/preference_input_enter_entry_send</item> <item>@string/preference_input_enter_entry_send</item>
<item>@string/preference_input_enter_entry_newline</item>
</string-array> </string-array>
<string-array name="preference_input_enter_entryvalues" translatable="false"> <string-array name="preference_input_enter_entryvalues" translatable="false">
<item>EMOJI</item> <item>EMOJI</item>
<item>SEND</item> <item>SEND</item>
<item>NEWLINE</item>
</string-array> </string-array>
<string name="preference_show_lag_key" translatable="false">show_lag</string> <string name="preference_show_lag_key" translatable="false">show_lag</string>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
android:title="@string/preference_theme_title" /> android:title="@string/preference_theme_title" />
<DropDownPreference <DropDownPreference
android:defaultValue="EMOJI" android:defaultValue="NEWLINE"
android:entries="@array/preference_input_enter_entries" android:entries="@array/preference_input_enter_entries"
android:entryValues="@array/preference_input_enter_entryvalues" android:entryValues="@array/preference_input_enter_entryvalues"
android:key="@string/preference_input_enter_key" android:key="@string/preference_input_enter_key"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment