diff --git a/res/drawable/metro_button_blue.xml b/res/drawable/metro_button_blue.xml new file mode 100644 index 00000000..5a23942f --- /dev/null +++ b/res/drawable/metro_button_blue.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/metro_button_blue_shape.xml b/res/drawable/metro_button_blue_shape.xml new file mode 100644 index 00000000..d559802b --- /dev/null +++ b/res/drawable/metro_button_blue_shape.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/res/drawable/metro_button_pressed.xml b/res/drawable/metro_button_pressed.xml index 0e91626c..fc25288a 100644 --- a/res/drawable/metro_button_pressed.xml +++ b/res/drawable/metro_button_pressed.xml @@ -15,6 +15,6 @@ --> - + \ No newline at end of file diff --git a/res/layout/calc_division_button.xml b/res/layout/calc_division_button.xml index 82ffaf46..148a7431 100644 --- a/res/layout/calc_division_button.xml +++ b/res/layout/calc_division_button.xml @@ -13,5 +13,5 @@ a:text="/" c:textDown="√" c:directionTextScale="0.5" - style="?digitButtonStyle" + style="?operationButtonStyle" a:onClick="digitButtonClickHandler"/> \ No newline at end of file diff --git a/res/layout/calc_multiplication_button.xml b/res/layout/calc_multiplication_button.xml index ab577d24..ea5831ae 100644 --- a/res/layout/calc_multiplication_button.xml +++ b/res/layout/calc_multiplication_button.xml @@ -13,6 +13,6 @@ c:textUp="^" c:textDown="^2" c:textLeft="Π" - style="?digitButtonStyle" + style="?operationButtonStyle" c:directionTextScale="0.5" a:onClick="digitButtonClickHandler"/> \ No newline at end of file diff --git a/res/layout/calc_plus_button.xml b/res/layout/calc_plus_button.xml index cc6be7ba..b01f8822 100644 --- a/res/layout/calc_plus_button.xml +++ b/res/layout/calc_plus_button.xml @@ -12,5 +12,5 @@ c:textUp="°" c:textDown="E" a:text="+" - style="?digitButtonStyle" + style="?operationButtonStyle" a:onClick="digitButtonClickHandler"/> \ No newline at end of file diff --git a/res/layout/calc_subtraction_button.xml b/res/layout/calc_subtraction_button.xml index 4ce38f8b..b10a691d 100644 --- a/res/layout/calc_subtraction_button.xml +++ b/res/layout/calc_subtraction_button.xml @@ -11,5 +11,5 @@ c:textDown="∂,…" a:text="-" c:directionTextScale="0.5" - style="?digitButtonStyle" + style="?operationButtonStyle" a:onClick="digitButtonClickHandler"/> \ No newline at end of file diff --git a/res/values/attributes.xml b/res/values/attributes.xml index 8932dfe6..7d2719a2 100644 --- a/res/values/attributes.xml +++ b/res/values/attributes.xml @@ -4,5 +4,6 @@ + diff --git a/res/values/styles-default-theme.xml b/res/values/styles-default-theme.xml index f06b6f46..8357fde0 100644 --- a/res/values/styles-default-theme.xml +++ b/res/values/styles-default-theme.xml @@ -12,6 +12,10 @@ + @@ -20,5 +24,6 @@ @style/default_digit_button_style @style/default_control_button_style @style/default_control_image_button_style + @style/default_operation_button_style \ No newline at end of file diff --git a/res/values/styles-light-blue-theme.xml b/res/values/styles-light-blue-theme.xml index ebff5daf..8e788923 100644 --- a/res/values/styles-light-blue-theme.xml +++ b/res/values/styles-light-blue-theme.xml @@ -15,6 +15,10 @@ @drawable/blue_button_dark + + @@ -23,6 +27,7 @@ @style/light_blue_digit_button_style @style/light_blue_control_button_style @style/light_blue_control_image_button_style + @style/light_blue_operation_button_style \ No newline at end of file diff --git a/res/values/styles-metro-theme.xml b/res/values/styles-metro-theme.xml index 9b0f6922..608543b6 100644 --- a/res/values/styles-metro-theme.xml +++ b/res/values/styles-metro-theme.xml @@ -10,6 +10,10 @@ @drawable/metro_button_light + + @@ -18,6 +22,7 @@ @style/metro_digit_button_style @style/metro_control_button_style @style/metro_control_image_button_style + @style/metro_operation_button_style \ No newline at end of file diff --git a/res/values/styles-violet-theme.xml b/res/values/styles-violet-theme.xml index 551a367f..3d306c84 100644 --- a/res/values/styles-violet-theme.xml +++ b/res/values/styles-violet-theme.xml @@ -10,6 +10,10 @@ @drawable/violet_button + + @@ -22,5 +26,6 @@ @style/violet_digit_button_style @style/violet_control_button_style @style/violet_control_image_button_style + @style/violet_operation_button_style \ No newline at end of file