diff --git a/app/misc/libs/drag-button-1.1.aar b/app/misc/libs/drag-button-1.1.aar index 04ed325e..7f27c42e 100644 Binary files a/app/misc/libs/drag-button-1.1.aar and b/app/misc/libs/drag-button-1.1.aar 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 9306bd9e..a247b890 100644 --- a/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java +++ b/app/src/main/java/org/solovyev/android/calculator/FloatingCalculatorKeyboard.java @@ -71,7 +71,7 @@ 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_white_24dp); + addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_grey300_24dp); addButton(row, 0, parametersCount > 0 ? parameterNames.get(0) : "x"); addButton(row, 0, "7"); addButton(row, 0, "8"); @@ -88,7 +88,7 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard { addButton(row, 0, "6"); addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText("%", up).setText("sqrt", down); addOperationButton(row, R.id.cpp_kb_button_minus, "−"); - final View backspace = addImageButton(row, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_white_24dp); + final View backspace = addImageButton(row, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_grey300_24dp); EditTextLongClickEraser.attachTo(backspace, user.getEditor()); row = makeRow(); @@ -98,8 +98,8 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard { addButton(row, 0, "2"); addButton(row, 0, "3"); addButton(row, 0, "0").setText("00", up).setText("000", down); - addImageButton(row, R.id.cpp_kb_button_space, R.drawable.ic_space_bar_white_24dp); - addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp); + 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); } private void makeViewPort() { @@ -115,7 +115,7 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard { addButton(row, 0, "5"); addButton(row, 0, "6"); addOperationButton(row, R.id.cpp_kb_button_divide, "/").setText("%", up).setText("sqrt", down); - final View backspace = addImageButton(row, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_white_24dp); + final View backspace = addImageButton(row, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_grey300_24dp); EditTextLongClickEraser.attachTo(backspace, user.getEditor()); row = makeRow(); @@ -123,14 +123,14 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard { 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_white_24dp); + addImageButton(row, R.id.cpp_kb_button_space, R.drawable.ic_space_bar_grey300_24dp); row = makeRow(); addButton(row, R.id.cpp_kb_button_brackets, "( )").setText("(", up).setText(")", down); addButton(row, 0, "0").setText("00", up).setText("000", down); 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_white_24dp); + addImageButton(row, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_grey300_24dp); row = makeRow(); final int parametersCount = parameterNames.size(); @@ -138,7 +138,7 @@ public class FloatingCalculatorKeyboard extends BaseFloatingKeyboard { 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_white_24dp); + addImageButton(row, R.id.cpp_kb_button_close, R.drawable.ic_done_grey300_24dp); } public int getRowsCount(boolean landscape) { diff --git a/app/src/main/java/org/solovyev/android/calculator/keyboard/BaseKeyboardUi.java b/app/src/main/java/org/solovyev/android/calculator/keyboard/BaseKeyboardUi.java index 83644e73..1ccbea93 100644 --- a/app/src/main/java/org/solovyev/android/calculator/keyboard/BaseKeyboardUi.java +++ b/app/src/main/java/org/solovyev/android/calculator/keyboard/BaseKeyboardUi.java @@ -10,10 +10,12 @@ import android.support.annotation.Nullable; import android.util.TypedValue; import android.view.HapticFeedbackConstants; import android.view.View; +import android.widget.ImageView; import org.solovyev.android.Views; import org.solovyev.android.calculator.*; import org.solovyev.android.calculator.buttons.CppSpecialButton; import org.solovyev.android.calculator.view.ScreenMetrics; +import org.solovyev.android.views.Adjuster; import org.solovyev.android.views.dragbutton.DirectionDragButton; import org.solovyev.android.views.dragbutton.DragDirection; import org.solovyev.android.views.dragbutton.SimpleDragListener; @@ -28,6 +30,9 @@ import static org.solovyev.android.calculator.Preferences.Gui.Layout.simple_mobi public abstract class BaseKeyboardUi implements SharedPreferences.OnSharedPreferenceChangeListener, SimpleDragListener.DragProcessor, View.OnClickListener { + protected static final float TEXT_SCALE = 0.6f; + protected static final float IMAGE_SCALE = 0.6f; + @NonNull protected final SimpleDragListener listener; @Inject @@ -59,6 +64,18 @@ public abstract class BaseKeyboardUi implements SharedPreferences.OnSharedPrefer textSize = layout.optimized ? 0 : calculateTextSize(); } + protected final void prepareButton(@Nullable ImageView button) { + prepareButton(button, IMAGE_SCALE); + } + + protected final void prepareButton(@Nullable ImageView button, float scale) { + if (button == null) { + return; + } + prepareButton((View) button); + Adjuster.adjustImage(button, scale); + } + protected final void prepareButton(@Nullable View button) { if (button == null) { return; @@ -76,6 +93,7 @@ public abstract class BaseKeyboardUi implements SharedPreferences.OnSharedPrefer if (textSize > 0) { button.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize); } + Adjuster.adjustText(button, TEXT_SCALE); } protected final void hideText(@Nullable DirectionDragButton button, @Nonnull DragDirection... directions) { diff --git a/app/src/main/java/org/solovyev/android/calculator/keyboard/PartialKeyboardUi.java b/app/src/main/java/org/solovyev/android/calculator/keyboard/PartialKeyboardUi.java index 9a156b88..6b20c892 100644 --- a/app/src/main/java/org/solovyev/android/calculator/keyboard/PartialKeyboardUi.java +++ b/app/src/main/java/org/solovyev/android/calculator/keyboard/PartialKeyboardUi.java @@ -16,6 +16,7 @@ import android.widget.ImageButton; import butterknife.Bind; import butterknife.ButterKnife; import jscl.NumeralBase; +import org.solovyev.android.Check; import org.solovyev.android.calculator.*; import org.solovyev.android.calculator.buttons.CppSpecialButton; import org.solovyev.android.calculator.view.EditorLongClickEraser; @@ -62,8 +63,10 @@ public class PartialKeyboardUi extends BaseKeyboardUi { prepareButton(leftButton); prepareButton(equalsButton); prepareButton(clearButton); - prepareButton(eraseButton); if (eraseButton != null) { + Check.isTrue(IMAGE_SCALE == 0.6f); + // backspace button is too big, scale it more + prepareButton(eraseButton, 0.5f); EditorLongClickEraser.attachTo(eraseButton); } if (isSimpleLayout()) { 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 e47e09af..543844f8 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 @@ -56,17 +56,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_white_24dp); + final View backspace = addImageButton(rowView, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_grey300_24dp); EditTextLongClickEraser.attachTo(backspace, user.getEditor()); 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_white_24dp); + addImageButton(rowView, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_grey300_24dp); break; case 3: - addImageButton(rowView, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp); + addImageButton(rowView, R.id.cpp_kb_button_close, R.drawable.ic_done_grey300_24dp); break; default: addButton(rowView, View.NO_ID, ""); @@ -80,17 +80,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_white_24dp); + final View backspace = addImageButton(rowView, R.id.cpp_kb_button_backspace, R.drawable.ic_backspace_grey300_24dp); EditTextLongClickEraser.attachTo(backspace, user.getEditor()); 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_white_24dp); + addImageButton(rowView, R.id.cpp_kb_button_keyboard, R.drawable.ic_keyboard_grey300_24dp); break; case 4: - addImageButton(rowView, R.id.cpp_kb_button_close, R.drawable.ic_done_white_24dp); + addImageButton(rowView, R.id.cpp_kb_button_close, R.drawable.ic_done_grey300_24dp); break; default: addButton(rowView, View.NO_ID, ""); diff --git a/app/src/main/java/org/solovyev/android/views/Adjuster.java b/app/src/main/java/org/solovyev/android/views/Adjuster.java new file mode 100644 index 00000000..35bc5eac --- /dev/null +++ b/app/src/main/java/org/solovyev/android/views/Adjuster.java @@ -0,0 +1,109 @@ +package org.solovyev.android.views; + +import android.graphics.drawable.Drawable; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.util.TypedValue; +import android.view.View; +import android.view.ViewTreeObserver; +import android.widget.ImageView; +import android.widget.TextView; + +import static android.graphics.Matrix.MSCALE_Y; + +public class Adjuster { + + private static final float[] MATRIX = new float[9]; + + public static void adjustText(@NonNull final TextView view, final float percentage) { + ViewTreeObserver treeObserver = getTreeObserver(view); + if (treeObserver == null) { + return; + } + treeObserver.addOnPreDrawListener(new TextViewAdjuster(view, percentage)); + } + + @Nullable + private static ViewTreeObserver getTreeObserver(@NonNull View view) { + final ViewTreeObserver treeObserver = view.getViewTreeObserver(); + if (treeObserver == null) { + return null; + } + if (!treeObserver.isAlive()) { + return null; + } + return treeObserver; + } + + public static void adjustImage(@NonNull final ImageView view, final float percentage) { + ViewTreeObserver treeObserver = getTreeObserver(view); + if (treeObserver == null) { + return; + } + treeObserver.addOnPreDrawListener(new ImageViewAdjuster(view, percentage)); + } + + private static class TextViewAdjuster implements ViewTreeObserver.OnPreDrawListener { + @NonNull + private final TextView view; + private final float percentage; + + public TextViewAdjuster(@NonNull TextView view, float percentage) { + this.view = view; + this.percentage = percentage; + } + + @Override + public boolean onPreDraw() { + // assume that the view properties are constant + final ViewTreeObserver treeObserver = getTreeObserver(view); + if (treeObserver != null) { + treeObserver.removeOnPreDrawListener(this); + } + final int height = view.getHeight(); + final float oldTextSize = Math.round(view.getTextSize()); + final float newTextSize = Math.round(height * percentage); + if (oldTextSize == newTextSize) { + return true; + } + view.setTextSize(TypedValue.COMPLEX_UNIT_PX, newTextSize); + return false; + } + } + + private static class ImageViewAdjuster implements ViewTreeObserver.OnPreDrawListener { + @NonNull + private final ImageView view; + private final float percentage; + + public ImageViewAdjuster(@NonNull ImageView view, float percentage) { + this.view = view; + this.percentage = percentage; + } + + @Override + public boolean onPreDraw() { + // assume that the view properties are constant + final ViewTreeObserver treeObserver = getTreeObserver(view); + if (treeObserver != null) { + treeObserver.removeOnPreDrawListener(this); + } + + final Drawable d = view.getDrawable(); + if (d == null) { + return true; + } + final int height = view.getHeight(); + view.getImageMatrix().getValues(MATRIX); + final int oldImageHeight = Math.round(d.getIntrinsicHeight() * MATRIX[MSCALE_Y]); + final int newImageHeight = Math.round(height * percentage); + if (oldImageHeight == newImageHeight) { + return true; + } + final int newPaddings = Math.max(0, height - newImageHeight) / 2; + view.setPadding(0, newPaddings, 0, newPaddings); + + return false; + } + } +} diff --git a/app/src/main/res/drawable-hdpi/ic_backspace_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_backspace_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_backspace_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_backspace_grey300_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_backspace_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_backspace_white_48dp.png new file mode 100644 index 00000000..f6a90acc Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_backspace_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png new file mode 100644 index 00000000..ceb1a1ee Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..9dff893e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_content_paste_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_content_paste_white_48dp.png new file mode 100644 index 00000000..3b6283fd Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_content_paste_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_done_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_done_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_done_grey300_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png new file mode 100644 index 00000000..c8a2039c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_keyboard_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_keyboard_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_keyboard_grey300_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_save_grey600_48dp.png b/app/src/main/res/drawable-hdpi/ic_save_grey600_48dp.png deleted file mode 100644 index 6ecab92a..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_save_grey600_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_settings_white_48dp.png new file mode 100644 index 00000000..eabb0a2b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_share_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_share_white_48dp.png new file mode 100644 index 00000000..a35b3cd1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_share_white_48dp.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 new file mode 100644 index 00000000..864f7d9b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_space_bar_grey300_24dp.png 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 index 864f7d9b..9e19db77 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_space_bar_white_24dp.png and b/app/src/main/res/drawable-hdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/kb_copy.png b/app/src/main/res/drawable-hdpi/kb_copy.png deleted file mode 100644 index 09416614..00000000 Binary files a/app/src/main/res/drawable-hdpi/kb_copy.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/kb_erase.png b/app/src/main/res/drawable-hdpi/kb_erase.png deleted file mode 100644 index eb5a4b40..00000000 Binary files a/app/src/main/res/drawable-hdpi/kb_erase.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/kb_paste.png b/app/src/main/res/drawable-hdpi/kb_paste.png deleted file mode 100644 index b46a8b38..00000000 Binary files a/app/src/main/res/drawable-hdpi/kb_paste.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/kb_settings.png b/app/src/main/res/drawable-hdpi/kb_settings.png deleted file mode 100644 index 6f40dd0e..00000000 Binary files a/app/src/main/res/drawable-hdpi/kb_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/kb_share.png b/app/src/main/res/drawable-hdpi/kb_share.png deleted file mode 100644 index 310a82a4..00000000 Binary files a/app/src/main/res/drawable-hdpi/kb_share.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldrtl-hdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-ldrtl-hdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..ac86165d Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-hdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-ldrtl-mdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-ldrtl-mdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..ee1c3d10 Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-mdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-ldrtl-xhdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..f5104146 Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xhdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..f2570c00 Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..611b8f47 Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_backspace_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_backspace_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_backspace_white_24dp.png rename to app/src/main/res/drawable-mdpi/ic_backspace_grey300_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_backspace_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_backspace_white_48dp.png new file mode 100644 index 00000000..ec5412bd Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_backspace_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png new file mode 100644 index 00000000..af7f8288 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..537fd4e8 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_content_paste_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_content_paste_white_48dp.png new file mode 100644 index 00000000..8015d558 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_content_paste_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_done_white_24dp.png rename to app/src/main/res/drawable-mdpi/ic_done_grey300_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png new file mode 100644 index 00000000..d400472f Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_keyboard_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_keyboard_white_24dp.png rename to app/src/main/res/drawable-mdpi/ic_keyboard_grey300_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_save_grey600_48dp.png b/app/src/main/res/drawable-mdpi/ic_save_grey600_48dp.png deleted file mode 100644 index 19c25c74..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_save_grey600_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_settings_white_48dp.png new file mode 100644 index 00000000..5caedc8e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_share_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_share_white_48dp.png new file mode 100644 index 00000000..22a8783e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_share_white_48dp.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 new file mode 100644 index 00000000..efe2f491 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_space_bar_grey300_24dp.png 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 index efe2f491..95298960 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_space_bar_white_24dp.png and b/app/src/main/res/drawable-mdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/kb_copy.png b/app/src/main/res/drawable-mdpi/kb_copy.png deleted file mode 100644 index 0c0ac9d8..00000000 Binary files a/app/src/main/res/drawable-mdpi/kb_copy.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/kb_erase.png b/app/src/main/res/drawable-mdpi/kb_erase.png deleted file mode 100644 index f15a9842..00000000 Binary files a/app/src/main/res/drawable-mdpi/kb_erase.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/kb_paste.png b/app/src/main/res/drawable-mdpi/kb_paste.png deleted file mode 100644 index 23a6ec93..00000000 Binary files a/app/src/main/res/drawable-mdpi/kb_paste.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/kb_settings.png b/app/src/main/res/drawable-mdpi/kb_settings.png deleted file mode 100644 index 1ebb60da..00000000 Binary files a/app/src/main/res/drawable-mdpi/kb_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/kb_share.png b/app/src/main/res/drawable-mdpi/kb_share.png deleted file mode 100644 index 31bbd3fa..00000000 Binary files a/app/src/main/res/drawable-mdpi/kb_share.png and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/cpp_onscreen_button_close.png b/app/src/main/res/drawable-nodpi/cpp_onscreen_button_close.png deleted file mode 100644 index 8a7c4197..00000000 Binary files a/app/src/main/res/drawable-nodpi/cpp_onscreen_button_close.png and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/cpp_onscreen_button_fold.png b/app/src/main/res/drawable-nodpi/cpp_onscreen_button_fold.png deleted file mode 100644 index 4cff3685..00000000 Binary files a/app/src/main/res/drawable-nodpi/cpp_onscreen_button_fold.png and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/cpp_onscreen_button_minimize.png b/app/src/main/res/drawable-nodpi/cpp_onscreen_button_minimize.png deleted file mode 100644 index 64ff9722..00000000 Binary files a/app/src/main/res/drawable-nodpi/cpp_onscreen_button_minimize.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_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_backspace_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_backspace_grey300_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_backspace_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_backspace_white_48dp.png new file mode 100644 index 00000000..88131b9a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_backspace_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png new file mode 100644 index 00000000..b7c7ffd0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..4ddee9ef Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_content_paste_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_content_paste_white_48dp.png new file mode 100644 index 00000000..42e5cfbc Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_content_paste_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_done_grey300_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png new file mode 100644 index 00000000..f53cc0c6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_keyboard_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_keyboard_grey300_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_save_grey600_48dp.png b/app/src/main/res/drawable-xhdpi/ic_save_grey600_48dp.png deleted file mode 100644 index 5f30c6c7..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_save_grey600_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_white_48dp.png new file mode 100644 index 00000000..507c5edd Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_share_white_48dp.png new file mode 100644 index 00000000..e351c7be Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_share_white_48dp.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 new file mode 100644 index 00000000..0c555e9c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_space_bar_grey300_24dp.png 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 index 0c555e9c..773586ce 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_space_bar_white_24dp.png and b/app/src/main/res/drawable-xhdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/kb_copy.png b/app/src/main/res/drawable-xhdpi/kb_copy.png deleted file mode 100644 index 94073182..00000000 Binary files a/app/src/main/res/drawable-xhdpi/kb_copy.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/kb_erase.png b/app/src/main/res/drawable-xhdpi/kb_erase.png deleted file mode 100644 index 8c4b099d..00000000 Binary files a/app/src/main/res/drawable-xhdpi/kb_erase.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/kb_paste.png b/app/src/main/res/drawable-xhdpi/kb_paste.png deleted file mode 100644 index 81d17937..00000000 Binary files a/app/src/main/res/drawable-xhdpi/kb_paste.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/kb_settings.png b/app/src/main/res/drawable-xhdpi/kb_settings.png deleted file mode 100644 index 2da568ee..00000000 Binary files a/app/src/main/res/drawable-xhdpi/kb_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/kb_share.png b/app/src/main/res/drawable-xhdpi/kb_share.png deleted file mode 100644 index 819d95dc..00000000 Binary files a/app/src/main/res/drawable-xhdpi/kb_share.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_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_backspace_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_backspace_grey300_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_backspace_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_backspace_white_48dp.png new file mode 100644 index 00000000..e26467df Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_backspace_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png new file mode 100644 index 00000000..6b717e0d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..886b0d08 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_content_paste_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_content_paste_white_48dp.png new file mode 100644 index 00000000..5c95eb26 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_content_paste_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_done_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_done_grey300_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png new file mode 100644 index 00000000..78aa5916 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_keyboard_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_keyboard_grey300_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_save_grey600_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_save_grey600_48dp.png deleted file mode 100644 index 5787b2fd..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_save_grey600_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_white_48dp.png new file mode 100644 index 00000000..55492f6c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_white_48dp.png new file mode 100644 index 00000000..9c6bdb5d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_share_white_48dp.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 new file mode 100644 index 00000000..b01f441d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_space_bar_grey300_24dp.png 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 index b01f441d..96910bfb 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_space_bar_white_24dp.png 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_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_backspace_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_backspace_white_24dp.png rename to app/src/main/res/drawable-xxxhdpi/ic_backspace_grey300_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_backspace_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_backspace_white_48dp.png new file mode 100644 index 00000000..c6ce06e6 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_backspace_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png new file mode 100644 index 00000000..39641921 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_content_copy_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_content_copy_white_48dp.png new file mode 100644 index 00000000..31d04998 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_content_copy_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_content_paste_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_content_paste_white_48dp.png new file mode 100644 index 00000000..7753cf43 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_content_paste_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_done_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png rename to app/src/main/res/drawable-xxxhdpi/ic_done_grey300_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png new file mode 100644 index 00000000..ded5652e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_grey300_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png rename to app/src/main/res/drawable-xxxhdpi/ic_keyboard_grey300_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_white_48dp.png new file mode 100644 index 00000000..9e242e77 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white_48dp.png new file mode 100644 index 00000000..3d4f6e9d Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_share_white_48dp.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 new file mode 100644 index 00000000..33832219 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_space_bar_grey300_24dp.png 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 index 33832219..1798cb96 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_space_bar_white_24dp.png and b/app/src/main/res/drawable-xxxhdpi/ic_space_bar_white_24dp.png differ diff --git a/app/src/main/res/layout/cpp_app_button_0.xml b/app/src/main/res/layout/cpp_app_button_0.xml index 72c85266..70adfd4a 100644 --- a/app/src/main/res/layout/cpp_app_button_0.xml +++ b/app/src/main/res/layout/cpp_app_button_0.xml @@ -29,7 +29,6 @@ a:id="@id/cpp_button_0" style="?attr/cpp_button_style_digit" a:text="0" - c:directionTextScale="0.5" c:textDown="000" c:textUp="00" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_6.xml b/app/src/main/res/layout/cpp_app_button_6.xml index 2c756765..a220db7c 100644 --- a/app/src/main/res/layout/cpp_app_button_6.xml +++ b/app/src/main/res/layout/cpp_app_button_6.xml @@ -29,7 +29,6 @@ a:id="@id/cpp_button_6" style="?attr/cpp_button_style_digit" a:text="6" - c:directionTextScale="0.33;0.30;0.33;0.33" c:textDown="rad" c:textLeft="F" c:textUp="deg" diff --git a/app/src/main/res/layout/cpp_app_button_7.xml b/app/src/main/res/layout/cpp_app_button_7.xml index c08a2399..71a30e8c 100644 --- a/app/src/main/res/layout/cpp_app_button_7.xml +++ b/app/src/main/res/layout/cpp_app_button_7.xml @@ -29,7 +29,6 @@ a:id="@id/cpp_button_7" style="?attr/cpp_button_style_digit" a:text="7" - c:directionTextScale="0.5;0.5;0.5;0.33" c:textDown="!" c:textLeft="0b:" c:textUp="i" diff --git a/app/src/main/res/layout/cpp_app_button_8.xml b/app/src/main/res/layout/cpp_app_button_8.xml index e6814105..cdf0d2a5 100644 --- a/app/src/main/res/layout/cpp_app_button_8.xml +++ b/app/src/main/res/layout/cpp_app_button_8.xml @@ -29,7 +29,6 @@ a:id="@id/cpp_button_8" style="?attr/cpp_button_style_digit" a:text="8" - c:directionTextScale="0.5;0.5;0.5;0.33" c:textDown="lg" c:textLeft="0d:" c:textUp="ln" diff --git a/app/src/main/res/layout/cpp_app_button_9.xml b/app/src/main/res/layout/cpp_app_button_9.xml index aa3784d0..30ebadd3 100644 --- a/app/src/main/res/layout/cpp_app_button_9.xml +++ b/app/src/main/res/layout/cpp_app_button_9.xml @@ -29,7 +29,6 @@ a:id="@id/cpp_button_9" style="?attr/cpp_button_style_digit" a:text="9" - c:directionTextScale="0.5;0.5;0.5;0.33" c:textDown="e" c:textLeft="0x:" c:textUp="π" diff --git a/app/src/main/res/layout/cpp_app_button_copy.xml b/app/src/main/res/layout/cpp_app_button_copy.xml index b164ce21..e0ab4c8a 100644 --- a/app/src/main/res/layout/cpp_app_button_copy.xml +++ b/app/src/main/res/layout/cpp_app_button_copy.xml @@ -26,4 +26,4 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_copy" style="?attr/cpp_button_style_control_image" - a:src="@drawable/kb_copy" /> \ No newline at end of file + a:src="@drawable/ic_content_copy_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_division.xml b/app/src/main/res/layout/cpp_app_button_division.xml index c1d00a28..7494653e 100644 --- a/app/src/main/res/layout/cpp_app_button_division.xml +++ b/app/src/main/res/layout/cpp_app_button_division.xml @@ -29,7 +29,6 @@ a:id="@id/cpp_button_division" style="?attr/cpp_button_style_operation" a:text="/" - c:directionTextScale="0.5" c:textDown="√" c:textUp="%" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_donate.xml b/app/src/main/res/layout/cpp_app_button_donate.xml index b2e8de63..ad6764f7 100644 --- a/app/src/main/res/layout/cpp_app_button_donate.xml +++ b/app/src/main/res/layout/cpp_app_button_donate.xml @@ -26,4 +26,4 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_like" style="?attr/cpp_button_style_control_image" - a:src="@drawable/kb_share" /> \ No newline at end of file + a:src="@drawable/ic_share_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_dot.xml b/app/src/main/res/layout/cpp_app_button_dot.xml index f280f186..53267b22 100644 --- a/app/src/main/res/layout/cpp_app_button_dot.xml +++ b/app/src/main/res/layout/cpp_app_button_dot.xml @@ -29,6 +29,5 @@ a:id="@id/cpp_button_period" style="?attr/cpp_button_style_digit" a:text="." - c:directionTextScale="0.5" c:textUp="," tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_equals.xml b/app/src/main/res/layout/cpp_app_button_equals.xml index b96040ce..5586d57b 100644 --- a/app/src/main/res/layout/cpp_app_button_equals.xml +++ b/app/src/main/res/layout/cpp_app_button_equals.xml @@ -28,7 +28,6 @@ a:id="@id/cpp_button_equals" style="?attr/cpp_button_style_control" a:text="=" - c:directionTextScale="0.5;0.5;0.33;0.5" c:textDown="@string/cpp_plot_button_text" c:textUp="≡" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_equals_no_bg.xml b/app/src/main/res/layout/cpp_app_button_equals_no_bg.xml index a658493c..71b986e3 100644 --- a/app/src/main/res/layout/cpp_app_button_equals_no_bg.xml +++ b/app/src/main/res/layout/cpp_app_button_equals_no_bg.xml @@ -31,7 +31,6 @@ a:text="=" a:textColor="?android:attr/textColorPrimary" c:directionTextColor="?android:attr/textColorPrimary" - c:directionTextScale="0.5;0.5;0.33;0.5" c:textDown="@string/cpp_plot_button_text" c:textUp="≡" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_erase.xml b/app/src/main/res/layout/cpp_app_button_erase.xml index 01970bc8..83d5f3ff 100644 --- a/app/src/main/res/layout/cpp_app_button_erase.xml +++ b/app/src/main/res/layout/cpp_app_button_erase.xml @@ -26,4 +26,4 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_erase" style="?attr/cpp_button_style_control_image" - a:src="@drawable/kb_erase" /> \ No newline at end of file + a:src="@drawable/ic_backspace_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_functions.xml b/app/src/main/res/layout/cpp_app_button_functions.xml index 9a27be77..968a76e8 100644 --- a/app/src/main/res/layout/cpp_app_button_functions.xml +++ b/app/src/main/res/layout/cpp_app_button_functions.xml @@ -28,8 +28,7 @@ xmlns:tools="http://schemas.android.com/tools" a:id="@id/cpp_button_functions" style="?attr/cpp_button_style_control" - a:text="ƒ(x)" + a:text="@string/cpp_kb_functions" a:textStyle="italic" - c:directionTextScale="0.4" c:textUp="+ƒ" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_history.xml b/app/src/main/res/layout/cpp_app_button_history.xml index f2a4db27..034294e9 100644 --- a/app/src/main/res/layout/cpp_app_button_history.xml +++ b/app/src/main/res/layout/cpp_app_button_history.xml @@ -28,6 +28,5 @@ style="?attr/cpp_button_style_control" a:text="@string/c_history_button" a:textStyle="bold" - c:directionTextScale="0.27" - c:textDown="@string/c_redo" - c:textUp="@string/c_undo" /> \ No newline at end of file + c:textDown="@string/cpp_kb_redo" + c:textUp="@string/cpp_kb_undo" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_left.xml b/app/src/main/res/layout/cpp_app_button_left.xml index 70c41924..ef38f5c3 100644 --- a/app/src/main/res/layout/cpp_app_button_left.xml +++ b/app/src/main/res/layout/cpp_app_button_left.xml @@ -29,6 +29,5 @@ a:id="@id/cpp_button_left" style="?attr/cpp_button_style_control" a:text="◁" - c:directionTextScale="0.5" c:textUp="◁◁" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_minus.xml b/app/src/main/res/layout/cpp_app_button_minus.xml index f363797d..4f9876e1 100644 --- a/app/src/main/res/layout/cpp_app_button_minus.xml +++ b/app/src/main/res/layout/cpp_app_button_minus.xml @@ -28,6 +28,5 @@ a:id="@id/cpp_button_subtraction" style="?attr/cpp_button_style_operation" a:text="−" - c:directionTextScale="0.4" - c:textDown="∂,…" + c:textDown="@string/cpp_kb_operators" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_multiplication.xml b/app/src/main/res/layout/cpp_app_button_multiplication.xml index f9a84853..bedf4fe5 100644 --- a/app/src/main/res/layout/cpp_app_button_multiplication.xml +++ b/app/src/main/res/layout/cpp_app_button_multiplication.xml @@ -29,7 +29,6 @@ a:id="@id/cpp_button_multiplication" style="?attr/cpp_button_style_operation" a:text="×" - c:directionTextScale="0.5" c:textDown="^2" c:textLeft="Π" c:textUp="^" diff --git a/app/src/main/res/layout/cpp_app_button_operators.xml b/app/src/main/res/layout/cpp_app_button_operators.xml index a2e4d85d..ee8775c5 100644 --- a/app/src/main/res/layout/cpp_app_button_operators.xml +++ b/app/src/main/res/layout/cpp_app_button_operators.xml @@ -27,5 +27,5 @@ xmlns:tools="http://schemas.android.com/tools" a:id="@id/cpp_button_operators" style="?attr/cpp_button_style_control" - a:text="∂,…" + a:text="@string/cpp_kb_operators" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_paste.xml b/app/src/main/res/layout/cpp_app_button_paste.xml index 20fe3060..055fe940 100644 --- a/app/src/main/res/layout/cpp_app_button_paste.xml +++ b/app/src/main/res/layout/cpp_app_button_paste.xml @@ -26,4 +26,4 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_paste" style="?attr/cpp_button_style_control_image" - a:src="@drawable/kb_paste" /> \ No newline at end of file + a:src="@drawable/ic_content_paste_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_plus.xml b/app/src/main/res/layout/cpp_app_button_plus.xml index d80428c1..179072e1 100644 --- a/app/src/main/res/layout/cpp_app_button_plus.xml +++ b/app/src/main/res/layout/cpp_app_button_plus.xml @@ -28,7 +28,6 @@ a:id="@id/cpp_button_plus" style="?attr/cpp_button_style_operation" a:text="+" - c:directionTextScale="0.5" c:textDown="E" c:textUp="°" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_right.xml b/app/src/main/res/layout/cpp_app_button_right.xml index 97239c45..bd76697e 100644 --- a/app/src/main/res/layout/cpp_app_button_right.xml +++ b/app/src/main/res/layout/cpp_app_button_right.xml @@ -29,6 +29,5 @@ a:id="@id/cpp_button_right" style="?attr/cpp_button_style_control" a:text="▷" - c:directionTextScale="0.5" c:textUp="▷▷" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_app_button_round_brackets.xml b/app/src/main/res/layout/cpp_app_button_round_brackets.xml index 8776b6e7..fc881291 100644 --- a/app/src/main/res/layout/cpp_app_button_round_brackets.xml +++ b/app/src/main/res/layout/cpp_app_button_round_brackets.xml @@ -29,7 +29,6 @@ a:id="@id/cpp_button_round_brackets" style="?attr/cpp_button_style_digit" a:text="( )" - c:directionTextScale="0.5;0.5;0.5;0.33" c:textDown=")" c:textLeft="(…)" c:textUp="(" diff --git a/app/src/main/res/layout/cpp_app_button_vars.xml b/app/src/main/res/layout/cpp_app_button_vars.xml index 33474a08..742089fe 100644 --- a/app/src/main/res/layout/cpp_app_button_vars.xml +++ b/app/src/main/res/layout/cpp_app_button_vars.xml @@ -28,8 +28,7 @@ xmlns:tools="http://schemas.android.com/tools" a:id="@id/cpp_button_vars" style="?attr/cpp_button_style_control" - a:text="π,…" + a:text="@string/cpp_kb_variables" a:textStyle="italic" - c:directionTextScale="0.4" c:textUp="+π" tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_plot_function_list_item.xml b/app/src/main/res/layout/cpp_plot_function_list_item.xml index 43e0b736..0339188f 100644 --- a/app/src/main/res/layout/cpp_plot_function_list_item.xml +++ b/app/src/main/res/layout/cpp_plot_function_list_item.xml @@ -53,6 +53,6 @@ a:paddingBottom="0dp" a:paddingTop="0dp" a:scaleType="centerInside" - a:src="@drawable/kb_settings" /> + a:src="@drawable/ic_settings_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_copy.xml b/app/src/main/res/layout/cpp_simple_button_copy.xml index c10119a7..84dae55e 100644 --- a/app/src/main/res/layout/cpp_simple_button_copy.xml +++ b/app/src/main/res/layout/cpp_simple_button_copy.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_copy" style="@style/CppKeyboardButton.Metro.Simple.Control.Image" a:contentDescription="Copy" - a:src="@drawable/kb_copy" /> \ No newline at end of file + a:src="@drawable/ic_content_copy_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_copy_material.xml b/app/src/main/res/layout/cpp_simple_button_copy_material.xml index c6731110..e57b7813 100644 --- a/app/src/main/res/layout/cpp_simple_button_copy_material.xml +++ b/app/src/main/res/layout/cpp_simple_button_copy_material.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_copy" style="@style/CppKeyboardButton.Material.Simple.Control.Image" a:contentDescription="Copy" - a:src="@drawable/kb_copy" /> \ No newline at end of file + a:src="@drawable/ic_content_copy_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_copy_material_light.xml b/app/src/main/res/layout/cpp_simple_button_copy_material_light.xml index 38b2cdd9..b9a1c838 100644 --- a/app/src/main/res/layout/cpp_simple_button_copy_material_light.xml +++ b/app/src/main/res/layout/cpp_simple_button_copy_material_light.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_copy" style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image" a:contentDescription="Copy" - a:src="@drawable/kb_copy" /> \ No newline at end of file + a:src="@drawable/ic_content_copy_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_erase.xml b/app/src/main/res/layout/cpp_simple_button_erase.xml index e1bc6109..ff6964e8 100644 --- a/app/src/main/res/layout/cpp_simple_button_erase.xml +++ b/app/src/main/res/layout/cpp_simple_button_erase.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_erase" style="@style/CppKeyboardButton.Metro.Simple.Control.Image" a:contentDescription="Erase" - a:src="@drawable/kb_erase" /> \ No newline at end of file + a:src="@drawable/ic_backspace_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_erase_material.xml b/app/src/main/res/layout/cpp_simple_button_erase_material.xml index f6ea69b3..be559021 100644 --- a/app/src/main/res/layout/cpp_simple_button_erase_material.xml +++ b/app/src/main/res/layout/cpp_simple_button_erase_material.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_erase" style="@style/CppKeyboardButton.Material.Simple.Control.Image" a:contentDescription="Erase" - a:src="@drawable/kb_erase" /> \ No newline at end of file + a:src="@drawable/ic_backspace_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_erase_material_light.xml b/app/src/main/res/layout/cpp_simple_button_erase_material_light.xml index 0e89af3b..6431333b 100644 --- a/app/src/main/res/layout/cpp_simple_button_erase_material_light.xml +++ b/app/src/main/res/layout/cpp_simple_button_erase_material_light.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_erase" style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image" a:contentDescription="Erase" - a:src="@drawable/kb_erase" /> \ No newline at end of file + a:src="@drawable/ic_backspace_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_functions.xml b/app/src/main/res/layout/cpp_simple_button_functions.xml index 53f761be..9af56204 100644 --- a/app/src/main/res/layout/cpp_simple_button_functions.xml +++ b/app/src/main/res/layout/cpp_simple_button_functions.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_functions" style="@style/CppKeyboardButton.Metro.Simple.Control" - a:text="ƒ(x)" + a:text="@string/cpp_kb_functions" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_functions_material.xml b/app/src/main/res/layout/cpp_simple_button_functions_material.xml index 6bc5e409..7ae1f81a 100644 --- a/app/src/main/res/layout/cpp_simple_button_functions_material.xml +++ b/app/src/main/res/layout/cpp_simple_button_functions_material.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_functions" style="@style/CppKeyboardButton.Material.Simple.Control" - a:text="ƒ(x)" + a:text="@string/cpp_kb_functions" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_functions_material_light.xml b/app/src/main/res/layout/cpp_simple_button_functions_material_light.xml index 110cbf9e..37a1b652 100644 --- a/app/src/main/res/layout/cpp_simple_button_functions_material_light.xml +++ b/app/src/main/res/layout/cpp_simple_button_functions_material_light.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_functions" style="@style/CppKeyboardButton.Material.Light.Simple.Control" - a:text="ƒ(x)" + a:text="@string/cpp_kb_functions" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_operators.xml b/app/src/main/res/layout/cpp_simple_button_operators.xml index 010ebfed..de62d8db 100644 --- a/app/src/main/res/layout/cpp_simple_button_operators.xml +++ b/app/src/main/res/layout/cpp_simple_button_operators.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_operators" style="@style/CppKeyboardButton.Metro.Simple.Control" - a:text="∂,…" + a:text="@string/cpp_kb_operators" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_operators_material.xml b/app/src/main/res/layout/cpp_simple_button_operators_material.xml index 62b65bd8..6ac88602 100644 --- a/app/src/main/res/layout/cpp_simple_button_operators_material.xml +++ b/app/src/main/res/layout/cpp_simple_button_operators_material.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_operators" style="@style/CppKeyboardButton.Material.Simple.Control" - a:text="∂,…" + a:text="@string/cpp_kb_operators" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_operators_material_light.xml b/app/src/main/res/layout/cpp_simple_button_operators_material_light.xml index af5ec293..2f63c99b 100644 --- a/app/src/main/res/layout/cpp_simple_button_operators_material_light.xml +++ b/app/src/main/res/layout/cpp_simple_button_operators_material_light.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_operators" style="@style/CppKeyboardButton.Material.Light.Simple.Control" - a:text="∂,…" + a:text="@string/cpp_kb_operators" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_paste.xml b/app/src/main/res/layout/cpp_simple_button_paste.xml index 826ecc73..6445637c 100644 --- a/app/src/main/res/layout/cpp_simple_button_paste.xml +++ b/app/src/main/res/layout/cpp_simple_button_paste.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_paste" style="@style/CppKeyboardButton.Metro.Simple.Control.Image" a:contentDescription="Paste" - a:src="@drawable/kb_paste" /> \ No newline at end of file + a:src="@drawable/ic_content_paste_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_paste_material.xml b/app/src/main/res/layout/cpp_simple_button_paste_material.xml index d7edb9e3..d546bdc0 100644 --- a/app/src/main/res/layout/cpp_simple_button_paste_material.xml +++ b/app/src/main/res/layout/cpp_simple_button_paste_material.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_paste" style="@style/CppKeyboardButton.Material.Simple.Control.Image" a:contentDescription="Paste" - a:src="@drawable/kb_paste" /> \ No newline at end of file + a:src="@drawable/ic_content_paste_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_paste_material_light.xml b/app/src/main/res/layout/cpp_simple_button_paste_material_light.xml index 70de0ccc..6578ec8e 100644 --- a/app/src/main/res/layout/cpp_simple_button_paste_material_light.xml +++ b/app/src/main/res/layout/cpp_simple_button_paste_material_light.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_paste" style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image" a:contentDescription="Paste" - a:src="@drawable/kb_paste" /> \ No newline at end of file + a:src="@drawable/ic_content_paste_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_settings.xml b/app/src/main/res/layout/cpp_simple_button_settings.xml index 9a7d66d1..8acfe857 100644 --- a/app/src/main/res/layout/cpp_simple_button_settings.xml +++ b/app/src/main/res/layout/cpp_simple_button_settings.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_settings" style="@style/CppKeyboardButton.Metro.Simple.Control.Image" a:contentDescription="Settings" - a:src="@drawable/kb_settings" /> \ No newline at end of file + a:src="@drawable/ic_settings_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_settings_material.xml b/app/src/main/res/layout/cpp_simple_button_settings_material.xml index 2bb99520..ef1406e3 100644 --- a/app/src/main/res/layout/cpp_simple_button_settings_material.xml +++ b/app/src/main/res/layout/cpp_simple_button_settings_material.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_settings" style="@style/CppKeyboardButton.Material.Simple.Control.Image" a:contentDescription="Settings" - a:src="@drawable/kb_settings" /> \ No newline at end of file + a:src="@drawable/ic_settings_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_settings_material_light.xml b/app/src/main/res/layout/cpp_simple_button_settings_material_light.xml index eb672718..ba59bb64 100644 --- a/app/src/main/res/layout/cpp_simple_button_settings_material_light.xml +++ b/app/src/main/res/layout/cpp_simple_button_settings_material_light.xml @@ -27,4 +27,4 @@ a:id="@id/cpp_button_settings" style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image" a:contentDescription="Settings" - a:src="@drawable/kb_settings" /> \ No newline at end of file + a:src="@drawable/ic_settings_white_48dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_vars.xml b/app/src/main/res/layout/cpp_simple_button_vars.xml index 1aa33392..94b86d47 100644 --- a/app/src/main/res/layout/cpp_simple_button_vars.xml +++ b/app/src/main/res/layout/cpp_simple_button_vars.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_vars" style="@style/CppKeyboardButton.Metro.Simple.Control" - a:text="π,…" + a:text="@string/cpp_kb_variables" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_vars_material.xml b/app/src/main/res/layout/cpp_simple_button_vars_material.xml index 7ef9f820..bdf3f73d 100644 --- a/app/src/main/res/layout/cpp_simple_button_vars_material.xml +++ b/app/src/main/res/layout/cpp_simple_button_vars_material.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_vars" style="@style/CppKeyboardButton.Material.Simple.Control" - a:text="π,…" + a:text="@string/cpp_kb_variables" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_simple_button_vars_material_light.xml b/app/src/main/res/layout/cpp_simple_button_vars_material_light.xml index b70379f8..ab353a9a 100644 --- a/app/src/main/res/layout/cpp_simple_button_vars_material_light.xml +++ b/app/src/main/res/layout/cpp_simple_button_vars_material_light.xml @@ -26,5 +26,5 @@ xmlns:a="http://schemas.android.com/apk/res/android" a:id="@id/cpp_button_vars" style="@style/CppKeyboardButton.Material.Light.Simple.Control" - a:text="π,…" + a:text="@string/cpp_kb_variables" a:textStyle="italic" /> \ No newline at end of file diff --git a/app/src/main/res/layout/cpp_wizard_step_choose_mode.xml b/app/src/main/res/layout/cpp_wizard_step_choose_mode.xml index f1786256..00620e4b 100644 --- a/app/src/main/res/layout/cpp_wizard_step_choose_mode.xml +++ b/app/src/main/res/layout/cpp_wizard_step_choose_mode.xml @@ -23,7 +23,6 @@ --> + a:text="7" /> diff --git a/app/src/main/res/layout/onscreen_header.xml b/app/src/main/res/layout/onscreen_header.xml index 28c8511e..4db82398 100644 --- a/app/src/main/res/layout/onscreen_header.xml +++ b/app/src/main/res/layout/onscreen_header.xml @@ -13,17 +13,17 @@ + a:src="@drawable/ic_space_bar_white_24dp" /> + a:src="@drawable/ic_file_download_white_24dp" /> + a:src="@drawable/ic_close_white_24dp" /> diff --git a/app/src/main/res/layout/onscreen_header_material.xml b/app/src/main/res/layout/onscreen_header_material.xml index dbb3c943..fba0c19b 100644 --- a/app/src/main/res/layout/onscreen_header_material.xml +++ b/app/src/main/res/layout/onscreen_header_material.xml @@ -13,17 +13,17 @@ + a:src="@drawable/ic_space_bar_white_24dp" /> + a:src="@drawable/ic_file_download_white_24dp" /> + a:src="@drawable/ic_close_white_24dp" /> diff --git a/app/src/main/res/layout/onscreen_header_material_light.xml b/app/src/main/res/layout/onscreen_header_material_light.xml index a7b4d59c..625240f8 100644 --- a/app/src/main/res/layout/onscreen_header_material_light.xml +++ b/app/src/main/res/layout/onscreen_header_material_light.xml @@ -13,17 +13,17 @@ + a:src="@drawable/ic_space_bar_white_24dp" /> + a:src="@drawable/ic_file_download_white_24dp" /> + a:src="@drawable/ic_close_white_24dp" /> diff --git a/app/src/main/res/values-land/text_non_translatable.xml b/app/src/main/res/values-land/text_non_translatable.xml new file mode 100644 index 00000000..9d511ad9 --- /dev/null +++ b/app/src/main/res/values-land/text_non_translatable.xml @@ -0,0 +1,4 @@ + + + 0.4;0.4;0.4;0.35 + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a05da725..e1225bff 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -14,6 +14,7 @@ 20sp 30dp + 12dp 25sp 25sp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9ae2e4d8..b1e47964 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,6 +27,7 @@ - + @@ -53,7 +51,9 @@ @dimen/cpp_widget_keyboard_button_text_size - + @@ -80,9 +78,7 @@ diff --git a/app/src/main/res/values/theme_material_light.xml b/app/src/main/res/values/theme_material_light.xml index c68c2197..2d9f6f9f 100644 --- a/app/src/main/res/values/theme_material_light.xml +++ b/app/src/main/res/values/theme_material_light.xml @@ -31,9 +31,7 @@ @drawable/material_button_light_primary - + @@ -53,7 +51,9 @@ @dimen/cpp_widget_keyboard_button_text_size - + @@ -82,9 +77,7 @@ diff --git a/app/src/main/res/values/theme_metro_blue.xml b/app/src/main/res/values/theme_metro_blue.xml index d2e8d3fa..73971396 100644 --- a/app/src/main/res/values/theme_metro_blue.xml +++ b/app/src/main/res/values/theme_metro_blue.xml @@ -34,7 +34,7 @@ 30dp 30dp 0 - 0dp + 6dp @dimen/cpp_onscreen_header_button_text_size @drawable/metro_widget_button_light @@ -43,9 +43,7 @@ @drawable/metro_blue_button - + - + - + - +