From 47075b0c104ecb31f422d381456fbb900f2f5efa Mon Sep 17 00:00:00 2001 From: serso Date: Sun, 7 Feb 2016 20:18:37 +0100 Subject: [PATCH] Keyboard styles --- app/misc/libs/drag-button-1.1.aar | Bin 23037 -> 23564 bytes .../FloatingCalculatorKeyboard.java | 16 +-- .../calculator/keyboard/BaseKeyboardUi.java | 18 +++ .../keyboard/PartialKeyboardUi.java | 5 +- .../variables/GreekFloatingKeyboard.java | 12 +- .../org/solovyev/android/views/Adjuster.java | 109 ++++++++++++++++++ ...24dp.png => ic_backspace_grey300_24dp.png} | Bin .../drawable-hdpi/ic_backspace_white_48dp.png | Bin 0 -> 543 bytes .../res/drawable-hdpi/ic_close_white_24dp.png | Bin 0 -> 221 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 266 bytes .../ic_content_paste_white_48dp.png | Bin 0 -> 340 bytes ...hite_24dp.png => ic_done_grey300_24dp.png} | Bin .../ic_file_download_white_24dp.png | Bin 0 -> 163 bytes ..._24dp.png => ic_keyboard_grey300_24dp.png} | Bin .../drawable-hdpi/ic_save_grey600_48dp.png | Bin 493 -> 0 bytes .../drawable-hdpi/ic_settings_white_48dp.png | Bin 0 -> 843 bytes .../res/drawable-hdpi/ic_share_white_48dp.png | Bin 0 -> 698 bytes .../ic_space_bar_grey300_24dp.png | Bin 0 -> 188 bytes .../drawable-hdpi/ic_space_bar_white_24dp.png | Bin 188 -> 114 bytes app/src/main/res/drawable-hdpi/kb_copy.png | Bin 424 -> 0 bytes app/src/main/res/drawable-hdpi/kb_erase.png | Bin 1156 -> 0 bytes app/src/main/res/drawable-hdpi/kb_paste.png | Bin 593 -> 0 bytes .../main/res/drawable-hdpi/kb_settings.png | Bin 601 -> 0 bytes app/src/main/res/drawable-hdpi/kb_share.png | Bin 896 -> 0 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 264 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 187 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 327 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 521 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 722 bytes ...24dp.png => ic_backspace_grey300_24dp.png} | Bin .../drawable-mdpi/ic_backspace_white_48dp.png | Bin 0 -> 392 bytes .../res/drawable-mdpi/ic_close_white_24dp.png | Bin 0 -> 175 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 188 bytes .../ic_content_paste_white_48dp.png | Bin 0 -> 244 bytes ...hite_24dp.png => ic_done_grey300_24dp.png} | Bin .../ic_file_download_white_24dp.png | Bin 0 -> 116 bytes ..._24dp.png => ic_keyboard_grey300_24dp.png} | Bin .../drawable-mdpi/ic_save_grey600_48dp.png | Bin 385 -> 0 bytes .../drawable-mdpi/ic_settings_white_48dp.png | Bin 0 -> 562 bytes .../res/drawable-mdpi/ic_share_white_48dp.png | Bin 0 -> 496 bytes .../ic_space_bar_grey300_24dp.png | Bin 0 -> 147 bytes .../drawable-mdpi/ic_space_bar_white_24dp.png | Bin 147 -> 86 bytes app/src/main/res/drawable-mdpi/kb_copy.png | Bin 361 -> 0 bytes app/src/main/res/drawable-mdpi/kb_erase.png | Bin 668 -> 0 bytes app/src/main/res/drawable-mdpi/kb_paste.png | Bin 511 -> 0 bytes .../main/res/drawable-mdpi/kb_settings.png | Bin 532 -> 0 bytes app/src/main/res/drawable-mdpi/kb_share.png | Bin 610 -> 0 bytes .../cpp_onscreen_button_close.png | Bin 157 -> 0 bytes .../cpp_onscreen_button_fold.png | Bin 113 -> 0 bytes .../cpp_onscreen_button_minimize.png | Bin 285 -> 0 bytes ...24dp.png => ic_backspace_grey300_24dp.png} | Bin .../ic_backspace_white_48dp.png | Bin 0 -> 724 bytes .../drawable-xhdpi/ic_close_white_24dp.png | Bin 0 -> 257 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 329 bytes .../ic_content_paste_white_48dp.png | Bin 0 -> 460 bytes ...hite_24dp.png => ic_done_grey300_24dp.png} | Bin .../ic_file_download_white_24dp.png | Bin 0 -> 157 bytes ..._24dp.png => ic_keyboard_grey300_24dp.png} | Bin .../drawable-xhdpi/ic_save_grey600_48dp.png | Bin 652 -> 0 bytes .../drawable-xhdpi/ic_settings_white_48dp.png | Bin 0 -> 1074 bytes .../drawable-xhdpi/ic_share_white_48dp.png | Bin 0 -> 938 bytes .../ic_space_bar_grey300_24dp.png | Bin 0 -> 176 bytes .../ic_space_bar_white_24dp.png | Bin 176 -> 95 bytes app/src/main/res/drawable-xhdpi/kb_copy.png | Bin 357 -> 0 bytes app/src/main/res/drawable-xhdpi/kb_erase.png | Bin 1552 -> 0 bytes app/src/main/res/drawable-xhdpi/kb_paste.png | Bin 544 -> 0 bytes .../main/res/drawable-xhdpi/kb_settings.png | Bin 461 -> 0 bytes app/src/main/res/drawable-xhdpi/kb_share.png | Bin 1150 -> 0 bytes ...24dp.png => ic_backspace_grey300_24dp.png} | Bin .../ic_backspace_white_48dp.png | Bin 0 -> 1023 bytes .../drawable-xxhdpi/ic_close_white_24dp.png | Bin 0 -> 347 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 524 bytes .../ic_content_paste_white_48dp.png | Bin 0 -> 703 bytes ...hite_24dp.png => ic_done_grey300_24dp.png} | Bin .../ic_file_download_white_24dp.png | Bin 0 -> 197 bytes ..._24dp.png => ic_keyboard_grey300_24dp.png} | Bin .../drawable-xxhdpi/ic_save_grey600_48dp.png | Bin 940 -> 0 bytes .../ic_settings_white_48dp.png | Bin 0 -> 1606 bytes .../drawable-xxhdpi/ic_share_white_48dp.png | Bin 0 -> 1356 bytes .../ic_space_bar_grey300_24dp.png | Bin 0 -> 186 bytes .../ic_space_bar_white_24dp.png | Bin 186 -> 99 bytes ...24dp.png => ic_backspace_grey300_24dp.png} | Bin .../ic_backspace_white_48dp.png | Bin 0 -> 1392 bytes .../drawable-xxxhdpi/ic_close_white_24dp.png | Bin 0 -> 436 bytes .../ic_content_copy_white_48dp.png | Bin 0 -> 727 bytes .../ic_content_paste_white_48dp.png | Bin 0 -> 994 bytes ...hite_24dp.png => ic_done_grey300_24dp.png} | Bin .../ic_file_download_white_24dp.png | Bin 0 -> 233 bytes ..._24dp.png => ic_keyboard_grey300_24dp.png} | Bin .../ic_settings_white_48dp.png | Bin 0 -> 2248 bytes .../drawable-xxxhdpi/ic_share_white_48dp.png | Bin 0 -> 1973 bytes .../ic_space_bar_grey300_24dp.png | Bin 0 -> 198 bytes .../ic_space_bar_white_24dp.png | Bin 198 -> 96 bytes app/src/main/res/layout/cpp_app_button_0.xml | 1 - app/src/main/res/layout/cpp_app_button_6.xml | 1 - app/src/main/res/layout/cpp_app_button_7.xml | 1 - app/src/main/res/layout/cpp_app_button_8.xml | 1 - app/src/main/res/layout/cpp_app_button_9.xml | 1 - .../main/res/layout/cpp_app_button_copy.xml | 2 +- .../res/layout/cpp_app_button_division.xml | 1 - .../main/res/layout/cpp_app_button_donate.xml | 2 +- .../main/res/layout/cpp_app_button_dot.xml | 1 - .../main/res/layout/cpp_app_button_equals.xml | 1 - .../layout/cpp_app_button_equals_no_bg.xml | 1 - .../main/res/layout/cpp_app_button_erase.xml | 2 +- .../res/layout/cpp_app_button_functions.xml | 3 +- .../res/layout/cpp_app_button_history.xml | 5 +- .../main/res/layout/cpp_app_button_left.xml | 1 - .../main/res/layout/cpp_app_button_minus.xml | 3 +- .../layout/cpp_app_button_multiplication.xml | 1 - .../res/layout/cpp_app_button_operators.xml | 2 +- .../main/res/layout/cpp_app_button_paste.xml | 2 +- .../main/res/layout/cpp_app_button_plus.xml | 1 - .../main/res/layout/cpp_app_button_right.xml | 1 - .../layout/cpp_app_button_round_brackets.xml | 1 - .../main/res/layout/cpp_app_button_vars.xml | 3 +- .../layout/cpp_plot_function_list_item.xml | 2 +- .../res/layout/cpp_simple_button_copy.xml | 2 +- .../cpp_simple_button_copy_material.xml | 2 +- .../cpp_simple_button_copy_material_light.xml | 2 +- .../res/layout/cpp_simple_button_erase.xml | 2 +- .../cpp_simple_button_erase_material.xml | 2 +- ...cpp_simple_button_erase_material_light.xml | 2 +- .../layout/cpp_simple_button_functions.xml | 2 +- .../cpp_simple_button_functions_material.xml | 2 +- ...simple_button_functions_material_light.xml | 2 +- .../layout/cpp_simple_button_operators.xml | 2 +- .../cpp_simple_button_operators_material.xml | 2 +- ...simple_button_operators_material_light.xml | 2 +- .../res/layout/cpp_simple_button_paste.xml | 2 +- .../cpp_simple_button_paste_material.xml | 2 +- ...cpp_simple_button_paste_material_light.xml | 2 +- .../res/layout/cpp_simple_button_settings.xml | 2 +- .../cpp_simple_button_settings_material.xml | 2 +- ..._simple_button_settings_material_light.xml | 2 +- .../res/layout/cpp_simple_button_vars.xml | 2 +- .../cpp_simple_button_vars_material.xml | 2 +- .../cpp_simple_button_vars_material_light.xml | 2 +- .../layout/cpp_wizard_step_choose_mode.xml | 4 +- .../layout/cpp_wizard_step_drag_button.xml | 1 - app/src/main/res/layout/onscreen_header.xml | 6 +- .../res/layout/onscreen_header_material.xml | 6 +- .../layout/onscreen_header_material_light.xml | 6 +- .../res/values-land/text_non_translatable.xml | 4 + app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/styles.xml | 2 + .../main/res/values/text_non_translatable.xml | 9 ++ app/src/main/res/values/theme_material.xml | 18 ++- .../main/res/values/theme_material_light.xml | 25 ++-- app/src/main/res/values/theme_metro_blue.xml | 7 +- app/src/main/res/values/theme_old_blue.xml | 4 +- app/src/main/res/values/theme_old_gray.xml | 4 +- app/src/main/res/values/theme_old_violet.xml | 4 +- 153 files changed, 225 insertions(+), 118 deletions(-) create mode 100644 app/src/main/java/org/solovyev/android/views/Adjuster.java rename app/src/main/res/drawable-hdpi/{ic_backspace_white_24dp.png => ic_backspace_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-hdpi/ic_backspace_white_48dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_close_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_content_paste_white_48dp.png rename app/src/main/res/drawable-hdpi/{ic_done_white_24dp.png => ic_done_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png rename app/src/main/res/drawable-hdpi/{ic_keyboard_white_24dp.png => ic_keyboard_grey300_24dp.png} (100%) delete mode 100644 app/src/main/res/drawable-hdpi/ic_save_grey600_48dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_settings_white_48dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_share_white_48dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_space_bar_grey300_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/kb_copy.png delete mode 100644 app/src/main/res/drawable-hdpi/kb_erase.png delete mode 100644 app/src/main/res/drawable-hdpi/kb_paste.png delete mode 100644 app/src/main/res/drawable-hdpi/kb_settings.png delete mode 100644 app/src/main/res/drawable-hdpi/kb_share.png create mode 100644 app/src/main/res/drawable-ldrtl-hdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-ldrtl-mdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-ldrtl-xhdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-ldrtl-xxhdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-ldrtl-xxxhdpi/ic_content_copy_white_48dp.png rename app/src/main/res/drawable-mdpi/{ic_backspace_white_24dp.png => ic_backspace_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-mdpi/ic_backspace_white_48dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_close_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_content_paste_white_48dp.png rename app/src/main/res/drawable-mdpi/{ic_done_white_24dp.png => ic_done_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png rename app/src/main/res/drawable-mdpi/{ic_keyboard_white_24dp.png => ic_keyboard_grey300_24dp.png} (100%) delete mode 100644 app/src/main/res/drawable-mdpi/ic_save_grey600_48dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_settings_white_48dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_share_white_48dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_space_bar_grey300_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/kb_copy.png delete mode 100644 app/src/main/res/drawable-mdpi/kb_erase.png delete mode 100644 app/src/main/res/drawable-mdpi/kb_paste.png delete mode 100644 app/src/main/res/drawable-mdpi/kb_settings.png delete mode 100644 app/src/main/res/drawable-mdpi/kb_share.png delete mode 100644 app/src/main/res/drawable-nodpi/cpp_onscreen_button_close.png delete mode 100644 app/src/main/res/drawable-nodpi/cpp_onscreen_button_fold.png delete mode 100644 app/src/main/res/drawable-nodpi/cpp_onscreen_button_minimize.png rename app/src/main/res/drawable-xhdpi/{ic_backspace_white_24dp.png => ic_backspace_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-xhdpi/ic_backspace_white_48dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_content_paste_white_48dp.png rename app/src/main/res/drawable-xhdpi/{ic_done_white_24dp.png => ic_done_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png rename app/src/main/res/drawable-xhdpi/{ic_keyboard_white_24dp.png => ic_keyboard_grey300_24dp.png} (100%) delete mode 100644 app/src/main/res/drawable-xhdpi/ic_save_grey600_48dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_settings_white_48dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_share_white_48dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_space_bar_grey300_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/kb_copy.png delete mode 100644 app/src/main/res/drawable-xhdpi/kb_erase.png delete mode 100644 app/src/main/res/drawable-xhdpi/kb_paste.png delete mode 100644 app/src/main/res/drawable-xhdpi/kb_settings.png delete mode 100644 app/src/main/res/drawable-xhdpi/kb_share.png rename app/src/main/res/drawable-xxhdpi/{ic_backspace_white_24dp.png => ic_backspace_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_backspace_white_48dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_content_paste_white_48dp.png rename app/src/main/res/drawable-xxhdpi/{ic_done_white_24dp.png => ic_done_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png rename app/src/main/res/drawable-xxhdpi/{ic_keyboard_white_24dp.png => ic_keyboard_grey300_24dp.png} (100%) delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_save_grey600_48dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings_white_48dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_white_48dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_space_bar_grey300_24dp.png rename app/src/main/res/drawable-xxxhdpi/{ic_backspace_white_24dp.png => ic_backspace_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_backspace_white_48dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_content_copy_white_48dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_content_paste_white_48dp.png rename app/src/main/res/drawable-xxxhdpi/{ic_done_white_24dp.png => ic_done_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png rename app/src/main/res/drawable-xxxhdpi/{ic_keyboard_white_24dp.png => ic_keyboard_grey300_24dp.png} (100%) create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_settings_white_48dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_share_white_48dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_space_bar_grey300_24dp.png create mode 100644 app/src/main/res/values-land/text_non_translatable.xml create mode 100644 app/src/main/res/values/text_non_translatable.xml diff --git a/app/misc/libs/drag-button-1.1.aar b/app/misc/libs/drag-button-1.1.aar index 04ed325e3b0179ec4e43084e921fc0ce632a9b91..7f27c42e68bbdf6d53d1646bbae2f7935788badc 100644 GIT binary patch delta 22271 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

#d6@G=X4tQqfNLs$V8)yisYxk|;Ylwf zKQMM9+mQXG0A)D6=wLv>y)X{b)+l-~to8b&GSk0=I?J z=onUo{~JX2h)n*Toic76H|rZ(+x zqCgmdo;c)66ujC%7_2gGRkq{ov#aB@VG5uQ4SJ%uRmB6w<9=@>7*Sg00}_fVBaJec z&3Z8x_vOg16ie}s3Cc^kC#=-3!L{-n-o=PW6`EvmEgXt$X6|1a(iw^y*Er{`62qN_ z&Lr@{$XMrpSlh1v30c=DDk{ah(C^pu+1e1$;uId^742`=%IjAg+0c#pQ;ASVU5nLl zFFFebu**q>>a1qStUhY}KWt7{QnP}tXG5+Y#zILOW5M5ch_|t5n`#%hfK!a#XVv9y zy~&Ka0t!H5?p2wy?XUGzim`RsB9QfEVkBS?+8>mEd6;>@OyFPrY?$O-@CYGScYms_ zR!h`eeF`H~Jx_W0{J_y_5kiqFpp(U^)H^rR@CzAwIGM=H+KaM_b!zzh7ul~9%564D zyg1@%m8%kgW2oeiyM&6Ui40663gyr+^YXjIw^)Oy`t~yxTrf)^`dDiJM%>CR{w3}& z#GC$qE#iv*XR>-KChpE6hR%lnjD{u+X{U7+)UTRLjo89OacM|d(EQdx2O&TagVdT( zChH)p>;^ZOrCti&qM|*idLlr4yift%dZh=}TBFWP&`hGQ2UftJV9>sXlqZ&y16GlO z<+yw5b;@n}vxw&S+VATHrpLm2D;9s_h@K4>Gl%ZVynnb)1oxza+R{ol9Cb}$az+`!Axn^BXZ0)J5^O>%@h`Y zOIfC5AUMV^)_MEqW9QZBZqar2N`l+p%*~&j6X! z+IZ>UX~u_%8VNQk-P8poZnLvUt%4>EQ5ICMv}q1Rsdg1jwMa4UN~Av6>0hYD4HGk) z!A#0aq%d0=OG}s`kYC>0yeqVd%SvxqHWq2N6edFn*u+j}s930WahNTF*17Qs%$VvTz2jVe} z;ArF@o5bYUhfRYA8$nEq6kTOR-Y*1mWr)}10J|)2)W19jlXC(=041N1;*nQU1mU*9i3trLJw#ykz!1MV$P7ebqTV9MMsWrtZKz;+ ze!9@?61+4i^c3=M>M47&WNB_6J^jA7FZu3?1)3T01h3on-LR-Ch=eV z?KbA+%|O&C^(jmgR%AoM8PX_xg9I#6h9~(MI&#AW|d!kE4-uZ|BO+X^98%neLvseHi<)>X`;^XOnwV0^)MC#4z6_T{eb^I zqt_`D1Ic~>0jVPW->AGW|Lb&C(UnILMCAirPmNmw(fZMQUE$4O=}pK6PM0SOZ2{(y zYfEvNZc=i8HHGdo^Kwx;OA&+cb`{6GwK^9Vj1Ag4dXe4re8uH<-Su0*&*vR}2Y7>s zG~UhE8;G_Y&<8**!AguPN<3ofA98+0vvXKJuDG(z_*vnZud*b#3D;DsZ6`W@Sb=V? z>7=c65n@ZX^Jr-tt#(D-tBM6VEl~|!JU0O!q`bg?)*DYJO~zihSpnJXu}Cqlq3N}; zy&KRt{Vq1lYCOWYVqz$fmW(Vodu&KK@_3=|bjr9=lrz-qy`1_--(X|`zI6QNMnr#< zaSSdcBDr6N$tY8k_3D(4}&?}q?cID)fGxBoQl2N8R zJUOAGph$~3d0~%2%A(%}xGe3p#u1Y(ir5&S)@l^L@R6)hv`v_Ex-XlR_7 zJF&cj`xV-S1O8qPMIYmz&c=b8uRroPZ`33_dUv;!b##vrhT1O7o8)aFUi#r1q5_*8Qv>8KRC$ZI9y2RX*)1}I;bVHgDayIlDESB1NOD7@Zt zaq_$K$n9j_OL5gNxCpssV;Jr)1;NLk8o?Ny?z3_8FNtyZ-L$)80)g)Nu=>5@op00# z3@rW2?l0{awRM?xjL#gOFX(!Q!z{?%m!iKBwtL-t+~I29>xTmG_@K6*3sR^A48}AC zD(J?zp!W3|nM?wyjz7aSl3|d4$-B(W#!!{%-)0RIx8iR~{A-oRE1-m>&p{mHYARP_ zlM~0wxq!v_NoE$arr^b#PE|Y)g1M1ZAB@?n$qGp_J$W%?O;dWmIt_~+%>`vBE-#s% zD`32;L28WOILqye7l4I(0E^&Z=6VCjM}#Ymm1{@cVsq-3)90b=RZk~>BwBLk^5r}( zd^VIaWWp6*W?+YR88X~f@jFlECF} zGgDhZx=aCAg=BXzW+IY@tNR`OO~r|)XA%^u0fSwcHCK}e&y}m7(61pkSz}LdkOTc) z!^ucwnMx16=Fu_>5ZYFM(nb6$S#p%+!cuBR)y^YA|1Efz6?|13J&Fl&j@O6E#CK0clP&;Hrgbjy?huZ@?}K z>67K9eIees6Vw?*bO}*URGGGo^sNHt39&?EILf&rm7YSn_J2x$k0or7G%XSrWxHJo zmJ^2%$=o=qS*ikV=!>#+mTM0d_@gFG;;AOO{7r!woCp}(1{~gg=a8UoS7nZun*Y87 z@A=?jW2@6{vJ#$9K#sdsWHx< z2yo$`MOGog{LzJfN(>9Z0#KRUx-4^52HEQI=svK<oO@|KRbrJb2RR^r9yez{g`Q7fLk)S@&Wy6& znLkURgRR>|4Rv>WB+~@9&k&1yj`{7TE?Ulc3RONkMiq=hkqUqOS-DKZzPSeLX8{PEM*Cz!`UHEL6nWvZ5fIv#th- z83Gf38u&R3{Y9YxxqBE}LC4xxlNL{+JKxI6$~MsxfZII9nc5rm^HteF1<1^X<+RPy z#uST>va)PQ54@I_`Ig0%Vg%cUK{wEHTVSVSE0h!)?=QTu0Z&>qwlYLRWnVD*)PT>D&(2>6oRetl zHj1l`9KT8iKshCxGUi?5ELipZ&}r*a^=@akZdlO=OA*ZzgmUIJw5UV_qbTYRKvHvm zdP7H814VS2cj0I;(nZ28@+Ff|hS}|kQ5^vlH}Hsd#>i+7`m=u~wbco#I>S>29MUm2 zu2Ab~=OQdri%+deEzUjF=-GQH*og@X%8+AJgtBJHn)Bp0!U_wphD9nZ-hqJa1hKY) zI87i0hmdgD;IN0hEXXDn-)|r_Co9E&Ee=`L<5qL9LVtONs@t5Dy1&GW1b!ilTC%Aq z-vQ0~*nc3XB7^teCr0VENi`6d;&PvBxYFr%xDFVJ7?KK(rB}?ypH1~(F!6C({mJ0@ z6=tE|HW*_RjB|A6Fh*>+m#{;5o*3T_KS?|_z6$~^z`^Efo;6}Ba2bOp62EwZbd80wpW8~brXX-yZq0ljj7M2NWy#id5U)7>i3g{fk zf6Az#3)+W1k+z@N)o}f7Fb&6lHUV-QjCWBAg>qiq7QWc!lC}m|S6A-}OmV5q($Yz( zxp!XD4=J5Ne{Ma4(8S8ZRp`ro3M5#J+Fr561Jq zhxSG$B@+53!(tf;vpGnlG?*ebORJ|0J{5I4;5}GAR%e_QC=G0@hTcbiKIrCk&^=F+ znilfa+#7_9#h5*A7u)WPJRPDu*9PGZlV4*ni;({XUy=Suq&~v;^h4tfE^*8eG@%{t5v@qzpbb*| zw%v{hGG33y5VUAnY6a+jvdEmt$GKvg9{zYiKg;ZFS*Q#Lo$KstT;q#RqV}Pb0mMl0s|t_d zavT=q4fnwc=FP()a8BDI+&N?o@4=cS?0Ru16rYFo8Z~jE=4obsHL}y22grB$!!p)a zxC!zC$%tq{%ux=LNz_N7&wY79;?nQM>tl}4`_2c=?Db0#;9$MO(ynBzYMPJPp1k|y zmX~kLKG0IWA^!Gj=h#HLTu?wju$ceOuQC3&l8OJS`>R?xp{Qc|$~BCZjFu#8TWF!F z46xFHQ5Ptrs0p!u&8VT4>40sJX4ToW<8WkwY$2i5viQ!;I((Gr<1(=5RZP7g{q>n& zh~hp|t2UC-5KDPPVHk$({AWAGA*~2^j-^TjrsBIz}923>)`(Gj4-_`D#IMxW`8oq;u^-trjE2ykH`A zjMM4Rl3D9^PE+I*E>!DP_-V%PR6CEt*!{N>d8Hwr^B1AAtZK3TNAFNyLvDdn?xbo@ z0F%^gYardd9{Fg{>Yy&$v~_mN_~ZxDvg=3vt}4abFjykkjdwBPNL72XVRN=rtM#61 zt1SqBp2f%x2j&N*mBi0dv!ojF)7Zs~qT6~g1BE~wF+gTjD2H8t^CE@qC6G*`w`OEq zhwUaao=JwGUSk#n21&_cHMPE%Eke9zqP?=3g4k`FLU`seCW~T$ijq=>((49dR&;FI zkE;#~qWZ{*oyOv-)lk23jTGttn^hbynQtk78}T}|_tdn9L@7D-s*2H|4xrB)=$RG? zbh6}Fb-gN+_-_w^oCF6&+%a52U)18jG&YixIfYnYxME?$QCj>jj;8JEq{QmOfW z)C)B&#^3L*mcO735R1qv@(`Gs(8y$d0K(IN-<6IZO;Aewa?V1%0>UD?6q<&t^K*fb zF<$Eu2g$hD*vV^=dgaP9Oj@w2s0}FW%J{c*t?^nx-R^ua{t&N3vx=JrXL>Chj!t?H zI|>MU*QRb%)^tJ+qq2soY^90SK|ULQ;%wtFM-la;g)1XmT=6D%gvtgj*YQ825c{Y@ za7`s6_=NDEDJzM4z#S{^ZsdR2wJ}t@TnPs5i#50=d7;Ey=l5bYJQ9nGhn@sBl88r* zg!oD+%mIO?*mTqb+9AI~>p(sBu8PtKJQ1uiP{P?vITF&g`W(wXxUmV zy7S0ytVI3_N1@H1w)m$W&c44V&Jvo<-F6&sA&H=qgN5W62q6k54tf!Nl)$5|x3=q! zjISV^;cm*6G^7n}9?h!WZLxIoV`?yrh;$ipGyqqlS@S9ACsH&se6Qbsrz<~%+kZhe zXe#-PB(s<$(xQ&z)aBI1rHVTjRKv6H*XNl|DbTEmcMh(-pl8lq~_|^ z$Qgu{IkXC@j-;nmn?^G|^S}F!tSAgm%;`hgyPxWrU$79d-Nlk(+SBG7lZs6`g!Q<$ z#^ovJl9R;m?@uo{$xlJBhvfvf(Hxa!M5@{umlL5dg zF+W2*0GCibZ#ICl&#R4$B5FyMwClK1_euN`5kCbNQ{63H>!hanP4oSagdBM{U86TR z5Ks@?|BZwk>;GqeE3}l|2Ixa~xjzJIFto-0W-Ii29Wx~S2D>&Bs2j6=+|M^A3>^WY zIyQA5VeN&OGRRH5>Q=~cJ=Kbt7!y+MYt8XuVueHq+o<0`D{!cA=MhUvt>=)-ZNIvY zl#==EeB=C;6M#t=l@0@KDBfL4TrK#7rrlNFSl0?8vz~>2OAB#$$r)!%h~n>q4Jwdl zIZZJ=ziOMDF=Z5|t7=ys(Fl^EU?GOb$!>0B^d$|VEv-?&HD!l7Cq;QdgmwR57=Q|u zxUKT|B;Om>tj$8A*|4_~bg+$u&_6#A$d=6IS%!7Vrr&7F3&`!DQb(v{X}DEbNI=Ov zCH8YISWH-dUb2cCJ(72XVFpxVZXTT!%;YusqA79A9tgc5$qs~U zNw*y#grG{F?ggPmUTKZ*PYECcNrA~5>tPO%$8aZqnRf6{8$aSkP~0|i(9xkwkpkoY z3M2V=vom{{&G-}c^A)#CgGNx`%O|rGK^=PTCt=VD+Lc9PKTOo`@gJq}#QFi=^%j~N zve@xZm_IuWph681F*K6Hkc!yMQHS6Q_rsN5Dy8kQjKqZYZLNJBEIgpmpijT-W}aVz zhZ+}u-DjsRED!R5P{?CXpbPk;$PLHNjtsFAjAo-3+04-uv1{;|^@Y9gmQ{`qU$%VT zc0=io$Tx(}HTrOCEY^Q_FgEfV92(HUI1R;``u(Hd?z9BkH{yTU3(fr>GeFkG+3=UO ziIAP0wTa<>HABbO%k}?+4gI#74-KA4Mb~hD510!OF8Bq^jC zi5NHNACKt{gb!_4nu16(zH0XUZ8omIO^^#DSAX5#TNB0}N-swL1jgMoMomYE4zdZ8 zly#?+$H$)u!@10!FDJm-)?J-Ltjk+QSvbbnSU+}D!T7O_3b>oC0-F-jE^;(s(f)IP zqE*35RV8U`^KdUk9wJp(L2E;ASCQzWzGSL(czi&>;9lluS4q6Y(mye)zj&*(NbMh0 z4TR_XqvSh-jL{%=LM3Oc!@PVSnZg-4OiskjfZ2p@%p9>x&x!jA2r$YsU^V}A`bZUM z3=h>p1+zpP$pbebY6qI0kl4fzN*-o^Xa1?=$(pSR&%}Gjd}>g=70kMjZa zHzbCjU=}pMKtK!s_Wz9kM%V5Cd?@{^GN29Rt+Kc%V8+a1$LwJU1;ywe&h(R6QX-I6 ziWs|L#2h&l3{l~fl!cUJR3Q|*|<6xJ6yeMk5YE@a2nx%GsOZzgt zRORJ!6J^P_)A6J+c?O|C^ikUTRmb(#@2|fM`PNQ11Hq=S2*r&!woif-JGXJE%R{l4 z4|Wn@Vgl1RX^4uQU3!@~MipBYJBzj4mDQE@fYrj;VououEUxjM5}&RMmM3mk=F~*e zt_rYp!|8!%X9gi3Umr1-WlRBoLqIZVjK#AwrToGf^ZPP+a=6q1UOr{lqR+m)^QgoD zpJ$#k7p916!Cegd&?&*2CRHzDh{fa9bduLXs+cP2kfQX~ z+jZ=mN@z#LVysw`&^JEnTe@s9wa zD~xL0WVypTU$6hPGU}PR9RgUt=+(+`LA(E-n!+YD5puZRu1?c`+djtb6YcP ztc*FNrzUhmpl#)IpGjZ0R+1BwcAi@+O@Fly48ivR=lhud&CIOZfAbdsha_WWsWxOE>MVZ?RD)9PzV}A(4CZ{`}aP6 zx5{hpT8L)7L1Vh4{MR}=+lf(Nm4;R( z5Go3MQ~db|anWruSm!u58y|NPb_{+dfU|QlYI!4Nc`-8j#2yP}o!%3K!NqADq-uYl zwgD(&CbPs=9*4?8UH#@c6$1Ds4$~wmc&ud@+R+S5RUpo7RV43k$h(FL@(KE|EeVf-5N0NjS8CY>}I5LCkN*)64@Xs(9aAp|zKDZya)Uy)6-9qfd_3wwHhFfKrg@f=lwC}0ETHI-UO7Ygxg zVGES%MtWJxctR&O3fW4ICaH9|(oU&zxfHOXRdjm#PB5lL?CrvgS<|%#k!$5#C$@IC zY$1^gX-Y91d1An<#$lue;~J}pJPUJ%Kk6xyeh90OL-if$nEa|Fp3Ok?Fd|lM{XE|! z5*=E9!iRh%&RS0pc>*%74Hc-8wUnHb1ZTr+^2z%g*b!xV@9|x+E1yI{pckH-n3$B# z)Qq7@36L8p#dZu{bM9 zn~v_8hZkw-XLM!27fN<^;8QJP`BaA2bQkV_bC1?QdaJ5-4^)LyJi1b}ue2)WfTkYH zgpP|L&ZlIi0ug9)Wxp6oZr8DEAWbQRd&s6K4Bo5gaA4_8B)N&3daxyco6t;DH+3$K zn)quWGI(h=(qb4vLpPOmio=hDZO=dsTi<^^lv_q8Tp1MJW zY;cfr59P`4;l+T)%98C&%*!W_WaXgxDMEaRVwXcW6%;C{Ffmvduy)D|pf9EIkMKpS z{J^uRFt5b~=M&6fm^&3}hkXAmJI#Ng%VDZyy;3iYIt2mrE#%LW&FM%1xOK&{oZBO6 z(27-@0IVG5A9w(UU1>$^6K^cLxmU-3Gm((Id$bQ-K<$81cjTYa`$g}VsqHko<+Bga zul%Xy(ctq}aDd%GmUDN8-R!H{R@JQy_jkD8g!2$%2|d%&We;G=?MB|YJL&1^S#U4RC$%qm^$@*@53$7gK+i{FN4hmB+4x?A+UUZ>X5%J z+{JB&qS_+;TR2m^Xq9S`-lDx#d*OPvRlT(9p=v7b&K5whKkTyAFMsktEl_^X@InRf z8xj^wu^`~9y^s2^G6o0eCr13qA7=H{Jl?*e z;l3`_7EIb&e04kNeXBkD@cIgWn({kH^*!Kxp$_(w{5XMv7R=A%d*)j~U|y9u@$(l5v^3KAB7*N_N33k5??Ol{6L z5?eb&=|IUG>`>`8XSO1uodd|+j@l_XjD+rIaSBlLg$dH({b(+;!kic8PnBr{N%}IV zzz0}*oFv7Xm@?7@DswIkL2zN>Ol-d~i!VL;_nKCEy%g#*8@)qlX^59$NM>{|p4@ki zv9Gl#SsVNe${lWh{S!il$V5E9mqUMcWV0Dv!+;=`(+O=r-l90(hjN=2s>$6z1ZrDZ z&zq3rT(_*_u10ad*KT$XL9tkLrjs$VBeX;dW3!C8HrKfzaIBLm`U>@3VcK)B&$S|G z;&!yPnV(pd<`0GC@jnde>LDx5uIHEe$i>sSjWXJ`<*(p>%jLCazsc#hN?K0iLMEZ0 zkq>Jm76y-=Vvrx#^$|w?2wVxdT5{KoTJ+iG0PXFij=|YOk@|v*A3GNJeDc^Z6zMSv z4HiClW2@-XQ8c_|tR(b%w0L~WBKsJ1**0jSiLMmE33n5#X_iVv6`@ymc~tNWM=yzW zZSz)A55~ZMzZ~4T2`z35{3h$Sno%7q5VX@a;M3vx9HACZr@-@QVMlzZ041&hPh{f8R z!#%t0-yOle_vzgZ)HUK|*|!1PM%{PPve>di6^mTvJC+?I7m=eh5o8f?p&pkbliG~N`=WFc|ESOxG<+F+c@&C^S{m0T1cO?h9H zB&?%<4bse-_JfFc80U}1yFteckJKjz<(6Z*C?Orrt47xD32zrxMyOn4zws9#TGX%= zwPDW{?P%^zFr1Vqij&I;B0EIpeHmkeI^bev6a;5L8%EwL7Yt+|8=|6=4j_tq3gi(4 zWUc`B#0a{Ke@g}#XY2@n0Fw+0Hdw^d<{tT9>yTxz^ih$oPNW;N zz>OBU@nvTg7Hztp#IE;O_R-+#N@(PIuaTaqAo-^F(x~# zf~-wX{{2g7DpHbbJYLC@qkux818RyrqVvN|gBWca9`&MF`yR%1CY^q)$_f1{k5(Cf zBL)q4mS9-ruc+^Gb5+y!^2c`U_<%`bNNhg?}Z0?mX; z_9e8qS-|0{L)q_v;HDX2>U61pYr_Ybif1QK7xc9f1+$XN#(fFQHl`*ANU^vXxuDq^ z%)-B3+rjWdkX3_5F#QAVOs8LR93bK#9Y|;MS|a79b+!>v5*AFU77u0l+Sr$&x3UH| zoR<;t$I?4`G~HcbV6m++6YIS@U>{R=c^Q{f!aNXvoDLsFrbo@?D^Tixp5}N1s2#Jd zaX@F)rQ`*%Ph8NsX?0b=KeRkgj4h5Zq`aWbv$-9VFjAgp0?~NNgnX_G#<2D#qz)C7 z47ka!+)5@YwAzv?L~Cf4t_seolhFh?&m+aKE?^4%GSewVGtBv8L^|MCY(gr0u_1Ki zg+nLBU9~|_0TCN(5!P;h6pknG2Q#`ODbvK_SHg1dY~(GbDPY6Qb25O)@<2UdHThaVoSp5*t0G5lp4^%%ISjQw)a z#x=7)Uh5pWeO=Is(cyzv$gxAxH?OZ}nf&6^E;JuSb_Bi1=e{C;b661B36z727P*jm z9SI9*@^4igGM2H8j8)MBjJJFqI)Nzy0c_s)l6X7FjSJ)jWaytdAxvdJKlz;BOm}K} z4ADn+9#Mk@cq@)H@9|Pm1?RBfX>jReW4trAMVqwWU7vW?paP(Xh6C-5#CxbjmH;sm zilGx~0i6!qAh{TShE+cTE~tx}(e_tY;xP;+PgxW6@-UdxBq%C+$RQsFlOKU$84^DF z7ug1O$OW zy1Rs-8;JoF0TGZ!P>`0CMjE7%lpI>=?jGPp|Ihob=Y5|2;auzNd+*=b=i6ELz0Oq^ zp3iLw_vo`S0_>roBl-)Zvu?4LIW$K`#qbrIXLs)#WqYWss0pNKQE+1~G+%`q9B% zZ0IJjB1#JEw^TmEM2R<;a!T7AFdejN+(%p@9YUL^Y_1T6SXXKRM{lDW0Y{55l$hU? zd5x2=#ZDQmj~|=q(P6*uSZ%5~II?)b8m-fy(!QtGh!V74=}z+3Ht zrArb`i7%)`nTz zP1T)E@{xzdSKS;$glgN?pbY1EbZ~FAlK+6(vcVKY;!Wj>>e^<4$_j?}tfTF6t%9UtK&$ZyN;3J~M@T>&5nB71~bTp79(EaD8obwKuqq-%34jn0~Cxw?xc1 zCV9-sGx}}ULZ2b$?U&apwH7xxd<1V$fqt3Vk0TilNf2h}YvYu=rrTcr*PHME-;mp$n3}3XJV1tm1nu@?O?4ey^-ozHB>JvtWOR!`kWvUkMN^ z=bv%%T%bq}Qf27fm9zkGaut=vknb8Jh{}>L7 zy2-ujVgjaxeL16o?B&DP`ugXeyn|22@BMSux6$joJUy?c16z&YagT@(gN2<<-4^AO z*vd7yXRR^KV=kYsUdnyRmVWgq@Y-%ruRhyt{InmSYD^{^vv;KE27Xml%>;cR(+{wWb*7+^tFmPX2`*0 z^A)-B2{`B5ywt=0*BfW@h;(rUMMd8Dfw+n0qM+)$Xf~mz=t1@n?-d%k*C|6Z*x;3j zs;AO;MOs+1m>>5NY{fOl> z7_{7UziLHPwiQp%n$UL@89O7K&P3;_u3N+D(pPCsuI&{HA0tlcD#eRhiLl^|NuwO5 zZk5RSOr1&Ly7-d%Vzvkx?q~Y$K(w4qFO>8b6~-yAcUZ)*n+O&N5Y{IXyK;!k;wKRa zs7Ev|1}CM2pkQ{?DFk4y;c^Zs`3HNJX1m4B2EWF?Q3H6{HV>lX)tUlFaGe55e3{M@ z{i*Rrgp7W}fwkQMxYvQl-#(l)AJ@b!ElFH2`a2VU^As1~?qmAeAGlc)Xy{E>(R_Q0 zUj7CAwieJhns4K+$1EHxj0;QUk_LGUy=&U|89VuU5+s(!eH7ka%P}nC73%%u^?GDi zEhoP7(2lfO){omrA>L*dy{6o*dZLtw%MkoTO!zh>ynZF&Ff``iw;<8Z)B)%lhk1GR zl~AJgS*dDdQkjvxr8bL)=1@By51QZ%lG(MUT z(J1?E`e$6$&AtdLcM+tgm`n{{%ZEI-y$j`&S_e0l{g5NxG$S3nUj8GpOqvjx0cY!* zhvPy+!5i10lT7L$cOjU>JT^S~gXNdVN7;iD@NdB>+rGiN(r`tSV;x%~)xGM4dA&!E z&jT-h1PSKEZ2(XjsS4MV;?1@+bi8dCyIl2TUS|v_3bRK^_;oU1e$`*Bl||4BBMr4< z;#&1pfW~Xvotw^|I3AVuFftoYlKCpfW7cSHco=h3|kg*}>E3GSVnI zfIDnh_GlZa42Z2h=KN&#lfr>Rps{1cV{OQB6u36<^O-3w;=D3jSoYRFtoe9%xp-*V zDAZwmK(py(f2g$7I>%FLOPnk(_zo89!2-JYmdG0xol#!%Ze43LyDsO5D=FGlyfY>f zVU5Lx<$l!O1CwRyxXw&z1L$iyOH&XvTr$Nel`b+ol>UABm^9&@dnYrM_t8>|1wOmk zQc9Xxyb?lPh>@58PlCC7|1HFDoD4g1ctSO^_(T<}oT@+q8nZmbW#Lx`-x251pw({o z#*DRSRekHyZwblatOW26(?W81ZT+!)dw4*dP3Ju9!8&D6rtvReS@;z?YV<1|LIKYg zFL@UAYvf0LjxG!wl4V7HKY>})wIcmRS^bc;>bikJn|=N6lHb7Y$yA(sCf&$Ev}^!S zix#po4u7vcx43kyqVEW=BYn~gVT26ZwDjnFG|+pQ?u4Sa4att`UD^F`B`}P$;HtTO zre;V?1FpmWFk075bZYl9S?|cbnnW~4%uN8N?D7@c@P?(VeSO@gLN>tN85cs|g8faFR1Rj&THuSZ<){c9p`mXg$i(_w4=QfZ!a&7c>QHwdnq{j{=rzR5tC3zbNIhV|7T?mMoMBrynW4<@2(OWuhT5TQqyR5c%@-b5<57 zn;F|;h~jQ!-3%;gjIMN%V_k|a7ihg7ATsQeRPmNRZEXUwz&{s(X1lO*0K@6q-UE$> zN^yhV%ld5={+6$TFD89^$I<%5bvl^$5;9u1L^&}z47TUz>rK>d{MmJ+g1(|jl%H1< z=61=z_`9J!Z-nk`C(x)%^(`^6PfO)$Ff%w)lFN(g5yiV4ee;QzD|5$3cq+(7PkeQ-*tLolY}Ar z+%V;cnS6tEU!!O~3&hWrd32&S3LV5F(b)C)S%URkS&q3Xf0vdsVltmoLv@~r?Nx#G z`;V)8%=dRGFMik@!(J#rPSe$kNHB28yo zwddesvJv{an~#p7Wv%j~JA8lbx9YK1zU1dSH^!;_&v|@e zZQrHKzAciW)EAUiSVizEnEJdik)bfEROH|58QAW2oqi0LpU*^b+>ni+q3kc=X`3dX zC=`qkljmtQ*q0OxmlDj%ca3D>@Z<3a;rSI^UZS)nABbDY>uUlfS`fR1(OIUBd!%(fs)02KfSCTrx{-ybB z3)jvZm&3WJX>(da-Ki5CandbRyaw6A&?$@3%8)=`%YaAEQ&35crJ%7|9BvVAkI;_- zIkTr03o94XkjjO^CUqOL%8+Oc$)AhnkQ1A$xyZ-q8El@G4EGM|{1#a6N@^zYdZPA& z*sMt54$7D}xRDnubI8`Pbt_S|AQWk5A}i@r2iEN^G9wHl!T`$vS8oh+sa<=3N@`$k z6u@V;$2q4}Bt=%jd2H{@$k?Tv@Jor61dghaR`hYMo#t%*^m|>KSfvj^AQ0!n7QKSO zxf~IxxSKOk?`<9Cfq<(E!bQdyA44tvMBrWdeW!GV3cZPK&~i2E3j-8B?j9EWX;8bgY4n+xXNm>9Ls zQ_a$auqI}Xu$V3cPt0s%I(#7L#w+YXteOyeG-?W#It3=+cwHr@?bt;Png%Q;2m;`r z#(b)4=asYSZ1uR6q_vK72}L&GedJqHjg~y4rHS*VKNNt@w|u9$H{g?lFWlbX#tu?U zfV{w%3^z?ToZ~$@(iJUXUAwS|P2qd2cK0rd-l3>H8#pEV^Hwplw=~`@R3Y8lSfRrm zkBPTJ>l}mWtNPNhBc*~GKT*Lbe_u(@2sEUp!RQ5rfH8#9nQGPorpT&QPPsK?d?>YX5(WV|G9 z_i2+m0mym`nh~mTm^?9wxA+;L5qZvrm_ZLJ_qy)JsWz?1z@QL`s*Rs;^g7)dCTJq| zT-Lr|__SfeMGoy|2=TY9CGut}fZAnkX4PJVHd{UHDen!mz;#@2%lRH3nvWOV<9Djx z&H;;0Kw%i4{1OzNX2TB^pA}lnd9~Hj8VR{l&SJ>3ImV_D;*Q1jAw%X0k|e!ahnEG= zt%OoCO#@m@gP7k|gqc^4(XPU}ts00!uHVZ-y@dSk@v3_DJ|ueEaZ0-f8;e1T5GD-( zcbIchx36WBFt<&3q6?M?K~>#nfIuS-nwrLUUCf1es$6~VIru1(ygfNo+vbBuE;ZV; zyY`#`-7F?c8E8`ezRJ#(2pT%Y$d{1Ehm%kbehC2v3yLcJNUb2{%6qaUUV`0D>IW`vV{obQ$1=}XAcZk!cU0jp^{_j# zaBZZ-qttE1n;8V`x|4j#r(aWw{;91uSx0ww72B>;1CGxmh?>zSN=LASf))Q_sN%`{ zTL~O2>RLzw3u9=WQZY)tL_E(>z|JLq*0*0{l+z63-DjW#!VF@>^81L#iKR)wa}yUAiByDyQ< z&sz!^^)3}lZZ8W5l%ORJ0U$%eFo6kR%oCuT^ALbT!>Z$C94m4L`t2H7{pz6V6l=Tj zZXk?0m`eb7pNkZ@d-k0XM8t?3paVVi_^5#X$*$c$LPnK8E5?|UrYK~v-q;&AQ^E_-KOi|yMX67g}>HB^Hh*&}xf zZ<@)#Ic2M_2!D5f;a}X;7A&w3aN~IGiJVfqF+Ci@EotX=V>r~$>GBm5nfp~w&xUT& z_A#yn*n}9@ZNv!Rx(T@1yWjccVQt**87;|lk>&ILfZv7ZzRMNjCIs*FS>f4V-#Pbj zX#IIt#;GQxNIKE>=y#m;YMk$&YKzPW!5#4bd7{SS9ijcPMpe;a{HxA7?0>X6O$P(@ zZ{o8q=&yF`p8wSqJ?6jKs`pR+k^Vo8Jo^9SNAzjn50Yv)6W5-JJ`$)ApYMP8`BE((gAi;ah?gN?eSi-Vo5 zr&l7mA>rQ{;|*y9RrOF%JZwFA|C9I!0QeW>j|c2OL5Q*^=c<>eX+ZTC;A}txNY_hz zYrypPw!(l$C`TU!#nRHv>%V~iJ|gA+@*XrVv{ygDko7OX#E^!%-QWT6U^naaUo#~> s@F_R`EIZgZ{U<;1;bkar4N*`WT^#;v?V%CCXPCHbNP(&QP=bQ;KYfY!l>h($ delta 21735 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 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 0000000000000000000000000000000000000000..f6a90accffbb4b543e8f8022630636650d0f6c73 GIT binary patch literal 543 zcmV+)0^t3LP)Dr}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-hdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ceb1a1eebf2b2cc9a008f42010e144f4dab968de GIT binary patch literal 221 zcmV<303!d1P)og+*{ z>6z1@lfD*AYSPav7) zfyt^}>3h8YPrOl~&bIK~65jQklGz8^s`HjR)m&{kzPv-l%`Z#z-}dkAefd0i+B#oMt~<<^xstnlb8{5mtL=ho7ckC`3%k(e zzgaZogQm0t-}49MOq?nc9MFh+3-*7nfr*ONoC>?pz6 vJ;#2KkIQ7wjFU0?#uGbOtWRV!Nq%GI->9qIWN?BB=s5;YS3j3^P6_K!Vz zX^P3#LPu>mtb~s2opNVe^rc*jAc0>DxzBg8$cs2#KKWdy<9u=FJgtBGjk&+K+-LH; zX6k40xX&~@&+_SvHMdKm??3Lk9=mC?<^@LoJ=d9k&t`c0>4f{;&2Ra4J=lD1ucLd- z)ra4km_(DOMMPa(zChuU#QpOUla@DB-APz~|DEd_-4~ILik-}^yCWxEnv=jB`hcma zk=I0R?Tx%XkL)aFUC-5uK|w}~6xZHjtGapn{WqTfKW{5EvIu!B;QL(d$i%5K!2v6= z_QR@ejcFC88ynjyLT@@)a@*`uyTQ--jBn1`DZ$-y7=yFw7R}-mZ9KzQG_#%wXk5Cc X%gTe~DWM4fsqT(M literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c8a2039c583803eab552eb2ad15248ad4f306b14 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8mZytjh{y4_Q*ZMgP~c#YJsK$U z)~(q1m-m)lF^^vy&zFBx;@>#sNTW$[{bH;=%sZG7QZ>uQBcw?@Ce|ClF7G156^ z#Rt_}Q9HRs{l8sYa>)1&$3+cMLFMTJXY2PZ*sH$V@BeR?lj;@>g(qYZ*L3k@0BvRP MboFyt=akR{0D4_J0ssI2 literal 0 HcmV?d00001 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 6ecab92a7d4f604f08f24fcda65789486ca9722a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`&U5>EalYaqsQT^I3-+1lT^rn6$p)7ODDhURy*^-u0roK<2~U-n^b5xFJs z!7^%z`rC!#ndzHn&pPwugW>kZR{5KE->?fSt_pW$5p)r7G-W*+@jz1EVp_=e=Z)(= zhDj||@cd`>w7AJLs5p>QeS(VV z=O$)Lk7)`MQ@E{!fW}P~cLW>D64}fbk<`N{m9eOsGi=)e5%c;m{t1zda)p}5`ozq{ z7F;>_Q!(|{g60j8%T2Ga>F%v8T+1z0?HC*zaGd+q%ORPWZAHfP!)RVB2S(!`lt|Um(uYf2_cGfFjG~?QJ_SKM>Hu7Qz_%` zC^KY0j^p?%F-hrI#t?oEkx>e=^x$WZC9-20$8bAJMiyi_f!j|s$&C!#uq!e{4&*3d z*U4D<;$4cQ>yQUJNq3uf6oz@6$E?Ckd0-Y5%+4`a;aG`TuRL)UvsTrDjhJ=G6Wy3? zP%Zcjv%EY}z-*IhK|5x7d7^;XCe?zCn03h$-I#4qEm(P<#_c#+Sul>1xE*7f>{!k} z_~{|56pZ6*{0y;7>1g5}{!WmS0WF-w-(4mv4bw>oQKFMsszM7}DHGx$QauHt_cw57G zmNrf?VwFPCz(EGt%|eYrmJb-fVG|Z VF?y~eTbBR;002ovPDHLkV1i=jh>-vQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a35b3cd14af89804b7c3aab8f9b54cfe88771d19 GIT binary patch literal 698 zcmV;r0!96aP))E)Qv=1Dpnk1InpvI&qSnTPM&I{WK*8?NJ&ecW~5|Co@S)v zo;+)jihdt!$TJgZIOCp9j7RYtcTHy&qi7EMT1#hYjzy7Fyz4JnxBa7?nwO$TPFj`q zr?*r*?-yB%jzw_{yK2{dO_w|wdyK1E*V43R#&{IRA)lzr`oVKi2CrL}b=NCV1}DtR zdf-F7Q4|%E=4@)&v1!&s>@nzymi_)U?dd3vQ7f{R9MxmWmaIiDM3IbXXy<|7Wc}gI zD3(zTooV{g6HzP`D?0PNXQFr}b>fbfBMo!%)O?^fQn4w|-AGAGo@S(ETb^d5WJ8`i zk&;ORsJsW`0@zk4-OaZ6`@bTm>hqOLRBE*psAIi;?hzpcu;@0>~$&4^`LKYLci zIrnAV_F@#zgsOE-E$e2C#U2B`(z4&Ks^KV)cEMwO`8>gR#dEQ>t#buIhb5Q9LKD%GxreN1uxt9@X%L{wSIr@7a>|t0nC$dn$@& z&^LB;W=UV9V8l;4^I4?g4IA>+3`Qyrxu7A>*+|KZJl{o1ZpgC`DY-7se57PXp6N)* zlss=oN`^EX|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 literal 0 HcmV?d00001 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 864f7d9b2a0bc9e9dc6e8cc6f8cc6003bca7d2f3..9e19db77da1098b8d9597ba46f4abbee496a0d59 100644 GIT binary patch delta 84 zcmdnPSTsS!&(hPyF~s9|a)Jcw;sg<%*bn;|SynFiWG^9*Do{6dF`HnvfQlQ3!y+Cf nsS5`euw8nPAtnb@$-&G}+VEa;kJ5WK1|aZs^>bP0l+XkK!S5Uu delta 159 zcmXTg!#F{uo+-)O-G$+Qd;gjJ3=9mM1s;*b3=G`DAk4@xYmNj^kiEpy*OmP~haeZX z+G+M>jX)t^PZ!4!kK@S+60D08M0hk0be!3F=>QNcxa<%iz0515`Jb_Yfx!y{p+tc; zFSV@7TnXtTP1bP0 Hl+XkK-?cWo 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 09416614b8080c2bb79431f7646177a25594eaf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAjKa)3{WE0F$AV=&8=cLC5Eg_0n@ zU@IEGZ*dVBFS zUz34A>qD)kP=PI7T#LT_ogb7?Jj+4<*_tE&POeG&lPx#0%A)?L;(MXkIcUS000SaNLh0L01FZT01FZU(%pXi00007bV*G`2i*q}6eJy^ zg?3&E8xT-KdbmqG(>l;9tE?n77{liKt)KavKc^?;Z=4Nh^xigb;yP7wb z+eQ)5mhZ@OkR(MtP9_Oaf9Y+(ghD8kHN9orI4w++ z7<LNTlF)f@L1i}y@M1PcS|c9{a&SPeLW}!AjkAoNGKvIyS1XPbyR<(x>mx8P)J;6P9I4MVpEYU zDgxp-fUy~+x9C}(;iolM=AW-Jjp+MRGrAe@dJ~=gBg-#hV~@fyUUV;S$TM6tgQw>2 z*S*Ji=k`#qwLnfV2=NO48EU#^yv(~4NcVUtA?5e|#dO}9cXEMRht>d<-Ql&|oqCr6 z^S*n@hwUtqZsm#}OrhV!Qhn$0khzRQkv%V&CJhuwHXpc;EQ?9L1mHLJC&&lI0n(*|c1Y2I50gF=WIuF)K47ziOwmImymi2McH1~~h<;Wjt}pnfWcJM>-% z;x=aLIH(@QxBJwSf_AIM7;y%Ejia8nJV}(JqHjc`B8~qrTNLlkzgS;4On0@DgXeH#zkPSDLm~Q5bog*b2f5rR5!UW)SasJ6gH0hl8y{U`)__bvnT8rdk4Rh(7v($;hESEZw&&=QY?vzV!HwVhf z)x^bG^Rsw8?m!eqeMiA1GSkRQjPF6O#Lnu$P9Ip$TF}}nh9`j0y zlULI#EsVZluit4p$~M@H7OQGW(g~dzxw}On>zZzA8b!X2F0ZPk(6X*_m!_0|t35o3 z^%o(O6`Rx(Izv7IMD-~FihNrVBY%(D`A6F5^dpq5nljIG3A-i#Q&Z_)#!SEq(gpgvqyXk_tUrkEFic^}3H|dY`Mk&3I1BrIk`_2e;>eQ)Ir%s(Zb^0H( WFMk;a_VvvG0000CJMuFY7@k@;>2`p4o5t>| z4zFt$n)8ah=kDcRF#W>zMi&c12c`pTOcgd>FMb^iI4xupZgpZer{>T8XA39UKG~Zb znARbq=fWqilrH#mcBIpj47nd+0+#dd>vYU1JJWQ6QO<>rU#Xpa;^F2K51p80kaHD%qKfR(?Q Yo2D7NOt!jY2n=ZkPgg&ebxsLQ0P+7{wEzGB 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 6f40dd0e312052ff2886fc845cb32688da223abd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 601 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAk#;Q*fyS0Md=h=YSIy7PhFa3~4# z3ua*F;NzE+l2%gHuyJ&9arel`Dkv^3uc)eSYVYXnn>Kys+(k>4uUNTp=dRuRkDobv z{_2gJx9{G6`uy#?_aDFi{1<$c=Nkh9Bde#2V@SoVx7Tk69dZz0xxi*Bq};LMqu5bt zmxH_Ac(h*r|F0##&FAc)(?(lEr#+p=|6=*vxtT1D8z$}-*%~Mwb#Y42Qa`IDxhzY) zZ{6F_vhjmo(FMaYkGkI20}tjTOK`@vF0hxG!quhh%E;qNsk zThu3QUs>q($+%c>-7SG9i+}74xfrj1JkWFHt){R!_TpP->opxXXs)Ha$M)~;Ij4Yu O%i!ti=d#Wzp$Pyz!FP-R 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 310a82a4a5d55d5dbdc22475bd856afc2db42c49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmV-`1AqL9P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*o2 z6AU@cD&_hB00RI?L_t(|+U=apOH@%9#-Ec?AY~GjWh3;xX;DdwD3ErQyH-JAnH9Kh z(WZ74w9x*C3R(nV1VWo|G$`CeMFv?|p;@~GvlNtHi@A$oaOOJW8TG#RJiA%k=g#@v zkMn+8zyFlJ-m5Drr*EFG*QRz0SF8>aIAj5x57;60ZT^NSfg6 z0X|ZmW`K?~z{vn(RIZDb;nV;_EKRdOi&a3E@uLB&fJX7B)_m_Z2H>V{?7zXDe!93Q&}lk9xH1wOC{7^fZI@TP?!X0Ixl4EO5wjrE;lTQ(TaBMVp%p zSCD_%hm!}XK5943EasgPw_k_l4VHE&x4}}Iav!s7lk{7;ubTTMJ$23vDkvyuCG{Ue W>xdlhut)&_0000~VK-lv zK~bl=KrPwBqe;HOMCJwHY& zc=$7y`ZMR2O?ZBeQ{{rRBP*{m`*rIX8Jg=GwZv+oe{N}3GXA%AN?3sJyeRDq1^>yS zTP80*%w_eo`kp=$r^*BebYiYLQ0yj%xce(=LsQi!lPJed8`H3WC*1$VxU@AsJoKBj vlA|m@VbY76JMW!y@O9kK{BE{G+g}FDWLfL{cpG1!*BCrq{an^LB{Ts5TFhlP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ee1c3d10408d4b738de315bed0747e5797fbd5af GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DCQlc~kch)?Zy545C81Pfl(_^87s& lk2&UwmkR9O$7eTPc-0G+&8u!PO#-@x!PC{xWt~$(699>yMCt$l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f5104146dbeb12c0aaa7d016fbb3e1db39f3718f GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{uz6;uuoF`1Y1#*C7WHwuf)j zbDe>UW=`VWN(+h3eKll1YWS=<^OpZa{IU2(BD zdwCn=%aWNNSXnVlyU6(ZMZ@(M4Z0j25px+BnOMHeZD1CkmlOHDj>lkgP|^Fp90||Z zZho(0DOgy3eOd!^>p$JM4CzKuw;AP9zGSgiOul%HFJStY#X<@W4Iup-0tm)~`HaZ? z0Dpvvh94|FA3vBf?3jFUv+M&8x9MdKwypO>`4k)DpNSPXC<}@crrKN;f&_yN;q?9TD+gu2XC{TpVyU~yMN&7_T5L%oH^6y zn(w>Eu;{SE&*`H7zE`dNbi!#tS@b#9tnag<8~?eL=mqT7 zxuAVB>Nr#GiEHjU7y5GECO7t7{rOoFYz1`*);ns147A>~wV(CYgtgxz7EH`po80*B z#I;(T3kMo~Lj95&x%^XJwF>cm>Gj{VB~_9?WQT%x_!P?quI(u=*i-cu9AcgS<<1e+ zRKEp>n$-EeL_D3@D8zQ<#sOJn>9Q{u`gqr`i3rkQbkO64IN~>R&6TB-z=EDm?&7_YoFW@mU+#=0Pno1rwCam8)xhF!h?O&e;385kx@GBB_)G%zwG zFfd4fm>}@2c&2Mu<>?!@YwK$p?pL00pa1>uSH^9{vo~J<{qGmUW*har_r70ew>Udt z<+oXzuQ8@c8a<6GzGHNtY@YGgxJ{S!4)|8RSQpw5dF;!DaKBqD5lg1aMYG&EZMFBy z%;s+ldY6L3-!h)L9NhhlVcN@;q16n|Rj>BiHuzR$#xdTSFTeJ8R=FN-R!d@_M-mV<}1oPKlF1dfZ&8)H0U*C4g z7LI}`zEv4#-kULct-I{JU2`o{&Qs0c_vim)i7$9!P@j5=cjnS9JOQ7Mw{W)2S+<2Q zplHT&pN-GY1l2J)oD5sH`Q#L-;>mBPd}I7~Gw|K!b0Sgc6C=I6vKj8@n?IkKK2ve_ spDkvRo6gvX-}Lre$&tWd1&{E0=D*U+tUR+N&w;$;>FVdQ&MBb@0Di{v6#xJL literal 0 HcmV?d00001 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 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<&)~00002B5kK^|J))MUC zlz7ydwCsb8xn}W?^r?}5wtsjdmvX{3=JbT!J9sKPrYmk={m|7^>A|Z*7j^D$`>}ry Zqi^Z9GQN4ct^!@a;OXk;vd$@?2>?I&LQeny literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..537fd4e8b4444ac18d9d339f0f57badcf960454d GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DW=|K#kch)?uRC%z81T4Uoaa{c z`<9%~l3oAh7HD{G;7(1OZ_8nh1<95B8csrlV<|Kimi-68y@O1TaS?83{1OV@rL3IEC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8015d55880ee921a84a2fe7b77d51fc16c589064 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D-JULvAr*{ouiJ7Rau9HMXd=Wv zL7pZ1=Hf`sM_XHbi~2iW*s7!iXMAl*P&_zSCy~3mGFaE=)78l>$7TtO$Ju0BPMXx> z`#>uCT}^qau&~EY!?mfR{1zWp{}nnAaPjeLAGf}v*BzQCGB~$~nB|FjluFnKC{FK> zRxR2p|6<~1kttVBSlWNc{50?E@4ZZ1E&WVf8VedA#D6xPBPV_~wn^N4>Ym`iU-n5d n`fb&>IY%u6{1-oD!M<2tZ%1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d400472fd64b0a90998ce6c5eab813b7c8eeec12 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Yfl%)5R22v2@+fn?1dz*HZ0um z&|dF?!>nm+mvS-{o;0&fnzA@EQ^BmzWWo}eRZ9~msAiWq$nrXiF)+AFy^vQr>(2u; OhQZU-&t;ucLK6V({vp)> literal 0 HcmV?d00001 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 19c25c748cf1421a7f8fd112ebb995664e7e2b08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sX#qYVuBCJVcMkZz1=^@s666=m zz|N_rp{=WDU}S7!+R)oSVbb~y8#g_A^7P$@PoKYh|M4^I{Q*9p;+38*jv*Dd-d;V; z*JL2#dT|@a3FmoQS{~K^|Eu=~7CAdTEpaHgU~BWz%PJ%2VeyL#-%?&~srct8qZFlN zesS{RiuFl~Vg?C~%wiTm;#YOT$!6Pw5h_8;mbx7@{nHcJ-e@@I+6{*V4|X;=94cmG zJh}N6+Y+1S0veU;6c;Scw3Xrr5U)Rf|HATxt9@4PF-u|hkIJ3Vc-kss0e|am_9VS? ihtK~uY5eeTFT-oG+TZ$}$*n*~GkCiCxvXlpy;7r2s24Mgk2IZK^^iBh`hXFsLp$Hi^-XdC|o$nN|w}JYolv9aiaA3)AHJ#jL^+Vnw!iASI;~WiKXmD0RMEHO!?-j&6;kHOKLX;?@ zWGE7DPJUcs54$WqYC|tM?Dm*a5EB$J%My_f5ptOQ;JnO8utv}pJu;w=5<;?v>&>8 zhF?Y&EaUf-F4>V}ouDGUG9XTwpfwUQW0DePIU@2QLIJZP6AEI68g@DQ)P^_(>}pKO zkE?_$vBVfLVvMs)nQ&JW#5%6Ll?i8P;6j~onehS_p38;=e>tq*49Si(?RM$JF6|Z- zhLe1y=@Yj&%{<$LDKkeuxA{!dCfy3hWwyzZQVXYeKoyfe+#{|QF7lc(Gdc+Jm}KP& zE12AuD=c7gL#~j*pF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..22a8783e70f01488cb1396f18645fef00c7bb299 GIT binary patch literal 496 zcmVF8i@ z;dr8?qTnEcf#YSTw1b150_0@p@+*a+28_exGc&aM`@C!DnA6=W1TD^dHLWnpGa); zm^Y+_9MMXOw6rNEF~s6@a)Jb_v-BT!rb$oORat4wLHcDhU=VjKg1MOG+W!btgPSRK7VcqKg0X=nx{A$ zepfGKy7PXU)&bk4&ClocAG?uqU|~X#(__58vgNWMJ{GOvra+y#qCZv fR-f;@5h?s%CR*qU3AOS89nIkB>gTe~DWM4f5vs$) 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 f15a9842db7d65564f8fde60d2ad030039408186..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 668 zcmV;N0%QG&P)Px#0%A)?L;(MXkIcUS000SaNLh0L01FZT01FZU(%pXi00007bV*G`2i*q}6ec!3 z5Bo#_00JOML_t(o!|j$oYg9oL#n0WuL@+8*Hcg6DLSkVmwJ}%*Qd-#v0V}_NpTXA7 zBBh;`g%~7-#!hTRLmIV~pdhSIjfGDe+gTz?wLsTnBVrKM}+40JVDHMY#_Q|0eJ9J~b0x~6_(~7OA=qHd)jDP>x%AkT|WTPbn3;-ZPjgo;eUV`I)sgy!081`;;*l z7a=aOlPn9^WC|g!v4=7C3nr1p?b31|50J>=GT$j@pQLY@MivYH3_NvMhbAw?a8G|z>T-ac_r6S-%uNFt)K&vFG~k>2S1F`qnxoNUCy`nnG(a@u0C z=-w!j{GMrqSm!lU7UHh|G*fic17ew8<1ziDxsoDQrOEn2iV0saC1WaeA71M`Cb0000XbgZTs%MhfiO+cI)=thfkk9 zfBXL9_uq%_2Rs29aNX0zF{I+w+tZo+2OUIOAFjML_15-961#(L|NLL?+r_qhvGF#R zk99jIpRBwgzGS=khbS>oN7=eaQ-j9rN=9GP2MHBB8vc3-WERJD6t363*3P}--p0u8 z&t42q7)&M!JlSB_V8N=kVZ}X$y`mFD7@F@gtodUkpv!rxouM$FC91qGht*(2ES7u6{1-oD!M< D=zBG4 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 1ebb60da802c28f9f274f7ebc5c46fc0a2c5b7c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 532 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s8v}eoT!HleAqBS2D4GLwv{gxv zUoZnJ8wU@+fRM0=n7D+JuAYUBi?^>|KwwB@T0wb5eN%f!*R<&~XU|)*boshXJ9h5g zvv>dD`=@+)=>2F80+*$xIQ2&%Vi%+mFbu4gZt9?(f9Ot1c;p7n^5n zsS42YDcRTP@Ool*faJu<2Y3x{>VD4>c=<*+UM^+R(i66Rs(&MTZ5-4#FEVU7!L2KA zD4%ElBszHJq~zeHV=kf^xl!p77Asz+oZnL8kuuGMZGz{_iyDtJik5l^I^EUXI+LCA zXIER){6D-?%0C&G>|StM-TwQh_D5!mH=c7ovU>LN7mwA_*lna&c2xY(&<6UE!PC{x JWt~$(698J~LPr1q 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 31bbd3fa0b211dabcfc06e4a85d5fd46d001738c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*o2 z6BZ~Jw?ESW00H7jL_t(&-tC#sE(1{%#?LKENo+(UBp!ftB}n|)YV7q9ENq2Xcma#{ zB~T0H0kDvevcN_nvDT=6u@Q+>sy~}6nKYVqMmuvx`t2s^nf$)nxpTfVSEQwu{*QnJ zun#-{MIaAs0h8LnW55p8RR+>Pn?`tJSG^vkH5y1#zskUbHUlTP)26fD1PmV)kq;4x zxG2jTV}^e&A_4ya{T>(woEJeG81hi_8n^)<4rE2-+(UUT$Y(wdWPvZdYc8zd0NWbD z4}p2$v<7?@=+*{4?Wk!77J&=fumDQ7Pb>h&FYsMA;8pI^2@C=qe+3!?R)7s)4VVQY z%>r-aN{#|&RX}cl85iJ3zJXh)N#L!3<1a}y?3LCho zFz_xSJ#N#XG3Gfa13{Dqr@*^ZrO&p zRbVOMa z^wyg2V4$EWjoy2x>CpB|NjiBAOG7k uq;ejfqS&c;<=|JPGt9R>%H55d#mpcqD)IWlRV6E+K@6U*elF{r5}E*;tvRs( 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 4cff3685ba13a78d0103d4388e7fa58ec823faf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^N+8U{3?$t(9|r;{&H$efS0Mc#42mn3CIdN4B|(0{ z3^V^bJi7tpiF&#?hDcmaPLQ~kAS$49;PfnqT5m>KdtSk=tG-u&3K%?H{an^LB{Ts5 DQjZ{$ 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 64ff97229d785006c30a22b607460c79886560f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^3=*07`vZ^)4DbnY1=4fp&YeGh{=$U|_w3oT zZ{NN{hYlS%a^&2(a~CgOyn6NOty{P5+_`h_-o5+x?>~I_@bTlvPo6w^`t<4Z=g(if zc=7V(%U7>n{YL@;Dvp=e(gP;Ha 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 0000000000000000000000000000000000000000..88131b9aff5785fe07ab1d2a7c6a082de3258c4c GIT binary patch literal 724 zcmV;_0xSKAP)9}N*bUL6vf8QhENI{m}$MD#tXU!7hq{)#VD@8yT%)q#%h=qjL{V+cp0XG zn9Scy(CUQb{hm2~oRggA-N5rpo*_B;uo8btN=iyfN=iyNNsBN1X1}t-XI7cVcF(AC z2e>U&kDmb#7^@DrPfGd7ST(>6Qp;);z;Sw{mI3pAz=54qzF*z6pfg`omkOMiA!Xs6V_3Izs(`paI_M_1%P^en5}`*HO~IFo6)(A6`QT z9OWlUI!p+Jpnla~kbgcpVO^=O0Fdva1)E5A67(MHI5ZeEvKKgugLd^Q; z^U(=0>!Z!bk@j8$M|}x!6(Is)+)-Zu%n0)l36A;#;5E?`tld#x1zbUhLWo}Q&?XI7|%4q$RGLo5C<^LX5OD!jU_UOVe*VJ032pBZ-8+zcYyIc13=C*GRIxY z9bml39dLy2dH>_9ahWvJHN5wd6tiMj#xoi)XZUZ4)Y8I?DtCvJ@_~a@0mdzM5*bfx zSid^JIKf@I`^ea)%L;S<`WTsC0q9o%1yBG5Pyhu$0sH~z_U)b{&Qcu!0000 zOA5m<3jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~# zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX Hu0mjfhD&W| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4ddee9ef09f13f7c27faac1c159d37c8c8f3bbe7 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z$oD9;uuoF`1Y1z*P#Frw}&Oi zj`ApGhZ?$GGdiK;WT@>qtDG&`)BJk*^MjW4)88>W>g_pq=38<~QsU#wrS-S}Jy$jk zRAuP<<8Zn`GK#I|f>}bA?1n9TH=@}0Tz~4{z`)4#?=DNtzqlI}MX4MNOYU*EcG@va zsL(&qYbRz9ygOSZVM$%9BA>y;i>iDZCR|kJ+c5E>6#I&=?%(5V96;JxI0O`MG2VbJ zfUEctJs9)C2^5xEoo968i2f7UcR|Gyh)2Ju) v;nsmxcJ29DPtRrk-!9L5Vm9XYUQ7owYqav=XINnPq?GE)uf$N-tH0_Bf8jpPqO>Y_&rZ&ePF!vvDyCX z+`<

^%CZJNP9Hj(yl(#^b~q^RYMi*D2Q-4dybpi#r;;>xyzLpD$}b5d1k|b+3Q1 zxC8(GsQ&^99d8*q=T59#AIZ#B<1Kk<+1U=B`$g3bJ3p15 z&-s3skwc+@feB26)I(^52o{#QH6x3F0|S)M;8=M_Zh~M?cJ+Zd6K36DPU2aZ^5Pb= zl8{rT*Au1{o0VGb1#f11!^zq9e`ccB+4q)tXL_d037)<=&FT7Q+rl5}5WBDcWot=R Uwn!Gy0mU1Gr>mdKI;Vst02IBp`~Uy| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f53cc0c62c228828d73c90f681eda0835179b0b0 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D6i*k&kch)?FYe|&V8Fv1*n95m zR5e$DAHp{l&A!8XfIV8!#r>2YP$7e#!c^^(-Y0%@RoZ*qi`F<)`EKq{{v+@Hw5*sR zFA(}!c2Utj$B^^;IgbBnE;xI?rFh=CsojiM7+vgNGclA;TJ|n(&Igb&p00i_>zopr E0CTxJ1ONa4 literal 0 HcmV?d00001 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 5f30c6c734c496dc0cc8ad3dc8e2cd3f06edb9a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 652 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy$q1^9%xmJTUk`=Un&=yJ=FAirP+ zMkZ!9b`DN%9$r2v8C`utSC8<>=-7s~_O9-p{)v;POr1Vs&eG*8SMNJ;=-Tz0x9&f9 z_~`MIA3y&s-(u^}z`z*d>EaktaqI1kn|_A^L|Pvn4vZG@&H%O0j^CAqCXl$moR91Fb6m^?q)mZ!^kQEWYu%(%z7GQ zG*f$fjo^Xx$G-2b(0#zX_{;m$v@>k;__xRE8F1w$3#&a?e)#d5E{>4c*H-)yM`B+e znZ#yt_p=$V#_s2$QWJ{Le>PEgIj{Or!;j8)&sDeI`OL@r;jVm?19L#}TImOjj%qe_ zF~W>J&bM!f_%PhPaqx5e0ak;P|8|}i$zfPsm9*d6$qT#MyAVL02PJ zsWCrbmMc^Kf-BuDUDg7(L|y*9zx_*XS37^q-QDSZoXvNqet%j0tm5eP^}KpH#;-+t emSx`J{l=Wip7~6jHP{&#NerH@elF{r5}E+QG#GpU 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 0000000000000000000000000000000000000000..507c5edd44bfb5efe41327d5cef511a108d35f13 GIT binary patch literal 1074 zcmV-21kL-2P)+t)}?IPi4`?n-BcG{I5ur- z(S>O`4876<#~6}k=`>Up4hWM~CUltm-)|Ri1Ni>m=Xw7B>2vXZK2lazR#sM4OxVB` zGWm@sMM^ z-;l({UGfbz*r=0l*o=*rbn~#1)BM5?7AY+r;d^YHV6D>PUbfT6IjR&Lx6#YE6o*+) zuBKoO-MHxHK}|s}>p4WgxIShmD&AzWe%_@-6DZ+pqS#BZCQ!mV^fOt5qM?`(rW@k` zYsq0Fe-hOnJV_2~IlvgxjZ&g0_?+}E6PL@R*DQCeAjPd$B{wAK#0SSo$OW75#b()K zHUs$LSLVnT+wsWmw*M;;$z=L|Dth}oRO&PU|Q78@DG)EG-;f#n348sTZV zVF~9kvs0GXg_$1ilRM_pLS`uz%MxXz$ZS8iD;g5KO+dIKazGp50^T5@IM7A7EpotC z!W~mwxJ0;WIiQwsy^0H?ge#H*l7zdexR6PK98gHOKye|H0y&_NaDn2&2;t_-0ZGDL zRb044xEeWN72z%_E_4yDUJlqsxMPX~IW&?Y+)+88op1pSBoqyIaEQ!Ol*$riq{ys= zxpK!+dNI=^OYFwX1(wJSoA?`3V^qijl?0d?Wut77&!^Zq%PbjU4n5fUgnXH!m=5f< zk}m_~a~ON=BxQz5hH%r$Y-PY44&!E!3Yp*}?#{7XA*iGWcbzi9S)vHoMVW4ZGIkRX z#g8(<%S4r;jjhy@q>w_AtYRDOq=;&>OpwD#d~}?I%ut7qs$`Bm_@-GlSja#4WRw!w z;XQoPAY06$A7At_L-u$UUpyrjB^DU#RVFRX2UE@R5j!x|C?D|xrk<0JScR#T@)5nxBvhE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e351c7beb089e9513ef5ddaa2ac3f1a6638474cf GIT binary patch literal 938 zcmV;b16BNqP)OV%)fi;J>`G%jw)8gjVE${JR2aaY!G0~hnM zhG|@UElYTe3EXtc3bxQs9yfX7vVdw{;WqBh$^xF`2P*M9I}|qJ3{e@6PKArjoMZ`q zzv59!fmanSI=PO&6?&+plSP6ovR7f^QNATeik(_R0|VqKmg6Jp6&~t1O&))jcuMQg zz!ARWI(NwM6X$u29SRTC9OM@M7CFo&S;iB5kG}$E*e=U>kWUFR#U6!^Dg|IO$GL;Q zdG;$z?BZ=E`Hcb|x0vJv&02@&xrVwOhY7LL@4M9>gD@+_--REpnJm3KuU?nF43nuCUR}5|x-@k1XJG+|9FJHqb%=H!GZ? zR#tEVHz}HB3FEjJmo=nuF(+%t;UXt%$l)REk1CR+@t5HZYGfZVddcE%mgiK277p?u!wk{S zAzEYsZHy7*0=xAuo@I(+(gP_7Qy#3`=^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 literal 0 HcmV?d00001 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 0c555e9c529aa6edbc0d88b5522a11503b1c4878..773586ce6d4bc59fba75146af859440782479c66 100644 GIT binary patch delta 77 zcmdnM7(YS6osj_u>MM_E0V$@EAirP+hO)_LEr2`;PZ!6K3dUrKgb$64jq_z**$X5r bXA@&!$g>lF8T$Qe1xTl-tDnm{r-UW|Dr6ST delta 159 zcma#wz&Jsoo`Z#ff#EN=ArFvZO7eDhVff$Pe`Y_B$64SJSV>{1CN5Vw>GnQ%*_AW- zYKja8_#gcVxV=Jk9&gmwrPrl71Pb)u|Jy2TE6LB$U|+J|jrHyMu!K24(-=Hm{an^L HB{Ts5i)1vq 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 940731822e33eb2e301229185ad4daa12707f21d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy##1AIbUf%Jb8!S<<-nt<8_N`m}? z8MqY6E1KFnCT-ty;Q0OTzYe_G#SfIb=;`7ZQgQ3;wS#<31|qD1AtItv|NXzd>w+k! zkc#Z9Tp!*ZQsny@PeBGB+IhnJ!5?t z!-MmD3?JT1V3;o}^kB0y0?OfSzOUboFyt=akR{ E0CHBZ&;S4c 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 8c4b099dc2eaa23a05b7a51b88744ec41928fa17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1552 zcmV+r2JiWaP)Px#0%A)?L;(MXkIcUS000SaNLh0L01FZT01FZU(%pXi00007bV*G`2i*q}6ekSg z7!$Vu00opuL_t(|+U;6FYg|Sp6#f>fmap5AU8*wES zwJ1fYwIJA55Cs+N(mznD;7YpGO;cKlwbZB$QL2&}Q`7Hr@$S3tzM0I-eQ$=$i1!Pb zH<{db=ALuDbM86!J|H0>At50lAt50lAt50lA>ls&K_fF00szLU+(Z}vx!>Wyf~#QF z6tE56ZNBBLj`p^pb>BV!uIA~HM9soJehMl(_IDI zrFq*jv`97>gqi%0u^5*zhmkvp~RR8{dLV)FTFj zhNq3w{1JSu1|*q=n@kHdI;Sb~>z!q3YYr!!C9KQb)!}{DkpG7Vu%eTGq~an$acf-g^SMOHy>thq zbzS7FOh=24+6HBxUDqY;Rzs&$36#K2`ew@&!|9(AC5ntuK+?RX-JOR!Dv(`%RIORt+wbZu<h_xw1*CsMoVT?>TQs?t%=q2j3M!(jXhGg@l)8)uS=2~XMYk_x-n}nsHNJi6L7pQDrqA2;t!7FpJiuDs z?obPPv2SaY^@&7(J)T+L(Pj^?OZr(m!f4=q9K=doc!3~j+#eJ*brm?Our%MRRrk+D z%`gn-eN~CnwVd{)^nqGLDhlRTOIc^Ht`*_H!d4V4Vu@I-kZ#v|&k6)}>3T8(n z-sI!ty(%_}*cS?jbcE3gxFJ{chCuL1{Zo*qwd0{wsPK-~G#CnPNTkDzB~q^BA9`7j zcDu{BOH10N$F$}?sgZ@O^9ExhKM^zg6i=axS!2D9Zv-p6@H&8((3IJbrrz%OsFV7DNWh19W>^a3 zcGVV)AtnZj#|tcY%)o|99|XHgRw?rq+b=^_qA;SxKQCnN;FbQsc@&;isdUsHc5S2a zxJ``*uSVr@vr(N-LPA19LPA19LPA19LPEm-3I77nj@YNOl3@-20000EU<~JFLv?k8Td39%wU%1Hf+bn7?{{G*ezd7D7C@|`!Z^NDM+*=f% zdvYw{6FIl3DPZE>*0}GB^^I=3+BNFNetTK?|78TDjQn3l?p0au_&dHXaQe098!wB; zd|^f_E+0PiU;0;9Ps`M{wfEnD-t_n4NiX6Y!uj%mdK II;Vst00<5#J^%m! 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 2da568ee7d916b9b723010dcd82fbffb557c3bb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 461 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!o0(?STf%N}@0LNB5Sp&3Ny(Gvl zn1PjzT}4epGax7=J|QVLzr3Qhsin2OWBdLC$1hyGbou&?TepAx`Kzd`Edpy|b{{gEKoCN>nbsf0M>oeqBwKL852Y(#mKl ztw~SrM}+%%p8IibnbX7>6LOh^HYd%#QkvksccZB34tW*_MpEjTPYa&}GzhaW_ z(T*oS(iVR4n8Y=yyitiEu{--{?p0MKPs!OvlOEgN{PMx$%%t3;>yOKv=Rb*+eI>8f z`>XbhX%lz%S^)=!#(cI(>&m`|quemTVvJ_l95-FVS+fe_V=^^v0^e=O#g#taw;OXk;vd$@?2>>&(2ATi> 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 819d95dc37bc74098230752f0846498e325b2f52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wF4y>YXf{jT!GyGqhNqS;KSblDPRQD zl?3?(GcYo-u(EM-ar5vAi-?LzNJ`7d%E@bLY3mpm8X23JTi7@`ySll1`uGM01&74M z#wR2uC8uQN=H(X@m6Vp%*3~yPx3soRm^f+j%ms^=ty#Nn{f14Ow`|?Mci;X42M--S za`f1ROP6olynW~1{Ra;pKY9B6#miT(-+lb_{l}lb|CYJdRWmR!8F{)mhE&{od#gHF zC{cv%L;7S^ohwG#r@GFZx@5FV)9t3K?xszj!opIfrDe<%72ELc=bN(zn}fUOe4PLM zOv~f<%r@z5u@&d5`EG1&mXVnecWXsWq{REYrpCqkwVWdDF%xz^p8aY4AO{F)b*2AfzK%n`iGB(bg| zOO)sEqE!tKm#r{6FhT69l49Nax$%o;Jv;K6E$8u3dxy^JXKx(qp1$PBYq?v;PD@W0 zw>N*}xwc<-&kwx?&$qYO=BFKFelg?2)Ad`k`Sk4yK7A}-`RUV44RgB<&t2X>c>Coh zOT|Z)H$Q$X-Kf5P-qTHy_h)>w7q!q&ib?Y8@!ldSXYp&|%R^&c5Xfx1}!azi(8wPlH`^ z{-$-F;ZpCV*KX@;PrU!b%#HIOYl=nfI#$MSqOX>RRDO02tm|}M=>6bVX?x6~vAd_L;Ne=Z(vLCS0r8l4B>cUGDvQlVeSbt_u5} ztMN?P^X!)(qwAa5Zx@}byULLs^h#s7gK+S*z00^?*9Ev{g}s{}oM3JA+IxY;i$f08 mU-S7_zc0S)d*f^TPv&h!n_f?OsFVgw#|)mXelF{r5}E)CZ1)lX 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 0000000000000000000000000000000000000000..e26467dfdc484f7a8cec52d7bf45676603eead58 GIT binary patch literal 1023 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFdy@DaSW+oe0$g1Z%L@cv5&^3 zkCtSxHm*8kQSj_Yj9*F)u>E7m>Pb;9!boZ@p3;o!ZUW} zimo_c8ugBi`MmZ!-`3};x88R>7v288@~ChAwCAe-{`!Zbm8-p_tDp8PS|buy65Cn1O2(n{U4n>LKi?M~hq)lSq}@(`?g|;80P9j|ZbB(b3kQG3D_&Q4`48^VQVyyt zS#X}=mC7X`tiqrsdEmWcuN*qxYE_mf$$HF>tdyJU!LDU*{MPir zEUzWZQ|Hh8Bvr6T_$APQ*H2D4$sj`O{11&9dv7uwzPPnlhV~zr&S-`xhKJ9MItLn6u;5e;zIS&DlI9^Jc906Rb0D zreDYl<(aK@{6cBV1Vw)YtUsX4plYY#67nGVp^`s?%9%6&H#$5L{C{2K)EOxc_FYE= z*}Brx6wdpw?CMo!KDs?|LFM;_jW))d8Xs3QKD+DAHp_f-GIM3xXQ0?JbN&+Rb1a(&EVvMkH8EXyh{JTRaptiwcq@D(P;=ehLbl?EMKm*m7(@7_siS}}k zNFtnck{HL4mc!ypcyUoqJV~4rM^fS3C#iAnkyJU3biCmDy`VZLOv=LXld^HVq)DpNSPXC<}@crv@aYgx<6ny`7p)03X8`HOUBn44QZfB)e2-^8@EZ|jdA zF!heRc_I4aR_=d$B>6?$gkJRMF6JybtnViLV$Ct-3q871S*jLHa$s)tVu}s+U7&iE zrE2Lc2kBLuCSfI3jVwYQ3P^&4)8JSqrr7UhdSL z9?YbB;==Zo4eL%^Ix6CzUNdPauXFVR`IJ{HO)qG+`iMTuZG3m~+9KTxT{(NVuvV!@ zzux9hy=iMU%ajLq`cx-4Fmb9-h4>;W3~~2@UuZtS;J*0Ja%=M1*ysi3o3`e0Z&8Xq zz0ILK<@Gk*3x=&evJ$tLSkI@tnwY_BlI}gt&LWFnBxcgm;v}vG53D73DK2B;(z|h? zSbmOhFcT}Yzev@a1IosWcmryS#rAASbLW2>vH8ig#viv?{lKBPV9jsd=DmkvCi(dB Q17n%N)78&qol`;+08{n7=>Px# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5c95eb2651564b216ff1fffb225a52b9371516fe GIT binary patch literal 703 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFtvHQIEGX(KDoT#+bK|@z0lDo zrt8+#tjQ_?Jz)zM-c{XTuPC%gan^0E(+lsO&B(|!iqV=N6{Qk&XH!(HNPWunW|s<&sO>VB{+q7`^m;@70=B5 zkDTQ(IVxFyS+)827KdUH$s@eRYOJ%C9$6qa(@b?jdvsgifn2u*&TXX$P76YH+P-=o z`PnEZadhrw=C#JFc5G&jHC%Q2B)^D)>pUY<6;lhfCUO11OC}S)9JFTrHuF0F6ZP)a zJ>pLH%ciYRIRB_=LD~YAQWF!7uQ{!m3m2YS7Pdfk*9(hHcdZ>yuX9_#61&AEM?Cq3 zrx*LDVE6v(WtZFMNip7Zh%5+Eu$ayxa=7k!^?ZI( zTn!pseu}ehggUGiP)Txhe4~(Ld64ajuga&GuHQeq?dR;2m64EBaA;s)WMbhEfHE>B zG6OjaN)aM(DHvl*6N(O)FdiLPr53#R*;6ck;kUwTq`!6 z{M;q}c9QeD;J*(4Z$C3!Z~1hO)Qn<3%e4RIZ*m=+7+{W6acB^GA^xlUZPS*OO3c87 O$>8bg=d#Wzp$Pzsu@kcZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..78aa591668242095017c9d5e96f7a9873fe1fbc8 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawdOTemLo)8Yz3#}@pdi5FIM2@h zcsF};z`+CWBzDIKG_pEry11Auz9p#O(7?dR#KIx4z`kMCt2a+vCtcS%nf>^QsrM(T z{K~l&Yj@SA9If=c^vXIaY>wlkMR7)vg;t&u=kNuYJa3$GaHnEwp`ORgIc%D% z9bd_-+cP~F!Z*RN~ z5_S}5d#KNTK|$dnON#>!yQoWFXXj}{rvSwXIrsmc{ZYKiZfdjH7S#=dpe2|J9T^JOB8jP2#!ty0sZD&fDQ6klV$gI&1&*4KDGnO+vay zgr;T0tLOx(G$XORH{ZqBzanyozE_(+??xFkJ| zkSyWy*G;{kWplN}QT)Ty-9fCf2X0T)%3!`HwQ2#^p3qQ7*NWMJtWO`V6|gw*?^N3V z_wKR$xo`L%zKswq;f&vz9XeqR>$ja=!t-vOT2R5+xwm(!qmbgp;)`r2&4hj_{95qO z=-9V+7a3Ic8Xf!c%umPRQnX~TU3u8)wtweNeE*!Wqt8qTW=islGkOe`jVHsS6p?Sr4+cj*`!u%YuUtQ;TttfbreH&17ESc zob_8(>u*Kll)d6puT9+LzvzOyPr%>wXWzH>b!wSD_IdvLiK<#|-uvk9nv?%8x_wi( i(eM~BJ~ux9D*f`y%Z{oE76!n?$KdJe=d#Wzp$P!?N2tO8 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 0000000000000000000000000000000000000000..55492f6caab651f464cff5e820555053f01f76ad GIT binary patch literal 1606 zcmV-M2D$l(P)#7(@wkM03*(PI*71lVLWzMWdM2t*`%d%{Vq{Q<&PQ@R4E&Q^Qm#bWF#_OofhHu`y4f<34OG zQ|MTWjr9s0uVCXO);i7_JY!yf;R7}Q&Y5KflI)CCrcF@KIm5m&0abZ1Is%%W)C%nZ+yu=K} zgNb~=dHp;|lg30nzhf9zhS@;9#>AId&nKLBlp4i>hq=&B?jWNQsO53;xRz%Pm#YLa z{D_@g=-2X(sSI-|eRR;Ei_peNd^y3Lx(E$)(8s0ZnJ(XWfzpa}(n__?VJh43Z7Y*? z4%M{MNs-bv%P($bY$sUF42f1w6Ni3&AaNa!agwp!B7aEHMR|(sBToA$Ql4&7@`bwz z!4mnw<(wb{r>K<=JV7Yd$vtKqZAH7_!h?vb`{CJOy%uvs6+#+5v6a)UV>#f2fRmnCi_j|)ecBX`L1I`)>y0ajq| zb+U4c6pv8EMi(hLKqdRJQRHD#@_}YfV{Wb-VLs;iSs;IyMGt27$|1Tiv!9vri-|mk ziN$h=dol4W6BGv?V3cSI)XE|17$KTb?pJ(xo@hGd7(0mO8O4dWh~^v=B{?;>5>9(|3|sz=PQP3t73tSNJzB3^QAnxQPNT z9A%E&U@-+;IZRd-$Z-T$^0dho8J@aubYMnzhxA6u=N_$4WF_|GQ zZHb^@)DuFaVWIGr7 zrQ*N@j&NQd9W-c6Ttx?ixbi7$xKd-Hk#+os^LoiB9!%i{{>3)#AfvKT#~NJt4Yev8 zmvJX=@;-myT7BM8j|*2RR8%m8tpSCM9&B|fWc(RhFDhg_j;%)(GL~TLE`^M5VC!au zj49ZWJDo}S=yEs zDoT1GUPKS(Q=1QSO)aNsK2K58IL_gm?!2puB!<)9JilH1zyJU1B}F2UNF)-8L?V$$ z#0_brDbf_ZDPjZF)bX!6s#(vQJgEqArcz0BDtMK2g%@Ku&fWaMiwYw$`5IR%$WXY@ zg?+TdFXSjZc#xyC)DdzN4%|l-_o9*x3IkShufC9dj3O2JvW;|(l8VE$k!4IKRTE_y zyGT`;?4lPw^pI7|#)p}*iZ%GKN>;HCA1Y-Pm+;}DtfB!QuFEPK@u6N;aS0zT$SNxE zVUMh$6dzW~CZ6LUKD;J-=*n9BNYYid(4Kdx!8N01EXQzh ziCMIfNT--aTqOCBxPpw{e2a`ltzFjOGWD+)g9k z@sfg!G+yTdE>1FD&7uoaDPboyTqVINcCef&bWyPJ40~~LjrZuFaN!|V;pQ72Rk+ZO zx2eU&0fs4T7{gIqTxK?H6fQi$x439zDOs|Cn4Hj&k7>ZgR{AK|c$_(`;{XX7fm#l- zmO^@{8N`^zd0d=gf`W{6CbOI7{LFaL)C7argNtjtPlkew0*-Ju`x&ZR=)zYdaj~Aq z6l7#jikl>hXe-f{x2VO%0iIW|kxeBnv5oN@!Np|?NmsCu&0$(YBcIV(K}QCaw1#c; zl?9aG-)UZv4UELMYkWY4Y@iLlu)2|GdEtKQSU(6w0wvdY-jeJgL*~2V+ zsHC54VhuhlmsM2Z!){r{C49Ijt7yQ7o3e@qe7GsA_!A#4$SNxFVVA686+SGJRm{YP zD)M9#-SHzyDLJx;9r%)9E^%4I1bjL~fovg-gZQtz#c#BRB&FoY0! z-Bd70w~$QP)KSlQDp4nJ za0`PlBg3pY5H=O_WK-yT-=O#yuz=5Lf)P(jv*QM-d=U&Vh|8;2vj~^_XhgWw5^ubL{0u7PxWy85}Sb4q9e0LgV3H~;_u delta 169 zcmYe^#W+Eto`Z#ff#Ls?>N7x!DaqU2h2ejD|C#+j9%q3^WHAE+w=f7ZGR&GI0Tg5} z@$_|Nzt17a#m$(h=F z(KIbxl56W``H{}nGEP3 zunvQE#+VRZ5)^3C+QEiW05JCt+ewYfLA;f5O)-EYF?_CnQ+Qod<&h~YWiQLlcK_aMb9_VBLK5gB-O6C!c4 ze(+7&g11A`NSaFDr_U45S&NAa(e9_`@Zd=m_?5nA{m1r~!%ExEbYAQ&Y0GnmdB%sW zRbk5SU;TS>28e7Acm7++$U1F)hkN>l`$EyWa=<_Rf|0Ohdd(Tm?YnEMS;@B$;zUw< zaaNf(d{6^z9xaPDAC^TDM8C*hBq2M3+rQ~!Z6Svb2_1}jJ=A_GLZwftR`f--*UVjM zB=rJ5vGn$!Z3fGUXhy=0`*>^x;!rST5dhgcW^?j@)xQ{HSZgqV%{|)BJNMs!osXw{bQ)mlB{mP zQcIVNgd>Rt-oWep4xq%!;Kr>oRygh9*vIMUNU~uWI&&_zt&@-{XWDv&pry@&Ok1rw z8HY&&q?SSOcV@)lynI zU0?-JMwbjSZIt^pnaAw{CbChffqNxs=)#G|d2B~p$Hu@QolS4KHDxkdGyuDIC^K1d^-jqS44H+II3XbnutpOO}I3!%BoWloLc9XtPcgC9pN< z^XyX`ADsU^M_jhyk8#sJ*YPj)YP%H%9l&&=h$L!-Wsa4(4$L(;ecoNBbwqpsshXl$ z@0gA7h65BRLNLoRy0%)gI;skI$!5Ef6Fokw<%JEF7+3^9Z_mbgSd?6q;eI zt}=)-Ys~tqEs`Z<^D<2dj9sr_yh}bYjK<7~oVmtBhAVqdal*VeLu70qcm6Jabz^}5 zJeUHE7KKhIh|SBS{E}z=crrKsB#H0|3vssU@=LI<41?Az*Qs~g!#NEIT^CV0^@`7s zleHOSKJbYn{LG;-Si)Q$Xqvqq`L@oE+4;PL&HzRSEY!Zfeof`rqf%ID)nkvw! zlU<)~_23%q+*69NEFVuX`cZy&leHhxfk+Wh7I7_`yV0zCFG!*ne7icqeE9KsC+=h{ zFQxcvSok|vFKk-GjE$c#CtY;7T2t3;@i0V`EXJRLztzFis$NQq(p7x~9pet6X z%Hl^7Ph37SRVS!m(hcuF%IPPKQka0lt2FaHW zSPaXM3YYnjqCv~%PKBCw;kk1!k&{L)h=GQx4--}Puu!>sE2X^$$@lB^q}&zdaBgeQ ztu)5pzZt32ETvhYyB39D^lU%DgQgv&#U%8l^-CA%qY@2qA=!B5=cm zUgehujQG*l{{`@rPr!f|fEk^>KI9WteE@ilV6HEl&_rJ@p_zU*;T}RirIc{5NocNLm*7JGdV(AM zYYDFOvk5~8{Z*t_>U=!XvoehUSEh=adIga45oe)B9kGgT}7UT3Cirmr(oHPv^YQ1-p=Hlh5u;xggf zX{&yw+El-OrrKQJRl@b7x{HLmNkj95`a#LLnW{Veb2C+!`ppt#r)=g4@?c8RY{yJj~W@W|h^mU4q`i)2y~Rw@J`jIh$1%|In!~{Tb{nMqaxlgb+dq eA%qY@zJ@mriVM?qfwL0;0000XA}bD!(9cT_&`IduQt zWEIazDo;(qBU7e6_qq8s>TQ(WF8!V7v%Q!Krp(^6RD)sqPxDm9AJhH^i8Y))HDCUK z{MLT{hS?%)54`UMNi_ThGS2T=X21}x$$LO)DPzP^6Nd9Z=9EheHGi0S7#NsAt~Ov` zKw_5t-j{GHI4tr>y5DXFi68qOsFv^4V3+s<6fNcRW^CK9?;&TjntjE7{S`TL*MDW$ z`knPF%jT+vU%#79$ratuKj7>3qTJTuZ>?i$a9Sd|sM{;| zdWPVhlVV+s{4U&khX10S7;hkmUqs1|P|lx%CYG zk}FH=8CLgP*<|0~>Xvm+{=oU3E8qVy_XPBO8%eGWXnNyY17u=00(M7MV6Tw`^_hwaB!2?=Ahj hwOKaEvclu~AN#&f8uzPy?N$SM)YH|^Wt~$(69AhQ@lgN( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7753cf4319a1596338dc5c73713da6f1832eabba GIT binary patch literal 994 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfqA8;i(^OyDh zU3;{nBjcc>%Dt_#cXWvq7QDNZ@Oa6gt!5lteE+z;9PYME{wJFEN-c!X#LcQqx5}{N z>bETYTia)Dt=tiR{c-uv* z?-u18Heb2|z<(3J|BAYj_nRHb8+zp1G zC=tWdu%86N$o%RTD;iIVcS`u;FkF@TNp3BH<9i7)Tt@0aMx?k z5)b{HhLYWm7hjnnhG!-ehRcymWX=t{(4? zqCNxNXM(~(j560I6l6bel@q!ZqRJGrpt+^|)cfaRLQdyq^F6rW*tUGnYcnIKRcg#W zo7zO&D{qqvht=yk=!h<2bVT8eiIBf6;5FFT=!|4q{>eK>9bQ}#*gFXkgW?fg2%XDjNBO@5pxxN%k9q4&=I|Cj4z7n=wi36z%Tf+YViSLf}o&?`9cao zRf9;uzC~5Z)eZeC?p=_3V7h91F8_wkS8H!E+qiudd&{`)lcenX3EkfqRP`@@yryZ( zkT-XcyL9no_61KY|6ev*Dt@5y-e>c-Mz7fejLuKEzvXF_bUXU_x zyUMMr@%7OSlQ!G<{!xo@~`iztJub{;=K`nWa@0i$1L~$Ovnw3 t4Ea~}oAE{`g9HNu8$$ylLjnVWd4Ij_{mJ)40;NFV=jrO_vd$@?2>`ZpYmNW_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ded5652e406a8bb0788402b1ea2034968a241ead GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=J@dWsUxB}__Fko@OdIgZrQWE4B z%@VZ8#xa<@HhnOS1viNAnEC})a|0sJS72xJ-2)f?&QaR z?3aFfZT$|bN3Ya!ZWwgOIdJDMXyKo5=w(d|$6F^2ai?7ZNyM@uS}y1~X^1JRa37T8 i%D!pbm~%M(0r%^vOJ5j@by@-4#Ng@b=d#Wzp$Pz$!&MXj literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9e242e7748071f029d35d43492b9619b7c2104fa GIT binary patch literal 2248 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 Hu0mjfk57Cb literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3383221927dad70ecc61e956c90b297d7c9e2e37 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgn3BBRT^Rni_n+Ah4nJ za0`PlBg3pY5H=O_WK-yTwI2M=Y`mTLgAh+jv*Dd-d=O$Vh|8;2z+Aku3qSS zVy>#^r0->3z4vokfQmq%zH>A8*52nr=j}2|Hr bs6F6p^~HgW^=hHXY>zopr0B6q^SO5S3 delta 181 zcmYc|#yCNuo`Z#ffx%?y&DaqU2h2ejD|C#+j9%q3^WHAE+w=f7ZGR&GI0Tg5} z@$_|Nzt17a#bp?HUWgqi6z=Kb7*cWT?KMX(1_1$wz$X^(>V>{1=Bj#5`d;SMdq1ZI zs0ak=J2!K0?R_qE-Y%mwuBw)qiG@QzU%{b)fsu*j&gAm{ug$<5h~fjzR$m<0Sg#hE Q%mxW~y85}Sb4q9e0R6x;NdN!< 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 - + - + - + - +