Keyboard styles

This commit is contained in:
serso
2016-02-07 20:18:37 +01:00
parent 30eed6af8c
commit 47075b0c10
153 changed files with 225 additions and 118 deletions

View File

@@ -14,6 +14,7 @@
<dimen name="cpp_fragment_title_text_size">20sp</dimen>
<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
<dimen name="cpp_keyboard_simple_image_button_padding">12dp</dimen>
<dimen name="cpp_display_text_size_mobile">25sp</dimen>
<dimen name="cpp_editor_text_size_mobile">25sp</dimen>

View File

@@ -27,6 +27,7 @@
</style>
<style name="CppKeyboardButton">
<item name="android:textAllCaps">false</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">1</item>
@@ -38,6 +39,7 @@
<item name="android:textColor">@color/cpp_button_text</item>
<item name="android:scaleType">centerInside</item>
<item name="directionTextColor">@color/cpp_button_text</item>
<item name="directionTextScale">@string/cpp_direction_text_size</item>
</style>
<style name="CppText.Editor.Onscreen.Light" parent="CppText.Editor.Onscreen">

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="cpp_kb_variables" translatable="false">π</string>
<string name="cpp_kb_functions" translatable="false">ƒ</string>
<string name="cpp_kb_operators" translatable="false"></string>
<string name="cpp_kb_undo" translatable="false"></string>
<string name="cpp_kb_redo" translatable="false"></string>
<string name="cpp_direction_text_size" translatable="false">0.3;0.3;0.3;0.25</string>
</resources>

View File

@@ -33,15 +33,13 @@
<item name="android:background">@drawable/material_blue_button</item>
</style>
<style name="CppKeyboardButton.Material.Control.Image" parent="CppKeyboardButton.Material.Digit">
<item name="android:padding">6dp</item>
</style>
<style name="CppKeyboardButton.Material.Control.Image" parent="CppKeyboardButton.Material.Digit"/>
<style name="CppHeaderButton.Material" parent="CppKeyboardButton.Material.Control">
<item name="android:layout_width">30dp</item>
<item name="android:layout_height">30dp</item>
<item name="android:layout_weight">0</item>
<item name="android:padding">0dp</item>
<item name="android:padding">6dp</item>
<item name="android:textSize">@dimen/cpp_onscreen_header_button_text_size</item>
</style>
@@ -53,7 +51,9 @@
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="CppKeyboardButton.Material.Simple.Control.Image" parent="CppKeyboardButton.Material.Control.Image"></style>
<style name="CppKeyboardButton.Material.Simple.Control.Image" parent="CppKeyboardButton.Material.Control.Image">
<item name="android:padding">@dimen/cpp_keyboard_simple_image_button_padding</item>
</style>
<style name="CppKeyboardButton.Material.Simple.Operation" parent="CppKeyboardButton.Material.Operation">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
@@ -62,9 +62,7 @@
<style name="Cpp.Theme.Material" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control_image">
@style/CppKeyboardButton.Material.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
</style>
@@ -80,9 +78,7 @@
<style name="Cpp.Theme.Material.Dialog.Alert" parent="Cpp.Theme.Dialog.Alert">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control_image">
@style/CppKeyboardButton.Material.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
</style>

View File

@@ -31,9 +31,7 @@
<item name="android:background">@drawable/material_button_light_primary</item>
</style>
<style name="CppKeyboardButton.Material.Light.Control.Image" parent="CppKeyboardButton.Material.Light.Digit">
<item name="android:padding">6dp</item>
</style>
<style name="CppKeyboardButton.Material.Light.Control.Image" parent="CppKeyboardButton.Material.Light.Digit"/>
<style name="CppKeyboardButton.Material.Light.Control" parent="CppKeyboardButton.Material.Light.Digit" />
@@ -41,7 +39,7 @@
<item name="android:layout_width">30dp</item>
<item name="android:layout_height">30dp</item>
<item name="android:layout_weight">0</item>
<item name="android:padding">0dp</item>
<item name="android:padding">6dp</item>
<item name="android:textSize">@dimen/cpp_onscreen_header_button_text_size</item>
</style>
@@ -53,7 +51,9 @@
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="CppKeyboardButton.Material.Light.Simple.Control.Image" parent="CppKeyboardButton.Material.Light.Control.Image"></style>
<style name="CppKeyboardButton.Material.Light.Simple.Control.Image" parent="CppKeyboardButton.Material.Light.Control.Image">
<item name="android:padding">@dimen/cpp_keyboard_simple_image_button_padding</item>
</style>
<style name="CppKeyboardButton.Material.Light.Simple.Operation" parent="CppKeyboardButton.Material.Light.Operation">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
@@ -62,19 +62,14 @@
<style name="Cpp.Theme.Material.Light" parent="Cpp.Theme.Light">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control_image">
@style/CppKeyboardButton.Material.Light.Control.Image
</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Light.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
</style>
<style name="Cpp.Theme.Material.Light.Dialog" parent="Cpp.Theme.Light.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control_image">
@style/CppKeyboardButton.Material.Light.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Light.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
</item>
</style>
@@ -82,9 +77,7 @@
<style name="Cpp.Theme.Material.Light.Dialog.Alert" parent="Cpp.Theme.Light.Dialog.Alert">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control_image">
@style/CppKeyboardButton.Material.Light.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Light.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
</item>
</style>

View File

@@ -34,7 +34,7 @@
<item name="android:layout_width">30dp</item>
<item name="android:layout_height">30dp</item>
<item name="android:layout_weight">0</item>
<item name="android:padding">0dp</item>
<item name="android:padding">6dp</item>
<item name="android:textSize">@dimen/cpp_onscreen_header_button_text_size</item>
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
@@ -43,9 +43,7 @@
<item name="android:background">@drawable/metro_blue_button</item>
</style>
<style name="CppKeyboardButton.Metro.Blue.Control.Image" parent="CppKeyboardButton.Metro.Blue.Control">
<item name="android:padding">6dp</item>
</style>
<style name="CppKeyboardButton.Metro.Blue.Control.Image" parent="CppKeyboardButton.Metro.Blue.Control"/>
<style name="CppKeyboardButton.Metro.Simple.Digit" parent="CppKeyboardButton.Metro.Blue.Digit">
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
@@ -64,6 +62,7 @@
<style name="CppKeyboardButton.Metro.Simple.Control.Image" parent="CppKeyboardButton.Metro.Blue.Control.Image">
<item name="android:background">@drawable/metro_widget_button_light</item>
<item name="android:padding">@dimen/cpp_keyboard_simple_image_button_padding</item>
</style>
<style name="Cpp.Theme.Metro.Blue" parent="Cpp.Theme">

View File

@@ -34,9 +34,7 @@
<item name="android:textColor">@color/cpp_button_text_operator</item>
</style>
<style name="CppKeyboardButton.Blue.Control.Image" parent="CppKeyboardButton.Blue.Control">
<item name="android:padding">6dp</item>
</style>
<style name="CppKeyboardButton.Blue.Control.Image" parent="CppKeyboardButton.Blue.Control"/>
<style name="Cpp.Theme.Blue" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Blue.Digit</item>

View File

@@ -34,9 +34,7 @@
<item name="android:textColor">@color/cpp_button_text_operator</item>
</style>
<style name="CppKeyboardButton.Gray.Control.Image" parent="CppKeyboardButton.Gray.Control">
<item name="android:padding">6dp</item>
</style>
<style name="CppKeyboardButton.Gray.Control.Image" parent="CppKeyboardButton.Gray.Control"/>
<style name="Cpp.Theme.Gray" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>

View File

@@ -34,9 +34,7 @@
<item name="android:background">@drawable/violet_button_dark</item>
</style>
<style name="CppKeyboardButton.Violet.Control.Image" parent="CppKeyboardButton.Violet.Control">
<item name="android:padding">6dp</item>
</style>
<style name="CppKeyboardButton.Violet.Control.Image" parent="CppKeyboardButton.Violet.Control"/>
<style name="Cpp.Theme.Violet" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Violet.Digit</item>