diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt index 18fe50aa..065758bb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -42,6 +42,7 @@ class SettingsActivity : SimpleActivity() { setupShowPopupOnKeypress() setupKeyboardLanguage() setupKeyboardHeightMultiplier() + setupShowClipboardContent() updateTextColors(settings_nested_scrollview) @@ -141,4 +142,12 @@ class SettingsActivity : SimpleActivity() { else -> getString(R.string.small) } } + + private fun setupShowClipboardContent() { + settings_show_clipboard_content.isChecked = config.showClipboardContent + settings_show_clipboard_content_holder.setOnClickListener { + settings_show_clipboard_content.toggle() + config.showClipboardContent = settings_show_clipboard_content.isChecked + } + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt index 175d34ed..48b40e4a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt @@ -29,6 +29,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getInt(HEIGHT_MULTIPLIER, 1) set(keyboardHeightMultiplier) = prefs.edit().putInt(HEIGHT_MULTIPLIER, keyboardHeightMultiplier).apply() + var showClipboardContent: Boolean + get() = prefs.getBoolean(SHOW_CLIPBOARD_CONTENT, true) + set(showClipboardContent) = prefs.edit().putBoolean(SHOW_CLIPBOARD_CONTENT, showClipboardContent).apply() + private fun getDefaultLanguage(): Int { val conf = context.resources.configuration diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt index b2b4f21e..40e36e06 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -13,6 +13,7 @@ const val SHOW_POPUP_ON_KEYPRESS = "show_popup_on_keypress" const val LAST_EXPORTED_CLIPS_FOLDER = "last_exported_clips_folder" const val KEYBOARD_LANGUAGE = "keyboard_language" const val HEIGHT_MULTIPLIER = "height_multiplier" +const val SHOW_CLIPBOARD_CONTENT = "show_clipboard_content" // differentiate current and pinned clips at the keyboards' Clipboard section const val ITEM_SECTION_LABEL = 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index a40b9b61..1bc2af6c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -657,7 +657,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut } private fun handleClipboard() { - if (mToolbarHolder != null && mPopupParent.id != R.id.mini_keyboard_view) { + if (mToolbarHolder != null && mPopupParent.id != R.id.mini_keyboard_view && context.config.showClipboardContent) { val clipboardContent = context.getCurrentClip() if (clipboardContent?.isNotEmpty() == true) { mToolbarHolder?.apply { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 12ebb51b..b2cce518 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -206,6 +206,21 @@ tools:text="@string/small" /> + + + + + +