diff --git a/app/misc/res/kb_facebook.png b/app/misc/res/kb_facebook.png deleted file mode 100644 index d7def6ba..00000000 Binary files a/app/misc/res/kb_facebook.png and /dev/null differ diff --git a/app/misc/res/kb_facebook_icon.png b/app/misc/res/kb_facebook_icon.png deleted file mode 100644 index 3cd69338..00000000 Binary files a/app/misc/res/kb_facebook_icon.png and /dev/null differ diff --git a/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java b/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java index 532cb8da..6590c9ad 100644 --- a/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java +++ b/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java @@ -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) { diff --git a/app/src/main/java/org/solovyev/android/calculator/keyboard/BaseFloatingKeyboard.java b/app/src/main/java/org/solovyev/android/calculator/keyboard/BaseFloatingKeyboard.java index 50e93d2f..6f0feb6b 100644 --- a/app/src/main/java/org/solovyev/android/calculator/keyboard/BaseFloatingKeyboard.java +++ b/app/src/main/java/org/solovyev/android/calculator/keyboard/BaseFloatingKeyboard.java @@ -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; } diff --git a/app/src/main/java/org/solovyev/android/calculator/variables/GreekFloatingKeyboard.java b/app/src/main/java/org/solovyev/android/calculator/variables/GreekFloatingKeyboard.java index 968d0692..da9e23f5 100644 --- a/app/src/main/java/org/solovyev/android/calculator/variables/GreekFloatingKeyboard.java +++ b/app/src/main/java/org/solovyev/android/calculator/variables/GreekFloatingKeyboard.java @@ -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, ""); diff --git a/app/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java b/app/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java index cd2285d6..12769efc 100644 --- a/app/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java +++ b/app/src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java @@ -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); } diff --git a/app/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java b/app/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java index 23da915e..5c489004 100644 --- a/app/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java +++ b/app/src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java @@ -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); } diff --git a/app/src/main/res/color/cpp_wizard_button_selector.xml b/app/src/main/res/color/cpp_wizard_button_selector.xml index 3d5b8f2e..5070e788 100644 --- a/app/src/main/res/color/cpp_wizard_button_selector.xml +++ b/app/src/main/res/color/cpp_wizard_button_selector.xml @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_backspace_grey300_24dp.png b/app/src/main/res/drawable-hdpi/ic_backspace_grey300_24dp.png deleted file mode 100644 index ef76616b..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_backspace_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_backspace_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_backspace_white_24dp.png new file mode 100644 index 00000000..136e8b8c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_backspace_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_done_grey300_24dp.png b/app/src/main/res/drawable-hdpi/ic_done_grey300_24dp.png deleted file mode 100644 index ef1b2ca6..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_done_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..c278b6c2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_grey300_24dp.png b/app/src/main/res/drawable-hdpi/ic_keyboard_grey300_24dp.png deleted file mode 100644 index d2b2ed4d..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_keyboard_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png new file mode 100644 index 00000000..5352d4c3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_space_bar_grey300_24dp.png b/app/src/main/res/drawable-hdpi/ic_space_bar_grey300_24dp.png deleted file mode 100644 index 864f7d9b..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_space_bar_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_space_bar_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_space_bar_white_24dp.png new file mode 100644 index 00000000..9e19db77 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_backspace_grey300_24dp.png b/app/src/main/res/drawable-mdpi/ic_backspace_grey300_24dp.png deleted file mode 100644 index 99871fb2..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_backspace_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_backspace_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_backspace_white_24dp.png new file mode 100644 index 00000000..48863dcd Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_backspace_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_done_grey300_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_grey300_24dp.png deleted file mode 100644 index 1ddeef87..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_done_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..6d84e143 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_grey300_24dp.png b/app/src/main/res/drawable-mdpi/ic_keyboard_grey300_24dp.png deleted file mode 100644 index b863d02e..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_keyboard_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png new file mode 100644 index 00000000..e8c24c72 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_space_bar_grey300_24dp.png b/app/src/main/res/drawable-mdpi/ic_space_bar_grey300_24dp.png deleted file mode 100644 index efe2f491..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_space_bar_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_space_bar_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_space_bar_white_24dp.png new file mode 100644 index 00000000..95298960 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_backspace_grey300_24dp.png b/app/src/main/res/drawable-xhdpi/ic_backspace_grey300_24dp.png deleted file mode 100644 index ad229f0b..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_backspace_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_backspace_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_backspace_white_24dp.png new file mode 100644 index 00000000..ec5412bd Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_backspace_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_done_grey300_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_grey300_24dp.png deleted file mode 100644 index e27c938b..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_done_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..3b2b65d2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_grey300_24dp.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_grey300_24dp.png deleted file mode 100644 index 8041bc62..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_keyboard_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png new file mode 100644 index 00000000..2b6b9b45 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_space_bar_grey300_24dp.png b/app/src/main/res/drawable-xhdpi/ic_space_bar_grey300_24dp.png deleted file mode 100644 index 0c555e9c..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_space_bar_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_space_bar_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_space_bar_white_24dp.png new file mode 100644 index 00000000..773586ce Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_backspace_grey300_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_backspace_grey300_24dp.png deleted file mode 100644 index 05ef4b12..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_backspace_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_backspace_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_backspace_white_24dp.png new file mode 100644 index 00000000..f6a90acc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_backspace_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_grey300_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_done_grey300_24dp.png deleted file mode 100644 index 92bf47c2..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_done_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..0ebb5555 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_grey300_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_grey300_24dp.png deleted file mode 100644 index 2a5dcefa..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_keyboard_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png new file mode 100644 index 00000000..9d0bed27 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_space_bar_grey300_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_space_bar_grey300_24dp.png deleted file mode 100644 index b01f441d..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_space_bar_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_space_bar_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_space_bar_white_24dp.png new file mode 100644 index 00000000..96910bfb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_backspace_grey300_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_backspace_grey300_24dp.png deleted file mode 100644 index 9843dad2..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_backspace_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_backspace_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_backspace_white_24dp.png new file mode 100644 index 00000000..88131b9a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_backspace_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_done_grey300_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_done_grey300_24dp.png deleted file mode 100644 index 40a1c8dc..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_done_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png new file mode 100644 index 00000000..d670618c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_grey300_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_grey300_24dp.png deleted file mode 100644 index 25bcfe6e..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png new file mode 100644 index 00000000..f77d9d2a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_space_bar_grey300_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_space_bar_grey300_24dp.png deleted file mode 100644 index 33832219..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_space_bar_grey300_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_space_bar_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_space_bar_white_24dp.png new file mode 100644 index 00000000..1798cb96 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml b/app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml index c5dd024f..6cb7c8bc 100644 --- a/app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml +++ b/app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml @@ -27,7 +27,7 @@ a:insetTop="@dimen/cpp_button_padding"> - + diff --git a/app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml b/app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml index 55dfe4a1..811d51b2 100644 --- a/app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml +++ b/app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml @@ -26,7 +26,7 @@ a:insetRight="@dimen/cpp_button_padding" a:insetTop="@dimen/cpp_button_padding"> - + diff --git a/app/src/main/res/layout-land/cpp_app_keyboard.xml b/app/src/main/res/layout-land/cpp_app_keyboard.xml index 87a764fe..c6295d2b 100644 --- a/app/src/main/res/layout-land/cpp_app_keyboard.xml +++ b/app/src/main/res/layout-land/cpp_app_keyboard.xml @@ -44,10 +44,10 @@ - - + + @@ -69,10 +69,10 @@ - - + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7d060afc..a7175d6d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -21,27 +21,24 @@ --> - #ffe6e6e6 + @color/grey_300 @color/cpp_text_inverse - #424242 + @color/grey_800 @color/cpp_text - #ffd4d4d4 #ffffffff - #ffffff99 - #ffffff99 - @color/grey_950 - #fff6f1ef - #424242 - #616161 - #757575 - #ff707070 + @color/grey_950 + @color/grey_100 + @color/grey_600 #66ffffff - #fafafa + @color/grey_100 #000000 + #f5f5f5 + #e0e0e0 + #757575 #424242 #313131 #212121 @@ -57,5 +54,6 @@ #2e7d32 #880e4f + #ffff8d \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6b9010ff..a55df8bc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -109,13 +109,13 @@