abouttreesummaryrefslogcommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-land/dimens.xml3
-rw-r--r--res/values/dimens.xml6
-rw-r--r--res/xml/azerty.xml13
-rw-r--r--srcs/juloo.keyboard2/Keyboard2View.java56
-rw-r--r--srcs/juloo.keyboard2/KeyboardData.java4
5 files changed, 49 insertions, 33 deletions
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 782a7cc..d9491c0 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <dimen name="horizontal_margin">10dp</dimen>
<dimen name="key_padding">7dp</dimen>
- <dimen name="key_height">35dp</dimen>
+ <dimen name="key_height">37dp</dimen>
<dimen name="label_text_size">18dp</dimen>
<dimen name="sublabel_text_size">11dp</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fc58462..56089b3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <dimen name="key_margin">2dp</dimen>
+ <dimen name="vertical_margin">2dp</dimen>
+ <dimen name="horizontal_margin">2dp</dimen>
<dimen name="key_padding">5dp</dimen>
- <dimen name="key_height">40dp</dimen>
+ <dimen name="key_bg_padding">1dp</dimen>
+ <dimen name="key_height">44dp</dimen>
<dimen name="label_text_size">16dp</dimen>
<dimen name="sublabel_text_size">10dp</dimen>
</resources>
diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index 725c7e0..b22fa14 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -13,7 +13,7 @@
<key key0="p" key2="0" key3="à" key4="\@" />
</row>
<row>
- <key key0="q" />
+ <key key0="q" key1="tab" />
<key key0="s" />
<key key0="d" />
<key key0="f" />
@@ -25,16 +25,21 @@
<key key0="m" key2="µ" key4="*" />
</row>
<row>
+ <key width="1.4" key0="shift" />
<key key0="w" key1="&gt;" key3="&lt;" />
<key key0="x" />
<key key0="c" key2="\?" key4="," />
<key key0="v" key2="." key4=";" />
<key key0="b" key2="/" key4=":" />
<key key0="n" key2="§" key4="!" />
- <key width="1.5" key0="\u007F" />
+ <key key0="n" key2="§" key4="!" />
+ <key width="1.6" key0="back" key2="del" />
</row>
<row>
- <key width="4.5" key0=" " />
- <key width="2" key0="\u000A" />
+ <key width="1.7" key0="ctrl" />
+ <key width="1.3" key0="alt" key1="page_up" key2="end" key3="home" key4="page_down" />
+ <key width="4.0" key0=" " />
+ <key key1="up" key2="right" key3="down" key4="left" />
+ <key width="2.0" key0="return" />
</row>
</keyboard>
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 999bf64..146e146 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -17,10 +17,12 @@ public class Keyboard2View extends View
private Keyboard2 _ime;
private KeyboardData _keyboard;
+ private float _verticalMargin;
+ private float _horizontalMargin;
private float _keyWidth;
private float _keyHeight;
- private float _keyMargin;
private float _keyPadding;
+ private float _keyBgPadding;
private Paint _keyBgPaint;
private Paint _keyDownBgPaint;
@@ -31,10 +33,12 @@ public class Keyboard2View extends View
{
super(context, attrs);
DisplayMetrics dm = context.getResources().getDisplayMetrics();
- _keyMargin = getResources().getDimension(R.dimen.key_margin);
+ _verticalMargin = getResources().getDimension(R.dimen.vertical_margin);
+ _horizontalMargin = getResources().getDimension(R.dimen.horizontal_margin);
_keyHeight = getResources().getDimension(R.dimen.key_height);
_keyPadding = getResources().getDimension(R.dimen.key_padding);
- _keyWidth = (dm.widthPixels - _keyMargin) / KEY_PER_ROW - _keyMargin;
+ _keyBgPadding = getResources().getDimension(R.dimen.key_bg_padding);
+ _keyWidth = (dm.widthPixels - (_horizontalMargin * 2)) / KEY_PER_ROW;
_keyBgPaint = new Paint();
_keyBgPaint.setColor(getResources().getColor(R.color.key_bg));
_keyDownBgPaint = new Paint();
@@ -110,13 +114,13 @@ public class Keyboard2View extends View
float y;
float keyW;
- y = -_keyHeight;
+ y = _verticalMargin - _keyHeight;
for (KeyboardData.Row row : _keyboard.getRows())
{
- y += _keyHeight + _keyMargin;
+ y += _keyHeight;
if (touchY < y || touchY >= (y + _keyHeight))
continue ;
- x = (KEY_PER_ROW * (_keyMargin + _keyWidth) - _keyMargin - row.getWidth(_keyWidth, _keyMargin)) / 2 + _keyMargin;
+ x = (KEY_PER_ROW * _keyWidth - row.getWidth(_keyWidth)) / 2 + _horizontalMargin;
for (KeyboardData.Key k : row)
{
keyW = _keyWidth * k.width;
@@ -131,7 +135,7 @@ public class Keyboard2View extends View
invalidate();
return ;
}
- x += keyW + _keyMargin;
+ x += keyW;
}
}
}
@@ -161,7 +165,8 @@ public class Keyboard2View extends View
if (_keyboard.getRows() == null)
height = 0;
else
- height = (int)((_keyHeight + _keyMargin) * ((float)_keyboard.getRows().size()) + _keyMargin);
+ height = (int)(_keyHeight * ((float)_keyboard.getRows().size())
+ + (_verticalMargin * 2));
setMeasuredDimension(MeasureSpec.getSize(wSpec), height);
}
@@ -171,37 +176,40 @@ public class Keyboard2View extends View
float x;
float y;
- y = _keyMargin;
+ y = _verticalMargin;
for (KeyboardData.Row row : _keyboard.getRows())
{
- x = (KEY_PER_ROW * (_keyMargin + _keyWidth) - _keyMargin - row.getWidth(_keyWidth, _keyMargin)) / 2 + _keyMargin;
+ x = (KEY_PER_ROW * _keyWidth - row.getWidth(_keyWidth)) / 2 + _horizontalMargin;
for (KeyboardData.Key k : row)
{
float keyW = _keyWidth * k.width;
if (k.downPointer != -1)
- canvas.drawRect(x, y, x + keyW, y + _keyHeight, _keyDownBgPaint);
+ canvas.drawRect(x + _keyBgPadding, y + _keyBgPadding,
+ x + keyW - _keyBgPadding, y + _keyHeight - _keyBgPadding, _keyDownBgPaint);
else
- canvas.drawRect(x, y, x + keyW, y + _keyHeight, _keyBgPaint);
+ canvas.drawRect(x + _keyBgPadding, y + _keyBgPadding,
+ x + keyW - _keyBgPadding, y + _keyHeight - _keyBgPadding, _keyBgPaint);
if (k.key0 != null)
- canvas.drawText(new char[]{k.key0.getChar()}, 0, 1,
- keyW / 2 + x, (_keyHeight + _keyLabelPaint.getTextSize()) / 2 + y, _keyLabelPaint);
+ canvas.drawText(k.key0.getName(), keyW / 2 + x,
+ (_keyHeight + _keyLabelPaint.getTextSize()) / 2 + y, _keyLabelPaint);
float textOffsetY = _keySubLabelPaint.getTextSize() / 2;
+ float subPadding = _keyPadding + _keyBgPadding;
if (k.key1 != null)
- canvas.drawText(new char[]{k.key1.getChar()}, 0, 1,
- x + _keyPadding, y + _keyPadding + textOffsetY, _keySubLabelPaint);
+ canvas.drawText(k.key1.getName(), x + subPadding,
+ y + subPadding + textOffsetY, _keySubLabelPaint);
if (k.key2 != null)
- canvas.drawText(new char[]{k.key2.getChar()}, 0, 1,
- x + keyW - _keyPadding, y + _keyPadding + textOffsetY, _keySubLabelPaint);
+ canvas.drawText(k.key2.getName(), x + keyW - subPadding,
+ y + subPadding + textOffsetY, _keySubLabelPaint);
textOffsetY /= 2; // lol
if (k.key3 != null)
- canvas.drawText(new char[]{k.key3.getChar()}, 0, 1,
- x + _keyPadding, y + _keyHeight - _keyPadding + textOffsetY, _keySubLabelPaint);
+ canvas.drawText(k.key3.getName(), x + subPadding,
+ y + _keyHeight - subPadding + textOffsetY, _keySubLabelPaint);
if (k.key4 != null)
- canvas.drawText(new char[]{k.key4.getChar()}, 0, 1,
- x + keyW - _keyPadding, y + _keyHeight - _keyPadding + textOffsetY, _keySubLabelPaint);
- x += keyW + _keyMargin;
+ canvas.drawText(k.key4.getName(), x + keyW - subPadding,
+ y + _keyHeight - subPadding + textOffsetY, _keySubLabelPaint);
+ x += keyW;
}
- y += _keyHeight + _keyMargin;
+ y += _keyHeight;
}
}
}
diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java
index c08fe8b..07b0c09 100644
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@@ -70,9 +70,9 @@ class KeyboardData
}
}
- public float getWidth(float keyWidth, float keyMargin)
+ public float getWidth(float keyWidth)
{
- return (keyWidth * _keysWidth + ((size() - 1) * keyMargin));
+ return (keyWidth * _keysWidth);
}
}
generated by ps-cgit (a fork of cgit), using a theme by hackitude