abouttreesummaryrefslogcommitdiff
diff options
context:
space:
mode:
authorJules Aguillon2023-07-17 00:05:27 +0200
committerJules Aguillon2023-07-19 23:30:58 +0200
commit324aa26ba4d062edcbbecab9de2f0a8f2c3c8dfc (patch)
treeaa03ee82090d42e1ee2a6677e3ff56bbb7be50ef
parent6747669c2d64f4b01d5ce03729695689a03e20c7 (diff)
downloadunexpected-keyboard-324aa26ba4d062edcbbecab9de2f0a8f2c3c8dfc.tar.gz
unexpected-keyboard-324aa26ba4d062edcbbecab9de2f0a8f2c3c8dfc.zip
Refactor: Make KeyValue.makeStringKey public
-rw-r--r--srcs/juloo.keyboard2/KeyValue.java19
1 files changed, 10 insertions, 9 deletions
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index ed80f86..b3008ca 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -290,12 +290,13 @@ final class KeyValue
return new KeyValue("", Kind.Placeholder, id.ordinal(), 0);
}
- private static KeyValue fallbackMakeKey(String name)
+ /** Make a key that types a string. */
+ public static KeyValue makeStringKey(String str)
{
- if (name.length() == 1)
- return new KeyValue(name, Kind.Char, name.charAt(0), 0);
+ if (str.length() == 1)
+ return new KeyValue(str, Kind.Char, str.charAt(0), 0);
else
- return new KeyValue(name, Kind.String, 0, 0);
+ return new KeyValue(str, Kind.String, 0, 0);
}
public static KeyValue getKeyByName(String name)
@@ -305,10 +306,10 @@ final class KeyValue
/* These symbols have special meaning when in `res/xml` and are escaped in
standard layouts. The backslash is not stripped when parsed from the
custom layout option. */
- case "\\?": return fallbackMakeKey("?");
- case "\\#": return fallbackMakeKey("#");
- case "\\@": return fallbackMakeKey("@");
- case "\\\\": return fallbackMakeKey("\\");
+ case "\\?": return makeStringKey("?");
+ case "\\#": return makeStringKey("#");
+ case "\\@": return makeStringKey("@");
+ case "\\\\": return makeStringKey("\\");
case "shift": return modifierKey(0x0A, Modifier.SHIFT, 0);
case "ctrl": return modifierKey("Ctrl", Modifier.CTRL, 0);
@@ -443,7 +444,7 @@ final class KeyValue
case "replaceText": return editingKey("repl.", Editing.REPLACE);
case "textAssist": return editingKey("assist", Editing.ASSIST);
case "autofill": return editingKey("auto.", Editing.AUTOFILL);
- default: return fallbackMakeKey(name);
+ default: return makeStringKey(name);
}
}