From 5103111d4953b4868954bd4a2529888775cdf3e2 Mon Sep 17 00:00:00 2001 From: serso Date: Tue, 15 Mar 2016 21:51:59 +0100 Subject: [PATCH] Style changes --- app/misc/res/kb_facebook.png | Bin 745 -> 0 bytes app/misc/res/kb_facebook_icon.png | Bin 940 -> 0 bytes .../FloatingCalculatorKeyboard.java | 53 +++++++++--------- .../keyboard/BaseFloatingKeyboard.java | 4 +- .../variables/GreekFloatingKeyboard.java | 12 ++-- .../calculator/view/AngleUnitsButton.java | 6 +- .../calculator/view/NumeralBasesButton.java | 6 +- .../res/color/cpp_wizard_button_selector.xml | 6 +- .../ic_backspace_grey300_24dp.png | Bin 525 -> 0 bytes .../drawable-hdpi/ic_backspace_white_24dp.png | Bin 0 -> 333 bytes .../drawable-hdpi/ic_done_grey300_24dp.png | Bin 264 -> 0 bytes .../res/drawable-hdpi/ic_done_white_24dp.png | Bin 0 -> 188 bytes .../ic_keyboard_grey300_24dp.png | Bin 343 -> 0 bytes .../drawable-hdpi/ic_keyboard_white_24dp.png | Bin 0 -> 196 bytes .../ic_space_bar_grey300_24dp.png | Bin 188 -> 0 bytes .../drawable-hdpi/ic_space_bar_white_24dp.png | Bin 0 -> 114 bytes .../ic_backspace_grey300_24dp.png | Bin 371 -> 0 bytes .../drawable-mdpi/ic_backspace_white_24dp.png | Bin 0 -> 234 bytes .../drawable-mdpi/ic_done_grey300_24dp.png | Bin 207 -> 0 bytes .../res/drawable-mdpi/ic_done_white_24dp.png | Bin 0 -> 139 bytes .../ic_keyboard_grey300_24dp.png | Bin 222 -> 0 bytes .../drawable-mdpi/ic_keyboard_white_24dp.png | Bin 0 -> 126 bytes .../ic_space_bar_grey300_24dp.png | Bin 147 -> 0 bytes .../drawable-mdpi/ic_space_bar_white_24dp.png | Bin 0 -> 86 bytes .../ic_backspace_grey300_24dp.png | Bin 640 -> 0 bytes .../ic_backspace_white_24dp.png | Bin 0 -> 392 bytes .../drawable-xhdpi/ic_done_grey300_24dp.png | Bin 323 -> 0 bytes .../res/drawable-xhdpi/ic_done_white_24dp.png | Bin 0 -> 199 bytes .../ic_keyboard_grey300_24dp.png | Bin 316 -> 0 bytes .../drawable-xhdpi/ic_keyboard_white_24dp.png | Bin 0 -> 192 bytes .../ic_space_bar_grey300_24dp.png | Bin 176 -> 0 bytes .../ic_space_bar_white_24dp.png | Bin 0 -> 95 bytes .../ic_backspace_grey300_24dp.png | Bin 838 -> 0 bytes .../ic_backspace_white_24dp.png | Bin 0 -> 543 bytes .../drawable-xxhdpi/ic_done_grey300_24dp.png | Bin 455 -> 0 bytes .../drawable-xxhdpi/ic_done_white_24dp.png | Bin 0 -> 255 bytes .../ic_keyboard_grey300_24dp.png | Bin 389 -> 0 bytes .../ic_keyboard_white_24dp.png | Bin 0 -> 252 bytes .../ic_space_bar_grey300_24dp.png | Bin 186 -> 0 bytes .../ic_space_bar_white_24dp.png | Bin 0 -> 99 bytes .../ic_backspace_grey300_24dp.png | Bin 1132 -> 0 bytes .../ic_backspace_white_24dp.png | Bin 0 -> 724 bytes .../drawable-xxxhdpi/ic_done_grey300_24dp.png | Bin 565 -> 0 bytes .../drawable-xxxhdpi/ic_done_white_24dp.png | Bin 0 -> 308 bytes .../ic_keyboard_grey300_24dp.png | Bin 471 -> 0 bytes .../ic_keyboard_white_24dp.png | Bin 0 -> 319 bytes .../ic_space_bar_grey300_24dp.png | Bin 198 -> 0 bytes .../ic_space_bar_white_24dp.png | Bin 0 -> 96 bytes .../cpp_wizard_button_shape_normal.xml | 2 +- .../cpp_wizard_button_shape_pressed.xml | 2 +- .../main/res/layout-land/cpp_app_keyboard.xml | 8 +-- app/src/main/res/values/colors.xml | 22 ++++---- app/src/main/res/values/styles.xml | 8 +-- app/src/main/res/values/theme.xml | 20 +++---- app/src/main/res/values/theme_old_blue.xml | 2 +- app/src/main/res/values/theme_old_gray.xml | 2 +- app/src/main/res/values/theme_old_violet.xml | 2 +- .../main/res/xml/preferences_appearance.xml | 7 --- 58 files changed, 75 insertions(+), 87 deletions(-) delete mode 100644 app/misc/res/kb_facebook.png delete mode 100644 app/misc/res/kb_facebook_icon.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_backspace_grey300_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_backspace_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_done_grey300_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_keyboard_grey300_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_space_bar_grey300_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_space_bar_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_backspace_grey300_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_backspace_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_done_grey300_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_keyboard_grey300_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_space_bar_grey300_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_space_bar_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_backspace_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_backspace_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_done_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_keyboard_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_space_bar_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_space_bar_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_backspace_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_backspace_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_done_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_keyboard_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_space_bar_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_space_bar_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_backspace_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_backspace_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_done_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_keyboard_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_space_bar_grey300_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_space_bar_white_24dp.png diff --git a/app/misc/res/kb_facebook.png b/app/misc/res/kb_facebook.png deleted file mode 100644 index d7def6bac2bd60ea851aebc79a1708bec66fc916..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmeAS@N?(olHy`uVBq!ia0vp^&OqGB!3HGDceXABQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?i-Fp&gD|6$#_S59AbW|YuPgf0mGiwTUa9~l^!GCf@!Ln>~) zy=|KvYRJ(3@p%m2z7m0>+q*iNJM@AIuB_bB>{VD^H0hCog=WWtashXCM_E@{nO}ld zKNwrML>*iAJ*eI({J6w#go1temYyEdmZXmQCFX^?6sBF3Bd8+f;93QeB0PP{zp|k{Hby+{`Jis0pzN=4vSR8j)kaod@WGfFk{iD zi0osHJ`&S|9giG2vGH#lQ{0lA1O4F z5rWB6ObzSqmvv7xPU=u>lRzc{^P(P9wN$AIegB-Xr0$=t{p@v4$vN($)pnvJ_wVdo0{5 zaFBgPg3^x;#p%+=m9}@dJ`sCvI(ch?#qwL5Z$3{xUvOR~j}d4m1B1@h4J@Y(d@moq zYJ9c%>fWoh?8m>pf4}bAs{N}^n^)}p_gDU^|JC#C>+Smt>jV^hFPHe2Zn7#Zu-Vsm zxz74nMb1>_dyf{+2`xFk`ub||Rl?CX9M-L=a$r2CzGwR?dt|L*cN^Xrp7zrv^14+Q0ZpF8qBsWh+saWQ9H zLCx~j=hHSQuK6RB!+xi(raw&n{FBWEoN*B~$5;8U+MQ;U%BXkd_tjwIS?j$&G?neY zzG`~9S+4a1r$@W@R+YB}i$8Fhvr4 zJ+9Bo^K4+c)3$tddzwxC^anGm>z;ky&V25UCgZ>9?Sf|I|I4Gl-VyWL8($kf*WO~^ z`gLV*zpJ#{_Q~w2(>?IBYTH@cyL-ZG1Lm&XCz<@_{i{VB1;u_jFKqUQE$D8?uzmJ`0G`7iS)&RS+3W^iVs zssHDRqGvz<|6_d2V)rS=zlUEPX0?cHU8UD+_^yC6E&5*(e+Pr$0tP_^CJ_ZDmj 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 ef76616bf0aed0ecfc4dfbab3fdd52ea17dc79c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 525 zcmV+o0`mQdP)-r#BLRd%zefi(TWl9Dz6Oin&mA-3ZNb;Op?sqVuGsEK)$QrB0Iwt|j;IPJ3XpVlK zl3ngB)vRj+;!qvWo59i7Ac_Z8Lls5DDsT*->y(C74H>|pV2gIaqIK%4GNN3}FC#9M z;7%xm>~J6141=q$0OSaw8Bo0(eQQ1V-^#eVRt7Q=u_go7_??S%oy;8KaA0&s6i(!;+7>=p=sSH3w zyhj>=PAO``4mNnQ?ixsw?GRO`gcE4E!QqBFhf$C{UWY4n0a)-o1yoh)M!OFjFHd~7aP;!l^Xz#x}Y-+uTu@YP75rlv<@26yjwGp4M z|G^8hYyXu;V23lN1$V**X5@EGd2ejx%n@}xrOX;H)b*Z157d@0htLN!a%Xi!@*?w} zpnJ4)0xdCP#sn_EgAUL-0){amCX8VOIu9DLK#NSUC6zEnOZ1>S{2~qZc@0q*f%egq z8Vi#_Ll*dv%~2+SZjqD{<~N}s&;3j@_EutA+Uzk1WZbO4#4qovA^MQcQ%2tv3i|k0wldT1B8JTQ$c0-gT?}VrzTo=zCUt@yctdGd9PBwH5B1 zmMZa^Q7!ZtYjIU`;Oe!rgwBMn%k$_>R@+;&F?fjtg1L#NwPgg&e IbxsLQ0M$fYtN;K2 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 0000000000000000000000000000000000000000..c278b6c2b30ba9bb52391af71120270e908a7502 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8v!{z=h{y4_R}8rt40u`}^1XVn zvWkOUU-^j{pVq65HqD1Oi)r3+T*LWdLcQO)Q$gY0SWi# mI0*h{o5b;0Guz~Cq_l|d_dwzLnQwv4VeoYIb6Mw<&;$SqxI>Tt literal 0 HcmV?d00001 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 d2b2ed4ddb683979f6a2024340d5c2636ee076bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmV-d0jU0oP)hfu{OrgiUnZgN0b#SdE0DW z*pHdVWPwh9ER}8akOlpQr!TDJm;>o4Yixr;BIdFKuu>y5!hlVfY%1FzO8OULQ*0kof0SnnjO<&280 zIobytNZwoT{3Pt3we~dQFMO}z9Eqwv@aoCdTZ<`F@c2gWbjyPdOg_t^q|k0wldT1B8K8x2KC^h{y5d1PRu~4UG@?zxn^? zKd;K6L;p9uICkUT|4;K}K0MveyUOwTzscO^7D;`Xp40qqk(3MLfxH0b8P^#mAJaG5 z!m}t!LY6^&3$sG?L4o}zCU7aQs_e~b^kr@?5S3jb)w21{qUnzRPkg%-pCy`;9>BXv war275U+#0=eQ%T^^6%&WrS7ZG1~RZPT>Yj|E9E!$F3?#Fp00i_>zopr0M0E@@c;k- literal 0 HcmV?d00001 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 864f7d9b2a0bc9e9dc6e8cc6f8cc6003bca7d2f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTQ1%T^vI^jwdHbur5vz;n6(Mac1YG z13<9gvO|RQGOv*4f5rv|1}_YR5(V14)UqmbC8UouX}f83|NFlrbD8Iwg;i?{P1^gK d0u7QF82+5#er=e@QwcPf!PC{xWt~$(69DPnI4A%B 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 0000000000000000000000000000000000000000..9e19db77da1098b8d9597ba46f4abbee496a0d59 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;rKgKyh{y5d1PRu~2_ihPANDh{ ztX%NPUP2&Mpl<47Hoz@kC&uf<@T|4~+>k4oOA-?@iyA^P_ws&q~{; z6aToEo-V!gb?37yGQM#amgv>aP;B4B{$HhS`DaU+o2zS2>wab57bm=lGk&0<9bWWVc0> z+>>H3pQr3xtGrdORMD(}$7AVJGre^8rQ91OW-U;?`ALdlskG_hAicF&g49pOcWlL^)DudPQ?# z>=7dNisp`x+jUEsl&Hz=trQ8y=FL3m{8Fg1!Z6qQp%m(@GhOv@*HTcHiv(ri3(E4j k8+r?F-kg>3<@>$x0_uA^XphlbDgXcg07*qoM6N<$g0$^nH2?qr literal 0 HcmV?d00001 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 1ddeef87c8c2a678a48a7ae266bb652665db9e53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad7K3vkw8&y zVGw3ym^BBap1s7=*OmP~H#ZL>TN(fTD4}6Xes!*ckk5YM!sq|z#+NsF6r7pcX8r&DpSBFeOK$^o w52{p%u4-K}A#=y)`7BQZba@xgzopr01FXB9{>OV 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 0000000000000000000000000000000000000000..6d84e1431bafe464f26cb2f63061c4c9b57edb10 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iAWs*^5R2aA1PRt12kLb%O=-GeF>qN`e$ mOkm7ZjI#{k);#6T#=sC9S)hEq`Oa^k=?tE(elF{r5}E+GHZxWL literal 0 HcmV?d00001 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 b863d02e35fe8bf34b50b79c1b95c2830d555689..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad7K3vkw8&y zVGw3ym^BBap1s7=*OmP~had-!)QYt;)&qs|JzX3_EKWb|Kgiplz~d@^MD&Vk#4*Ji zCr$6Psx~OTI=G-hK|x*k-@?qv*Z)PXGV_ 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 0000000000000000000000000000000000000000..e8c24c729411b9cc1b9b0f27170060248e36c4d4 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1S5Ftm5R22v2@)$G)Iaz?{Xb`8 z`2W9xQXJasjng@JU6@RG1;q3wNlCRePd;&_VItRx#ScXT^{N^#Jn(nPs`_}p{Kzvu ZhG*it9^9SByb5R_gQu&X%Q~loCII^{D?tDN literal 0 HcmV?d00001 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 efe2f491f8702617e66a75118dec028499725199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad7K3vkw8&y zVGw3ym^BBap1s7=*OmP~haeZX^yK_k6M#Z0o-U3d7N?UFBv_rLV}8~@wKpvCSt8|A l&8xE_Z)qd%;)D(+2KkGeIt+gft_P}T@O1TaS?83{1OP??CBgsz 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 0000000000000000000000000000000000000000..95298960770b63ab5cdf0034faecd4b9522693f7 GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Sx*K~z}7 z?U%o9(?A%&f3evZpnzJ6SeWkxDjuLyD-aBA{_hE_yaNL(YC9CQsgqP`Rn{WJ8+7Ye zRlEU7D})rbT4qQvZhYt1%6UP#(P#aB=kLDnzBA0ne9Sru`p4(b_`oW6XCVLP8}HO* zA<)dpGG{DXSpF|o9PPx86+GPIz2*y~#-6n;7{&zh1mV8DO^%0X+a^9HkSc4I(=@o9 zJ;H)rfin>v6W*u7p^@TI!`DyUiLAfEx)EPihtefrQ;V-FUv6mOCWJ^HBRnt&D#`;8 zmxGwXqptk%0$WKT+A`u{O~#6`mT zN25bEgzZyGhyN=$;bn@9yR8V);Gqy8McOHox=k&Fk_Hcj^Cg6bsp}?GjQ4H|9vnVq zz(a{Wans|$;U?df>CmK~;r%dk#z|YIJ4K+bXk^EW8!5f+l*3LP)60s-i9P4X%uWQ)AT@*$)+`i2^m? zjZyGPipH`kjTBO5cY04g;hSQC8J|9~uV##0OUpN1b0)#o`qhO-5S&#b8L+AqjAi{^s= aPVfhq$js3ZhY{xh0000LkJd 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 0000000000000000000000000000000000000000..ec5412bd8a66a3c8512d858c1f8090935a97b0ab GIT binary patch literal 392 zcmV;30eAk1P)7z<`z;jXwgQzp9mW!y*j_L)Urzog7Tw4mjnNHokh=!9i6kv=iUE*AsiY@ zwbM@HiWxhO*^UKm%uv_ljVks)@>< z4|#_uDE9%zam2Fs7-22CKAyk*E6j4L75z%{5Txl`6KOW$3$P m!j@yUWljq-lHR`nPQW+BD)wYfX<&)~0000x<4}`LT{q= zhHHZ1iO}9HwE3Vz={^RxGfA{tMUCT9PGmdrIPhOb4b&+PAr96M(A>p-x?&9)t zn#amE^=EO+nIBu?p4Kibb9(oJ)Zjhqo0e!ia4Qyx=)n)FM;A%Qg=%it?A*&M zvT57h)vsbjx@0oyx4a4tY-N(o_v_tk;Pbv!ob`6GO5)LIR`ocgiC+}>OKTM>qYLv4 Qf&OFgboFyt=akR{0Aw$CRsaA1 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 0000000000000000000000000000000000000000..3b2b65d26291575f2741d223cdf80facb436dc20 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DK2I0Nkcif|mv{3vD2TKsT6rJ; zxO0YV_Rhw~KO`R95NK`?{Vrkn{YyRw{}S|A6v9i-|5NUW$ta?Pygm%Nsv&hZQ(vErfMP< zpY|qT;e@T~2GVmjs_iOcP8GfRxWIp!T*SgH3xzW-UCWN&pdxyvwy|Tg>(ABBmD6V` z+SI9a|K+r_+EQWAJqK Kb6Mw<&;$U(N_#s1 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 0000000000000000000000000000000000000000..2b6b9b458883d68085d669c2cbd9c410b6b0eba1 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dc25__kch)?uR3xyCtB0v23M-|u#BZeV$E=I;sB#y8r(G#nfi&MR|QaNGQQ!t|y=_xp1D8BDPp7HOM5 rDwpQW<~u)YpUkco6-%$Q?`8;{@x1(hMb|Z;lNdZ*{an^LB{Ts5KN?C5 literal 0 HcmV?d00001 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 0c555e9c529aa6edbc0d88b5522a11503b1c4878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{XT~v7dO|>`=^qCLXMs;jv*0;-(GU$Vh|8u4R~Vlu3qSS zV&Za@lWy;Gmt8rNucpXwfdA2-fZHon=kZ2;U3y)bL!dza{lBfkw)_kY_9gq>Sl^xx SOPB*RjKR~@&t;ucLK6TY&o!q2 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 0000000000000000000000000000000000000000..773586ce6d4bc59fba75146af859440782479c66 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PUCo*%Q~loCIGF57z+RZ literal 0 HcmV?d00001 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 05ef4b1218de72010ac6a8bd009b416c8f4065fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 838 zcmV-M1G)T(P)%1ZzM0@q1IK~!ko z?U}u96G0S(zgTD^3JU%LJi~|*rKCn{0%Q{)0h&aj015FfNEq6LLo)jN4Td%dB?wPsg%q)~uR#|10HBd9|N80Cj&Kfrfrbf}F z%?E0x3p2-#XXOGdZs*dRpWHFO+(5hB&rPo%+;RZPGd6NvLa(hras%OFu0Y=^)}PsDfRx-IxC-?pUl`|xl4M?7_P|&14PL@l!R18pZhu#&1lL#cM+*AI0 zk7Z(|TSXkC0+MUI(c_qg3aLwEc39LPRZ`2f$FhmR?6KrP>Jpg)FfohldjiRd(n@fr#Gn244KkcV6wrVqh_)Q8hU+VJU6jmt`)Z5gl?(;`Yh8o~itU`q`ok9nZp zodFH04j}E1ASL0{UAgmgFv=Vqb$|XOb161PR6XENn}efiIF7Wfm8vQK(=JhYN*1A!|m%VWrPzrlYna5`^#o?bXyY8 z0eQ>j3K%Jo22QRXvgz_paySX}lUgs^iYj0P!-irGSn;q9582iwP?;yRym!wF671Tsg2tn-CG(_G4YDr}kqH)-CQ&bGvjJoL*2Yo@dQ~=lX0wpiQer^#GSsA8o$3+RLS$f`cLsAf z#r)qJ_`y@0*^Oz_rcIkRcwFWgr?gz$esRhRHV7iHyUGX3>?=1jpm&tp7aHR{q3oXb zbFOnv*?sBPAldsht%W%m^BsByX2;);Fhh&iWdThJqdpl}7z^Pu|-S<8-)gkzvh&y^=R$3bt93p5r73dA2;qK297oBHOJlC;9B| zIcQ9_B~6#(BsN$&Xk4}&Y2T8W_ zAjwu9B-zS?s>-$sqN;2sK~$CPAh3H$xqYT_&=ro0ac&TS-zA>%k)K@LR-AA^LpZ4D hO`r)hfhJH5_Zt)xGl39wZMOgb002ovPDHLkV1j7D^}qlC literal 0 HcmV?d00001 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 92bf47c2093756db6931274c7676add08e933ff6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 455 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawn3BBRT^Rni_n+Ah4nJ za0`PlBg3pY5H=O_WRu2JPazkO4k2pU|@{!ba4#HxcBykVbLK2f!2rYs!JQC zSMVxYI?b5F9r(=8qV$%-ZubUb3s;GLN$*W5?@wucdp}`zzF7Yf!v&eMmH|;}f7rkD z(~=g^eN<`_2l%L_9~e(R*LM$4d>@9i11SjuuEIGWZZd7rYW;Xofl;EeaO+Utnh|ou;szm>~B{tD~-7r)N-$BY-P&#jQNU*r)ZbHBwd`kehsYoAAtD;%D2 zFJImo+i~RN$9>MntURPE{R-rjx*uOY#L8Yg`6*9MkF!eMxd(o-N}dHueSLB-yZDPI zKXRFyswX67H0Q+OtBy@P>c6(UpQv!yb4MMEN6(xkzbCXGIpw)$fu+ZpIbWm~=I*bb u`YCdqvsU9}#i@rXCwM)|00)WhOa5z&M{0ULUflu=b_P#ZKbLh*2~7Y7NwzHj 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 0000000000000000000000000000000000000000..0ebb55559b55f99df3270796763745a71f113078 GIT binary patch literal 255 zcmV=}0*5fKp)HP1G&I6Iqc zjKz5rgEVtukiIy2Qo_-K;J|?c2M!!K@i?}(lWik$uJ;4aeo|e|;mI*SsV?U@bDX5g zSJ{Te;g>S0!OODIPipkgGo)TTcRZxVWAGnIFqKOr(UM3=(~BhBSvit;g=R?Vjh>M7 zAB+M?!6}eboF615Cqq(m7NiKA4^kA)n-qydL_|cirW>R3em?os7vTT^002ovPDHLk FV1hF8Y9jyu literal 0 HcmV?d00001 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 2a5dcefa350d45bd306fee322edd6a3d1b9ba002..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 389 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 qlO_5RMEvsIY4`z*$Ag!LRelF{r5}E)36&T(C literal 0 HcmV?d00001 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 @@