holm/Unexpected-Keyboard
1
0
Fork 0
forked from extern/Unexpected-Keyboard
Code Pull Requests Activity

Modify the number row according to the numpad script

Browse Source 
The same way as the numpad is modified.
This commit is contained in:
Jules Aguillon 2024-02-28 23:19:50 +01:00
parent 8c7559d8f6
commit 8b5d971fb5
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
srcs/juloo.keyboard2/Config.java
View File

@ -223,9 +223,11 @@ public final class Config
extra_keys_subtype.compute(extra_keys, extra_keys_subtype.compute(extra_keys,
new ExtraKeys.Query(kw.script, present)); new ExtraKeys.Query(kw.script, present));
} }
boolean number_row = this.number_row && !show_numpad; KeyboardData.Row number_row = null;
if (number_row) if (this.number_row && !show_numpad)
remove_keys.addAll(KeyboardData.number_row.getKeys(0).keySet()); number_row = modify_number_row(KeyboardData.number_row, kw);
if (number_row != null)
remove_keys.addAll(number_row.getKeys(0).keySet());
kw = kw.mapKeys(new KeyboardData.MapKeyValues() { kw = kw.mapKeys(new KeyboardData.MapKeyValues() {
public KeyValue apply(KeyValue key, boolean localized) public KeyValue apply(KeyValue key, boolean localized)
{ {
@ -278,8 +280,8 @@ public final class Config
}); });
if (show_numpad) if (show_numpad)
kw = kw.addNumPad(modify_numpad(KeyboardData.num_pad, kw)); kw = kw.addNumPad(modify_numpad(KeyboardData.num_pad, kw));
if (number_row) if (number_row != null)
kw = kw.addNumberRow(); kw = kw.addTopRow(number_row);
if (extra_keys.size() > 0) if (extra_keys.size() > 0)
kw = kw.addExtraKeys(extra_keys.entrySet().iterator()); kw = kw.addExtraKeys(extra_keys.entrySet().iterator());
return kw; return kw;
@ -328,12 +330,10 @@ public final class Config
}); });
} }
/** Modify the pin entry layout. [main_kw] is used to map the digits into the static KeyboardData.MapKeyValues numpad_script_map(String numpad_script)
same script. */
public KeyboardData modify_pinentry(KeyboardData kw, KeyboardData main_kw)
{ {
final KeyModifier.Map_char map_digit = KeyModifier.modify_numpad_script(main_kw.numpad_script); final KeyModifier.Map_char map_digit = KeyModifier.modify_numpad_script(numpad_script);
return kw.mapKeys(new KeyboardData.MapKeyValues() { return new KeyboardData.MapKeyValues() {
public KeyValue apply(KeyValue key, boolean localized) public KeyValue apply(KeyValue key, boolean localized)
{ {
switch (key.getKind()) switch (key.getKind())
@ -346,7 +346,21 @@ public final class Config
} }
return key; return key;
} }
}); };
}
/** Modify the pin entry layout. [main_kw] is used to map the digits into the
same script. */
public KeyboardData modify_pinentry(KeyboardData kw, KeyboardData main_kw)
{
return kw.mapKeys(numpad_script_map(main_kw.numpad_script));
}
/** Modify the number row according to [main_kw]'s script. */
public KeyboardData.Row modify_number_row(KeyboardData.Row row,
KeyboardData main_kw)
{
return row.mapKeys(numpad_script_map(main_kw.numpad_script));
} }
private float get_dip_pref(DisplayMetrics dm, String pref_name, float def) private float get_dip_pref(DisplayMetrics dm, String pref_name, float def)

4
srcs/juloo.keyboard2/KeyboardData.java
View File

@ -132,10 +132,10 @@ public final class KeyboardData
return new KeyboardData(this, extendedRows); return new KeyboardData(this, extendedRows);
} }
public KeyboardData addNumberRow() public KeyboardData addTopRow(Row row)
{ {
ArrayList<Row> rows_ = new ArrayList<Row>(this.rows); ArrayList<Row> rows_ = new ArrayList<Row>(this.rows);
rows_.add(0, number_row.updateWidth(keysWidth)); rows_.add(0, row.updateWidth(keysWidth));
return new KeyboardData(this, rows_); return new KeyboardData(this, rows_);
} }