From 31c12e5182c089cacbb62264cf222b09294208c9 Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Mon, 9 Sep 2019 19:10:42 +0000
Subject: [PATCH] layout: Convert numbers to yaml

---
 data/keyboards/geometry/number-keypad.xml | 40 -------------------
 data/keyboards/number.yaml                | 47 +++++++++++++++++++++++
 data/keyboards/symbols/special/number.xml | 22 -----------
 data/squeekboard.gresources.xml           |  2 -
 4 files changed, 47 insertions(+), 64 deletions(-)
 delete mode 100644 data/keyboards/geometry/number-keypad.xml
 create mode 100644 data/keyboards/number.yaml
 delete mode 100644 data/keyboards/symbols/special/number.xml

diff --git a/data/keyboards/geometry/number-keypad.xml b/data/keyboards/geometry/number-keypad.xml
deleted file mode 100644
index 9c15302a..00000000
--- a/data/keyboards/geometry/number-keypad.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<geometry version="0.90">
-  <bounds x="0" y="10.000000" width="410.0000" height="229"/>
-
-  <outline id="default" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="37.46341" y="0.000000"/>
-    <point x="37.46341" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="altline" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="48.39024" y="0.000000"/>
-    <point x="48.39024" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="outline7" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="88.97561" y="0.000000"/>
-    <point x="88.97561" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-  <outline id="spaceline" corner-radius="1.000000">
-    <point x="0.000000" y="0.000000"/>
-    <point x="120.5853" y="0.000000"/>
-    <point x="120.5853" y="52.44877"/>
-    <point x="0.000000" y="52.44877"/>
-  </outline>
-
-  <button name="BackSpace" oref="altline" />
-  <button name="space" oref="spaceline" />
-  <button name="Return" oref="outline7" />
-
-  <view>
-    <section angle="0">1 2 3 parenleft parenright</section>
-    <section angle="0">4 5 6 numbersign asterisk</section>
-    <section angle="0">7 8 9 plus minus</section>
-    <section angle="0">BackSpace 0 space Return</section>
-  </view>
-</geometry>
diff --git a/data/keyboards/number.yaml b/data/keyboards/number.yaml
new file mode 100644
index 00000000..d96698c6
--- /dev/null
+++ b/data/keyboards/number.yaml
@@ -0,0 +1,47 @@
+---
+bounds: { x: 0, y: 10, width: 410, height: 229 }
+
+outlines:
+    default:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 37.46341, height: 52 }
+    altline:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
+    outline7:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
+    spaceline:
+        corner_radius: 1
+        bounds: { x: 0, y: 0, width: 120.5853, height: 52 }
+
+views:
+    base:
+        - "1 2 3 parenleft parenright"
+        - "4 5 6 numbersign asterisk"
+        - "7 8 9 plus minus"
+        - "BackSpace 0 space Return"
+
+buttons:
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+    space:
+        outline: spaceline
+        label: " "
+    Return:
+        outline: outline7
+        icon: "key-enter"
+    asterisk:
+        label: "*"
+    numbersign:
+        label: "#"
+    minus:
+        label: "-"
+    plus:
+        label: "+"
+    parenleft:
+        label: "("
+    parenright:
+        label: ")"
+
diff --git a/data/keyboards/symbols/special/number.xml b/data/keyboards/symbols/special/number.xml
deleted file mode 100644
index 5e44402c..00000000
--- a/data/keyboards/symbols/special/number.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='ASCII' standalone='yes'?>
-<symbols version="0.90">
-  <symbol label="1">1</symbol>
-  <symbol label="2">2</symbol>
-  <symbol label="3">3</symbol>
-  <symbol label="(">parenleft</symbol>
-  <symbol label=")">parenright</symbol>
-  <symbol label="4">4</symbol>
-  <symbol label="5">5</symbol>
-  <symbol label="6">6</symbol>
-  <symbol label="#">numbersign</symbol>
-  <symbol label="*">asterisk</symbol>
-  <symbol label="7">7</symbol>
-  <symbol label="8">8</symbol>
-  <symbol label="9">9</symbol>
-  <symbol label="+">plus</symbol>
-  <symbol label="-">minus</symbol>
-  <symbol label="0">0</symbol>
-  <symbol keyval="65293" icon="key-enter">Return</symbol>
-  <symbol label=" ">space</symbol>
-  <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
-</symbols>
diff --git a/data/squeekboard.gresources.xml b/data/squeekboard.gresources.xml
index 08290e9b..5bf423a8 100644
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@@ -2,7 +2,6 @@
 <gresources>
   <gresource prefix="/sm/puri/squeekboard">
    <file compressed="true">style.css</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/number-keypad.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file>
@@ -31,7 +30,6 @@
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ua.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
-   <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/special/number.xml</file>
    <file>icons/key-enter.svg</file>
    <file>icons/key-shift.svg</file>
    <file>icons/keyboard-mode-symbolic.svg</file>