Miscellaneous changes
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@ public class InputMethod extends InputMethodService {
|
||||
mInputView.mClipboardPopup.dismiss();
|
||||
}
|
||||
|
||||
// Cyclers
|
||||
// Cyclers & runnables
|
||||
|
||||
private class SymbolCycler extends Cycler {
|
||||
@Override
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user