From f836b3cf83cdcaaac28adceca971bf2392694d88 Mon Sep 17 00:00:00 2001 From: CodeDead Date: Sat, 16 Apr 2022 16:46:38 +0200 Subject: [PATCH] * Improved icon for android 12 + * Refactoring * Replaced deprecated code * Gradle upgrade --- app/src/main/AndroidManifest.xml | 1 - app/src/main/ic_launcher-playstore.png | Bin 0 -> 12122 bytes .../deadhash/domain/utils/LocaleHelper.java | 25 ------- .../codedead/deadhash/gui/MainActivity.java | 68 +++++++++--------- .../res/drawable/ic_launcher_foreground.xml | 15 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 ++ .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 ++ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 1132 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 2224 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 826 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 1415 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 1638 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 3170 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 2602 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 5139 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 3735 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 7431 -> 0 bytes .../res/values/ic_launcher_background.xml | 4 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 20 files changed, 65 insertions(+), 62 deletions(-) create mode 100644 app/src/main/ic_launcher-playstore.png create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/values/ic_launcher_background.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06d0cce..33eb738 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,6 @@ tools:ignore="GoogleAppIndexingWarning"> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..92d0c4a5436c9b0eb23f127e455ee1b46daade0d GIT binary patch literal 12122 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 Build.VERSION_CODES.N) { - return updateResources(context, language); - } - return updateResourcesLegacy(context, language); } @@ -79,24 +72,6 @@ private static void persist(final Context context, final String language) { editor.apply(); } - /** - * Update the resources of a specific Context - * - * @param context The Context that should be updated to contain the proper resources - * @param language The language code that should be set - * @return The Context that contains the correct resources and locale - */ - @TargetApi(Build.VERSION_CODES.N) - private static Context updateResources(final Context context, final String language) { - final Locale locale = new Locale(language); - Locale.setDefault(locale); - - final Configuration configuration = context.getResources().getConfiguration(); - configuration.setLocale(locale); - - return context.createConfigurationContext(configuration); - } - /** * Update the resources of a specific Context * diff --git a/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java b/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java index 1d9d10d..062e581 100644 --- a/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java +++ b/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java @@ -10,8 +10,9 @@ import android.os.CountDownTimer; import android.os.Handler; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatDelegate; import androidx.core.app.ActivityCompat; import androidx.core.app.ShareCompat; @@ -106,6 +107,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On private CheckBox ChbCRC32; private final String tmpFile = "tmpFile"; + private ActivityResultLauncher activityResultLauncher; @Override protected void onCreate(final Bundle savedInstanceState) { @@ -163,6 +165,35 @@ protected void onCreate(final Bundle savedInstanceState) { loadSettingsContent(); loadAlertContent(); + + this.activityResultLauncher = registerForActivityResult( + new ActivityResultContracts.StartActivityForResult(), + result -> { + if (result.getData() != null) { + final Uri selectedFileUri = result.getData().getData(); + if (selectedFileUri != null) { + try (final InputStream selectedFileStream = getContentResolver().openInputStream(selectedFileUri)) { + final File outputFile = new File(getApplicationContext().getCacheDir(), tmpFile); + + try (final FileOutputStream outputStream = new FileOutputStream(outputFile, false)) { + if (selectedFileStream != null) { + StreamUtility.copyStream(selectedFileStream, outputStream); + edtFilePath.setText(selectedFileUri.getPath()); + } else { + Toast.makeText(getApplicationContext(), R.string.error_open_file, Toast.LENGTH_SHORT).show(); + } + } catch (final IOException ex) { + Toast.makeText(getApplicationContext() + , R.string.error_copy_file, Toast.LENGTH_SHORT).show(); + } + } catch (final IOException ex) { + Toast.makeText(getApplicationContext(), R.string.error_open_file, Toast.LENGTH_SHORT).show(); + } + } else { + Toast.makeText(getApplicationContext(), R.string.error_open_file, Toast.LENGTH_SHORT).show(); + } + } + }); } /** @@ -297,7 +328,7 @@ private void loadFileHashContent(final Bundle savedInstance) { .setAction(Intent.ACTION_GET_CONTENT) .addCategory(Intent.CATEGORY_OPENABLE); - startActivityForResult(Intent.createChooser(intent, getString(R.string.dialog_select_file)), 123); + activityResultLauncher.launch(Intent.createChooser(intent, getString(R.string.dialog_select_file))); } }); @@ -455,7 +486,7 @@ private void loadHelpContent() { btnWebsite.setOnClickListener(v -> IntentUtils.openSite(v.getContext(), "http://codedead.com/")); - btnSupport.setOnClickListener(v -> ShareCompat.IntentBuilder.from(MainActivity.this) + btnSupport.setOnClickListener(v -> new ShareCompat.IntentBuilder(MainActivity.this) .setType("message/rfc822") .addEmailTo("admin@codedead.com") .setSubject("DeadHash - Android") @@ -577,7 +608,6 @@ private void loadSettingsContent() { lang = "ru"; } - final int checkedRadioButtonId = group.getCheckedRadioButtonId(); int themeIndex = 0; if (checkedRadioButtonId == R.id.RdbLightTheme) { @@ -683,34 +713,4 @@ public boolean onNavigationItemSelected(@NonNull final MenuItem item) { drawer.closeDrawer(GravityCompat.START); return true; } - - @Override - protected void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 123 && resultCode == RESULT_OK) { - if (data != null) { - final Uri selectedFileUri = data.getData(); - if (selectedFileUri != null) { - try (final InputStream selectedFileStream = getContentResolver().openInputStream(selectedFileUri)) { - final File outputFile = new File(getApplicationContext().getCacheDir(), tmpFile); - - try (final FileOutputStream outputStream = new FileOutputStream(outputFile, false)) { - if (selectedFileStream != null) { - StreamUtility.copyStream(selectedFileStream, outputStream); - edtFilePath.setText(selectedFileUri.getPath()); - } else { - Toast.makeText(this, R.string.error_open_file, Toast.LENGTH_SHORT).show(); - } - } catch (final IOException ex) { - Toast.makeText(this, R.string.error_copy_file, Toast.LENGTH_SHORT).show(); - } - } catch (final IOException ex) { - Toast.makeText(this, R.string.error_open_file, Toast.LENGTH_SHORT).show(); - } - } else { - Toast.makeText(this, R.string.error_open_file, Toast.LENGTH_SHORT).show(); - } - } - } - } } diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..74e5b3a --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..7353dbd --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..7353dbd --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 5d30b3bc94ac563c513ccb0b75e07f3091be5018..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1132 zcmV-y1e5!TP)|nS17a?_|O-G-%ME zK|}VTK&S{qA(b4K;2Y0Md4lJN9>iNjKjMwd=;yAzhs#B@q~L*igc|{b;pTFSN>XV5 z{LY=wOBgsOPly~rW0H#dw1&tbtpx>hdhu7zyai#SuMQzJdjPN&rD$#0at{fS|8b5EVoPQ9)D?6~utSV1R~(2I%eW1&6}{v$L}> zF);yygM-l0(gL};xu8<15=)Rmp@7QDN?2N2f~%`5@caG$#pmNJ;wzfh_N(%Xc z3JVLt?REze4=3g>_V)Ims;Vj=m`FkO_4ROZaUobtC|<7@1_lN|tyYsI$Y!&_?d`27 zIiWb6PDn~hB12GZZEfJrOC=`=9>`gimA9b0ygWERKbKriZ~({hWi4oaem*90f*c(k zL3(<+JOx=SmZ)Ycp>%e3%2SZbHiK>;i;FUP#~@x^YpODo7~wfgwpeUr&_XOq@w zG_bI+K&BwH?(y^a;z+Ylc6K&gUtg0aXn1%yq9DAg*6DO%1>tSQ>gpCw zS?J;2J#m8i`ucdaAgxv#u?2ZN9`XdWx3}{egQ}~m!wSmG%#2tPA$k_WQ@qh=yi*RI z_UGp2$ehK}($c(VXJ@>=e0zHv@TxmlImF|V*=&xRDLy8G@X018Ck0&u9<*0hR$y~; zQ_$}J;NSqt%F3X$v@{}%i;EG@cXD#_&v7|9InoO%FE78By;xUQ7w`Sl=;$b~%H_T7 z=40JW@ZHwy_3{;j_f%rbtl{cGxQr`gM;>>AFpZ6kF{voxfm3KjF)jsRy1Tn2l{7s) z4av#Lf@?Z)D+sTMo0^*7^72x2w;CE6ib_sg3kp(HR0L~lYf;T^hlhtyS63&hP#^b# zf(yZ#nwr2K>*nSr;stMQZ9zvz2VQ)NE}P0iP-wTy$jE@^=H@`RnVFdhJdU24nu3v$ z5ol{`3(SI2KL5hc=WwMm9OL8T^w%Bq=Py(c6+{J5K~xYGLJ5Z@3^nemOg_AxG(d@eUFBO-9K(;*CqCkQj*smw8RxjaHVU?lnv y4>i{m@jn$jlsS4X7c~=uP!IwQ8Z>CgB7OrVg7#|vYbZnj0000yFhwb#tzeC&)|wa)~bOv)*mM7 zAFcHVHb%ut3)%;z39(I6-zFMks|`&WDHVKBc?rwyIm@}`GR|w4ncbark}oW?Gk5O! z_MCIiJ@?$P*@Ao62@VDD?;o23g^d6>>95{HyeI4kbC7Tjh40;frvYhz8H6-C=k~Kr zOC0=H7ms+r62SX_M!+wC8-N}_KVX>9Pv>sXHF#|;-5W1y(^qW_`r(wAK@y+>@C~3F zz$OW7<7;X&Nn*avP}dky-$u`t>r+r2FxQ$)z)=}u#ta}u31c!u9i_fV`xo%TC48<13`#m} zCNWAx@n;TEpXB-)P;#CGv_=EBQokFKPAwZ7kr#MmA$NWH% z#2w#qQsYq38ZB+YzOFFad2{yHNSrVWafp3<(=1Km4KA}7IdXk1Hku@-;B$s7NRE^w zl;L@!%#FtoQv`=>MRKGh{RN1V$T%s2S}ov^eRbU53c09BnO0R8ks~Fk#$Qw8lfCJH z0U@>s7lODfDBH6VnSCPYa2RTjRExe6GMzq|*2}^?hlMG)Y|DKyHSV;22!l~e@2K{Z zUWd)q>_r)tHDR~gS$1|dtE#GEd-m*M$B!Rp9UUF4wY8P)-@l)2*sy`+=jStr!x3s4 z#K>YaeGyl&&wbGzm&?V<%F5V<3m4e%@G$duJc<|@8DXbSpJwIdZ8T-V68aN$CB_Uu_zQj~y1&7VI%R7SL3K&o2s$eCNKha5Dgii!$0Ffia3IUIw7 zgI;aI_CkQ9cht0qFUmFRF|SRVHhIluGUSM6hkh#r%(DMiA`1kb%hYvf8#PiMWoy@ry*(cRt65)%`HJ)*6YGc*2A zt(JN1+qcgYayYR4Ae-4oa*L3B(XUaBpq!i>uTwRXp!@glv$V9dU=nm#>WA#YT;!A* zL7O*k)-C9@YuDKJ?b}&(bv4_uV+Xr_{kraZ+uPgO?%lghLvC)a8bQATBE`}h?u?=U ze<(R<9ESD8JENncUP7Xxq9)uQ6BEOB?b>Ck_UT1YQIVRX#)64h(NXiDC{ZXbc!Z#Y zgaohfS`R;T=#b)60?#)$H-|bw|4IW!hmiZZr$i7&%zCs(L46;hu&_`U(Lp4r4=_`X zpll&I_Q)__TwJXA;I6JN@4QTnAT+g}o}N%7XiP|=&6Xo*rW!#@mo7Dgpy=pmD-bkC zj-V`3FIf{q)6rvM7z(HnGafS=U@#VuR5 z=0}kd>pHE; z>VX3XOeF~0*E@eQiJ%7J!YNnNyi%*7%*;%7=gu8d$hmdv7E4Y}4i-TiZx9zwX~GPL zv<$#at%TX?)vFC3sxjGLT3YIpFa{FDW&MW&W`|8?%Y&2Z`C9a(T+`JLo4h#)Rw4;5CqY$`j7A}L5}^kv}?gTl(nN_OSS70qNm z29g&qUi4~>G-nhff<}b`^r^&w>e4f+*sK07J!7m?TU+bR3t_;Ai-T=#ZS3H|gKXo* zjjW)cfJH<^7?LJMlFytuql%q7cj{ewUPH2L7BJu*tzR3}N+C|@hgkkOaaaztTJg4aijrLq3hDMpbm`Zx@I z5tro?k}=w!Dpxx(i|k(2ca1xqu)EJom6l=ht`X%PSS{w6e}RvCcPyAV}m4` z>Gy@fRs_sBzeX~}7`0ymGi<34;H?!LoE0~-cpMJL+qUt2`BQ8LzNElTv)t+MfOiFw zMl57jNX~ndkdL#O@CFA5HJk;SR4J^&T46(7A8Ae&&9_Y3=!*^Gn-4O9q!My=Jgx|} zEtwBjDWI>f+s1c7$J+w13)(@y0%jlQ2?gi;7YpXJWK5#bKT^$ihS{1U=aVq|I1M-2 zf%?|N-@8F1N=nRK=+mdR@y)!`sILKkYmA+SNt^{|JDtwuwuxKB`RL&>*_5QC=?Un| z3d${~P#=T(N*yQJb~+#z?7bZRc1Vcv2xN^-Qd2xK#N+1$wc&)S@Z2Jg2tBgukvV;IIBwxf7K>=6_bv75&eF^x3 z4{1L4w*h8_ZG4AqV%wxKS@g^)HjBJVh^I@EC~C#pqkIr(5yns;+-LCrF)En+oz~)d zDYm*tpKsE4c+D}q2k*r;NLyx-DJ9XfEcKElF(hzPfSE+Ke>j7lg`=O#<$3`y4}}IS z0|JT=_!-Z^cZGP3ZG21mEV?(9+KQvLE&ZARMLhFLOPvGp=%Q9 yo>*!lY)H{^?EGbIF4Bf5f}74cm6m}6b^H(PlM-8hrx6JN0000JHB2;1m++?vJ z+T^4jf|Z#b$?^?hy_fZ$rXjDd5WmPtECt^@m*F?!&AqI=0#3wFN(J1*3eegE9z{SA zpg~}Mejc{Bx8d;c5RQ(HU}t9soK7dG)oQv0g25o<^Lgm?dcd;m0L5YvqS5GMi;ORz z*XtpbO7Vu~Bb&{_?CdNZ0y>=za=F~l;W?_+D$LEz$uE#hCMAdGz{8DU82JSJem{GA zdpoiK=HTE!K7sS|^FLzYE-x>k*=#;Ilol5k!R2y|1X|r#lgT7qz-%@{x7+0n)o!;T z5{dMOhf1XapU(%iT5YVJ5+fFiNf!u*!-5yw+S(fE>gDBSxVgEZM*xpqzKeA_9nfmE zyyLZ8F4H5hySpn{pj0Z+BM=IO1TVO`xj7JiX=#bBA!M;w1Sj$J^);-oulKhMcoMIy ztn^nKswOf1Rx_E5=rY=BwV=^xfY`kPuTEaC7d#%%0D(Y2@Z7z~?$qG4lBM z7!rv@f5kwnh2$qOqtOT_Cns=vdOCo^;ZPpx6#+$H41xdp$KBTy_kdSSfGZk2Lwu*O zz=6w6FU1775|a+`iNX@oXT42cJ^%m! diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 6bbac8762c240b02be82e690e5d082e8bf8715d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1415 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 k9R>yl1_lNO28K!T4?U{Xtc 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 IM6N<$f()0z>;M1& diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 6f0b3dd3cad61ea2555a6260145364141caf45d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2602 zcmai0c{mh$7yixIhslWS#z@(h?AO|GMItk5kYz@$T>FxJH_2GDRF)(%jGLv1kewD3 zH*1tFTN-0*Gm+5Er|-}EJm2%3=XuY2&iUg!=RD_+_oQO2&EYUn7ytlnao+UO5oiAb zC;O47nk_a1z{RjIHO56utrtal+L{aWzH_>h-y>>Ks;1`Y`#w)oCbWFww2GVx%HLK% zOCUd?!nE$>h9w^^+s>5j1kM?a!%ojBMM`so|#_d>YiT9h_Eie_*4sC#oz8k~;(x82+SLrY-a zQo9tEs+Wo9BxJH25&@=;hOZk^h==8B&r0Suv-1HC!Nea-jKGusVR%iwz6FIdL=uutHFr zz!-1>22`*+9*Ch#P?AX3c3EKV+J(K7*ez3dgwcMZE%gGD8 z03xd(q7v+w;~Sgqio1w!4S}Gm!0Jd@vS6@LBOfnaT1hBK6@7G2?&^Z}%&?VVsi~)~ zEKeMsC55ehG^P#~anlu_Q7DOmD$eJhc??ZBIv-#2CjQ~(ma$9>{2LKmH#toHJwp%a zWBrmV+Sys$-NR$7H$zOiX7|};=S8|Vk;!DPyergc%1RVeB{(m&N(|c1U=^UmRe%tx zpN0>8etXxaD89jSv#iKR%VhcSMah zB`@PeQd3i<{NVS`#v65yu%T+o77{|+kYQ5|UQ)dFk;;~jE)b*Oh|RWoy7AeV?^oB< z;U`doMPVB=ToEB4W!GtPr{uZ+ta_8iw3?T;TQ5&{84KDl`dh=gae7*s@3g;0(C72N zYWTLW#&zQ?$+P~`P?=3A#6T3}6cl(ljr=%TDdU`jK3KdazU2w9cV#Ymha{L?)cL^} z9LFv&A`BY*rnP^yFz^W8-M~*H!}@dNrC45L=epu0w^jf`)w9?rcB(14Ble(4O;-el zZim7HH68nZ3!EoDnfA$3!8=m*9yIw)i;@_?ysQWJsnwUt^0nVc(zUO}%5Q$5HUH=y zP|;bi_|~+Ie!ZCzGV$0!Ya=x%C}`!!-q)HrGdR(R1tA&ucKpVIoSc3n^VH7z^oNgO z;xp2W?1zu|>}m;q^eAx>+cqfOakQ}rbzjM${&Vnz(!H`QUpzU{9Q$t5B5RgEtW36$b~0USF+UVBP(S!}j96 zGcTHECBb<$^q&OHYi|(Jk+y8d^J4?KQkEN30OcSze};QYg-3R8a4GNgQLRE(JFKlP;(Xb1)DFXvAP@5@;wnP3%QV8tN?lQ_f05scCQiJ08LQ@wx7~I^Yay1IU*VlKV;*X26=vLXRk+vu-(XWsewWHlPOVM!{tv00Wt4`e?c^E#t#tKK-TdJ@bC<7L&guYuFy?m7qLG|N65M1r8y*4?a!0Fjwcnky)Ix KHmxzan(!Ya7M+s- diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 6c44272ca27be355b9bd209ad88b5d48a980819c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5139 zcmV+u6zuDXP)#q$%U;5IQzVxLpeR=ruaq&X}QAE7Xr@JjZAt4BYkbq4Pd|^IM!7=2FY0AEXw4>x9?jTYyA>rGfGoG=Ua?Ddut+mvLOCa``it*SKuu zvX9GGTuncRq~9lBEu9 znTNLJo7x-<1DL)NsBLHfuIBP2m)&6ouwDX10OFMPX_Vj+_cXs|H`+SP^aapb$>Gb~ zx#ZAJ;qrc%K@@}MBrLH&C4e%w=Y2dwr!ZdRB0 zgEUBL!I3*~IG2Bifu`OA&_t5@Ffh?Ge!qo&(3b^2NA?Y_B!XTo)?(KDmgbMA!<*0@y;ShakH05%8(wqtEDbMAgh9{|-$aCgQOd~JivO~j@ zbco3BEcVJ2-!DzoH)?oX1JPzKIc^U&`lO%#(D1kpq8BB2d~P*e)UfF~y6oDh_3sRq zrpgL0|2k8EOAnrVf{o($o7^@t3rK;&V@CQWfO#cBjds>{bBj|g`#o=J)8!dcwn2g? zss4~it$a+w<2i`t7~kE%kQAr+a_#qc)*t#_vLNzFF@;T9`*>ChZIPU5UouSB{Td$6 zLo_APT1XU3Du+ielD_qzcrQ_(ejex2)o3orl@Q;DZnR8mpOn!;%Z=vpe+hA%FOvw? zjV`x))S^P^^IH3)oECaTvM!ElpJ7__q^u?yOfaF@w#VIg>r`zys{oTW@7!#*AV8`t@UN z+qPwXzhA=6Iw`6xipd5hXCl=vnRXnzWdnAFTczV95}$f`Q{te(9qDLoI7`p zef;sq?4_4pVv{FNWuzHJMOrHefZ&rj)7yAk3RZ{-Ezw< z+O&lSXgil|Y5Z;bK7*Zdo+~OU*qSwKLVio4;1P26>{+&Y_3BU?G(6uK+fhdNV(u}g zss@ltt6cjG9Xgcl-Mcs8;FyJ+b8@t`Z*;*JFTvPn*fn2yM)UqICC+mo5MblSk7r+f z^;Od05pwkC(NLSHZQ7X*{oG|V6~l z$ELd(`x96Q#^V1Faa6Ezja`69`|RJp-;)55?A*DNm6esHGeGO%2U)H~E&LxU*7&Ji z6ZYt%k9rm!p@rxf(%6Jik*W?77naNy(MHEzpR?mYlN0*+=bw8TAd+3XcCq5(;&gSS zDdlx&EKzA;?{2U=`Rv)9pQb_OKHtPJ|Xmox0yU@4UlmYHC6WZeEl){Wvl9Gr@!v_n_?$g^b||eiJ3IS=ln`2+oi}eDJ9Ow!N@zZnvS7giJC5|TU?S714@6$~i*^8_ zR8rNQ@Z59HvC7KIsQ2#CqX&E8g%?7mN5i88AWF8+wK|m#;>G`o*Mw05yvo4g`Sa&P z$@4imIWd_~>NE|JEr7(>Z{?D2SU4$Bth}~1nvW%j86ZkcRkdJB06g=|GjU}OW@cux zRjXEMfb0Xb+h{5k9E>)V58y?mTn@ww(BQ#?l|49x0qo>2ck9-Tefi~=8X$WBQ7ov^ z%F4W$>sJ{~rSjtf=(gK#Q}*DGJ@%OGtwHnW&({Fi1BiCx)L2>45Q}EjSc#1*4x}pn zLwV9P1yzwcOVfT0P~35#(_H$;0#Gk5b@2l9#1l^_OR31u&$kT_nLsbE$GHHYvs|tO z8^LHn#4O~1d>b!7%a$!u^3WSLY`7rS6R+gu<*^+*c4&a?EoTg}5(^Rl^|b@gqD708 zJoNhY>y-dRQ~D1+_&@^`KS1ZK0u;oH=&-VH;sxlDM;=k~(7SiBUtg zfyC}$BWMMnHe5c87a&T$QnlBemNJ$sS;8_hGU6&qwPM8zy_BJ5DWeQ*1fs2lWg8cs z?;h7;>biC7ly3GT$2^wxFq*wl+6OJfYJhA5^d8p2vZJkq`S2n-@AL&b=^Rt0Oi|ha z1j5p#OD(O7Q7Y~7<;yiZYSTH2tO7)-9EDsK*#YR%OE0xljxL_5J!zxb+S&`YAJd-u z{{8#2sZ*zhlFl?VNcCUT>tbNG-C<{NzHop<SSM4gs+8Y7_uS)jQvF0QVF{otWS4*~2W>R(AFrY|5NV-}8#j6m9;%M-RLw*W`9PDvLatSSgd<&m zyr5$$Y6Q_#TI+TJruWr<%pI3*cH#bZh2r*gke z7uoa(Kua;1Y8`8dJ3nS(avgCXLQSrESqvZOkcfs8aso#fy`E#FNVbnuRfM z6YKOnoEgi5Dx=-1UpNVo0I9sZJd_HuefxIy_19l3ITwsJ7Sh4Il%Vg1b1+;8kQmb= zTrS6$=NmSUy%c7w7_0M7saP9}rM}OA0Ruu?d)|2C4R-9$Y~xmw7fuj#N9N=@dIhoatyn3H6lgeAQJ~g--mT)K#j7NO{r= z7cLB$J~{^c=9_O09qK~nFrJ+piIT#?!cY+kYQJ5f>LUuB=j$=n1@X?l!kMugL?o;1 z)=t#o>Zh!iR*_oz_PJTBsa>#WPw9rHuBWN-SeBwrw!hena8qlTuyVgVd+B7D^fI zvjSt<0b?9gseQslrpr<8Fk;)0)UT zrmGH)bCpvwua>ls$eE^9`tE+ef2Ib=TLAGfn~x2H6;jT#-$=kEw2-JHL?!U4rs8XQ zR_2Xa7uP=PFlLoTbJ>=JXrFKnbs3y6s^a;XhRF5sP`SFRFlOx%;W$Tgs0)NC3j_i` zm&}+pXYTWR8o25D1x!~Z#x65arYn*u%Ry|20#QA91LsOnP93FoN3^*Se$N7!t}Ym} zoJ5lGl`I|Ont}|V$Fg9H=?bTX#4<-Ave~*L1$K)LGA2D(xZP+vs;N81rche0@EI<-WPhj#!KvzCFi11A zk2FL{gXa@I27|F;P=&Ecy5AGcAIim|9NF4S_yY{%Klf;e5)RLP-uJ_?RM8bQdUV<^m zaGTR?b!H}}_oaBC9{d4mcJ}u$S#et8&nP5#p67kr7n-LV`dpr_dj_6J5S0kWnm=f* z-|zpu)Bzfz`2C%F-j{!%K83^FMbbQ;g(n3(qCfCe5135^GzZ zad;*Io}QSh7o)FT6DU;a6N##4<#^y;h*PXFPeZjto}vSuH+bI-Mby8>XwGSFKJpkYB{VNppCooYoF@R7d$V@2h$6C2R0S?1(cnYM7g}AMxMcHre@xGzUj^lsE7`x*jI07y7Op`Z5Q7>o-#Tk~11x!{MvIw~0XN z%fDg2<(+lF1X4Q1jT%kh9OQj64YMp^vMP+`3aSauD0B-%!nr2(+W`xHA#Fs#Fy3i@ z;hlHNO|g|H}l_L<{f(`jH+++ zu$gL*z&XR^75=Q_08Vd6H}uKH=%cK3)jC$SQ333GIaD^O?^=L#JxtqY5#l3_E{Enj z@h-%3{>qGZ9QevVm$e zwMG6v(l(pGqURg{CK z55ym7CE92{rZW;yPC+GWmqULGCXr0`XH#ajyjNpM(T!d zE19;Cd83tRJ}^Jy1GJD2)Os$5EjX_ACb+DM`Mr_ubC`0HsZG3X6L=d3psm78iFl6C zI0Bq(4UT${veCJu*4x6dtU^Rv)=D%${kUlu!3S;<7dmxjEhSprQnMoNO?#>cSLNomzC@xn}Sbz`geOzX9 zd4|7kwb4|Ce}~a@$S^tQR4bVd+B*(8hQHDO?ZIp5J*(+6xXhx@q|c^2aNMge?kzNp zfTlCrT86fZ^Vl;rIEe)*fEkIQ?Xx;_d(FBb!QyF*`4Nek3GHWFnrZ$-Vw!=4`2C*w< zI0C9Z(v(?fELn5O^8f#n--FK(u!scqO5C#@+R(-Xjal1ha9j#gE&^|ba88TisJ4ej z=!C(pf@$drjd2O22Soh4J6_Wn@2SLRbi`+t;vPk~XFl4Xq46k80SsCOoYNe{RPx|I z39#D0v=qakEddO&l;Ho0@!B>LD6R3Ct#FSl+%sr0PZ}DJ10_Qxz{$?B| diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 537ae8f036548c26f76dad113155fa1971124769..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3735 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 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index f7cdb7b15f3f9080b39310749dfcd664b453e6c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7431 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 FV1iK~D0%<@ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..beab31f --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #000000 + \ No newline at end of file diff --git a/build.gradle b/build.gradle index da11dfb..cdf8d5c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4410496..105209b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Jul 06 16:47:53 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME