diff options
| -rw-r--r-- | res/values/dimens.xml | 15 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 6 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Keyboard2View.java | 16 |
3 files changed, 20 insertions, 17 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index f32b786..355c3a1 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <dimen name="horizontal_margin">3dp</dimen> - <dimen name="margin_top">2dp</dimen> - <dimen name="margin_bottom">5dp</dimen> + <dimen name="margin_top">3dp</dimen> + <dimen name="margin_bottom">7dp</dimen> <dimen name="key_padding">2dp</dimen> - <dimen name="key_bg_padding">1.3dp</dimen> - <dimen name="key_height">50dp</dimen> - <dimen name="key_round">4dp</dimen> - <dimen name="label_text_size">16dp</dimen> - <dimen name="sublabel_text_size">10dp</dimen> + <dimen name="key_vertical_interval">2dp</dimen> + <dimen name="key_horizontal_interval">2dp</dimen> + <dimen name="key_height">51dp</dimen> + <dimen name="key_round">5dp</dimen> + <dimen name="label_text_size">18dp</dimen> + <dimen name="sublabel_text_size">12dp</dimen> <dimen name="emoji_type_button_height">56dp</dimen> <dimen name="emoji_grid_height">250dp</dimen> </resources> diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index f2b010a..dd42b0e 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -11,7 +11,8 @@ class Config public final float marginTop; public final float keyPadding; - public final float keyBgPadding; + public final float keyVerticalInterval; + public final float keyHorizontalInterval; public final float keyRound; public float subValueDist; @@ -36,7 +37,8 @@ class Config // static values marginTop = res.getDimension(R.dimen.margin_top); keyPadding = res.getDimension(R.dimen.key_padding); - keyBgPadding = res.getDimension(R.dimen.key_bg_padding); + keyVerticalInterval = res.getDimension(R.dimen.key_vertical_interval); + keyHorizontalInterval = res.getDimension(R.dimen.key_horizontal_interval); keyRound = res.getDimension(R.dimen.key_round); // default values subValueDist = 10f; diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java index 6d9587c..0dc76ea 100644 --- a/srcs/juloo.keyboard2/Keyboard2View.java +++ b/srcs/juloo.keyboard2/Keyboard2View.java @@ -336,8 +336,9 @@ public class Keyboard2View extends View if (_keyboard.getRows() == null) height = 0; else - height = (int)(_config.keyHeight * ((float)_keyboard.getRows().size()) - + _config.marginTop + _config.marginBottom); + height = (int)((_config.keyHeight + _config.keyVerticalInterval) + * ((float)_keyboard.getRows().size()) + + _config.marginTop + _config.marginBottom); setMeasuredDimension(dm.widthPixels, height); _keyWidth = (getWidth() - (_config.horizontalMargin * 2)) / _keyboard.getKeysWidth(); } @@ -351,11 +352,10 @@ public class Keyboard2View extends View float x = _config.horizontalMargin; for (KeyboardData.Key k : row.getKeys()) { - x += k.shift * _keyWidth; - float keyW = _keyWidth * k.width; + x += k.shift * _keyWidth + _config.keyHorizontalInterval; + float keyW = _keyWidth * k.width - _config.keyHorizontalInterval; KeyDown keyDown = getKeyDown(k); - _tmpRect.set(x + _config.keyBgPadding, y + _config.keyBgPadding, - x + keyW - _config.keyBgPadding, y + _config.keyHeight - _config.keyBgPadding); + _tmpRect.set(x, y, x + keyW, y + _config.keyHeight); if (keyDown != null) canvas.drawRect(_tmpRect, _keyDownBgPaint); else @@ -363,7 +363,7 @@ public class Keyboard2View extends View if (k.key0 != null) drawLabel(canvas, k.key0, keyW / 2f + x, (_config.keyHeight + _labelTextSize) / 2f + y, (keyDown != null && (keyDown.flags & KeyValue.FLAG_LOCKED) != 0)); - float subPadding = _config.keyBgPadding + _config.keyPadding; + float subPadding = _config.keyPadding; if (k.key1 != null) drawSubLabel(canvas, k.key1, x + subPadding, y + subPadding - _keySubLabelPaint.ascent(), false); if (k.key3 != null) @@ -374,7 +374,7 @@ public class Keyboard2View extends View drawSubLabel(canvas, k.key4, x + keyW - subPadding, y + _config.keyHeight - subPadding - _keySubLabelPaint.descent(), true); x += keyW; } - y += _config.keyHeight; + y += _config.keyHeight + _config.keyVerticalInterval; } } |