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 a9d622f4..055eb3c6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -22,6 +22,7 @@ class SettingsActivity : SimpleActivity() { setupPurchaseThankYou() setupCustomizeColors() setupUseEnglish() + setupClipboard() updateTextColors(settings_scrollview) @@ -44,7 +45,7 @@ class SettingsActivity : SimpleActivity() { // make sure the corners at ripple fit the stroke rounded corners if (settings_purchase_thank_you_holder.isGone()) { - settings_use_english_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme) + settings_use_english_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme) } settings_purchase_thank_you_holder.setOnClickListener { @@ -64,10 +65,7 @@ class SettingsActivity : SimpleActivity() { settings_use_english.isChecked = config.useEnglish if (settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone()) { - settings_general_settings_label.beGone() - settings_general_settings_holder.beGone() - } else if (settings_use_english_holder.isGone()) { - settings_purchase_thank_you_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme) + settings_show_clipboard_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme) } settings_use_english_holder.setOnClickListener { @@ -76,4 +74,12 @@ class SettingsActivity : SimpleActivity() { exitProcess(0) } } + + private fun setupClipboard() { + settings_show_clipboard.isChecked = config.showClipboard + settings_show_clipboard_holder.setOnClickListener { + settings_show_clipboard.toggle() + config.showClipboard = settings_show_clipboard.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 da522063..7c5a12e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Config.kt @@ -7,4 +7,8 @@ class Config(context: Context) : BaseConfig(context) { companion object { fun newInstance(context: Context) = Config(context) } + + var showClipboard: Boolean + get() = prefs.getBoolean(SHOW_CLIPBOARD, true) + set(showClipboard) = prefs.edit().putBoolean(SHOW_CLIPBOARD, showClipboard).apply() } 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 1b0abff0..cb22b9b2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -6,3 +6,6 @@ const val SHIFT_ON_PERMANENT = 2 // limit the count of alternative characters that show up at long pressing a key const val MAX_KEYS_PER_MINI_ROW = 5 + +// shared prefs +const val SHOW_CLIPBOARD = "show_clipboard" diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt index 24dcade1..711d259f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt @@ -281,7 +281,6 @@ class MyKeyboard { } /** - * * Creates a blank keyboard from the given resource file and populates it with the specified characters in left-to-right, top-to-bottom fashion, * using the specified number of columns. If the specified number of columns is -1, then the keyboard will fit as many keys as possible in each row. * @param context the application or service context diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index da47e465..ace534c0 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -78,7 +78,7 @@ style="@style/SettingsHolderCheckboxStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/ripple_bottom_corners"> + android:background="@drawable/ripple_background"> + + + + + +