Style changes
Before Width: | Height: | Size: 745 B |
Before Width: | Height: | Size: 940 B |
@ -69,13 +69,13 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
|
||||
final int parametersCount = parameterNames.size();
|
||||
|
||||
LinearLayout row = makeRow();
|
||||
addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_grey300_24dp);
|
||||
addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_white_24dp);
|
||||
addButton(row, 0, parametersCount > 0 ? parameterNames.get(0) : "x");
|
||||
addButton(row, 0, "7");
|
||||
addButton(row, 0, "8");
|
||||
addButton(row, 0, "9").setText(up, "π").setText(down, "e");
|
||||
addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText(up, "%").setText(down, "sqrt");
|
||||
addOperationButton(row, R.id.cpp_kb_button_multiply, "×").setText(up, "^n").setText(down, "^2");
|
||||
addOperationButton(row, R.id.cpp_kb_button_plus, "+");
|
||||
addButton(row, R.id.cpp_kb_button_clear, "C");
|
||||
|
||||
row = makeRow();
|
||||
@ -84,59 +84,60 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard {
|
||||
addButton(row, 0, "4");
|
||||
addButton(row, 0, "5");
|
||||
addButton(row, 0, "6");
|
||||
addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText(up, "%").setText(down, "sqrt");
|
||||
addOperationButton(row, R.id.cpp_kb_button_minus, "−");
|
||||
final View backspace = addImageButton(row, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_grey300_24dp);
|
||||
addOperationButton(row, R.id.cpp_kb_button_plus, "+");
|
||||
final View backspace = addImageButton(row, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_white_24dp);
|
||||
EditTextLongClickEraser.attachTo(backspace, user.getEditor(), user.isVibrateOnKeypress());
|
||||
|
||||
row = makeRow();
|
||||
addButton(row, R.id.cpp_kb_button_functions_constants, "f/π");
|
||||
addButton(row, 0, ".").setText(up, ",");
|
||||
addButton(row, R.id.cpp_kb_button_functions_constants, "ƒ/π");
|
||||
addImageButton(row, R.id.cpp_kb_button_space, R.drawable.ic_space_bar_white_24dp);
|
||||
addButton(row, 0, "1");
|
||||
addButton(row, 0, "2");
|
||||
addButton(row, 0, "3");
|
||||
addButton(row, 0, "0").setText(up, "00").setText(down, "000");
|
||||
addImageButton(row, R.id.cpp_kb_button_space, R.drawable.ic_space_bar_grey300_24dp);
|
||||
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_grey300_24dp);
|
||||
addButton(row, 0, ".").setText(up, ",");
|
||||
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
|
||||
}
|
||||
|
||||
private void makeViewPort() {
|
||||
final int parametersCount = parameterNames.size();
|
||||
|
||||
LinearLayout row = makeRow();
|
||||
addButton(row, R.id.cpp_kb_button_constants, "π…");
|
||||
addButton(row, R.id.cpp_kb_button_functions, "ƒ");
|
||||
addImageButton(row, R.id.cpp_kb_button_space, R.drawable.ic_space_bar_white_24dp);
|
||||
final View backspace = addImageButton(row, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_white_24dp);
|
||||
EditTextLongClickEraser.attachTo(backspace, user.getEditor(), user.isVibrateOnKeypress());
|
||||
addButton(row, R.id.cpp_kb_button_clear, "C");
|
||||
|
||||
row = makeRow();
|
||||
addButton(row, 0, "7");
|
||||
addButton(row, 0, "8");
|
||||
addButton(row, 0, "9").setText(up, "π").setText(down, "e");
|
||||
addOperationButton(row, R.id.cpp_kb_button_multiply, "×").setText(up, "^n").setText(down, "^2");
|
||||
addButton(row, R.id.cpp_kb_button_clear, "C");
|
||||
addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText(up, "%").setText(down, "sqrt");
|
||||
addButton(row, 0, parametersCount > 0 ? parameterNames.get(0) : "x");
|
||||
|
||||
row = makeRow();
|
||||
addButton(row, 0, "4");
|
||||
addButton(row, 0, "5");
|
||||
addButton(row, 0, "6");
|
||||
addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText(up, "%").setText(down, "sqrt");
|
||||
final View backspace = addImageButton(row, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_grey300_24dp);
|
||||
EditTextLongClickEraser.attachTo(backspace, user.getEditor(), user.isVibrateOnKeypress());
|
||||
addOperationButton(row, R.id.cpp_kb_button_multiply, "×").setText(up, "^n").setText(down, "^2");
|
||||
addButton(row, 0, parametersCount > 1 ? parameterNames.get(1) : "y");
|
||||
|
||||
row = makeRow();
|
||||
addButton(row, 0, "1");
|
||||
addButton(row, 0, "2");
|
||||
addButton(row, 0, "3");
|
||||
addOperationButton(row, R.id.cpp_kb_button_plus, "+");
|
||||
addImageButton(row, R.id.cpp_kb_button_space, R.drawable.ic_space_bar_grey300_24dp);
|
||||
addOperationButton(row, R.id.cpp_kb_button_minus, "−");
|
||||
addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_white_24dp);
|
||||
|
||||
row = makeRow();
|
||||
addButton(row, R.id.cpp_kb_button_brackets, "( )").setText(up, "(").setText(down, ")");
|
||||
addButton(row, 0, "0").setText(up, "00").setText(down, "000");
|
||||
addButton(row, 0, ".").setText(up, ",");
|
||||
addOperationButton(row, R.id.cpp_kb_button_minus, "−");
|
||||
addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_grey300_24dp);
|
||||
|
||||
row = makeRow();
|
||||
final int parametersCount = parameterNames.size();
|
||||
addButton(row, 0, parametersCount > 0 ? parameterNames.get(0) : "x");
|
||||
addButton(row, 0, parametersCount > 1 ? parameterNames.get(1) : "y");
|
||||
addButton(row, R.id.cpp_kb_button_functions, "f");
|
||||
addButton(row, R.id.cpp_kb_button_constants, "π");
|
||||
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_grey300_24dp);
|
||||
addButton(row, R.id.cpp_kb_button_brackets, "( )").setText(up, "(").setText(down, ")");
|
||||
addOperationButton(row, R.id.cpp_kb_button_plus, "+");
|
||||
addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
|
||||
}
|
||||
|
||||
public int getRowsCount(boolean landscape) {
|
||||
|
@ -34,8 +34,8 @@ public abstract class BaseFloatingKeyboard implements FloatingKeyboard {
|
||||
protected BaseFloatingKeyboard(@NonNull User user) {
|
||||
this.user = user;
|
||||
final Resources resources = user.getResources();
|
||||
textColor = resources.getColor(R.color.cpp_kb_button_text);
|
||||
textColorSecondary = resources.getColor(R.color.cpp_kb_button_text);
|
||||
textColor = resources.getColor(R.color.cpp_button_text);
|
||||
textColorSecondary = resources.getColor(R.color.cpp_button_text);
|
||||
sidePadding = resources.getDimensionPixelSize(R.dimen.cpp_button_padding);
|
||||
buttonBackground = App.getTheme().light ? R.drawable.material_button_light : R.drawable.material_button_dark;
|
||||
}
|
||||
|
@ -57,17 +57,17 @@ public class GreekFloatingKeyboard extends BaseFloatingKeyboard implements View.
|
||||
private void makeLastColumnLand(@NonNull LinearLayout rowView, int row) {
|
||||
switch (row) {
|
||||
case 0:
|
||||
final View backspace = addImageButton(rowView, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_grey300_24dp);
|
||||
final View backspace = addImageButton(rowView, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_white_24dp);
|
||||
EditTextLongClickEraser.attachTo(backspace, user.getEditor(), user.isVibrateOnKeypress());
|
||||
break;
|
||||
case 1:
|
||||
addButton(rowView, R.id.cpp_kb_button_change_case, "↑");
|
||||
break;
|
||||
case 2:
|
||||
addImageButton(rowView, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_grey300_24dp);
|
||||
addImageButton(rowView, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_white_24dp);
|
||||
break;
|
||||
case 3:
|
||||
addImageButton(rowView, R.id.cpp_kb_button_close, R.drawable.ic_done_grey300_24dp);
|
||||
addImageButton(rowView, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
|
||||
break;
|
||||
default:
|
||||
addButton(rowView, View.NO_ID, "");
|
||||
@ -81,17 +81,17 @@ public class GreekFloatingKeyboard extends BaseFloatingKeyboard implements View.
|
||||
addButton(rowView, R.id.cpp_kb_button_clear, "C");
|
||||
break;
|
||||
case 1:
|
||||
final View backspace = addImageButton(rowView, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_grey300_24dp);
|
||||
final View backspace = addImageButton(rowView, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_white_24dp);
|
||||
EditTextLongClickEraser.attachTo(backspace, user.getEditor(), user.isVibrateOnKeypress());
|
||||
break;
|
||||
case 2:
|
||||
addButton(rowView, R.id.cpp_kb_button_change_case, "↑");
|
||||
break;
|
||||
case 3:
|
||||
addImageButton(rowView, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_grey300_24dp);
|
||||
addImageButton(rowView, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_white_24dp);
|
||||
break;
|
||||
case 4:
|
||||
addImageButton(rowView, R.id.cpp_kb_button_close, R.drawable.ic_done_grey300_24dp);
|
||||
addImageButton(rowView, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp);
|
||||
break;
|
||||
default:
|
||||
addButton(rowView, View.NO_ID, "");
|
||||
|
@ -25,7 +25,7 @@ package org.solovyev.android.calculator.view;
|
||||
import android.content.Context;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import jscl.AngleUnit;
|
||||
import org.solovyev.android.calculator.R;
|
||||
import org.solovyev.android.views.dragbutton.DirectionDragImageButton;
|
||||
import org.solovyev.android.views.dragbutton.DirectionTextView;
|
||||
@ -33,8 +33,6 @@ import org.solovyev.android.views.dragbutton.DragDirection;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import jscl.AngleUnit;
|
||||
|
||||
public class AngleUnitsButton extends DirectionDragImageButton {
|
||||
|
||||
@Nonnull
|
||||
@ -61,7 +59,7 @@ public class AngleUnitsButton extends DirectionDragImageButton {
|
||||
for (DragDirection direction : DragDirection.values()) {
|
||||
final DirectionTextView.Text text = getText(direction);
|
||||
if (isCurrentAngleUnits(text.getValue())) {
|
||||
text.setColor(ContextCompat.getColor(getContext(), R.color.cpp_selected_angle_unit_text), 1f);
|
||||
text.setColor(ContextCompat.getColor(getContext(), R.color.yellow_100), 1f);
|
||||
} else {
|
||||
text.setColor(ContextCompat.getColor(getContext(), R.color.cpp_text), DirectionTextView.DEF_ALPHA);
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ package org.solovyev.android.calculator.view;
|
||||
import android.content.Context;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import jscl.NumeralBase;
|
||||
import org.solovyev.android.calculator.R;
|
||||
import org.solovyev.android.views.dragbutton.DirectionDragImageButton;
|
||||
import org.solovyev.android.views.dragbutton.DirectionTextView;
|
||||
@ -33,8 +33,6 @@ import org.solovyev.android.views.dragbutton.DragDirection;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import jscl.NumeralBase;
|
||||
|
||||
public class NumeralBasesButton extends DirectionDragImageButton {
|
||||
|
||||
@Nonnull
|
||||
@ -61,7 +59,7 @@ public class NumeralBasesButton extends DirectionDragImageButton {
|
||||
for (DragDirection direction : DragDirection.values()) {
|
||||
final DirectionTextView.Text text = getText(direction);
|
||||
if (isCurrentNumberBase(text.getValue())) {
|
||||
text.setColor(ContextCompat.getColor(getContext(), R.color.cpp_selected_angle_unit_text), 1f);
|
||||
text.setColor(ContextCompat.getColor(getContext(), R.color.yellow_100), 1f);
|
||||
} else {
|
||||
text.setColor(ContextCompat.getColor(getContext(), R.color.cpp_text), DirectionTextView.DEF_ALPHA);
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="@color/cpp_wizard_button_pressed" android:state_enabled="true" android:state_pressed="true" />
|
||||
<item android:color="@color/cpp_wizard_button_disabled" android:state_enabled="false" />
|
||||
<item android:color="@color/cpp_wizard_button_normal" />
|
||||
<item android:color="@color/grey_600" android:state_enabled="true" android:state_pressed="true" />
|
||||
<item android:color="@color/grey_300" android:state_enabled="false" />
|
||||
<item android:color="@color/grey_800" />
|
||||
</selector>
|
Before Width: | Height: | Size: 525 B |
BIN
app/src/main/res/drawable-hdpi/ic_backspace_white_24dp.png
Normal file
After Width: | Height: | Size: 333 B |
Before Width: | Height: | Size: 264 B |
BIN
app/src/main/res/drawable-hdpi/ic_done_white_24dp.png
Normal file
After Width: | Height: | Size: 188 B |
Before Width: | Height: | Size: 343 B |
BIN
app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png
Normal file
After Width: | Height: | Size: 196 B |
Before Width: | Height: | Size: 188 B |
BIN
app/src/main/res/drawable-hdpi/ic_space_bar_white_24dp.png
Normal file
After Width: | Height: | Size: 114 B |
Before Width: | Height: | Size: 371 B |
BIN
app/src/main/res/drawable-mdpi/ic_backspace_white_24dp.png
Normal file
After Width: | Height: | Size: 234 B |
Before Width: | Height: | Size: 207 B |
BIN
app/src/main/res/drawable-mdpi/ic_done_white_24dp.png
Normal file
After Width: | Height: | Size: 139 B |
Before Width: | Height: | Size: 222 B |
BIN
app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png
Normal file
After Width: | Height: | Size: 126 B |
Before Width: | Height: | Size: 147 B |
BIN
app/src/main/res/drawable-mdpi/ic_space_bar_white_24dp.png
Normal file
After Width: | Height: | Size: 86 B |
Before Width: | Height: | Size: 640 B |
BIN
app/src/main/res/drawable-xhdpi/ic_backspace_white_24dp.png
Normal file
After Width: | Height: | Size: 392 B |
Before Width: | Height: | Size: 323 B |
BIN
app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png
Normal file
After Width: | Height: | Size: 199 B |
Before Width: | Height: | Size: 316 B |
BIN
app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png
Normal file
After Width: | Height: | Size: 192 B |
Before Width: | Height: | Size: 176 B |
BIN
app/src/main/res/drawable-xhdpi/ic_space_bar_white_24dp.png
Normal file
After Width: | Height: | Size: 95 B |
Before Width: | Height: | Size: 838 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_backspace_white_24dp.png
Normal file
After Width: | Height: | Size: 543 B |
Before Width: | Height: | Size: 455 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png
Normal file
After Width: | Height: | Size: 255 B |
Before Width: | Height: | Size: 389 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png
Normal file
After Width: | Height: | Size: 252 B |
Before Width: | Height: | Size: 186 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_space_bar_white_24dp.png
Normal file
After Width: | Height: | Size: 99 B |
Before Width: | Height: | Size: 1.1 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/ic_backspace_white_24dp.png
Normal file
After Width: | Height: | Size: 724 B |
Before Width: | Height: | Size: 565 B |
BIN
app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png
Normal file
After Width: | Height: | Size: 308 B |
Before Width: | Height: | Size: 471 B |
BIN
app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
Normal file
After Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 198 B |
BIN
app/src/main/res/drawable-xxxhdpi/ic_space_bar_white_24dp.png
Normal file
After Width: | Height: | Size: 96 B |
@ -27,7 +27,7 @@
|
||||
a:insetTop="@dimen/cpp_button_padding">
|
||||
|
||||
<shape>
|
||||
<solid a:color="@color/cpp_wizard_button_normal" />
|
||||
<solid a:color="@color/grey_800" />
|
||||
<corners a:radius="@dimen/cpp_button_corner" />
|
||||
</shape>
|
||||
</inset>
|
||||
|
@ -26,7 +26,7 @@
|
||||
a:insetRight="@dimen/cpp_button_padding"
|
||||
a:insetTop="@dimen/cpp_button_padding">
|
||||
<shape>
|
||||
<solid a:color="@color/cpp_wizard_button_pressed" />
|
||||
<solid a:color="@color/grey_600" />
|
||||
<corners a:radius="@dimen/cpp_button_corner" />
|
||||
</shape>
|
||||
</inset>
|
||||
|
@ -44,10 +44,10 @@
|
||||
|
||||
<include layout="@layout/cpp_app_button_9" />
|
||||
|
||||
<include layout="@layout/cpp_app_button_multiplication" />
|
||||
|
||||
<include layout="@layout/cpp_app_button_division" />
|
||||
|
||||
<include layout="@layout/cpp_app_button_multiplication" />
|
||||
|
||||
<include layout="@layout/cpp_app_button_memory" />
|
||||
|
||||
</LinearLayout>
|
||||
@ -69,10 +69,10 @@
|
||||
|
||||
<include layout="@layout/cpp_app_button_6" />
|
||||
|
||||
<include layout="@layout/cpp_app_button_plus" />
|
||||
|
||||
<include layout="@layout/cpp_app_button_minus" />
|
||||
|
||||
<include layout="@layout/cpp_app_button_plus" />
|
||||
|
||||
<include layout="@layout/cpp_app_button_history" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -21,27 +21,24 @@
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<color name="cpp_text">#ffe6e6e6</color>
|
||||
<color name="cpp_text">@color/grey_300</color>
|
||||
<color name="cpp_text_error">@color/cpp_text_inverse</color>
|
||||
<color name="cpp_text_inverse">#424242</color>
|
||||
<color name="cpp_text_inverse">@color/grey_800</color>
|
||||
<color name="cpp_text_inverse_error">@color/cpp_text</color>
|
||||
|
||||
<color name="cpp_kb_button_text">#ffd4d4d4</color>
|
||||
<color name="cpp_button_text">#ffffffff</color>
|
||||
<color name="cpp_button_text_operator">#ffffff99</color>
|
||||
<color name="cpp_selected_angle_unit_text">#ffffff99</color>
|
||||
<color name="cpp_main_bg">@color/grey_950</color>
|
||||
<color name="cpp_main_bg_light">#fff6f1ef</color>
|
||||
<color name="cpp_wizard_button_normal">#424242</color>
|
||||
<color name="cpp_wizard_button_disabled">#616161</color>
|
||||
<color name="cpp_wizard_button_pressed">#757575</color>
|
||||
<color name="cpp_widget_cursor">#ff707070</color>
|
||||
<color name="cpp_bg">@color/grey_950</color>
|
||||
<color name="cpp_bg_light">@color/grey_100</color>
|
||||
<color name="cpp_widget_cursor">@color/grey_600</color>
|
||||
|
||||
<color name="cpp_wizard_disabled_text">#66ffffff</color>
|
||||
<color name="cpp_material_accent">#fafafa</color>
|
||||
<color name="cpp_material_accent">@color/grey_100</color>
|
||||
|
||||
<color name="black">#000000</color>
|
||||
|
||||
<color name="grey_100">#f5f5f5</color>
|
||||
<color name="grey_300">#e0e0e0</color>
|
||||
<color name="grey_600">#757575</color>
|
||||
<color name="grey_800">#424242</color>
|
||||
<color name="grey_850">#313131</color>
|
||||
<color name="grey_900">#212121</color>
|
||||
@ -57,5 +54,6 @@
|
||||
|
||||
<color name="green_800">#2e7d32</color>
|
||||
<color name="pink_900">#880e4f</color>
|
||||
<color name="yellow_100">#ffff8d</color>
|
||||
|
||||
</resources>
|
@ -109,13 +109,13 @@
|
||||
</style>
|
||||
|
||||
<style name="CppMain.Widget" parent="CppMain">
|
||||
<item name="android:background">@color/cpp_main_bg</item>
|
||||
<item name="android:background">@color/cpp_bg</item>
|
||||
<item name="android:padding">1dp</item>
|
||||
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
|
||||
</style>
|
||||
|
||||
<style name="CppMain.Widget.Light" parent="CppMain.Widget">
|
||||
<item name="android:background">@color/cpp_main_bg_light</item>
|
||||
<item name="android:background">@color/cpp_bg_light</item>
|
||||
</style>
|
||||
|
||||
<style name="CppText.Editor.Widget" parent="CppText.Editor.BaseWidget"/>
|
||||
@ -140,12 +140,12 @@
|
||||
</style>
|
||||
|
||||
<style name="CppMain.Onscreen" parent="CppMain">
|
||||
<item name="android:background">@color/cpp_main_bg</item>
|
||||
<item name="android:background">@color/cpp_bg</item>
|
||||
<item name="android:padding">@dimen/cpp_onscreen_main_padding</item>
|
||||
</style>
|
||||
|
||||
<style name="CppMain.Onscreen.Light" parent="CppMain.Onscreen">
|
||||
<item name="android:background">@color/cpp_main_bg_light</item>
|
||||
<item name="android:background">@color/cpp_bg_light</item>
|
||||
</style>
|
||||
|
||||
<style name="WizardLabel.Last" parent="WizardLabel">
|
||||
|
@ -27,9 +27,9 @@
|
||||
<item name="colorPrimaryDark">@color/black</item>
|
||||
<item name="colorAccent">@color/cpp_material_accent</item>
|
||||
|
||||
<item name="android:windowBackground">@color/cpp_main_bg</item>
|
||||
<item name="android:windowBackground">@color/cpp_bg</item>
|
||||
|
||||
<item name="cpp_main_bg">@color/cpp_main_bg</item>
|
||||
<item name="cpp_main_bg">@color/cpp_bg</item>
|
||||
<item name="cpp_fab_bg">@color/blue_900</item>
|
||||
<item name="cpp_text_color">@color/cpp_text</item>
|
||||
<item name="cpp_text_color_error">@color/cpp_text_error</item>
|
||||
@ -47,7 +47,7 @@
|
||||
</style>
|
||||
|
||||
<style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.DialogWhenLarge">
|
||||
<item name="android:windowBackground">@color/cpp_main_bg</item>
|
||||
<item name="android:windowBackground">@color/cpp_bg</item>
|
||||
|
||||
<item name="colorPrimary">@color/grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/black</item>
|
||||
@ -58,7 +58,7 @@
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
|
||||
<item name="cpp_main_bg">@color/cpp_main_bg</item>
|
||||
<item name="cpp_main_bg">@color/cpp_bg</item>
|
||||
<item name="cpp_fab_bg">@color/blue_900</item>
|
||||
<item name="cpp_text_color">@color/cpp_text</item>
|
||||
<item name="cpp_text_color_error">@color/cpp_text_error</item>
|
||||
@ -72,7 +72,7 @@
|
||||
<item name="colorPrimaryDark">@color/black</item>
|
||||
<item name="colorAccent">@color/cpp_material_accent</item>
|
||||
|
||||
<item name="cpp_main_bg">@color/cpp_main_bg</item>
|
||||
<item name="cpp_main_bg">@color/cpp_bg</item>
|
||||
<item name="cpp_fab_bg">@color/blue_900</item>
|
||||
<item name="cpp_text_color">@color/cpp_text</item>
|
||||
<item name="cpp_text_color_error">@color/cpp_text_error</item>
|
||||
@ -82,13 +82,13 @@
|
||||
</style>
|
||||
|
||||
<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="android:windowBackground">@color/cpp_main_bg_light</item>
|
||||
<item name="android:windowBackground">@color/cpp_bg_light</item>
|
||||
|
||||
<item name="colorPrimary">@color/teal_400</item>
|
||||
<item name="colorPrimaryDark">@color/teal_400</item>
|
||||
<item name="colorAccent">@color/teal_400</item>
|
||||
|
||||
<item name="cpp_main_bg">@color/cpp_main_bg_light</item>
|
||||
<item name="cpp_main_bg">@color/cpp_bg_light</item>
|
||||
<item name="cpp_fab_bg">@color/teal_400</item>
|
||||
<item name="cpp_text_color">@color/cpp_text_inverse</item>
|
||||
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
|
||||
@ -99,7 +99,7 @@
|
||||
</style>
|
||||
|
||||
<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.DialogWhenLarge">
|
||||
<item name="android:windowBackground">@color/cpp_main_bg_light</item>
|
||||
<item name="android:windowBackground">@color/cpp_bg_light</item>
|
||||
|
||||
<item name="colorPrimary">@color/teal_400</item>
|
||||
<item name="colorPrimaryDark">@color/teal_400</item>
|
||||
@ -110,7 +110,7 @@
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
|
||||
<item name="cpp_main_bg">@color/cpp_main_bg_light</item>
|
||||
<item name="cpp_main_bg">@color/cpp_bg_light</item>
|
||||
<item name="cpp_fab_bg">@color/teal_400</item>
|
||||
<item name="cpp_text_color">@color/cpp_text_inverse</item>
|
||||
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
|
||||
@ -124,7 +124,7 @@
|
||||
<item name="colorPrimaryDark">@color/teal_400</item>
|
||||
<item name="colorAccent">@color/teal_400</item>
|
||||
|
||||
<item name="cpp_main_bg">@color/cpp_main_bg_light</item>
|
||||
<item name="cpp_main_bg">@color/cpp_bg_light</item>
|
||||
<item name="cpp_fab_bg">@color/teal_400</item>
|
||||
<item name="cpp_text_color">@color/cpp_text_inverse</item>
|
||||
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
|
||||
|
@ -31,7 +31,7 @@
|
||||
</style>
|
||||
|
||||
<style name="CppKeyboardButton.Blue.Operation" parent="CppKeyboardButton.Blue.Digit">
|
||||
<item name="android:textColor">@color/cpp_button_text_operator</item>
|
||||
<item name="android:textColor">@color/yellow_100</item>
|
||||
</style>
|
||||
|
||||
<style name="Cpp.Theme.Blue" parent="Cpp.Theme">
|
||||
|
@ -31,7 +31,7 @@
|
||||
</style>
|
||||
|
||||
<style name="CppKeyboardButton.Gray.Operation" parent="CppKeyboardButton.Gray.Digit">
|
||||
<item name="android:textColor">@color/cpp_button_text_operator</item>
|
||||
<item name="android:textColor">@color/yellow_100</item>
|
||||
</style>
|
||||
|
||||
<style name="Cpp.Theme.Gray" parent="Cpp.Theme">
|
||||
|
@ -27,7 +27,7 @@
|
||||
</style>
|
||||
|
||||
<style name="CppKeyboardButton.Violet.Operation" parent="CppKeyboardButton.Violet.Digit">
|
||||
<item name="android:textColor">@color/cpp_button_text_operator</item>
|
||||
<item name="android:textColor">@color/yellow_100</item>
|
||||
</style>
|
||||
|
||||
<style name="CppKeyboardButton.Violet.Control" parent="CppKeyboardButton">
|
||||
|
@ -39,13 +39,6 @@
|
||||
a:key="gui.vibrateOnKeypress"
|
||||
a:title="@string/cpp_prefs_vibrate_on_keypress" />
|
||||
|
||||
<ListPreference
|
||||
a:entries="@array/p_multiplication_sign_values"
|
||||
a:entryValues="@array/p_multiplication_sign_values"
|
||||
a:key="engine.multiplicationSign"
|
||||
a:summary="@string/c_calc_multiplication_sign_summary"
|
||||
a:title="@string/c_calc_multiplication_sign" />
|
||||
|
||||
<ListPreference
|
||||
a:entries="@array/p_theme_names"
|
||||
a:entryValues="@array/p_theme_values"
|
||||
|