From bda8abfe3d0a703644869564b39b8c3d304f98bd Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Mon, 9 Dec 2019 14:42:28 +0100 Subject: [PATCH 01/15] Allow multiline notes --- app/src/main/res/layout/loyalty_card_edit_activity.xml | 2 +- app/src/main/res/layout/loyalty_card_view_layout.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml index 4ce3df789..17897cff8 100644 --- a/app/src/main/res/layout/loyalty_card_edit_activity.xml +++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml @@ -119,7 +119,7 @@ + android:textIsSelectable="true" + android:scrollbars="vertical"/> From 7b7624a3e074a6bdeef4e40186ccf9165fd6b4cc Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Wed, 11 Dec 2019 17:35:31 +0100 Subject: [PATCH 02/15] Fix white on white icons --- .../card_locker/LoyaltyCardViewActivity.java | 46 ++++++++++++++++-- .../drawable-anydpi/ic_arrow_back_black.xml | 11 +++++ .../ic_lock_open_black_24dp.xml | 11 +++++ .../ic_lock_outline_black_24dp.xml | 11 +++++ .../ic_mode_edit_black_24dp.xml | 11 +++++ .../res/drawable-anydpi/ic_share_black.xml | 11 +++++ .../res/drawable-hdpi/ic_arrow_back_black.png | Bin 0 -> 174 bytes .../drawable-hdpi/ic_lock_open_black_24dp.png | Bin 0 -> 358 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 361 bytes .../drawable-hdpi/ic_mode_edit_black_24dp.png | Bin 0 -> 245 bytes .../main/res/drawable-hdpi/ic_share_black.png | Bin 0 -> 453 bytes .../res/drawable-mdpi/ic_arrow_back_black.png | Bin 0 -> 124 bytes .../drawable-mdpi/ic_lock_open_black_24dp.png | Bin 0 -> 231 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 235 bytes .../drawable-mdpi/ic_mode_edit_black_24dp.png | Bin 0 -> 177 bytes .../main/res/drawable-mdpi/ic_share_black.png | Bin 0 -> 287 bytes .../drawable-xhdpi/ic_arrow_back_black.png | Bin 0 -> 182 bytes .../ic_lock_open_black_24dp.png | Bin 0 -> 411 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 415 bytes .../ic_mode_edit_black_24dp.png | Bin 0 -> 264 bytes .../res/drawable-xhdpi/ic_share_black.png | Bin 0 -> 525 bytes .../drawable-xxhdpi/ic_arrow_back_black.png | Bin 0 -> 237 bytes .../ic_lock_open_black_24dp.png | Bin 0 -> 609 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 610 bytes .../ic_mode_edit_black_24dp.png | Bin 0 -> 350 bytes .../res/drawable-xxhdpi/ic_share_black.png | Bin 0 -> 799 bytes 26 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml create mode 100644 app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml create mode 100644 app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml create mode 100644 app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml create mode 100644 app/src/main/res/drawable-anydpi/ic_share_black.xml create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_back_black.png create mode 100644 app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_share_black.png create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_back_black.png create mode 100644 app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_share_black.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_back_black.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_share_black.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_black.png diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index d3db308e3..e3000e90a 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -6,6 +6,7 @@ import android.content.pm.ActivityInfo; import android.graphics.Color; import android.os.Build; import android.os.Bundle; +import android.support.v4.graphics.ColorUtils; import android.support.v4.widget.TextViewCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; @@ -44,6 +45,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity ImportURIHelper importURIHelper; Settings settings; + boolean backgroundNeedsDarkIcons; + private void extractIntentFields(Intent intent) { final Bundle b = intent.getExtras(); @@ -165,6 +168,17 @@ public class LoyaltyCardViewActivity extends AppCompatActivity collapsingToolbarLayout.setBackgroundColor(backgroundHeaderColor); + // If the background is very bright, we should use dark icons + backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > 0.5); + if(backgroundNeedsDarkIcons) + { + ActionBar actionBar = getSupportActionBar(); + if(actionBar != null) + { + actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back_black); + } + } + if(barcodeImage.getHeight() == 0) { Log.d(TAG, "ImageView size is not known known at start, waiting for load"); @@ -203,13 +217,21 @@ public class LoyaltyCardViewActivity extends AppCompatActivity { getMenuInflater().inflate(R.menu.card_view_menu, menu); - if(settings.getLockBarcodeScreenOrientation()) + // Always calculate lockscreen icon, it may need a black color + boolean lockBarcodeScreenOrientation = settings.getLockBarcodeScreenOrientation(); + MenuItem item = menu.findItem(R.id.action_lock_unlock); + setOrientatonLock(item, lockBarcodeScreenOrientation); + if(lockBarcodeScreenOrientation) { - MenuItem item = menu.findItem(R.id.action_lock_unlock); - setOrientatonLock(item, true); item.setVisible(false); } + if(backgroundNeedsDarkIcons) + { + menu.findItem(R.id.action_share).setIcon(R.drawable.ic_share_black); + menu.findItem(R.id.action_edit).setIcon(R.drawable.ic_mode_edit_black_24dp); + } + return super.onCreateOptionsMenu(menu); } @@ -258,13 +280,27 @@ public class LoyaltyCardViewActivity extends AppCompatActivity { if(lock) { - item.setIcon(R.drawable.ic_lock_outline_white_24dp); + if(backgroundNeedsDarkIcons) + { + item.setIcon(R.drawable.ic_lock_outline_black_24dp); + } + else + { + item.setIcon(R.drawable.ic_lock_outline_white_24dp); + } item.setTitle(R.string.unlockScreen); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); } else { - item.setIcon(R.drawable.ic_lock_open_white_24dp); + if(backgroundNeedsDarkIcons) + { + item.setIcon(R.drawable.ic_lock_open_black_24dp); + } + else + { + item.setIcon(R.drawable.ic_lock_open_white_24dp); + } item.setTitle(R.string.lockScreen); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR); } diff --git a/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml b/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml new file mode 100644 index 000000000..98478bec9 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml new file mode 100644 index 000000000..6481a6ab2 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml new file mode 100644 index 000000000..e79c7fa13 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml new file mode 100644 index 000000000..0fcc94c3d --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_share_black.xml b/app/src/main/res/drawable-anydpi/ic_share_black.xml new file mode 100644 index 000000000..d6d88a382 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_share_black.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_black.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_black.png new file mode 100644 index 0000000000000000000000000000000000000000..ebdf584072f2bf37a00dfb4d39fd3f02b66ded99 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBN~)y>7_WU?AXf@kOJ^ z=Gkk%N;I{fym(jl4NEtNUy7Yi@>d5=L)Bvu>`&(`m*818rRd0+oVJ5UTv9$CXXaUU z%}U6b$8i6l6|de!ubaFx_3Vu8*X=ppO?9lh;v(oOB6aHgim#is-^g;kI?v2@Sfcs` Z%elk55B*jbvI07Q!PC{xWt~$(69596MKb^Z literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8e6a089716dbddaa3e09bdf07c5247639e6b8b2f GIT binary patch literal 358 zcmV-s0h#`ZP)6uMwIR2``*r{pI(Ik)Rw<7oQq zVZ(CDmJWm*VLzjDE^rKbnk_x93|LVk{Ts}gK)XrJ-J*yCX;_^ zaU9P`)=?CN5cHuN9V7^XIR(y>B)O+)`s4x~#$Yp6R+c2EHb`4w1KTk&b7Dasv{n0} zC_)JO&~YfEnZj1cU_yvvmSwB94Rjb|P`R-JmNkPcs9-ph%v4=d`U{<$dvev-nl5|T zu$uC;1EEG3P}l>gvBzBPKonrh0{A@^;Ijp69guOLs;Z{sOwcL0bX|gdrS>J@`(q%Q zywe4u0NV}OqO&O=_#SfaG!8W0Wy5_spuYtw%W^@l`v!vkSAp=V)A*IyUf=x!j04f} zJt&U!;hR7=1<=i9$l4mR?v%NU(E20c^*f2E|ZXX+_hGNCAc1AFQ5sYB|5`!<}nPW7et2X v0g+-_Aacwahy{a$5H3KK!}`Z5k!;8Z^g0oRL+#2$00000NkvXXu0mjfL=j@l literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_share_black.png b/app/src/main/res/drawable-hdpi/ic_share_black.png new file mode 100644 index 0000000000000000000000000000000000000000..7bfe54373cf07635612e8515b3f69f31c6be4630 GIT binary patch literal 453 zcmV;$0XqJPP)_?|B1pxQM5{r)L|5;DW4Go z@;vY0FPMe$88IN_%6St|mStyBJVS&dw8BGan(l;Qc-sVHJcr7%Tt}F4z|0m#v3`Zo z578>Cs%nM#LgNa^jBtbm&@S`_5O2o&5MI6qBNO%O0dvQ&8SApp5j~(9ab0(lUtP}$ z{2nu*O*OSEP3%inkJ^2?h6Y9xR0pF|dWqgLTDC<|Y_}-c3G+v4I*(d-=2Y^yU>A^e zA+s*2|5Ntd6FJ)~+ZeHTVx%!Hc|?7xf!%X{bq2-Z3b2d%aD`_t^E}^h9A_>0mPgJx zXvCpw9E`>Zp*eoMXmasc?B>C6F>Ebb$Ae_P4dETH2}<;ShRQr@(Z>!&Z>&~%h+$)% v*pfp(USdUcT4lQ12z$@G2g&uJUZms;@RS(%xQ*rv00000NkvXXu0mjfK0?Yj literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_black.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_black.png new file mode 100644 index 0000000000000000000000000000000000000000..24a4928186a265854983c362ca7ee7af9cf384a8 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj&YmugAr-fh6C_xjxg;bdUp5+? zrS?sKMpu3<_pf}3ML}y`DqWknmRU#L77#NJs WdzEv}YbXX9$KdJe=d#Wzp$P!qUnO$@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7bef37b2acbb554f821247c1af1177caf0745bf1 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj>pWc?Ln>}1CrI!(`1|`GyK?2q z(IZDxm|7fjCP;+xuuG*e95GbjF|iS9NvxS5V;aL}q;clZA*Y247dCQ&6?yb2&2MO8 zO5r%+P-3}4RpE5(iERf?oY0UFQBeqAe7f<7Ly>~1Nq5bHhmH#IJbK(byu3>jq&yEQ z*edLG+1(|>bIIH1RHvePOy@Q88r=q0yLBg)++ccg;<(t%=KD;u*e_-nEsYO!{Cp_y b1S7-b-Wh@s6ID(EUC!X?>gTe~DWM4f<|{Ln>}1CrI!(`1|`GyK?2q z(IZDxm|7fjCP;+xuuG*e95GbjF|iS9NvxS5V;aL}q;clZA*Y247dCQ&6?yb2&2MO8 zO5r%+P-3}4RpE5(iERf?oY0UFQBeqAe7f<7Ly>~%lphLg84dz+>@1B}c=Wh=czKs5 zNO>MquvOT5q{aGVn{u>M$c72R>s($-?-M(qBp;pbP0l+XkK!IM&6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..fd08725aa0581452075b875f9dc242551fc1490b GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj6`n4RAr-fh6C_x-u(h?d1-ZGo zIUYN9%+18`&XFT3m#$nfVe9f;nZx5YlmIUex$- zT~7|Dhm4BmdKI;Vst0Ih94Hvj+t literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_share_black.png b/app/src/main/res/drawable-mdpi/ic_share_black.png new file mode 100644 index 0000000000000000000000000000000000000000..d03e2495f8622797dcbcdff72eb5c1cc69806523 GIT binary patch literal 287 zcmV+)0pR|LP)9U5UhgW-F`v6R6HbU9z;($R(exGL_emV?hd3-ib63P5DYAYJujR1hw+UK~?Vu90Usjs^Iw)JlP`W+=djkQRz(x zv8TIC9&!j_t&}m9*3CX{#8t8tcQ|bb{c;)>eW;o%6q>{wh;gXw*9m!K*+i5u5SoBPRqL7 l1a&rxhIwGH+(Z7Y^8!mQ$eHs$GYFU{p^YHD`h zt#y~Hd@>PC{I9(9iAATdW!jI<&VbI2-S5?81(lmPlsXiW{90zpdUocweBs`@#)g5x a;{%hcfK-kBsbEE*(F~rhelF{r5}E*NMMKg6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..54fefc3e819ad4dd08fcadf89ef334667f6f6e1e GIT binary patch literal 411 zcmV;M0c8G(P)%7EP$7gGTaBGYCoov-BzZ5HnU`iVk@iEa zuIrgnYMG{KNwz1uG=}FA@8B~^@L86H07}0%n>9Y+n6OU?lzIicg@{65cJxV-#7_WT zo6vz>+kDWMJ#0)+Q55a-JYQE;HGlZw8UNv33z3j5Va=GQB;C-e2A16l;A7?lOJbv< zm@97suahu$0%HwM0A*1JQ540hYhU;pyHIiv*y#zY$NZ}XUp=ug*5Cx3f7S3MBu1K zAGio$ZWkxc+mO}5`Fuh^2nc~cB%mvIUu9({@JzY8Dl0nyn{sziR(1k5uy>MrF+?!V&-g002ovPDHLk FV1lR8u#o@& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..edff073bcdef11e813874db84f15997be6f3d933 GIT binary patch literal 415 zcmV;Q0bu@#P)r?i{Evgc_^HPNOq0SnMQoPBM=)lZna) zNz*hlW6UzkvWj#=dTbTX72d&Sl;HC`j{uZ@&n|6kqA_8g5-4*Icn1-KvEt~{G)-;* zJhh<%J$2b&ta#YipyD{*6h-k@*Y(fU4$t@x?>dM?VhL-{W3IsoBuR331pr?F z%q3BQcnq(e$e|UVLkTE>F%zKLy=YIEyGPGFPn?l<@CBdVz?1IZ4ZP!=wD&^7ZdgOA zmj*{QdMiZ$zP%>v5Y@uFKP8|9l)x7f;GO%?&MHpeR_E^9S;YysI(MJWDo()Fx%+fh zCGhnj6nqi~Uq-bPD*+{-1pN97{-ZwlYn9+Hwt~M}R8jeGxd6~3Rhe7(;;sMy002ov JPDHLkV1lS-x-|d* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..710d6cc0cb1cfff608fdbfee9ff7e93a9aec22ee GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt^PVn_Ar-gYUa{pmQ0 z{kDSN{4A^yIU5drXFKq)nn~f~T1KEYhKxT^3^s9>O>#HeGPs^TeYWMvfg@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_share_black.png b/app/src/main/res/drawable-xhdpi/ic_share_black.png new file mode 100644 index 0000000000000000000000000000000000000000..eedcacb55ec913632f4d61edaa3e4b75fc841843 GIT binary patch literal 525 zcmV+o0`mQdP)@@1S-Wv=C*Lj{#hr{6)lh?e*HEHkwd5C--jYi+ThOOoUW4}S=0nswk#2iI3JRss*+2Z#(g_h|VY zzZclnR&)n#f?I<83w%yeBq!q*dF<|pDTmNxrHm*iNw>%X47EiTE(=)RE&8S=TjtIk zWQx%azhychr z0KfX$Zknd|1RH7+T$ku(1kvyJZ?}1=Ckd&q(F7FxSp{-DRV(xk@-1RGP87Y?G~&Zn zB}X7M_{~)y}g_FkO711MU#L7 z8WVe--j_;gcw^7LWbsBdV4-PcK8O1zv_VS%u-`Ll~d_vHgV}kcB zV}4GdCHAgW@7XdNM3QTqnpik5#ZB)@-ufq-^to0@alJ|`w-ZMHUr`-DDcdnIjDkXsEYwt{6<=}-J#g&hb+O`E zGT%PEP3!Ue*%^Jd(O_fB+{X4b79ZZu%uQLpQ}gkRO`)OA^3%>(gfn|29XchT9v1b> ze)mc7dy--kDp{sT+LX9AKH(3@>T*_bc3^Pa!Zp^MTCIMJ~D8oGgpH5>OK}Eq0wC_u2-7?_uvEyBOyF-&u8_hAQtw&=Yb z_6KI)TeIN8l9$I%I`i?i%B>3WZuyn`>+)RjAdN)xyh*v2Z|-4cPWt}&n;(*LCrjwi5us8yxkZmoY)>r{+&gVqM{-wKDQj|s(&Hdrg^!%l><$NdAAL z6mMakqwtwS!#E;i-OG-dO1`fI1F~i{H*j=-(FxnP(_8m>RK(6aRCT?}G%+{g@zLy? zldj!AedKj^b5P)y_~f(Gx5$_l_$kI7nUpi#mG{--O>c^NBQjZAww4#24`R`HuhJ5q z%y;Rg6(__cAEWU-kxf+<^9ed6M<=m!PC{xWt~$(699&$4V?f0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c36f260fa4893d42ff48af4f97d3637cd1cd0b63 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U{v*VaSW-r_4c|oUz3A~TjHX< zo!SMAViq<|&Woc1ti%srn)|YY(~5a9=XZPcnQcj3`VSB3aw&np>E6dXvS%Ip`I%#R z?rraiww`>6w%X88^ZrkB=IvUy{*yQA|0HL>e$_o&`Lo7fU)yp4%P#(8hVl!egnatytKXy@K;z+vHYVEopXK^xLsZ`bg zjBy2wm_`wYSOhRFtQVKyNEkKdaELO1xlcMQ%I*e0K6*2(20^d^0=~9TAc9vWm^kn% zUSEi|JB%^Q$c6#Hc}qCt3(Jn>H)FcrrZSPp#TaIkZ2)s(BilISkc91x*<~x++{3-z z0K+U`HrR{;%r0hGVLh1{CixwCfP9cuw#h@}Bl1#Vtxg-0oXSFlNh8}-Fe+JL%OkBx z&K`xmN*dWNEI2t#@=UT_M9#T#42}^a+b&FU(X#ErB&TfC%PFjECpdU6O!8Z?&7BJe zj|8s(`3jJhn3A;0eBl~JasJLtPjpj|x4k=CM0?cpJL|dw7>(Qw(vZ zHOyE}HilWV**qN#1}h~WgBfURxi%V&s>rs$CUE#YW}ijbjZmulUV_BzV3yd7GT3wG z-E+?0LB1jHB;7bfX})4lXI5Kaj9KXS`v>Geg2^)G>mUdY#k3JrFw3^!A<`DiafFGx zM~~0PxTYqejfk`b4>k`k*xZ+owjR}LbxBG#El$hn)$!vm7g93mr!7FHoI4(IYT}5T zQV${@xd4cqB!;+uw*~z5*|p~diHaw-E$DrPKIIx?0UH;7lw=Edr~t(Sr2qDb3lgl7 zbaE3pR+*0{>Y6r+2{T*DIZWoL5f>ahy&YE5WD-jzj+3O>9hr%HYL10dvrL|0rlFys dp`no~J^9j__6>1002ovPDHLkV1msVZHoW^ literal 0 HcmV?d00001 From a642b127955986d79b1b787713ade15a67ea603e Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 15 Dec 2019 12:49:09 +0100 Subject: [PATCH 03/15] Use a const for luminance halfway point --- .../main/java/protect/card_locker/LoyaltyCardViewActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index e3000e90a..b15c4f8f9 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -31,6 +31,7 @@ import protect.card_locker.preferences.Settings; public class LoyaltyCardViewActivity extends AppCompatActivity { private static final String TAG = "CardLocker"; + private static final double LUMINANCE_MIDPOINT = 0.5; TextView cardIdFieldView; TextView noteView; @@ -169,7 +170,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity collapsingToolbarLayout.setBackgroundColor(backgroundHeaderColor); // If the background is very bright, we should use dark icons - backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > 0.5); + backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > LUMINANCE_MIDPOINT); if(backgroundNeedsDarkIcons) { ActionBar actionBar = getSupportActionBar(); From 280fe76609394b37cef23293874401138d073734 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 15 Dec 2019 21:29:34 +0100 Subject: [PATCH 04/15] Use DrawableCompat tinting instead --- .../card_locker/LoyaltyCardViewActivity.java | 55 +++++++++--------- .../drawable-anydpi/ic_arrow_back_black.xml | 11 ---- .../ic_lock_open_black_24dp.xml | 11 ---- .../ic_lock_outline_black_24dp.xml | 11 ---- .../ic_mode_edit_black_24dp.xml | 11 ---- .../res/drawable-anydpi/ic_share_black.xml | 11 ---- .../res/drawable-hdpi/ic_arrow_back_black.png | Bin 174 -> 0 bytes .../res/drawable-hdpi/ic_arrow_back_white.png | Bin 0 -> 233 bytes .../drawable-hdpi/ic_lock_open_black_24dp.png | Bin 358 -> 0 bytes .../ic_lock_outline_black_24dp.png | Bin 361 -> 0 bytes .../drawable-hdpi/ic_mode_edit_black_24dp.png | Bin 245 -> 0 bytes .../main/res/drawable-hdpi/ic_share_black.png | Bin 453 -> 0 bytes .../res/drawable-mdpi/ic_arrow_back_black.png | Bin 124 -> 0 bytes .../res/drawable-mdpi/ic_arrow_back_white.png | Bin 0 -> 155 bytes .../drawable-mdpi/ic_lock_open_black_24dp.png | Bin 231 -> 0 bytes .../ic_lock_outline_black_24dp.png | Bin 235 -> 0 bytes .../drawable-mdpi/ic_mode_edit_black_24dp.png | Bin 177 -> 0 bytes .../main/res/drawable-mdpi/ic_share_black.png | Bin 287 -> 0 bytes .../drawable-xhdpi/ic_arrow_back_black.png | Bin 182 -> 0 bytes .../drawable-xhdpi/ic_arrow_back_white.png | Bin 0 -> 225 bytes .../ic_lock_open_black_24dp.png | Bin 411 -> 0 bytes .../ic_lock_outline_black_24dp.png | Bin 415 -> 0 bytes .../ic_mode_edit_black_24dp.png | Bin 264 -> 0 bytes .../res/drawable-xhdpi/ic_share_black.png | Bin 525 -> 0 bytes .../drawable-xxhdpi/ic_arrow_back_black.png | Bin 237 -> 0 bytes .../drawable-xxhdpi/ic_arrow_back_white.png | Bin 0 -> 398 bytes .../ic_lock_open_black_24dp.png | Bin 609 -> 0 bytes .../ic_lock_outline_black_24dp.png | Bin 610 -> 0 bytes .../ic_mode_edit_black_24dp.png | Bin 350 -> 0 bytes .../res/drawable-xxhdpi/ic_share_black.png | Bin 799 -> 0 bytes 30 files changed, 28 insertions(+), 82 deletions(-) delete mode 100644 app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml delete mode 100644 app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml delete mode 100644 app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml delete mode 100644 app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml delete mode 100644 app/src/main/res/drawable-anydpi/ic_share_black.xml delete mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_back_black.png create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_back_white.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_share_black.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_back_black.png create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_back_white.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_share_black.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_back_black.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_share_black.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_black.png diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index b15c4f8f9..b13430e41 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -4,12 +4,16 @@ package protect.card_locker; import android.content.Intent; import android.content.pm.ActivityInfo; import android.graphics.Color; +import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; +import android.support.v4.content.ContextCompat; import android.support.v4.graphics.ColorUtils; +import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v4.widget.TextViewCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.content.res.AppCompatResources; import android.support.v7.widget.Toolbar; import android.util.Log; import android.util.TypedValue; @@ -55,6 +59,22 @@ public class LoyaltyCardViewActivity extends AppCompatActivity Log.d(TAG, "View activity: id=" + loyaltyCardId); } + private Drawable getIcon(int icon, boolean dark) + { + Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon); + Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon); + if(dark) + { + DrawableCompat.setTint(wrappedIcon, Color.BLACK); + } + else + { + DrawableCompat.setTintList(wrappedIcon, null); + } + + return wrappedIcon; + } + @Override protected void onCreate(Bundle savedInstanceState) { @@ -171,13 +191,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity // If the background is very bright, we should use dark icons backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > LUMINANCE_MIDPOINT); - if(backgroundNeedsDarkIcons) + ActionBar actionBar = getSupportActionBar(); + if(actionBar != null) { - ActionBar actionBar = getSupportActionBar(); - if(actionBar != null) - { - actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back_black); - } + actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons)); } if(barcodeImage.getHeight() == 0) @@ -227,11 +244,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity item.setVisible(false); } - if(backgroundNeedsDarkIcons) - { - menu.findItem(R.id.action_share).setIcon(R.drawable.ic_share_black); - menu.findItem(R.id.action_edit).setIcon(R.drawable.ic_mode_edit_black_24dp); - } + menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons)); + menu.findItem(R.id.action_edit).setIcon(getIcon(R.drawable.ic_mode_edit_white_24dp, backgroundNeedsDarkIcons)); return super.onCreateOptionsMenu(menu); } @@ -281,27 +295,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity { if(lock) { - if(backgroundNeedsDarkIcons) - { - item.setIcon(R.drawable.ic_lock_outline_black_24dp); - } - else - { - item.setIcon(R.drawable.ic_lock_outline_white_24dp); - } + + item.setIcon(getIcon(R.drawable.ic_lock_outline_white_24dp, backgroundNeedsDarkIcons)); item.setTitle(R.string.unlockScreen); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); } else { - if(backgroundNeedsDarkIcons) - { - item.setIcon(R.drawable.ic_lock_open_black_24dp); - } - else - { - item.setIcon(R.drawable.ic_lock_open_white_24dp); - } + item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons)); item.setTitle(R.string.lockScreen); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR); } diff --git a/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml b/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml deleted file mode 100644 index 98478bec9..000000000 --- a/app/src/main/res/drawable-anydpi/ic_arrow_back_black.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml deleted file mode 100644 index 6481a6ab2..000000000 --- a/app/src/main/res/drawable-anydpi/ic_lock_open_black_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml deleted file mode 100644 index e79c7fa13..000000000 --- a/app/src/main/res/drawable-anydpi/ic_lock_outline_black_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml b/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml deleted file mode 100644 index 0fcc94c3d..000000000 --- a/app/src/main/res/drawable-anydpi/ic_mode_edit_black_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-anydpi/ic_share_black.xml b/app/src/main/res/drawable-anydpi/ic_share_black.xml deleted file mode 100644 index d6d88a382..000000000 --- a/app/src/main/res/drawable-anydpi/ic_share_black.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_black.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_black.png deleted file mode 100644 index ebdf584072f2bf37a00dfb4d39fd3f02b66ded99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBN~)y>7_WU?AXf@kOJ^ z=Gkk%N;I{fym(jl4NEtNUy7Yi@>d5=L)Bvu>`&(`m*818rRd0+oVJ5UTv9$CXXaUU z%}U6b$8i6l6|de!ubaFx_3Vu8*X=ppO?9lh;v(oOB6aHgim#is-^g;kI?v2@Sfcs` Z%elk55B*jbvI07Q!PC{xWt~$(69596MKb^Z diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png new file mode 100644 index 0000000000000000000000000000000000000000..f782543d3db50919a8abbc863101435d83504cb2 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt4W2HJAr-gY&e+S<>>$9l)%%mq z^mETW6^|Tp_gScr>Ga9(x!xRwZ_+=`NlI9($xHq7a28OvLdTrXmqYJVWb-}SZt=@> zDdV=Y|GW0Ro4V;{{=K0=gyoHZ6LJjY?`6YXg)Jve&hhiKRFAix!e$}&jxVTvcl(?# feb*To9NI+X|48m$S$u36(CrMKu6{1-oD!MQ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index 8e6a089716dbddaa3e09bdf07c5247639e6b8b2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmV-s0h#`ZP)6uMwIR2``*r{pI(Ik)Rw<7oQq zVZ(CDmJWm*VLzjDE^rKbnk_x93|LVk{Ts}gK)XrJ-J*yCX;_^ zaU9P`)=?CN5cHuN9V7^XIR(y>B)O+)`s4x~#$Yp6R+c2EHb`4w1KTk&b7Dasv{n0} zC_)JO&~YfEnZj1cU_yvvmSwB94Rjb|P`R-JmNkPcs9-ph%v4=d`U{<$dvev-nl5|T zu$uC;1EEG3P}l>gvBzBPKonrh0{A@^;Ijp69guOLs;Z{sOwcL0bX|gdrS>J@`(q%Q zywe4u0NV}OqO&O=_#SfaG!8W0Wy5_spuYtw%W^@l`v!vkSAp=V)A*IyUf=x!j04f} zJt&U!;hR7=1<=i9$l4mR?v%NU(E20c^*f2E|ZXX+_hGNCAc1AFQ5sYB|5`!<}nPW7et2X v0g+-_Aacwahy{a$5H3KK!}`Z5k!;8Z^g0oRL+#2$00000NkvXXu0mjfL=j@l diff --git a/app/src/main/res/drawable-hdpi/ic_share_black.png b/app/src/main/res/drawable-hdpi/ic_share_black.png deleted file mode 100644 index 7bfe54373cf07635612e8515b3f69f31c6be4630..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmV;$0XqJPP)_?|B1pxQM5{r)L|5;DW4Go z@;vY0FPMe$88IN_%6St|mStyBJVS&dw8BGan(l;Qc-sVHJcr7%Tt}F4z|0m#v3`Zo z578>Cs%nM#LgNa^jBtbm&@S`_5O2o&5MI6qBNO%O0dvQ&8SApp5j~(9ab0(lUtP}$ z{2nu*O*OSEP3%inkJ^2?h6Y9xR0pF|dWqgLTDC<|Y_}-c3G+v4I*(d-=2Y^yU>A^e zA+s*2|5Ntd6FJ)~+ZeHTVx%!Hc|?7xf!%X{bq2-Z3b2d%aD`_t^E}^h9A_>0mPgJx zXvCpw9E`>Zp*eoMXmasc?B>C6F>Ebb$Ae_P4dETH2}<;ShRQr@(Z>!&Z>&~%h+$)% v*pfp(USdUcT4lQ12z$@G2g&uJUZms;@RS(%xQ*rv00000NkvXXu0mjfK0?Yj diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_black.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_black.png deleted file mode 100644 index 24a4928186a265854983c362ca7ee7af9cf384a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj&YmugAr-fh6C_xjxg;bdUp5+? zrS?sKMpu3<_pf}3ML}y`DqWknmRU#L77#NJs WdzEv}YbXX9$KdJe=d#Wzp$P!qUnO$@ diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png new file mode 100644 index 0000000000000000000000000000000000000000..222690b0bda8f3b19e41098d181fd411fb7618c9 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcwN$2@4QU5oj?aae0Qo7MbJ=JN!%;kKt>^v1B zJY6mpuQ~$Vc}(3!cv2?6dEl^}oBi0QKm)E7tPG9wD=hwJ&G-wnjlt8^&t;ucLK6UV CRWu6# literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index 7bef37b2acbb554f821247c1af1177caf0745bf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj>pWc?Ln>}1CrI!(`1|`GyK?2q z(IZDxm|7fjCP;+xuuG*e95GbjF|iS9NvxS5V;aL}q;clZA*Y247dCQ&6?yb2&2MO8 zO5r%+P-3}4RpE5(iERf?oY0UFQBeqAe7f<7Ly>~1Nq5bHhmH#IJbK(byu3>jq&yEQ z*edLG+1(|>bIIH1RHvePOy@Q88r=q0yLBg)++ccg;<(t%=KD;u*e_-nEsYO!{Cp_y b1S7-b-Wh@s6ID(EUC!X?>gTe~DWM4f<|{Ln>}1CrI!(`1|`GyK?2q z(IZDxm|7fjCP;+xuuG*e95GbjF|iS9NvxS5V;aL}q;clZA*Y247dCQ&6?yb2&2MO8 zO5r%+P-3}4RpE5(iERf?oY0UFQBeqAe7f<7Ly>~%lphLg84dz+>@1B}c=Wh=czKs5 zNO>MquvOT5q{aGVn{u>M$c72R>s($-?-M(qBp;pbP0l+XkK!IM&6 diff --git a/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index fd08725aa0581452075b875f9dc242551fc1490b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj6`n4RAr-fh6C_x-u(h?d1-ZGo zIUYN9%+18`&XFT3m#$nfVe9f;nZx5YlmIUex$- zT~7|Dhm4BmdKI;Vst0Ih94Hvj+t diff --git a/app/src/main/res/drawable-mdpi/ic_share_black.png b/app/src/main/res/drawable-mdpi/ic_share_black.png deleted file mode 100644 index d03e2495f8622797dcbcdff72eb5c1cc69806523..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|LP)9U5UhgW-F`v6R6HbU9z;($R(exGL_emV?hd3-ib63P5DYAYJujR1hw+UK~?Vu90Usjs^Iw)JlP`W+=djkQRz(x zv8TIC9&!j_t&}m9*3CX{#8t8tcQ|bb{c;)>eW;o%6q>{wh;gXw*9m!K*+i5u5SoBPRqL7 l1a&rxhIwGH+(Z7Y^8!mQ$eHs$GYFU{p^YHD`h zt#y~Hd@>PC{I9(9iAATdW!jI<&VbI2-S5?81(lmPlsXiW{90zpdUocweBs`@#)g5x a;{%hcfK-kBsbEE*(F~rhelF{r5}E*NMMKg6 diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png new file mode 100644 index 0000000000000000000000000000000000000000..c4e8d91ba683c900302b749f592b4cd373f35319 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=D?D8sLn>~)y|t0|kbwkiqWDXt zutXlWg^B!JHxyYPE0h_zamjj3m#Db!ncrZ2()06lCZMhyzqO?`x{-CW%$J?Ae|Gm) z*~(9rf?`kZTdSUqzs>gP$;rv;{_|`q!HoZlKYickeS7EQZ+oBYPi;@BWDMgJ_|H!7J1wlk;AKLiGnp?2w+*3Q3j(wtYF0FSpe#*$eaABr8$J9I_d$pu+pzREv Lu6{1-oD!M<<&{(B literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index 54fefc3e819ad4dd08fcadf89ef334667f6f6e1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmV;M0c8G(P)%7EP$7gGTaBGYCoov-BzZ5HnU`iVk@iEa zuIrgnYMG{KNwz1uG=}FA@8B~^@L86H07}0%n>9Y+n6OU?lzIicg@{65cJxV-#7_WT zo6vz>+kDWMJ#0)+Q55a-JYQE;HGlZw8UNv33z3j5Va=GQB;C-e2A16l;A7?lOJbv< zm@97suahu$0%HwM0A*1JQ540hYhU;pyHIiv*y#zY$NZ}XUp=ug*5Cx3f7S3MBu1K zAGio$ZWkxc+mO}5`Fuh^2nc~cB%mvIUu9({@JzY8Dl0nyn{sziR(1k5uy>MrF+?!V&-g002ovPDHLk FV1lR8u#o@& diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png deleted file mode 100644 index edff073bcdef11e813874db84f15997be6f3d933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 415 zcmV;Q0bu@#P)r?i{Evgc_^HPNOq0SnMQoPBM=)lZna) zNz*hlW6UzkvWj#=dTbTX72d&Sl;HC`j{uZ@&n|6kqA_8g5-4*Icn1-KvEt~{G)-;* zJhh<%J$2b&ta#YipyD{*6h-k@*Y(fU4$t@x?>dM?VhL-{W3IsoBuR331pr?F z%q3BQcnq(e$e|UVLkTE>F%zKLy=YIEyGPGFPn?l<@CBdVz?1IZ4ZP!=wD&^7ZdgOA zmj*{QdMiZ$zP%>v5Y@uFKP8|9l)x7f;GO%?&MHpeR_E^9S;YysI(MJWDo()Fx%+fh zCGhnj6nqi~Uq-bPD*+{-1pN97{-ZwlYn9+Hwt~M}R8jeGxd6~3Rhe7(;;sMy002ov JPDHLkV1lS-x-|d* diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index 710d6cc0cb1cfff608fdbfee9ff7e93a9aec22ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt^PVn_Ar-gYUa{pmQ0 z{kDSN{4A^yIU5drXFKq)nn~f~T1KEYhKxT^3^s9>O>#HeGPs^TeYWMvfg@ diff --git a/app/src/main/res/drawable-xhdpi/ic_share_black.png b/app/src/main/res/drawable-xhdpi/ic_share_black.png deleted file mode 100644 index eedcacb55ec913632f4d61edaa3e4b75fc841843..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 525 zcmV+o0`mQdP)@@1S-Wv=C*Lj{#hr{6)lh?e*HEHkwd5C--jYi+ThOOoUW4}S=0nswk#2iI3JRss*+2Z#(g_h|VY zzZclnR&)n#f?I<83w%yeBq!q*dF<|pDTmNxrHm*iNw>%X47EiTE(=)RE&8S=TjtIk zWQx%azhychr z0KfX$Zknd|1RH7+T$ku(1kvyJZ?}1=Ckd&q(F7FxSp{-DRV(xk@-1RGP87Y?G~&Zn zB}X7M_{~)y}g_FkO711MU#L7 z8WVe--j_;gcw^7LWbsBdV4-PcK8O1zv_VS%u-`Ll~d_vHgV}kcB zV}4GdCHAgW@7XdNM3QTqnpik5#ZBU<~ziaSW-r_4baT7jvLU>%$od z$}TFA4%?Dvn=aup({tPCKU0=NEK_#V@{_d&&A~53n%-MI{Qb~@BY5ubd-G?y&$!70 zGz<)SE^d44+o@J`D&D0mR!nN;{!iW?=f{?nIo&tAQJ&LIEP`HOz>|K>i+XfJcH-okuq zq3i{|w+&?(>|30z(NMgli&^Sdf0OV3pXnRyzue<<99Vf#Y4BQ_nDT?G>C$1nQ1Il7mySS?b%ASm0|_kyFu#eIRY6_e~m z!51BU0gmqa6PG^wR1&hT@=8=+-yT=yuWC=02I5@RS)E b4hH8~Mc2GLB0KS?J4nRS)z4*}Q$iB}$=0OT literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index 4a74b1b318caa60d9b1ed6e42f2b6f3bfaf14c27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 609 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VAAk(aSW-r^>)@-ufq-^to0@alJ|`w-ZMHUr`-DDcdnIjDkXsEYwt{6<=}-J#g&hb+O`E zGT%PEP3!Ue*%^Jd(O_fB+{X4b79ZZu%uQLpQ}gkRO`)OA^3%>(gfn|29XchT9v1b> ze)mc7dy--kDp{sT+LX9AKH(3@>T*_bc3^Pa!Zp^MTCIMJ~D8oGgpH5>OK}Eq0wC_u2-7?_uvEyBOyF-&u8_hAQtw&=Yb z_6KI)TeIN8l9$I%I`i?i%B>3WZuyn`>+)RjAdN)xyh*v2Z|-4cPWt}&n;(*LCrjwi5us8yxkZmoY)>r{+&gVqM{-wKDQj|s(&Hdrg^!%l><$NdAAL z6mMakqwtwS!#E;i-OG-dO1`fI1F~i{H*j=-(FxnP(_8m>RK(6aRCT?}G%+{g@zLy? zldj!AedKj^b5P)y_~f(Gx5$_l_$kI7nUpi#mG{--O>c^NBQjZAww4#24`R`HuhJ5q z%y;Rg6(__cAEWU-kxf+<^9ed6M<=m!PC{xWt~$(699&$4V?f0 diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index c36f260fa4893d42ff48af4f97d3637cd1cd0b63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U{v*VaSW-r_4c|oUz3A~TjHX< zo!SMAViq<|&Woc1ti%srn)|YY(~5a9=XZPcnQcj3`VSB3aw&np>E6dXvS%Ip`I%#R z?rraiww`>6w%X88^ZrkB=IvUy{*yQA|0HL>e$_o&`Lo7fU)yp4%P#(8hVl!egnatytKXy@K;z+vHYVEopXK^xLsZ`bg zjBy2wm_`wYSOhRFtQVKyNEkKdaELO1xlcMQ%I*e0K6*2(20^d^0=~9TAc9vWm^kn% zUSEi|JB%^Q$c6#Hc}qCt3(Jn>H)FcrrZSPp#TaIkZ2)s(BilISkc91x*<~x++{3-z z0K+U`HrR{;%r0hGVLh1{CixwCfP9cuw#h@}Bl1#Vtxg-0oXSFlNh8}-Fe+JL%OkBx z&K`xmN*dWNEI2t#@=UT_M9#T#42}^a+b&FU(X#ErB&TfC%PFjECpdU6O!8Z?&7BJe zj|8s(`3jJhn3A;0eBl~JasJLtPjpj|x4k=CM0?cpJL|dw7>(Qw(vZ zHOyE}HilWV**qN#1}h~WgBfURxi%V&s>rs$CUE#YW}ijbjZmulUV_BzV3yd7GT3wG z-E+?0LB1jHB;7bfX})4lXI5Kaj9KXS`v>Geg2^)G>mUdY#k3JrFw3^!A<`DiafFGx zM~~0PxTYqejfk`b4>k`k*xZ+owjR}LbxBG#El$hn)$!vm7g93mr!7FHoI4(IYT}5T zQV${@xd4cqB!;+uw*~z5*|p~diHaw-E$DrPKIIx?0UH;7lw=Edr~t(Sr2qDb3lgl7 zbaE3pR+*0{>Y6r+2{T*DIZWoL5f>ahy&YE5WD-jzj+3O>9hr%HYL10dvrL|0rlFys dp`no~J^9j__6>1002ovPDHLkV1msVZHoW^ From d24a418bebe355d03f20d4e8fd0dbaf22fceea39 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Mon, 16 Dec 2019 11:36:19 +0100 Subject: [PATCH 05/15] Fix status bar icon colors --- .../main/java/protect/card_locker/LoyaltyCardViewActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 150a97dfe..8de96f898 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -197,6 +197,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons)); } + // Make notification area light if dark icons are needed + window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0); + if(format != null) { findViewById(R.id.barcode).setVisibility(View.VISIBLE); From c0d1b446d1549e8c6874948a56aeca9b6d13291b Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Mon, 16 Dec 2019 13:23:16 +0100 Subject: [PATCH 06/15] Make same text and header color at least slightly visible --- .../java/protect/card_locker/LoyaltyCardViewActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 8de96f898..65b54000f 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -7,7 +7,6 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; -import android.support.v4.content.ContextCompat; import android.support.v4.graphics.ColorUtils; import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v4.widget.TextViewCompat; @@ -200,6 +199,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity // Make notification area light if dark icons are needed window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0); + // Set shadow colour of store text so even same color on same color would be readable + storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE); + if(format != null) { findViewById(R.id.barcode).setVisibility(View.VISIBLE); From c5c2f702d0ef1f530c1ed76fe9311bb08da577db Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Fri, 27 Dec 2019 17:14:07 +0100 Subject: [PATCH 07/15] Up targetSdk for Google Play --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5c5b3621a..c6b7edb68 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,12 +7,12 @@ findbugs { } android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "protect.card_locker" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 35 versionName "0.25.4" } From 1a3dee2c2664c630ddda0ca0f85c955987c2ec2d Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Fri, 27 Dec 2019 17:27:40 +0100 Subject: [PATCH 08/15] Update support libraries --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c6b7edb68..2d4a28c42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,9 +41,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:27.0.2' - compile 'com.android.support:design:27.0.2' - compile 'com.android.support:support-v4:27.0.2' + compile 'com.android.support:appcompat-v7:28.0.0' + compile 'com.android.support:design:28.0.0' + compile 'com.android.support:support-v4:28.0.0' compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar' compile 'com.google.zxing:core:3.3.0' compile 'org.apache.commons:commons-csv:1.5' From d9f97380d9cf2980a83b30f95c3ab159835ecb93 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Fri, 27 Dec 2019 17:34:58 +0100 Subject: [PATCH 09/15] Fix status bar being white --- .../main/java/protect/card_locker/LoyaltyCardViewActivity.java | 1 + app/src/main/res/values-v21/styles.xml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 65b54000f..12340315e 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -198,6 +198,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity // Make notification area light if dark icons are needed window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0); + window.setStatusBarColor(Color.TRANSPARENT); // Set shadow colour of store text so even same color on same color would be readable storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE); diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 251fb9fb7..7475e9d6f 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -4,6 +4,5 @@ false true true - @android:color/transparent From 32b417895072c6bff38fc748fbc1081ab6cc2a9d Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Fri, 27 Dec 2019 17:40:12 +0100 Subject: [PATCH 10/15] Fix some warnings --- .../card_locker/LoyaltyCardViewActivity.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index 12340315e..ea889a161 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -197,8 +197,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity } // Make notification area light if dark icons are needed - window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0); - window.setStatusBarColor(Color.TRANSPARENT); + if(Build.VERSION.SDK_INT >= 23) + { + window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0); + } + if(Build.VERSION.SDK_INT >= 21) + { + window.setStatusBarColor(Color.TRANSPARENT); + } // Set shadow colour of store text so even same color on same color would be readable storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE); @@ -217,14 +223,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity @Override public void onGlobalLayout() { - if (Build.VERSION.SDK_INT < 16) - { - barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this); - } - else - { - barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this); - } + barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this); Log.d(TAG, "ImageView size now known"); new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute(); From b9d158583b3840ccda92bc0f6363c3ee0c2f89d9 Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sat, 28 Dec 2019 10:46:52 -0800 Subject: [PATCH 11/15] Update to AndroidX This is mostly the work of Android Studio's Refactor > Migrate to AndroidX... option. That mostly worked. The two places which were manually updated were: - The reference to AppBarLayout$ScrollingViewBehavior in loyalty_card_edit_activity.xml - The suggested constraintlayout version, 2.0.0-beta4 caused build issues that 1.1.3 avoids --- app/build.gradle | 8 ++--- app/src/main/AndroidManifest.xml | 2 +- .../card_locker/BarcodeSelectorActivity.java | 6 ++-- .../card_locker/CardShortcutConfigure.java | 4 +-- .../card_locker/ImportExportActivity.java | 17 +++++---- .../java/protect/card_locker/LoyaltyCard.java | 2 +- .../card_locker/LoyaltyCardEditActivity.java | 10 +++--- .../LoyaltyCardLockerApplication.java | 2 +- .../card_locker/LoyaltyCardViewActivity.java | 14 ++++---- .../protect/card_locker/MainActivity.java | 12 +++---- .../card_locker/intro/IntroActivity.java | 2 +- .../card_locker/intro/IntroSlide1.java | 2 +- .../card_locker/intro/IntroSlide2.java | 2 +- .../card_locker/intro/IntroSlide3.java | 2 +- .../card_locker/intro/IntroSlide4.java | 2 +- .../card_locker/intro/IntroSlide5.java | 2 +- .../card_locker/intro/IntroSlide6.java | 2 +- .../card_locker/preferences/Settings.java | 6 ++-- .../preferences/SettingsActivity.java | 6 ++-- .../res/layout/barcode_selector_activity.xml | 18 +++++----- .../res/layout/import_export_activity.xml | 18 +++++----- .../res/layout/loyalty_card_edit_activity.xml | 36 +++++++++---------- .../res/layout/loyalty_card_view_layout.xml | 20 +++++------ app/src/main/res/layout/main_activity.xml | 10 +++--- app/src/main/res/menu/main_menu.xml | 2 +- .../LoyaltyCardViewActivityTest.java | 2 +- .../protect/card_locker/MainActivityTest.java | 2 +- gradle.properties | 2 ++ 28 files changed, 106 insertions(+), 107 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2d4a28c42..4ac7af80b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,13 +41,13 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:28.0.0' - compile 'com.android.support:design:28.0.0' - compile 'com.android.support:support-v4:28.0.0' + compile 'androidx.appcompat:appcompat:1.2.0-alpha01' + compile 'com.google.android.material:material:1.2.0-alpha03' + compile 'androidx.legacy:legacy-support-v4:1.0.0' compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar' compile 'com.google.zxing:core:3.3.0' compile 'org.apache.commons:commons-csv:1.5' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + compile 'androidx.constraintlayout:constraintlayout:1.1.3' compile 'com.jaredrummler:colorpicker:1.0.2' compile group: 'com.google.guava', name: 'guava', version: '20.0' compile 'com.github.apl-devs:appintro:v4.2.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7a0e0be6a..d5d7644e0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,7 +86,7 @@ diff --git a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java index 86c647c3b..18becdcc6 100644 --- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java +++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java @@ -5,9 +5,9 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; diff --git a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java index 3e2c8f639..2917d703d 100644 --- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java +++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java @@ -4,8 +4,8 @@ import android.content.Intent; import android.database.Cursor; import android.os.Bundle; import android.os.Parcelable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.View; import android.widget.AdapterView; diff --git a/app/src/main/java/protect/card_locker/ImportExportActivity.java b/app/src/main/java/protect/card_locker/ImportExportActivity.java index e0be204cc..bd8fac2d3 100644 --- a/app/src/main/java/protect/card_locker/ImportExportActivity.java +++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java @@ -7,19 +7,18 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; -import android.provider.OpenableColumns; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; + +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/protect/card_locker/LoyaltyCard.java b/app/src/main/java/protect/card_locker/LoyaltyCard.java index a1dac3a69..152d15d35 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCard.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java @@ -1,7 +1,7 @@ package protect.card_locker; import android.database.Cursor; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class LoyaltyCard { diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index bb185b857..4cf69b92c 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -8,11 +8,11 @@ import android.graphics.Color; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java index c53584520..0705435fc 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java @@ -1,7 +1,7 @@ package protect.card_locker; import android.app.Application; -import android.support.v7.app.AppCompatDelegate; +import androidx.appcompat.app.AppCompatDelegate; import protect.card_locker.preferences.Settings; diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index ea889a161..592b564b1 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -7,13 +7,13 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; -import android.support.v4.graphics.ColorUtils; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.widget.TextViewCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.content.res.AppCompatResources; -import android.support.v7.widget.Toolbar; +import androidx.core.graphics.ColorUtils; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.widget.TextViewCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.content.res.AppCompatResources; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.util.TypedValue; import android.view.Menu; diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java index 68b736ca1..bc7abf2eb 100644 --- a/app/src/main/java/protect/card_locker/MainActivity.java +++ b/app/src/main/java/protect/card_locker/MainActivity.java @@ -11,13 +11,12 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.database.Cursor; -import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.ContextMenu; import android.view.Menu; @@ -36,7 +35,6 @@ import java.util.Calendar; import java.util.Map; import protect.card_locker.intro.IntroActivity; -import protect.card_locker.preferences.Settings; import protect.card_locker.preferences.SettingsActivity; public class MainActivity extends AppCompatActivity diff --git a/app/src/main/java/protect/card_locker/intro/IntroActivity.java b/app/src/main/java/protect/card_locker/intro/IntroActivity.java index d34b0b05d..37a699ed8 100644 --- a/app/src/main/java/protect/card_locker/intro/IntroActivity.java +++ b/app/src/main/java/protect/card_locker/intro/IntroActivity.java @@ -1,7 +1,7 @@ package protect.card_locker.intro; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.github.paolorotolo.appintro.AppIntro; diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide1.java b/app/src/main/java/protect/card_locker/intro/IntroSlide1.java index 7e53d7652..beecb43c3 100644 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide1.java +++ b/app/src/main/java/protect/card_locker/intro/IntroSlide1.java @@ -1,7 +1,7 @@ package protect.card_locker.intro; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide2.java b/app/src/main/java/protect/card_locker/intro/IntroSlide2.java index 6ee1952b7..a1e652c51 100644 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide2.java +++ b/app/src/main/java/protect/card_locker/intro/IntroSlide2.java @@ -1,7 +1,7 @@ package protect.card_locker.intro; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide3.java b/app/src/main/java/protect/card_locker/intro/IntroSlide3.java index deb6927b0..5acc83e7b 100644 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide3.java +++ b/app/src/main/java/protect/card_locker/intro/IntroSlide3.java @@ -1,7 +1,7 @@ package protect.card_locker.intro; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide4.java b/app/src/main/java/protect/card_locker/intro/IntroSlide4.java index d47a5ac8e..1a7ad6e69 100644 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide4.java +++ b/app/src/main/java/protect/card_locker/intro/IntroSlide4.java @@ -1,7 +1,7 @@ package protect.card_locker.intro; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide5.java b/app/src/main/java/protect/card_locker/intro/IntroSlide5.java index 6127ab1ba..ab3b5b757 100644 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide5.java +++ b/app/src/main/java/protect/card_locker/intro/IntroSlide5.java @@ -1,7 +1,7 @@ package protect.card_locker.intro; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide6.java b/app/src/main/java/protect/card_locker/intro/IntroSlide6.java index d3fba4f98..217967844 100644 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide6.java +++ b/app/src/main/java/protect/card_locker/intro/IntroSlide6.java @@ -1,7 +1,7 @@ package protect.card_locker.intro; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/protect/card_locker/preferences/Settings.java b/app/src/main/java/protect/card_locker/preferences/Settings.java index f6c9fb026..586e18769 100644 --- a/app/src/main/java/protect/card_locker/preferences/Settings.java +++ b/app/src/main/java/protect/card_locker/preferences/Settings.java @@ -3,9 +3,9 @@ package protect.card_locker.preferences; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.IntegerRes; -import android.support.annotation.StringRes; -import android.support.v7.app.AppCompatDelegate; +import androidx.annotation.IntegerRes; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AppCompatDelegate; import protect.card_locker.R; diff --git a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java index ee1bccbbb..485626742 100644 --- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java +++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java @@ -3,9 +3,9 @@ package protect.card_locker.preferences; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDelegate; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import android.view.MenuItem; import protect.card_locker.R; diff --git a/app/src/main/res/layout/barcode_selector_activity.xml b/app/src/main/res/layout/barcode_selector_activity.xml index 248087cee..8edd3374f 100644 --- a/app/src/main/res/layout/barcode_selector_activity.xml +++ b/app/src/main/res/layout/barcode_selector_activity.xml @@ -1,23 +1,23 @@ - + - - - + - + diff --git a/app/src/main/res/layout/import_export_activity.xml b/app/src/main/res/layout/import_export_activity.xml index 7d3f7fc76..464b3657e 100644 --- a/app/src/main/res/layout/import_export_activity.xml +++ b/app/src/main/res/layout/import_export_activity.xml @@ -1,23 +1,23 @@ - + - - - + - + diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml index 17897cff8..198a867b0 100644 --- a/app/src/main/res/layout/loyalty_card_edit_activity.xml +++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml @@ -1,28 +1,28 @@ - + - - - + + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> - - - +