From 361de2a76cfdcfeb84b32523723ead93abe07fbb Mon Sep 17 00:00:00 2001
From: Emil Kosz <ekosz@int.pl>
Date: Sun, 3 Nov 2024 20:17:41 +0100
Subject: [PATCH] Miscellaneous changes

---
 .../cfpi_fpsi/eu/titanboard/ClipManager.java     |  2 +-
 .../cfpi_fpsi/eu/titanboard/InputMethod.java     |  2 +-
 .../java/cfpi_fpsi/eu/titanboard/InputView.java  |  3 ++-
 .../eu/titanboard/PreferenceHolder.java          |  6 +++---
 app/src/main/res/layout/clip.xml                 |  1 +
 app/src/main/res/values/arrays.xml               | 16 ++++++++++++++++
 app/src/main/res/values/dimens.xml               |  2 +-
 app/src/main/res/values/strings.xml              |  6 +++---
 app/src/main/res/xml/preferences.xml             | 13 ++++++-------
 9 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/cfpi_fpsi/eu/titanboard/ClipManager.java b/app/src/main/java/cfpi_fpsi/eu/titanboard/ClipManager.java
index 0d62932..3290f8f 100644
--- a/app/src/main/java/cfpi_fpsi/eu/titanboard/ClipManager.java
+++ b/app/src/main/java/cfpi_fpsi/eu/titanboard/ClipManager.java
@@ -62,7 +62,7 @@ public class ClipManager extends ArrayList<ClipData.Item>
                 add(0, item);
             }
 
-            if (size() > mInputMethod.mPreferenceHolder.getMaxClipboardItems()) {
+            if (size() > mInputMethod.mPreferenceHolder.getClipboardSize()) {
                 remove(size() - 1);
             }
         }
diff --git a/app/src/main/java/cfpi_fpsi/eu/titanboard/InputMethod.java b/app/src/main/java/cfpi_fpsi/eu/titanboard/InputMethod.java
index dde5c80..215806f 100644
--- a/app/src/main/java/cfpi_fpsi/eu/titanboard/InputMethod.java
+++ b/app/src/main/java/cfpi_fpsi/eu/titanboard/InputMethod.java
@@ -169,7 +169,7 @@ public class InputMethod extends InputMethodService {
         mInputView.mClipboardPopup.dismiss();
     }
 
-    // Cyclers
+    // Cyclers & runnables
 
     private class SymbolCycler extends Cycler {
         @Override
diff --git a/app/src/main/java/cfpi_fpsi/eu/titanboard/InputView.java b/app/src/main/java/cfpi_fpsi/eu/titanboard/InputView.java
index 0a68fc2..380b277 100644
--- a/app/src/main/java/cfpi_fpsi/eu/titanboard/InputView.java
+++ b/app/src/main/java/cfpi_fpsi/eu/titanboard/InputView.java
@@ -179,7 +179,8 @@ public class InputView extends RelativeLayout {
 
             Button pasteButton = clipView.findViewById(R.id.paste_button);
             pasteButton.setText(item.getText());
-
+            // Required for marquee to work.
+            pasteButton.setSelected(true);
             pasteButton.setOnClickListener(button -> mInputMethod.getCurrentInputConnection().commitText(item.getText(), 1));
 
             LinearLayout finalClipView = clipView;
diff --git a/app/src/main/java/cfpi_fpsi/eu/titanboard/PreferenceHolder.java b/app/src/main/java/cfpi_fpsi/eu/titanboard/PreferenceHolder.java
index e313c6a..ce0960f 100644
--- a/app/src/main/java/cfpi_fpsi/eu/titanboard/PreferenceHolder.java
+++ b/app/src/main/java/cfpi_fpsi/eu/titanboard/PreferenceHolder.java
@@ -67,10 +67,10 @@ public class PreferenceHolder implements SharedPreferences.OnSharedPreferenceCha
                         mContext.getString(R.string.cycle_speed_default)));
     }
 
-    public int getMaxClipboardItems() {
+    public int getClipboardSize() {
         return Integer.parseInt((String)
-                getOrDefault(mContext.getString(R.string.preferences_key_clipboard_max_items),
-                        mContext.getString(R.string.clipboard_max_items_default)));
+                getOrDefault(mContext.getString(R.string.preferences_key_clipboard_size),
+                        mContext.getString(R.string.clipboard_size_default)));
     }
 
     @SuppressWarnings("unchecked")
diff --git a/app/src/main/res/layout/clip.xml b/app/src/main/res/layout/clip.xml
index 7f55a07..450b885 100644
--- a/app/src/main/res/layout/clip.xml
+++ b/app/src/main/res/layout/clip.xml
@@ -30,6 +30,7 @@
         android:layout_weight="1"
         android:background="@drawable/button_transparent"
         android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
         android:gravity="center_vertical"
         android:padding="@dimen/default_space"
         android:singleLine="true"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f517acb..cb26a97 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -64,4 +64,20 @@
         <item>750</item>
         <item>1000</item>
     </string-array>
+
+    <string-array name="preferences_clipboard_size_labels">
+        <item>3 items</item>
+        <item>5 items</item>
+        <item>10 items</item>
+        <item>20 items</item>
+        <item>30 items</item>
+    </string-array>
+
+    <string-array name="preferences_clipboard_sizes">
+        <item>3</item>
+        <item>5</item>
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 29e5adb..3da6a02 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -25,7 +25,7 @@
     <dimen name="default_text_size">16sp</dimen>
     <dimen name="image_button_vertical_padding">12dp</dimen>
     <dimen name="image_button_horizontal_padding">14dp</dimen>
-    <dimen name="clipboard_popup_width">196dp</dimen>
+    <dimen name="clipboard_popup_width">256dp</dimen>
     <dimen name="clipboard_popup_height">256dp</dimen>
     <dimen name="default_border_radius">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6553500..24ab2da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
 
     <string name="keymap_default">en</string>
     <string name="cycle_speed_default">500</string>
-    <string name="clipboard_max_items_default">10</string>
+    <string name="clipboard_size_default">5</string>
 
     <string name="state_button_default">\??</string>
     <string name="state_button_alt_locked">#!</string>
@@ -16,7 +16,7 @@
 
     <string name="preferences_label_floating_interface">Floating interface</string>
     <string name="preferences_label_cycle_speed">Cycling speed</string>
-    <string name="preferences_label_clipboard_max_items">Maximum clipboard items</string>
+    <string name="preferences_label_clipboard_size">Clipboard size</string>
     <string name="preferences_label_keymaps">Keymaps</string>
     <string name="preferences_label_copyright_info">Copyleft 🄯 Emil Kosz, 2024. License: GPLv3</string>
 
@@ -31,5 +31,5 @@
     <string name="preferences_key_floating_interface">floating_interface</string>
     <string name="preferences_key_keymaps">selected_keymaps</string>
     <string name="preferences_key_cycle_speed">cycle_speed</string>
-    <string name="preferences_key_clipboard_max_items">clipboard_items</string>
+    <string name="preferences_key_clipboard_size">clipboard_size</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 85574a8..2de54a1 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -32,13 +32,12 @@
         android:key="@string/preferences_key_cycle_speed"
         android:summary="@string/preferences_summary_cycle_speed"
         android:title="@string/preferences_label_cycle_speed" />
-    <EditTextPreference
-        android:defaultValue="@string/clipboard_max_items_default"
-        android:inputType="number|numberSigned"
-        android:key="@string/preferences_key_clipboard_max_items"
-        android:selectAllOnFocus="true"
-        android:singleLine="true"
-        android:title="@string/preferences_label_clipboard_max_items" />
+    <ListPreference
+        android:defaultValue="@string/clipboard_size_default"
+        android:entries="@array/preferences_clipboard_size_labels"
+        android:entryValues="@array/preferences_clipboard_sizes"
+        android:key="@string/preferences_key_clipboard_size"
+        android:title="@string/preferences_label_clipboard_size" />
     <MultiSelectListPreference
         android:defaultValue="@array/preferences_keymap_defaults"
         android:entries="@array/preferences_keymap_labels"