Skip to content

Add option to switch to main keyboard after enter in clipboard histor… #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
4di-hello wants to merge 1 commit into from
Closed

Add option to switch to main keyboard after enter in clipboard histor… #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/java/helium314/keyboard/keyboard/clipboard/ClipboardHistoryView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,9 @@ class ClipboardHistoryView @JvmOverloads constructor(
}

keyboardActionListener.onCodeInput(primaryCode, x, y, isKeyRepeat)
if (primaryCode == Constants.CODE_ENTER && Settings.getValues().mAlphaAfterClipEnter) {
keyboardActionListener.onCodeInput(KeyCode.ALPHA, Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE, false)
}
}

override fun onTextInput(text: String?) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/helium314/keyboard/latin/settings/Defaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ object Defaults {
val PREF_CLIPBOARD_TOOLBAR_KEYS = defaultClipboardToolbarPref
const val PREF_ABC_AFTER_EMOJI = false
const val PREF_ABC_AFTER_CLIP = false
const val PREF_ABC_AFTER_CLIP_ENTER = false
const val PREF_ABC_AFTER_SYMBOL_SPACE = true
const val PREF_ABC_AFTER_NUMPAD_SPACE = false
const val PREF_REMOVE_REDUNDANT_POPUPS = true
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/helium314/keyboard/latin/settings/Settings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@ class Settings private constructor() : SharedPreferences.OnSharedPreferenceChang
const val PREF_CLIPBOARD_TOOLBAR_KEYS = "clipboard_toolbar_keys"
const val PREF_ABC_AFTER_EMOJI = "abc_after_emoji"
const val PREF_ABC_AFTER_CLIP = "abc_after_clip"
const val PREF_ABC_AFTER_CLIP_ENTER = "abc_after_clip_enter"
const val PREF_ABC_AFTER_SYMBOL_SPACE = "abc_after_symbol_space"
const val PREF_ABC_AFTER_NUMPAD_SPACE = "abc_after_numpad_space"
const val PREF_REMOVE_REDUNDANT_POPUPS = "remove_redundant_popups"
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ open class SettingsValues(
val mRememberToolbarState: Boolean
val mAlphaAfterEmojiInEmojiView: Boolean
val mAlphaAfterClipHistoryEntry: Boolean
val mAlphaAfterClipEnter: Boolean
val mAlphaAfterSymbolAndSpace: Boolean
val mAlphaAfterNumpadAndSpace: Boolean
val mRemoveRedundantPopups: Boolean
Expand Down Expand Up @@ -504,6 +505,7 @@ open class SettingsValues(

mAlphaAfterEmojiInEmojiView = prefs.getBoolean(Settings.PREF_ABC_AFTER_EMOJI, Defaults.PREF_ABC_AFTER_EMOJI)
mAlphaAfterClipHistoryEntry = prefs.getBoolean(Settings.PREF_ABC_AFTER_CLIP, Defaults.PREF_ABC_AFTER_CLIP)
mAlphaAfterClipEnter = prefs.getBoolean(Settings.PREF_ABC_AFTER_CLIP_ENTER, Defaults.PREF_ABC_AFTER_CLIP_ENTER)
mAlphaAfterSymbolAndSpace = prefs.getBoolean(Settings.PREF_ABC_AFTER_SYMBOL_SPACE, Defaults.PREF_ABC_AFTER_SYMBOL_SPACE)
mAlphaAfterNumpadAndSpace = prefs.getBoolean(Settings.PREF_ABC_AFTER_NUMPAD_SPACE, Defaults.PREF_ABC_AFTER_NUMPAD_SPACE)
mRemoveRedundantPopups = prefs.getBoolean(Settings.PREF_REMOVE_REDUNDANT_POPUPS, Defaults.PREF_REMOVE_REDUNDANT_POPUPS)
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ fun TextCorrectionScreen(
Settings.PREF_ABC_AFTER_SYMBOL_SPACE,
Settings.PREF_ABC_AFTER_NUMPAD_SPACE,
Settings.PREF_ABC_AFTER_EMOJI,
Settings.PREF_ABC_AFTER_CLIP
Settings.PREF_ABC_AFTER_CLIP,
Settings.PREF_ABC_AFTER_CLIP_ENTER,
)
}

Expand Down Expand Up @@ -271,6 +272,9 @@ fun createCorrectionSettings(context: Context) = listOf(
Setting(context, Settings.PREF_ABC_AFTER_CLIP, R.string.switch_keyboard_after, R.string.after_clip) {
SwitchPreference(it, Defaults.PREF_ABC_AFTER_CLIP)
},
Setting(context, Settings.PREF_ABC_AFTER_CLIP_ENTER, R.string.switch_keyboard_after, R.string.after_clip_enter) {
SwitchPreference(it, Defaults.PREF_ABC_AFTER_CLIP_ENTER)
},
)

@Preview
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@
<string name="suggest_clipboard_content">Zwischenablagen-Inhalt vorschlagen</string>
<string name="after_symbol_and_space">Drücken der Eingabetaste oder der Leertaste nach anderen Tasten in der Symbolansicht</string>
<string name="after_clip">Auswählen eines Eintrags des Zwischenablagenverlaufs</string>
<string name="after_clip_enter">Drücken der Eingabetaste im Zwischenablagenverlauf</string>
<string name="after_emoji">Auswählen eines Emojis in der Emojiansicht</string>
<string name="switch_keyboard_after">Zur Haupttastatur zurückkehren nach …</string>
<string name="space_swipe_toggle_numpad_entry">Ziffernblock umschalten</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,8 @@ language, hence "No language". -->
<string name="after_emoji">Selecting emoji in emoji view</string>
<!-- Switch to main keyboard after selecting clipboard history entry -->
<string name="after_clip">Selecting clipboard history entry</string>
<!-- Description for the setting to switch to the main keyboard after pressing enter in the clipboard history view -->
<string name="after_clip_enter">Pressing enter in clipboard history view</string>
<!-- Switch to main keyboard after entering a symbol in symbols layout and then pressing space or enter -->
<string name="after_symbol_and_space">Pressing enter or space after other keys in symbols view</string>
<!-- Switch to main keyboard after entering something in numpad layout and then pressing space or enter -->
Expand Down
Loading