abouttreesummaryrefslogcommitdiff
path: root/res
diff options
context:
space:
mode:
authorJules Aguillon2022-02-27 01:50:24 +0100
committerJules Aguillon2022-02-27 01:50:24 +0100
commit23685ddb3c7a4a9a0c757a12330b4cf45aa0707e (patch)
tree86769c1c7d7428021726a11596d51a217d25a40a /res
parentce5cee42a101f699493aea8311c087020672dc59 (diff)
downloadunexpected-keyboard-23685ddb3c7a4a9a0c757a12330b4cf45aa0707e.tar.gz
unexpected-keyboard-23685ddb3c7a4a9a0c757a12330b4cf45aa0707e.zip
Compute text size relative to key height
Instead of a fixed size that don't work at all for bigger screens. Other tweaks: - Use the value-land dimens to vary 'extra_horizontal_margin' - Move label size to Config, because it can change at runtime (rotation) - Slightly decrease the size of "long" symbols
Diffstat (limited to 'res')
-rw-r--r--res/values-land/dimens.xml5
-rw-r--r--res/values/dimens.xml6
-rw-r--r--res/values/styles.xml6
3 files changed, 9 insertions, 8 deletions
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 9c908a4..fb04c3d 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -4,7 +4,8 @@
<dimen name="margin_bottom">3dp</dimen>
<dimen name="key_padding">3dp</dimen>
<dimen name="key_height">36dp</dimen>
- <dimen name="label_text_size">18dp</dimen>
- <dimen name="sublabel_text_size">11dp</dimen>
+ <item name="label_text_size" type="integer" format="float">0.4</item>
+ <item name="sublabel_text_size" type="integer" format="float">0.3</item>
<dimen name="emoji_type_button_height">48dp</dimen>
+ <dimen name="extra_horizontal_margin">20dp</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 59dbfef..e33332d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -7,10 +7,10 @@
<dimen name="key_vertical_interval">2dp</dimen>
<dimen name="key_horizontal_interval">2dp</dimen>
<dimen name="key_height">51dp</dimen>
- <dimen name="label_text_size">18dp</dimen>
- <dimen name="sublabel_text_size">12dp</dimen>
+ <item name="label_text_size" type="integer" format="float">0.33</item>
+ <item name="sublabel_text_size" type="integer" format="float">0.22</item>
<dimen name="emoji_type_button_height">56dp</dimen>
<dimen name="emoji_grid_height">250dp</dimen>
<dimen name="emoji_text_size">28dp</dimen>
- <dimen name="landscape_extra_horizontal_margin">20dp</dimen>
+ <dimen name="extra_horizontal_margin">0dp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bad63e1..159ac73 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -3,10 +3,10 @@
<style name="emojiTypeButton">
<item name="android:padding">1px</item>
<item name="android:gravity">center</item>
- <item name="android:minHeight">@dimen/label_text_size</item>
+ <item name="android:minHeight">18dp</item>
<item name="android:background">?attr/emoji_button_bg</item>
<item name="android:textColor">?attr/emoji_key_text</item>
- <item name="android:textSize">@dimen/label_text_size</item>
+ <item name="android:textSize">18dp</item>
</style>
<style name="emojiKeyButton">
<item name="android:layout_width">0px</item>
@@ -15,7 +15,7 @@
<item name="android:padding">0px</item>
<item name="android:background">?attr/emoji_key_bg</item>
<item name="android:textColor">?attr/emoji_key_text</item>
- <item name="android:textSize">@dimen/label_text_size</item>
+ <item name="android:textSize">18dp</item>
</style>
<!-- Passed to TextView.setTextAppearance -->
<style name="emojiGridButton">