changes
This commit is contained in:
Sergey Solovyev
parent
2747b26506
commit
19818c510e
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/appButton"
|
||||
a:src="@drawable/kb_logo"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="App"/>
|
||||
@ -10,4 +10,4 @@
|
||||
a:id="@+id/clearButton"
|
||||
a:text="@string/c_clear"
|
||||
a:textStyle="bold"
|
||||
style="@style/widget_metro_control_button_style"/>
|
||||
style="@style/cpp_simple_metro_control_button_style"/>
|
||||
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/copyButton"
|
||||
a:src="@drawable/kb_copy"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Copy"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/divisionButton"
|
||||
a:text="/"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
||||
style="@style/cpp_simple_metro_blue_operation_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/eightDigitButton"
|
||||
a:text="8"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/equalsButton"
|
||||
a:text="="
|
||||
style="@style/widget_metro_control_button_style"/>
|
||||
style="@style/cpp_simple_metro_control_button_style"/>
|
||||
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/eraseButton"
|
||||
a:src="@drawable/kb_delete"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Erase"/>
|
||||
@ -8,4 +8,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/fiveDigitButton"
|
||||
a:text="5"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -8,4 +8,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/fourDigitButton"
|
||||
a:text="4"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -10,4 +10,4 @@
|
||||
a:id="@+id/functions_button"
|
||||
a:text="ƒ(x)"
|
||||
a:textStyle="italic"
|
||||
style="@style/widget_metro_control_button_style"/>
|
||||
style="@style/cpp_simple_metro_control_button_style"/>
|
||||
@ -8,5 +8,5 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/historyButton"
|
||||
a:text="@string/c_history_button"
|
||||
style="@style/widget_metro_control_button_style"
|
||||
style="@style/cpp_simple_metro_control_button_style"
|
||||
a:textStyle="bold"/>
|
||||
74
android-app-core/res/layout/cpp_simple_keyboard.xml
Normal file
74
android-app-core/res/layout/cpp_simple_keyboard.xml
Normal file
@ -0,0 +1,74 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:orientation="vertical">
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/cpp_simple_seven_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_eight_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_nine_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_multiplication_button"/>
|
||||
<include layout="@layout/cpp_simple_percent_button"/>
|
||||
<include layout="@layout/cpp_simple_clear_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/cpp_simple_four_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_five_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_six_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_division_button"/>
|
||||
<include layout="@layout/cpp_simple_power_button"/>
|
||||
<include layout="@layout/cpp_simple_erase_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/cpp_simple_one_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_two_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_three_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_plus_button"/>
|
||||
<include layout="@layout/cpp_simple_like_button"/>
|
||||
<include layout="@layout/cpp_simple_copy_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/cpp_simple_round_brackets_button"/>
|
||||
<include layout="@layout/cpp_simple_zero_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_dot_button"/>
|
||||
<include layout="@layout/cpp_simple_subtraction_button"/>
|
||||
<include layout="@layout/cpp_simple_settings_button"/>
|
||||
<include layout="@layout/cpp_simple_paste_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/cpp_simple_left_button"/>
|
||||
<include layout="@layout/cpp_simple_right_button"/>
|
||||
<include layout="@layout/cpp_simple_vars_button"/>
|
||||
<include layout="@layout/cpp_simple_functions_button"/>
|
||||
<include layout="@layout/cpp_simple_app_button"/>
|
||||
<include layout="@layout/cpp_simple_history_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/leftButton"
|
||||
a:text="◀"
|
||||
style="@style/widget_metro_control_button_style"/>
|
||||
style="@style/cpp_simple_metro_control_button_style"/>
|
||||
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/likeButton"
|
||||
a:src="@drawable/kb_facebook"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Like"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/multiplicationButton"
|
||||
a:text="×"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
||||
style="@style/cpp_simple_metro_blue_operation_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/nineDigitButton"
|
||||
a:text="9"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/oneDigitButton"
|
||||
a:text="1"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/pasteButton"
|
||||
a:src="@drawable/kb_paste"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Paste"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/percentButton"
|
||||
a:text="%"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
||||
style="@style/cpp_simple_metro_blue_operation_button_style"/>
|
||||
@ -8,4 +8,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/plusButton"
|
||||
a:text="+"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
||||
style="@style/cpp_simple_metro_blue_operation_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/powerButton"
|
||||
a:text="^"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
||||
style="@style/cpp_simple_metro_blue_operation_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/rightButton"
|
||||
a:text="▶"
|
||||
style="@style/widget_metro_control_button_style"/>
|
||||
style="@style/cpp_simple_metro_control_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/roundBracketsButton"
|
||||
a:text="()"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/settingsButton"
|
||||
a:src="@drawable/kb_settings"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Settings"/>
|
||||
@ -3,4 +3,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/sevenDigitButton"
|
||||
a:text="7"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/sixDigitButton"
|
||||
a:text="6"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -8,4 +8,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/subtractionButton"
|
||||
a:text="-"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
||||
style="@style/cpp_simple_metro_blue_operation_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/threeDigitButton"
|
||||
a:text="3"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/twoDigitButton"
|
||||
a:text="2"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -10,4 +10,4 @@
|
||||
a:id="@+id/vars_button"
|
||||
a:text="π,…"
|
||||
a:textStyle="italic"
|
||||
style="@style/widget_metro_control_button_style"/>
|
||||
style="@style/cpp_simple_metro_control_button_style"/>
|
||||
@ -9,4 +9,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/zeroDigitButton"
|
||||
a:text="0"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
||||
@ -1,74 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:orientation="vertical">
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_seven_digit_button"/>
|
||||
<include layout="@layout/widget_eight_digit_button"/>
|
||||
<include layout="@layout/widget_nine_digit_button"/>
|
||||
<include layout="@layout/widget_multiplication_button"/>
|
||||
<include layout="@layout/widget_percent_button"/>
|
||||
<include layout="@layout/widget_clear_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_four_digit_button"/>
|
||||
<include layout="@layout/widget_five_digit_button"/>
|
||||
<include layout="@layout/widget_six_digit_button"/>
|
||||
<include layout="@layout/widget_division_button"/>
|
||||
<include layout="@layout/widget_power_button"/>
|
||||
<include layout="@layout/widget_erase_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_one_digit_button"/>
|
||||
<include layout="@layout/widget_two_digit_button"/>
|
||||
<include layout="@layout/widget_three_digit_button"/>
|
||||
<include layout="@layout/widget_plus_button"/>
|
||||
<include layout="@layout/widget_like_button"/>
|
||||
<include layout="@layout/widget_copy_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_round_brackets_button"/>
|
||||
<include layout="@layout/widget_zero_digit_button"/>
|
||||
<include layout="@layout/widget_dot_button"/>
|
||||
<include layout="@layout/widget_subtraction_button"/>
|
||||
<include layout="@layout/widget_settings_button"/>
|
||||
<include layout="@layout/widget_paste_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_left_button"/>
|
||||
<include layout="@layout/widget_right_button"/>
|
||||
<include layout="@layout/widget_vars_button"/>
|
||||
<include layout="@layout/widget_functions_button"/>
|
||||
<include layout="@layout/widget_app_button"/>
|
||||
<include layout="@layout/widget_history_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@ -89,19 +89,19 @@
|
||||
|
||||
|
||||
|
||||
<style name="widget_metro_digit_button_style" parent="metro_digit_button_style">
|
||||
<style name="cpp_simple_metro_digit_button_style" parent="metro_digit_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_control_button_style" parent="metro_control_button_style">
|
||||
<style name="cpp_simple_metro_control_button_style" parent="metro_control_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
|
||||
<style name="cpp_simple_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_control_image_button_style" parent="metro_control_image_button_style">
|
||||
<style name="cpp_simple_metro_control_image_button_style" parent="metro_control_image_button_style">
|
||||
<item name="android:scaleType">center</item>
|
||||
</style>
|
||||
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_seven_digit_button"/>
|
||||
<include layout="@layout/widget_eight_digit_button"/>
|
||||
<include layout="@layout/widget_nine_digit_button"/>
|
||||
<include layout="@layout/widget_multiplication_button"/>
|
||||
<include layout="@layout/widget_erase_button"/>
|
||||
<include layout="@layout/cpp_simple_seven_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_eight_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_nine_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_multiplication_button"/>
|
||||
<include layout="@layout/cpp_simple_erase_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -21,11 +21,11 @@
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_four_digit_button"/>
|
||||
<include layout="@layout/widget_five_digit_button"/>
|
||||
<include layout="@layout/widget_six_digit_button"/>
|
||||
<include layout="@layout/widget_division_button"/>
|
||||
<include layout="@layout/widget_percent_button"/>
|
||||
<include layout="@layout/cpp_simple_four_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_five_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_six_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_division_button"/>
|
||||
<include layout="@layout/cpp_simple_percent_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -33,22 +33,22 @@
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_one_digit_button"/>
|
||||
<include layout="@layout/widget_two_digit_button"/>
|
||||
<include layout="@layout/widget_three_digit_button"/>
|
||||
<include layout="@layout/widget_plus_button"/>
|
||||
<include layout="@layout/widget_power_button"/>
|
||||
<include layout="@layout/cpp_simple_one_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_two_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_three_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_plus_button"/>
|
||||
<include layout="@layout/cpp_simple_power_button"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_round_brackets_button"/>
|
||||
<include layout="@layout/widget_zero_digit_button"/>
|
||||
<include layout="@layout/widget_dot_button"/>
|
||||
<include layout="@layout/widget_subtraction_button"/>
|
||||
<include layout="@layout/widget_app_button"/>
|
||||
<include layout="@layout/cpp_simple_round_brackets_button"/>
|
||||
<include layout="@layout/cpp_simple_zero_digit_button"/>
|
||||
<include layout="@layout/cpp_simple_dot_button"/>
|
||||
<include layout="@layout/cpp_simple_subtraction_button"/>
|
||||
<include layout="@layout/cpp_simple_app_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_equals_button"
|
||||
<include layout="@layout/cpp_simple_equals_button"
|
||||
a:layout_margin="@dimen/cpp_button_margin"
|
||||
a:layout_weight="1"
|
||||
a:layout_width="0dp"
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_equals_button"
|
||||
<include layout="@layout/cpp_simple_equals_button"
|
||||
a:layout_margin="@dimen/cpp_button_margin"
|
||||
a:layout_weight="1"
|
||||
a:layout_width="0dp"
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<include layout="@layout/widget_keyboard"
|
||||
<include layout="@layout/cpp_simple_keyboard"
|
||||
a:layout_weight="5"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user