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

@@ -29,7 +29,6 @@
a:id="@id/cpp_button_0"
style="?attr/cpp_button_style_digit"
a:text="0"
c:directionTextScale="0.5"
c:textDown="000"
c:textUp="00"
tools:ignore="HardcodedText" />

View File

@@ -29,7 +29,6 @@
a:id="@id/cpp_button_6"
style="?attr/cpp_button_style_digit"
a:text="6"
c:directionTextScale="0.33;0.30;0.33;0.33"
c:textDown="rad"
c:textLeft="F"
c:textUp="deg"

View File

@@ -29,7 +29,6 @@
a:id="@id/cpp_button_7"
style="?attr/cpp_button_style_digit"
a:text="7"
c:directionTextScale="0.5;0.5;0.5;0.33"
c:textDown="!"
c:textLeft="0b:"
c:textUp="i"

View File

@@ -29,7 +29,6 @@
a:id="@id/cpp_button_8"
style="?attr/cpp_button_style_digit"
a:text="8"
c:directionTextScale="0.5;0.5;0.5;0.33"
c:textDown="lg"
c:textLeft="0d:"
c:textUp="ln"

View File

@@ -29,7 +29,6 @@
a:id="@id/cpp_button_9"
style="?attr/cpp_button_style_digit"
a:text="9"
c:directionTextScale="0.5;0.5;0.5;0.33"
c:textDown="e"
c:textLeft="0x:"
c:textUp="π"

View File

@@ -26,4 +26,4 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_copy"
style="?attr/cpp_button_style_control_image"
a:src="@drawable/kb_copy" />
a:src="@drawable/ic_content_copy_white_48dp" />

View File

@@ -29,7 +29,6 @@
a:id="@id/cpp_button_division"
style="?attr/cpp_button_style_operation"
a:text="/"
c:directionTextScale="0.5"
c:textDown="√"
c:textUp="%"
tools:ignore="HardcodedText" />

View File

@@ -26,4 +26,4 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_like"
style="?attr/cpp_button_style_control_image"
a:src="@drawable/kb_share" />
a:src="@drawable/ic_share_white_48dp" />

View File

@@ -29,6 +29,5 @@
a:id="@id/cpp_button_period"
style="?attr/cpp_button_style_digit"
a:text="."
c:directionTextScale="0.5"
c:textUp=","
tools:ignore="HardcodedText" />

View File

@@ -28,7 +28,6 @@
a:id="@id/cpp_button_equals"
style="?attr/cpp_button_style_control"
a:text="="
c:directionTextScale="0.5;0.5;0.33;0.5"
c:textDown="@string/cpp_plot_button_text"
c:textUp="≡"
tools:ignore="HardcodedText" />

View File

@@ -31,7 +31,6 @@
a:text="="
a:textColor="?android:attr/textColorPrimary"
c:directionTextColor="?android:attr/textColorPrimary"
c:directionTextScale="0.5;0.5;0.33;0.5"
c:textDown="@string/cpp_plot_button_text"
c:textUp="≡"
tools:ignore="HardcodedText" />

View File

@@ -26,4 +26,4 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_erase"
style="?attr/cpp_button_style_control_image"
a:src="@drawable/kb_erase" />
a:src="@drawable/ic_backspace_white_48dp" />

View File

@@ -28,8 +28,7 @@
xmlns:tools="http://schemas.android.com/tools"
a:id="@id/cpp_button_functions"
style="?attr/cpp_button_style_control"
a:text="ƒ(x)"
a:text="@string/cpp_kb_functions"
a:textStyle="italic"
c:directionTextScale="0.4"
c:textUp="+ƒ"
tools:ignore="HardcodedText" />

View File

@@ -28,6 +28,5 @@
style="?attr/cpp_button_style_control"
a:text="@string/c_history_button"
a:textStyle="bold"
c:directionTextScale="0.27"
c:textDown="@string/c_redo"
c:textUp="@string/c_undo" />
c:textDown="@string/cpp_kb_redo"
c:textUp="@string/cpp_kb_undo" />

View File

@@ -29,6 +29,5 @@
a:id="@id/cpp_button_left"
style="?attr/cpp_button_style_control"
a:text="◁"
c:directionTextScale="0.5"
c:textUp="◁◁"
tools:ignore="HardcodedText" />

View File

@@ -28,6 +28,5 @@
a:id="@id/cpp_button_subtraction"
style="?attr/cpp_button_style_operation"
a:text=""
c:directionTextScale="0.4"
c:textDown="∂,…"
c:textDown="@string/cpp_kb_operators"
tools:ignore="HardcodedText" />

View File

@@ -29,7 +29,6 @@
a:id="@id/cpp_button_multiplication"
style="?attr/cpp_button_style_operation"
a:text="×"
c:directionTextScale="0.5"
c:textDown="^2"
c:textLeft="Π"
c:textUp="^"

View File

@@ -27,5 +27,5 @@
xmlns:tools="http://schemas.android.com/tools"
a:id="@id/cpp_button_operators"
style="?attr/cpp_button_style_control"
a:text="∂,…"
a:text="@string/cpp_kb_operators"
tools:ignore="HardcodedText" />

View File

@@ -26,4 +26,4 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_paste"
style="?attr/cpp_button_style_control_image"
a:src="@drawable/kb_paste" />
a:src="@drawable/ic_content_paste_white_48dp" />

View File

@@ -28,7 +28,6 @@
a:id="@id/cpp_button_plus"
style="?attr/cpp_button_style_operation"
a:text="+"
c:directionTextScale="0.5"
c:textDown="E"
c:textUp="°"
tools:ignore="HardcodedText" />

View File

@@ -29,6 +29,5 @@
a:id="@id/cpp_button_right"
style="?attr/cpp_button_style_control"
a:text="▷"
c:directionTextScale="0.5"
c:textUp="▷▷"
tools:ignore="HardcodedText" />

View File

@@ -29,7 +29,6 @@
a:id="@id/cpp_button_round_brackets"
style="?attr/cpp_button_style_digit"
a:text="( )"
c:directionTextScale="0.5;0.5;0.5;0.33"
c:textDown=")"
c:textLeft="(…)"
c:textUp="("

View File

@@ -28,8 +28,7 @@
xmlns:tools="http://schemas.android.com/tools"
a:id="@id/cpp_button_vars"
style="?attr/cpp_button_style_control"
a:text="π,…"
a:text="@string/cpp_kb_variables"
a:textStyle="italic"
c:directionTextScale="0.4"
c:textUp="+π"
tools:ignore="HardcodedText" />

View File

@@ -53,6 +53,6 @@
a:paddingBottom="0dp"
a:paddingTop="0dp"
a:scaleType="centerInside"
a:src="@drawable/kb_settings" />
a:src="@drawable/ic_settings_white_48dp" />
</LinearLayout>

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_copy"
style="@style/CppKeyboardButton.Metro.Simple.Control.Image"
a:contentDescription="Copy"
a:src="@drawable/kb_copy" />
a:src="@drawable/ic_content_copy_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_copy"
style="@style/CppKeyboardButton.Material.Simple.Control.Image"
a:contentDescription="Copy"
a:src="@drawable/kb_copy" />
a:src="@drawable/ic_content_copy_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_copy"
style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
a:contentDescription="Copy"
a:src="@drawable/kb_copy" />
a:src="@drawable/ic_content_copy_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_erase"
style="@style/CppKeyboardButton.Metro.Simple.Control.Image"
a:contentDescription="Erase"
a:src="@drawable/kb_erase" />
a:src="@drawable/ic_backspace_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_erase"
style="@style/CppKeyboardButton.Material.Simple.Control.Image"
a:contentDescription="Erase"
a:src="@drawable/kb_erase" />
a:src="@drawable/ic_backspace_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_erase"
style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
a:contentDescription="Erase"
a:src="@drawable/kb_erase" />
a:src="@drawable/ic_backspace_white_48dp" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_functions"
style="@style/CppKeyboardButton.Metro.Simple.Control"
a:text="ƒ(x)"
a:text="@string/cpp_kb_functions"
a:textStyle="italic" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_functions"
style="@style/CppKeyboardButton.Material.Simple.Control"
a:text="ƒ(x)"
a:text="@string/cpp_kb_functions"
a:textStyle="italic" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_functions"
style="@style/CppKeyboardButton.Material.Light.Simple.Control"
a:text="ƒ(x)"
a:text="@string/cpp_kb_functions"
a:textStyle="italic" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_operators"
style="@style/CppKeyboardButton.Metro.Simple.Control"
a:text="∂,…"
a:text="@string/cpp_kb_operators"
a:textStyle="italic" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_operators"
style="@style/CppKeyboardButton.Material.Simple.Control"
a:text="∂,…"
a:text="@string/cpp_kb_operators"
a:textStyle="italic" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_operators"
style="@style/CppKeyboardButton.Material.Light.Simple.Control"
a:text="∂,…"
a:text="@string/cpp_kb_operators"
a:textStyle="italic" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_paste"
style="@style/CppKeyboardButton.Metro.Simple.Control.Image"
a:contentDescription="Paste"
a:src="@drawable/kb_paste" />
a:src="@drawable/ic_content_paste_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_paste"
style="@style/CppKeyboardButton.Material.Simple.Control.Image"
a:contentDescription="Paste"
a:src="@drawable/kb_paste" />
a:src="@drawable/ic_content_paste_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_paste"
style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
a:contentDescription="Paste"
a:src="@drawable/kb_paste" />
a:src="@drawable/ic_content_paste_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_settings"
style="@style/CppKeyboardButton.Metro.Simple.Control.Image"
a:contentDescription="Settings"
a:src="@drawable/kb_settings" />
a:src="@drawable/ic_settings_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_settings"
style="@style/CppKeyboardButton.Material.Simple.Control.Image"
a:contentDescription="Settings"
a:src="@drawable/kb_settings" />
a:src="@drawable/ic_settings_white_48dp" />

View File

@@ -27,4 +27,4 @@
a:id="@id/cpp_button_settings"
style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
a:contentDescription="Settings"
a:src="@drawable/kb_settings" />
a:src="@drawable/ic_settings_white_48dp" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_vars"
style="@style/CppKeyboardButton.Metro.Simple.Control"
a:text="π,…"
a:text="@string/cpp_kb_variables"
a:textStyle="italic" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_vars"
style="@style/CppKeyboardButton.Material.Simple.Control"
a:text="π,…"
a:text="@string/cpp_kb_variables"
a:textStyle="italic" />

View File

@@ -26,5 +26,5 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_vars"
style="@style/CppKeyboardButton.Material.Light.Simple.Control"
a:text="π,…"
a:text="@string/cpp_kb_variables"
a:textStyle="italic" />

View File

@@ -23,7 +23,6 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:gravity="center"
@@ -62,8 +61,7 @@
style="?attr/cpp_button_style_operation"
a:layout_width="100dp"
a:layout_height="100dp"
a:text="7"
c:directionTextScale="0.5" />
a:text="7" />
</FrameLayout>
<TextView

View File

@@ -53,7 +53,6 @@
a:minHeight="100dp"
a:minWidth="100dp"
a:text="9"
c:directionTextScale="0.5;0.5;0.5;0.33"
c:textDown="^2"
c:textUp="%" />

View File

@@ -13,17 +13,17 @@
<ImageButton
a:id="@+id/onscreen_fold_button"
style="@style/CppHeaderButton.Metro.Blue"
a:src="@drawable/cpp_onscreen_button_fold" />
a:src="@drawable/ic_space_bar_white_24dp" />
<ImageButton
a:id="@+id/onscreen_minimize_button"
style="@style/CppHeaderButton.Metro.Blue"
a:src="@drawable/cpp_onscreen_button_minimize" />
a:src="@drawable/ic_file_download_white_24dp" />
<ImageButton
a:id="@+id/onscreen_close_button"
style="@style/CppHeaderButton.Metro.Blue"
a:src="@drawable/cpp_onscreen_button_close" />
a:src="@drawable/ic_close_white_24dp" />
</LinearLayout>

View File

@@ -13,17 +13,17 @@
<ImageButton
a:id="@+id/onscreen_fold_button"
style="@style/CppHeaderButton.Material"
a:src="@drawable/cpp_onscreen_button_fold" />
a:src="@drawable/ic_space_bar_white_24dp" />
<ImageButton
a:id="@+id/onscreen_minimize_button"
style="@style/CppHeaderButton.Material"
a:src="@drawable/cpp_onscreen_button_minimize" />
a:src="@drawable/ic_file_download_white_24dp" />
<ImageButton
a:id="@+id/onscreen_close_button"
style="@style/CppHeaderButton.Material"
a:src="@drawable/cpp_onscreen_button_close" />
a:src="@drawable/ic_close_white_24dp" />
</LinearLayout>

View File

@@ -13,17 +13,17 @@
<ImageButton
a:id="@+id/onscreen_fold_button"
style="@style/CppHeaderButton.Material.Light"
a:src="@drawable/cpp_onscreen_button_fold" />
a:src="@drawable/ic_space_bar_white_24dp" />
<ImageButton
a:id="@+id/onscreen_minimize_button"
style="@style/CppHeaderButton.Material.Light"
a:src="@drawable/cpp_onscreen_button_minimize" />
a:src="@drawable/ic_file_download_white_24dp" />
<ImageButton
a:id="@+id/onscreen_close_button"
style="@style/CppHeaderButton.Material.Light"
a:src="@drawable/cpp_onscreen_button_close" />
a:src="@drawable/ic_close_white_24dp" />
</LinearLayout>