Skip to content

Display unpinned clipboard items on top #1903

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

Merged
merged 5 commits into from
Nov 4, 2025
Merged

Display unpinned clipboard items on top #1903

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a28cf56
Display unpinned clipboard items on top
eranl Aug 25, 2025
beab070
Add setting
eranl Oct 29, 2025
02c3c99
Minor fix
eranl Oct 29, 2025
b94e21a
unpinned -> pinned,
eranl Nov 2, 2025
d59954a
comment on shared preference listener
Helium314 Nov 4, 2025
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
19 changes: 13 additions & 6 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 @@ -55,7 +55,7 @@ class ClipboardHistoryView @JvmOverloads constructor(
private lateinit var clipboardAdapter: ClipboardAdapter

lateinit var keyboardActionListener: KeyboardActionListener
private var clipboardHistoryManager: ClipboardHistoryManager? = null
private lateinit var clipboardHistoryManager: ClipboardHistoryManager

init {
val clipboardViewAttr = context.obtainStyledAttributes(attrs,
Expand Down Expand Up @@ -84,6 +84,7 @@ class ClipboardHistoryView @JvmOverloads constructor(
@SuppressLint("ClickableViewAccessibility")
private fun initialize() { // needs to be delayed for access to ClipboardStrip, which is not a child of this view
if (this::clipboardAdapter.isInitialized) return
clipboardHistoryManager.sortHistoryEntries()
val colors = Settings.getValues().mColors
clipboardAdapter = ClipboardAdapter(clipboardLayoutParams, this).apply {
itemBackgroundId = keyBackgroundId
Expand Down Expand Up @@ -144,11 +145,11 @@ class ClipboardHistoryView @JvmOverloads constructor(
editorInfo: EditorInfo,
keyboardActionListener: KeyboardActionListener
) {
clipboardHistoryManager = historyManager
initialize()
setupToolbarKeys()
historyManager.prepareClipboardHistory()
historyManager.setHistoryChangeListener(this)
clipboardHistoryManager = historyManager
clipboardAdapter.clipboardHistoryManager = historyManager

val params = KeyDrawParams()
Expand Down Expand Up @@ -188,8 +189,7 @@ class ClipboardHistoryView @JvmOverloads constructor(
fun stopClipboardHistory() {
if (!this::clipboardAdapter.isInitialized) return
clipboardRecyclerView.adapter = null
clipboardHistoryManager?.setHistoryChangeListener(null)
clipboardHistoryManager = null
clipboardHistoryManager.setHistoryChangeListener(null)
clipboardAdapter.clipboardHistoryManager = null
}

Expand Down Expand Up @@ -226,8 +226,8 @@ class ClipboardHistoryView @JvmOverloads constructor(
}

override fun onKeyUp(clipId: Long) {
val clipContent = clipboardHistoryManager?.getHistoryEntryContent(clipId)
keyboardActionListener.onTextInput(clipContent?.content.toString())
val clipContent = clipboardHistoryManager.getHistoryEntryContent(clipId)
keyboardActionListener.onTextInput(clipContent.content.toString())
keyboardActionListener.onReleaseKey(KeyCode.NOT_SPECIFIED, false)
if (Settings.getValues().mAlphaAfterClipHistoryEntry)
keyboardActionListener.onCodeInput(KeyCode.ALPHA, Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE, false)
Expand All @@ -250,5 +250,12 @@ class ClipboardHistoryView @JvmOverloads constructor(

override fun onSharedPreferenceChanged(prefs: SharedPreferences?, key: String?) {
setToolbarButtonsActivatedStateOnPrefChange(KeyboardSwitcher.getInstance().clipboardStrip, key)

if (::clipboardHistoryManager.isInitialized && key == Settings.PREF_CLIPBOARD_HISTORY_UNPINNED_FIRST) {
// Ensure settings are reloaded first
Settings.getInstance().onSharedPreferenceChanged(prefs, key)
clipboardHistoryManager.sortHistoryEntries()
clipboardAdapter.notifyDataSetChanged()
}
}
}
4 changes: 3 additions & 1 deletion app/src/main/java/helium314/keyboard/latin/ClipboardHistoryEntry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

package helium314.keyboard.latin

import helium314.keyboard.latin.settings.Settings
import kotlinx.serialization.Serializable

@Serializable
Expand All @@ -11,7 +12,8 @@ data class ClipboardHistoryEntry (
var isPinned: Boolean = false
) : Comparable<ClipboardHistoryEntry> {
override fun compareTo(other: ClipboardHistoryEntry): Int {
val result = other.isPinned.compareTo(isPinned)
var result = other.isPinned.compareTo(isPinned)
if (Settings.getValues()?.mClipboardHistoryUnpinnedFirst == true) result = -result
Copy link
Owner

@Helium314 Helium314 Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you have some issues where SettingsValues were not yet loaded when the list is being sorted?

Copy link
Contributor Author

@eranl eranl Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, before I removed this line. But then I decided to keep this safe call just in case.

Copy link
Owner

@Helium314 Helium314 Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Reproduced and fixed by loading settings before calling ClipboardHistoryManager.onCreate

return if (result != 0) result else other.timeStamp.compareTo(timeStamp)
}
}
3 changes: 1 addition & 2 deletions app/src/main/java/helium314/keyboard/latin/ClipboardHistoryManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class ClipboardHistoryManager(
historyEntries.removeAt(index)
}

private fun sortHistoryEntries() {
fun sortHistoryEntries() {
historyEntries.sort()
}

Expand Down Expand Up @@ -157,7 +157,6 @@ class ClipboardHistoryManager(
if (pinnedClipString.isEmpty()) return
val pinnedClips: List<ClipboardHistoryEntry> = Json.decodeFromString(pinnedClipString)
historyEntries.addAll(pinnedClips)
sortHistoryEntries()
if (onHistoryChangeListener != null) {
pinnedClips.forEach {
onHistoryChangeListener?.onClipboardHistoryEntryAdded(historyEntries.indexOf(it))
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 @@ -138,6 +138,7 @@ object Defaults {
const val PREF_LANGUAGE_SWIPE_DISTANCE = 5
const val PREF_ENABLE_CLIPBOARD_HISTORY = true
const val PREF_CLIPBOARD_HISTORY_RETENTION_TIME = 10 // minutes
const val PREF_CLIPBOARD_HISTORY_UNPINNED_FIRST = false
const val PREF_ADD_TO_PERSONAL_DICTIONARY = false
@JvmField
val PREF_NAVBAR_COLOR = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/helium314/keyboard/latin/settings/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang

public static final String PREF_ENABLE_CLIPBOARD_HISTORY = "enable_clipboard_history";
public static final String PREF_CLIPBOARD_HISTORY_RETENTION_TIME = "clipboard_history_retention_time";
public static final String PREF_CLIPBOARD_HISTORY_UNPINNED_FIRST = "clipboard_history_unpinned_first";

public static final String PREF_ADD_TO_PERSONAL_DICTIONARY = "add_to_personal_dictionary";
public static final String PREF_NAVBAR_COLOR = "navbar_color";
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public class SettingsValues {
public final boolean mShiftRemovesAutospace;
public final boolean mClipboardHistoryEnabled;
public final long mClipboardHistoryRetentionTime;
public final boolean mClipboardHistoryUnpinnedFirst;
public final boolean mOneHandedModeEnabled;
public final int mOneHandedModeGravity;
public final float mOneHandedModeScale;
Expand Down Expand Up @@ -258,6 +259,7 @@ public SettingsValues(final Context context, final SharedPreferences prefs, fina
mShiftRemovesAutospace = prefs.getBoolean(Settings.PREF_SHIFT_REMOVES_AUTOSPACE, Defaults.PREF_SHIFT_REMOVES_AUTOSPACE);
mClipboardHistoryEnabled = prefs.getBoolean(Settings.PREF_ENABLE_CLIPBOARD_HISTORY, Defaults.PREF_ENABLE_CLIPBOARD_HISTORY);
mClipboardHistoryRetentionTime = prefs.getInt(Settings.PREF_CLIPBOARD_HISTORY_RETENTION_TIME, Defaults.PREF_CLIPBOARD_HISTORY_RETENTION_TIME);
mClipboardHistoryUnpinnedFirst = prefs.getBoolean(Settings.PREF_CLIPBOARD_HISTORY_UNPINNED_FIRST, Defaults.PREF_CLIPBOARD_HISTORY_UNPINNED_FIRST);

mOneHandedModeEnabled = Settings.readOneHandedModeEnabled(prefs, isLandscape, mIsSplitKeyboardEnabled);
mOneHandedModeGravity = Settings.readOneHandedModeGravity(prefs, isLandscape, mIsSplitKeyboardEnabled);
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/helium314/keyboard/settings/screens/PreferencesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ fun PreferencesScreen(
val b = (LocalContext.current.getActivity() as? SettingsActivity)?.prefChanged?.collectAsState()
if ((b?.value ?: 0) < 0)
Log.v("irrelevant", "stupid way to trigger recomposition on preference change")
val clipboardHistoryEnabled = prefs.getBoolean(Settings.PREF_ENABLE_CLIPBOARD_HISTORY, Defaults.PREF_ENABLE_CLIPBOARD_HISTORY)
val items = listOf(
R.string.settings_category_input,
Settings.PREF_SHOW_HINTS,
Expand Down Expand Up @@ -71,8 +72,8 @@ fun PreferencesScreen(
Settings.PREF_REMOVE_REDUNDANT_POPUPS,
R.string.settings_category_clipboard_history,
Settings.PREF_ENABLE_CLIPBOARD_HISTORY,
if (prefs.getBoolean(Settings.PREF_ENABLE_CLIPBOARD_HISTORY, Defaults.PREF_ENABLE_CLIPBOARD_HISTORY))
Settings.PREF_CLIPBOARD_HISTORY_RETENTION_TIME else null
if (clipboardHistoryEnabled) Settings.PREF_CLIPBOARD_HISTORY_RETENTION_TIME else null,
if (clipboardHistoryEnabled) Settings.PREF_CLIPBOARD_HISTORY_UNPINNED_FIRST else null
)
SearchSettingsScreen(
onClickBack = onClickBack,
Expand Down Expand Up @@ -171,6 +172,9 @@ fun createPreferencesSettings(context: Context) = listOf(
range = 1f..121f,
)
},
Setting(context, Settings.PREF_CLIPBOARD_HISTORY_UNPINNED_FIRST, R.string.clipboard_history_unpinned_first) {
SwitchPreference(it, Defaults.PREF_CLIPBOARD_HISTORY_UNPINNED_FIRST)
},
Setting(context, Settings.PREF_VIBRATION_DURATION_SETTINGS, R.string.prefs_keypress_vibration_duration_settings) { setting ->
SliderPreference(
name = setting.title,
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,10 @@
<string name="enable_clipboard_history">Enable clipboard history</string>
<!-- Description for enabling/disabling clipboard history mentioning that if disabled, clipboard content is pasted -->
<string name="enable_clipboard_history_summary">If disabled, clipboard key will paste clipboard content if any</string>
<!-- Preferences item for enabling clipboard history -->
<!-- Preferences item for controlling clipboard history retention time -->
<string name="clipboard_history_retention_time">History retention time</string>
<!-- Preferences item for showing unpinned clipboard items first -->
<string name="clipboard_history_unpinned_first">Show unpinned items on top</string>
<!-- Preferences item for enabling swipe deletion -->
<string name="delete_swipe">Delete swipe</string>
<!-- Description for "delete_swipe" option. -->
Expand Down
Loading