luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-20 14:19:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move "no limit" clipboard history retantion time to the right side

Browse source 
sort of fixes GH-1425 (at least the unclarity about finding the setting)
This commit is contained in:
Helium314 2025-03-22 19:05:24 +01:00
parent a3bada8d25
commit 7228fa06d1
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -13,7 +13,7 @@ android {
applicationId = "helium314.keyboard" applicationId = "helium314.keyboard"
minSdk = 21 minSdk = 21
targetSdk = 34 targetSdk = 34
versionCode = 3001 versionCode = 3002
versionName = "3.0-alpha2" versionName = "3.0-alpha2"
ndk { ndk {
abiFilters.clear() abiFilters.clear()

25
app/src/main/java/helium314/keyboard/latin/App.kt
View file

@ -530,18 +530,21 @@ fun checkVersionUpgrade(context: Context) {
prefs.edit().remove("auto_correction_confidence").putFloat(Settings.PREF_AUTO_CORRECT_THRESHOLD, value).apply() prefs.edit().remove("auto_correction_confidence").putFloat(Settings.PREF_AUTO_CORRECT_THRESHOLD, value).apply()
} }
} }
if (oldVersion <= 2310) { if (oldVersion <= 2310) {
listOf( listOf(
Settings.PREF_ENABLED_SUBTYPES, Settings.PREF_ENABLED_SUBTYPES,
Settings.PREF_SELECTED_SUBTYPE, Settings.PREF_SELECTED_SUBTYPE,
Settings.PREF_ADDITIONAL_SUBTYPES Settings.PREF_ADDITIONAL_SUBTYPES
).forEach { key -> ).forEach { key ->
val value = prefs.getString(key, "")!! val value = prefs.getString(key, "")!!
if ("bengali," in value) { if ("bengali," in value) {
prefs.edit().putString(key, value.replace("bengali,", "bengali_inscript,")).apply() prefs.edit().putString(key, value.replace("bengali,", "bengali_inscript,")).apply()
} }
}
}
if (oldVersion <= 3001 && prefs.getInt(Settings.PREF_CLIPBOARD_HISTORY_RETENTION_TIME, Defaults.PREF_CLIPBOARD_HISTORY_RETENTION_TIME) <= 0) {
prefs.edit().putInt(Settings.PREF_CLIPBOARD_HISTORY_RETENTION_TIME, 121).apply()
} }
}
upgradeToolbarPrefs(prefs) upgradeToolbarPrefs(prefs)
LayoutUtilsCustom.onLayoutFileChanged() // just to be sure LayoutUtilsCustom.onLayoutFileChanged() // just to be sure
prefs.edit { putInt(Settings.PREF_VERSION_CODE, BuildConfig.VERSION_CODE) } prefs.edit { putInt(Settings.PREF_VERSION_CODE, BuildConfig.VERSION_CODE) }

2
app/src/main/java/helium314/keyboard/latin/ClipboardHistoryManager.kt
View file

@ -120,7 +120,7 @@ class ClipboardHistoryManager(
private fun checkClipRetentionElapsed() { private fun checkClipRetentionElapsed() {
val mins = latinIME.mSettings.current.mClipboardHistoryRetentionTime val mins = latinIME.mSettings.current.mClipboardHistoryRetentionTime
if (mins <= 0) return // No retention limit if (mins > 120) return // No retention limit, changed from <= 0 because we want it to be larger than all other choices
val maxClipRetentionTime = mins * 60 * 1000L val maxClipRetentionTime = mins * 60 * 1000L
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
historyEntries.removeAll { !it.isPinned && (now - it.timeStamp) > maxClipRetentionTime } historyEntries.removeAll { !it.isPinned && (now - it.timeStamp) > maxClipRetentionTime }

4
app/src/main/java/helium314/keyboard/settings/screens/PreferencesScreen.kt
View file

@ -156,10 +156,10 @@ fun createPreferencesSettings(context: Context) = listOf(
key = setting.key, key = setting.key,
default = Defaults.PREF_CLIPBOARD_HISTORY_RETENTION_TIME, default = Defaults.PREF_CLIPBOARD_HISTORY_RETENTION_TIME,
description = { description = {
if (it < 0) stringResource(R.string.settings_no_limit) if (it > 120) stringResource(R.string.settings_no_limit)
else stringResource(R.string.abbreviation_unit_minutes, it.toString()) else stringResource(R.string.abbreviation_unit_minutes, it.toString())
}, },
range = -1f..120f, range = 1f..121f,
) )
}, },
Setting(context, Settings.PREF_VIBRATION_DURATION_SETTINGS, R.string.prefs_keypress_vibration_duration_settings) { setting -> Setting(context, Settings.PREF_VIBRATION_DURATION_SETTINGS, R.string.prefs_keypress_vibration_duration_settings) { setting ->