aboutsummaryrefslogtreecommitdiff
path: root/addons/api/src/main/res/values/strings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'addons/api/src/main/res/values/strings.xml')
-rw-r--r--addons/api/src/main/res/values/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/api/src/main/res/values/strings.xml b/addons/api/src/main/res/values/strings.xml
new file mode 100644
index 000000000..045e125f3
--- /dev/null
+++ b/addons/api/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-11 02:43:00 +0000
tr> -rw-r--r--src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java1
-rw-r--r--src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysOrderedListPreference.java144
-rw-r--r--src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickTextViewFactory.java2
-rw-r--r--src/main/java/com/anysoftkeyboard/ui/settings/AdditionalUiSettingsFragment.java5
-rw-r--r--src/main/java/com/anysoftkeyboard/ui/settings/EffectsSettingsFragment.java1
-rw-r--r--src/main/java/com/emtronics/dragsortrecycler/DragSortRecycler.java4
-rwxr-xr-xsrc/main/res/drawable-hdpi/ic_slider_icon.pngbin0 -> 521 bytes-rwxr-xr-xsrc/main/res/drawable-mdpi/ic_slider_icon.pngbin0 -> 315 bytes-rwxr-xr-xsrc/main/res/drawable-xhdpi/ic_slider_icon.pngbin0 -> 655 bytes-rwxr-xr-xsrc/main/res/drawable-xxhdpi/ic_slider_icon.pngbin0 -> 916 bytes-rw-r--r--src/main/res/layout/ordered_list_item.xml33
-rw-r--r--src/main/res/layout/ordered_list_pref.xml11
-rwxr-xr-xsrc/main/res/values-ar/strings.xml3
-rw-r--r--src/main/res/values-be/strings.xml1
-rwxr-xr-xsrc/main/res/values-bg/strings.xml3
-rwxr-xr-xsrc/main/res/values-ca/strings.xml3
-rwxr-xr-xsrc/main/res/values-cs/strings.xml3
-rwxr-xr-xsrc/main/res/values-da/strings.xml2
-rwxr-xr-xsrc/main/res/values-de/strings.xml3
-rwxr-xr-xsrc/main/res/values-el/strings.xml3
-rwxr-xr-xsrc/main/res/values-es/strings.xml3
-rw-r--r--src/main/res/values-fi/strings.xml3
-rw-r--r--src/main/res/values-fr/strings.xml3
-rwxr-xr-xsrc/main/res/values-hu/strings.xml3
-rwxr-xr-xsrc/main/res/values-it/strings.xml2
-rw-r--r--src/main/res/values-iw/strings.xml3
-rwxr-xr-xsrc/main/res/values-mk/strings.xml1
-rwxr-xr-xsrc/main/res/values-my/strings.xml1
-rwxr-xr-xsrc/main/res/values-nl/strings.xml3
-rwxr-xr-xsrc/main/res/values-pl/strings.xml3
-rwxr-xr-xsrc/main/res/values-pt/strings.xml3
-rwxr-xr-xsrc/main/res/values-ru/strings.xml2
-rw-r--r--src/main/res/values-se/strings.xml3
-rw-r--r--src/main/res/values-sl/strings.xml3
-rwxr-xr-xsrc/main/res/values-tr/strings.xml1
-rwxr-xr-xsrc/main/res/values-uk/strings.xml3
-rw-r--r--src/main/res/values/strings.xml6
-rw-r--r--src/main/res/xml/prefs_addtional_ui_addons_prefs.xml41
39 files changed, 231 insertions, 130 deletions
diff --git a/src/main/java/com/anysoftkeyboard/quicktextkeys/QuickTextKeyFactory.java b/src/main/java/com/anysoftkeyboard/quicktextkeys/QuickTextKeyFactory.java
index 144f6a4c7..b736098e1 100644
--- a/src/main/java/com/anysoftkeyboard/quicktextkeys/QuickTextKeyFactory.java
+++ b/src/main/java/com/anysoftkeyboard/quicktextkeys/QuickTextKeyFactory.java
@@ -16,11 +16,10 @@
package com.anysoftkeyboard.quicktextkeys;
-import android.annotation.TargetApi;
import android.content.Context;
import android.content.SharedPreferences;
-import android.os.Build;
import android.preference.PreferenceManager;
+import android.text.TextUtils;
import android.util.AttributeSet;
import com.anysoftkeyboard.addons.AddOnsFactory;
@@ -28,8 +27,7 @@ import com.menny.android.anysoftkeyboard.R;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.List;
public class QuickTextKeyFactory extends AddOnsFactory<QuickTextKey> {
@@ -55,54 +53,40 @@ public class QuickTextKeyFactory extends AddOnsFactory<QuickTextKey> {
}
public static QuickTextKey getCurrentQuickTextKey(Context context) {
- return getAllEnabledQuickKeys(context).get(0);
+ return getOrderedEnabledQuickKeys(context).get(0);
}
public static ArrayList<QuickTextKey> getAllAvailableQuickKeys(Context applicationContext) {
return msInstance.getAllAddOns(applicationContext);
}
- public static ArrayList<QuickTextKey> getAllEnabledQuickKeys(Context applicationContext) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- return getAllEnabledQuickKeysOrdered(applicationContext);
- } else {
- ArrayList<QuickTextKey> allKeys = getAllAvailableQuickKeys(applicationContext);
- QuickTextKey activeKey = getEnabledQuickKeyForLegacy(applicationContext);
- allKeys.remove(activeKey);
- allKeys.add(0, activeKey);
- return allKeys;
- }
- }
-
- private static QuickTextKey getEnabledQuickKeyForLegacy(Context applicationContext) {
- ArrayList<QuickTextKey> quickTextKeys = msInstance.getAllAddOns(applicationContext);
-
+ public static void storeOrderedEnabledQuickKeys(Context applicationContext, ArrayList<QuickTextKey> orderedKeys) {
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
- String settingKey = applicationContext.getString(R.string.settings_key_active_quick_text_key);
-
- String activeQuickKey = sharedPreferences.getString(settingKey, quickTextKeys.get(0).getId());
+ String settingKey = applicationContext.getString(R.string.settings_key_ordered_active_quick_text_keys);
- for (QuickTextKey key : quickTextKeys) {
- if (key.getId().equals(activeQuickKey)) return key;
+ List<String> quickKeyIdOrder = new ArrayList<>(orderedKeys.size());
+ for (QuickTextKey key : orderedKeys) {
+ quickKeyIdOrder.add(key.getId());
}
-
- return quickTextKeys.get(0);
+ SharedPreferences.Editor editor = sharedPreferences.edit();
+ editor.putString(settingKey, TextUtils.join(",", quickKeyIdOrder)).commit();
}
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
- private static ArrayList<QuickTextKey> getAllEnabledQuickKeysOrdered(Context applicationContext) {
+ public static ArrayList<QuickTextKey> getOrderedEnabledQuickKeys(Context applicationContext) {
ArrayList<QuickTextKey> quickTextKeys = msInstance.getAllAddOns(applicationContext);
//now, reading the ordered array of active keys
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
String settingKey = applicationContext.getString(R.string.settings_key_ordered_active_quick_text_keys);
- Set<String> defaultOrder = new LinkedHashSet<>(quickTextKeys.size());
- for (QuickTextKey key : quickTextKeys) defaultOrder.add(key.getId());
-
- Set<String> quickKeyIdsOrder = sharedPreferences.getStringSet(settingKey, defaultOrder);
+ List<String> quickKeyIdDefaultOrder = new ArrayList<>(quickTextKeys.size());
+ for (QuickTextKey key : quickTextKeys) {
+ quickKeyIdDefaultOrder.add(key.getId());
+ }
+ String quickKeyIdsOrderValue = sharedPreferences.getString(settingKey, TextUtils.join(",", quickKeyIdDefaultOrder));
+ String[] quickKeyIdsOrder = TextUtils.split(quickKeyIdsOrderValue, ",");
- ArrayList<QuickTextKey> orderedQuickTextKeys = new ArrayList<>(quickKeyIdsOrder.size());
+ ArrayList<QuickTextKey> orderedQuickTextKeys = new ArrayList<>(quickKeyIdsOrder.length);
for (String keyId : quickKeyIdsOrder) {
Iterator<QuickTextKey> iterator = quickTextKeys.iterator();
while (iterator.hasNext()) {
diff --git a/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java
index 30c572c4d..6161b8c84 100644
--- a/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java
+++ b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/FrameKeyboardViewClickListener.java
@@ -1,6 +1,5 @@
package com.anysoftkeyboard.quicktextkeys.ui;
-import android.view.KeyEvent;
import android.view.View;
import com.anysoftkeyboard.api.KeyCodes;
diff --git a/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysOrderedListPreference.java b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysOrderedListPreference.java
new file mode 100644
index 000000000..d644de81a
--- /dev/null
+++ b/src/main/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysOrderedListPreference.java
@@ -0,0 +1,144 @@
+package com.anysoftkeyboard.quicktextkeys.ui;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.preference.DialogPreference;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.anysoftkeyboard.quicktextkeys.QuickTextKey;
+import com.anysoftkeyboard.quicktextkeys.QuickTextKeyFactory;
+import com.emtronics.dragsortrecycler.DragSortRecycler;
+import com.menny.android.anysoftkeyboard.R;
+
+import java.util.ArrayList;
+
+public class QuickKeysOrderedListPreference extends DialogPreference {
+ private ArrayList<QuickTextKey> mQuickKeysAddOnsToStore;
+
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+ public QuickKeysOrderedListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ setDialogLayoutResource(R.layout.ordered_list_pref);
+ }
+
+ public QuickKeysOrderedListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ setDialogLayoutResource(R.layout.ordered_list_pref);
+ }
+
+ public QuickKeysOrderedListPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ setDialogLayoutResource(R.layout.ordered_list_pref);
+ }
+
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+ public QuickKeysOrderedListPreference(Context context) {
+ super(context);
+ setDialogLayoutResource(R.layout.ordered_list_pref);
+ }
+
+ @Override
+ protected void onBindDialogView(@NonNull View view) {
+ super.onBindDialogView(view);
+ mQuickKeysAddOnsToStore = QuickTextKeyFactory.getOrderedEnabledQuickKeys(getContext());
+ RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
+ recyclerView.setHasFixedSize(true);
+ recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+ recyclerView.setAdapter(new Adapter());
+
+ recyclerView.setItemAnimator(null);
+
+ DragSortRecycler dragSortRecycler = new DragSortRecycler();
+ dragSortRecycler.setViewHandleId(R.id.orderedListSlider);
+
+ dragSortRecycler.setOnItemMovedListener(new DragSortRecycler.OnItemMovedListener() {
+ @Override
+ public void onItemMoved(RecyclerView rv, int from, int to) {
+ QuickTextKey temp = mQuickKeysAddOnsToStore.remove(from);
+ mQuickKeysAddOnsToStore.add(to, temp);
+ rv.getAdapter().notifyItemMoved(from, to);
+ }
+ });
+