From 66b1bdc9c90e1f29ecec096286136b527ec6b8ed Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Fri, 15 Sep 2023 18:00:27 +0200
Subject: Refactor: Preferred positions for extra keys

The new PreferredPos class represents where an extra key should be
placed
Currently used to place keys at the same positions they were placed
before.
---
 srcs/juloo.keyboard2/CustomExtraKeysPreference.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'srcs/juloo.keyboard2/CustomExtraKeysPreference.java')

diff --git a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
index b17ff8d..d007bf7 100644
--- a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
@@ -10,8 +10,9 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONException;
 
@@ -30,14 +31,15 @@ public class CustomExtraKeysPreference extends ListGroupPreference<String>
     setKey(KEY);
   }
 
-  public static List<KeyValue> get(SharedPreferences prefs)
+  public static Map<KeyValue, KeyboardData.PreferredPos> get(SharedPreferences prefs)
   {
-    List<KeyValue> kvs = new ArrayList<KeyValue>();
+    Map<KeyValue, KeyboardData.PreferredPos> kvs =
+      new HashMap<KeyValue, KeyboardData.PreferredPos>();
     List<String> key_names = load_from_preferences(KEY, prefs, null, SERIALIZER);
     if (key_names != null)
     {
       for (String key_name : key_names)
-        kvs.add(KeyValue.makeStringKey(key_name));
+        kvs.put(KeyValue.makeStringKey(key_name), KeyboardData.PreferredPos.DEFAULT);
     }
     return kvs;
   }
-- 
cgit v1.2.3