From e52e537fd717bb27536a7e467d309fbf8ed958f9 Mon Sep 17 00:00:00 2001
From: matthiakl <t-m.42@mailpost.spdns.org>
Date: Sun, 24 Apr 2022 19:58:33 +0200
Subject: [PATCH] Added neo 2 layout (#125)

* Added neo 2 layout

* Move accents away from screen edge into second row
---
 res/values/arrays.xml            |  2 ++
 res/xml/neo2.xml                 | 49 ++++++++++++++++++++++++++++++++
 srcs/juloo.keyboard2/Config.java |  1 +
 3 files changed, 52 insertions(+)
 create mode 100644 res/xml/neo2.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 185f1c8..c38664e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -13,6 +13,7 @@
     <item>qwertz</item>
     <item>bgph1</item>
     <item>dvorak</item>
+    <item>neo2</item>
   </string-array>
   <string-array name="pref_layout_entries">
     <item>@string/pref_layout_e_system</item>
@@ -27,6 +28,7 @@
     <item>QWERTZ</item>
     <item>Bulgarian (Phonetic Traditional)</item>
     <item>Dvorak</item>
+    <item>Neo 2</item>
   </string-array>
   <string-array name="pref_programming_layout_values">
     <item>none</item>
diff --git a/res/xml/neo2.xml b/res/xml/neo2.xml
new file mode 100644
index 0000000..7ff0be7
--- /dev/null
+++ b/res/xml/neo2.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard bottom_row="false">
+  <row>
+    <key key0="x" key1="°" key2="1" key4="…"/>
+    <key key0="v" key1="§" key2="2" key4="_"/>
+    <key key0="l" key2="3" key4="["/>
+    <key key0="c" key2="4" key4="]"/>
+    <key key0="w" key2="5" key4="^"/>
+    <key key0="k" key2="6" key4="!"/>
+    <key key0="h" key2="7" key4="&lt;"/>
+    <key key0="g" key2="8" key4="&gt;"/>
+    <key key0="f" key2="9" key3="f11_placeholder" key4="="/>
+    <key key0="q" key2="0" key3="f12_placeholder" key4="&amp;"/>
+    <key key0="ß" key1="-"/>
+  </row>
+  <row>
+    <key key0="u" key1="tab" key2="accent_circonflexe" key4="\\"/>
+    <key key0="i" key2="accent_caron" key4="/"/>
+    <key key0="a" key2="accent_dot_above" key4="{"/>
+    <key key0="e" key2="accent_macron" key4="}"/>
+    <key key0="o" key2="accent_trema" key4="*"/>
+    <key key0="s" key2="accent_tilde" key4="\?"/>
+    <key key0="n" key2="accent_cedille" key4="("/>
+    <key key0="r" key2="accent_grave" key4=")"/>
+    <key key0="t" key2="accent_aigu" key4="-"/>
+    <key key0="d" key2="accent_ring" key4=":"/>
+    <key key0="y" key2="accent_double_aigu" key3="\@"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift" key1="esc"/>
+    <key key0="ü" key4="\#"/>
+    <key key0="ö" key4="$"/>
+    <key key0="ä" key4="|"/>
+    <key key0="p" key4="~"/>
+    <key key0="z" key4="`"/>
+    <key key0="b" key4="+"/>
+    <key key0="m" key4="%"/>
+    <key key0="." key1="," key3="&quot;" key4="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+  <row height="0.95">
+	  <key width="1.8" key0="ctrl" key2="meta" key4="switch_numeric"/>
+	  <key width="1.2" key0="fn" key1="alt" key2="change_method" key3="switch_emoji" key4="config"/>
+	  <key width="4.0" key0="space" key1="switch_programming" edgekeys="true"/>
+	  <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+	  <key key0="j" key4=";"/>
+	  <key width="1.8" key0="enter" key2="action"/>
+	</row>
+</keyboard>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 4022394..f6e40dc 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -227,6 +227,7 @@ final class Config
       case "qwerty_sv_se": return R.xml.qwerty_sv_se;
       case "qwertz": return R.xml.qwertz;
       case "ru_jcuken": return R.xml.local_ru_jcuken;
+      case "neo2": return R.xml.neo2;
       default: return R.xml.qwerty; // The config might store an invalid layout, don't crash
     }
   }