From c812483f132eb3a8d67f1c481e7e3399c77b7a7e Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 19 Nov 2021 13:29:28 +0100 Subject: [PATCH] updating some icons --- .../clock/extensions/Context.kt | 2 +- .../clock/fragments/StopwatchFragment.kt | 2 +- .../clock/services/TimerService.kt | 2 +- .../drawable-hdpi/ic_dismiss_alarm_big.png | Bin 874 -> 0 bytes .../res/drawable-hdpi/ic_sorting_triangle.png | Bin 288 -> 0 bytes app/src/main/res/drawable-hdpi/ic_timer.png | Bin 527 -> 0 bytes .../drawable-xhdpi/ic_dismiss_alarm_big.png | Bin 1098 -> 0 bytes .../drawable-xhdpi/ic_sorting_triangle.png | Bin 251 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_timer.png | Bin 401 -> 0 bytes .../drawable-xxhdpi/ic_dismiss_alarm_big.png | Bin 1632 -> 0 bytes .../drawable-xxhdpi/ic_sorting_triangle.png | Bin 482 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_timer.png | Bin 847 -> 0 bytes .../drawable-xxxhdpi/ic_dismiss_alarm_big.png | Bin 2131 -> 0 bytes .../drawable-xxxhdpi/ic_sorting_triangle.png | Bin 318 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_timer.png | Bin 773 -> 0 bytes .../main/res/drawable/ic_alarm_off_vector.xml | 3 +++ app/src/main/res/drawable/ic_alarm_vector.xml | 12 ++-------- .../main/res/drawable/ic_hourglass_vector.xml | 3 +++ .../drawable/ic_sorting_triangle_vector.xml | 3 +++ .../main/res/drawable/ic_stopwatch_vector.xml | 11 +++------ app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_reminder.xml | 21 +++++++++--------- app/src/main/res/layout/dialog_edit_timer.xml | 6 ++--- 23 files changed, 31 insertions(+), 36 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_sorting_triangle.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_timer.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_timer.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_sorting_triangle.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_timer.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_sorting_triangle.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_timer.png create mode 100644 app/src/main/res/drawable/ic_alarm_off_vector.xml create mode 100644 app/src/main/res/drawable/ic_hourglass_vector.xml create mode 100644 app/src/main/res/drawable/ic_sorting_triangle_vector.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt index 8dc24594..d63114b6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -313,7 +313,7 @@ fun Context.getTimerNotification(timer: Timer, pendingIntent: PendingIntent, add val builder = NotificationCompat.Builder(this) .setContentTitle(if(timer.label.isEmpty()) getString(R.string.timer) else timer.label) .setContentText(getString(R.string.time_expired)) - .setSmallIcon(R.drawable.ic_timer) + .setSmallIcon(R.drawable.ic_hourglass_vector) .setContentIntent(pendingIntent) .setPriority(NotificationCompat.PRIORITY_MAX) .setDefaults(Notification.DEFAULT_LIGHTS) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt index 9aa37fb8..b2dc7b6d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt @@ -267,7 +267,7 @@ class StopwatchFragment : Fragment() { } private fun updateSortingIndicators() { - var bitmap = requireContext().resources.getColoredBitmap(R.drawable.ic_sorting_triangle, requireContext().getAdjustedPrimaryColor()) + var bitmap = requireContext().resources.getColoredBitmap(R.drawable.ic_sorting_triangle_vector, requireContext().getAdjustedPrimaryColor()) view.apply { stopwatch_sorting_indicator_1.beInvisibleIf(sorting and SORT_BY_LAP == 0) stopwatch_sorting_indicator_2.beInvisibleIf(sorting and SORT_BY_LAP_TIME == 0) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt b/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt index ea8e7f36..efce8159 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt @@ -102,7 +102,7 @@ class TimerService : Service() { val builder = NotificationCompat.Builder(this) .setContentTitle(title) .setContentText(contentText) - .setSmallIcon(R.drawable.ic_timer) + .setSmallIcon(R.drawable.ic_hourglass_vector) .setPriority(Notification.PRIORITY_DEFAULT) .setSound(null) .setOngoing(true) diff --git a/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png deleted file mode 100644 index 28988eb4204591084d5a4ef16c19a93cae0d1199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 874 zcmV-w1C{)VP){J9RX6sx${eO}eqEHKI=j?g_4 zHQb`uHI~cDeMmB_IH!yA^;6Dpx9OGMd8kDaJf}gFrh_jjl}nRKmPKyXBqGAbrby6N zmr|(>O@h+7G^u2p?1(fR`bsdxDzPLxSwu$eFa=EavIkw`I`?|oU`u*U;|L8rC-Gg$ zL1~YayV1u*xi&>VXQL&jOsl!pIK@8IAi{F41XFa3((GZ5y(2Uz$_-4pvNUjoxy3n+ zA|mW*hV`R7&C>1DDAzK_!uTbL5A&o}lbEihW<|NaIdV;mme@X)#WNCzL_}1aJ5b{F$fmIZV36e_ zs>*#1C}?g5*B$ejuC2>?_@gQKK+7Z>|)UyciXk;-G@J=LUa?K)xR{+DZC*1Ww3awFqGYabo}3dU`b0Tame@T?(lSrZ9ujLsIo6lhHlq5RZ6r2` za;#cBL+8vjj-@zAlCedty~KGDIdh*copZKC`zX&mz?~7*=R63Q9a+2&7#&f4&UnB( zk;SzVD_5J-LE@6gVpEB$BXZ;h7Udd5;#k1ik;QT*OT$~+9Jw|{xerq=ZTJ~%xrn?2 z^3jOubM|yxoarXGKA&I&%3_+I-ea`hrVJUXj1`@neS?(YO ziGn*c&z^>zWG>a`_Od{N8BW(IO0t8mB~|50?A9^gGxoEZPU@xqvzqgLuGl0WRGaIp zpGv%-l{((3Hdn_b=E-A{<4PO~cr7ZUv&Utd>lzIsDay^Wc~njthkM9aOPcRhr)gjE z$io~P#&4mQqg~<>XFJLsHc>yy(7+n;zkj?R0Dw@}6W1%F AdH?_b diff --git a/app/src/main/res/drawable-hdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-hdpi/ic_sorting_triangle.png deleted file mode 100644 index 0bb1f5e6ed0ee1b0ce89d29af8b29085859a62ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^DnKm6!3HFam1{JB6lZ})WHAE+w=f7ZGR&GI0TjIC z>EamT(fRg@qEM5AMBBrD#TPt{9tu?q{0RybEKTkP8J{`al-La<)|NHjO!>m#)_gFb zg7*NAmC>OMI!C`V{r>a+&AKn=oepqBe0e)Tg|Ya7*EO~ezmKeGP=7DWc;4&?^Rh`t9-)&rx?Gqpz?B>h3o%;;S4$}iuynT`v)!Z^$s-~cKb8}v|<}Ic~>3}4T zpm#hhzKVWYI8@WMu9{)9)$EOpnu{N4`Q!+Gy2&TuF==wLjibP0l+XkKKHO_8 diff --git a/app/src/main/res/drawable-hdpi/ic_timer.png b/app/src/main/res/drawable-hdpi/ic_timer.png deleted file mode 100644 index b23601069af1ce7c701427a633b3cbb68dfa1d18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmV+q0`UEbP)nYRyoS#utMrKmDivBiD?n@eka$uqv4 zM8+z*1$y$)We_TPan>lGPMlttQctZjCW-iE{r_F5gPeeLuvW RN$LOq002ovPDHLkV1ns*=hOfI diff --git a/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png deleted file mode 100644 index 4703ce91ba04783363e11f6eef11445a030d6ca5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1098 zcmV-Q1hxB#P)40*5ZktG+qP}nwrx9iv2EMQdK9jW*3KIY{!_hEz2|hDc%JLRTc*1GPjzEW zrcee zu{I?-Jj3Mj#ngO7hoe%G-c%qKWC*TLnN5Cp8`lwCBn@Y61!4z^B>lv)^1-$gD<*x! zqE#NDLrEILW)YIgu>^Z^2~YAVE#w$Y1Ml!Sw{j{gD1rIuNm7YpeUnNPPhu+`cW z&)sax6wdzn3gzyk)+gxzsFcL!e21@LoWYds`SY6QUfL4 zTepnsXEK*Hwu`aI7BPY$*p0v7rQ9}dfE9%0NC{;{q z;d6!H09+?37(16G?JNg#u~q1UbR(v~s+p5YmQ)qC#`O#H{{2bM;c8%}zd4CH7=i0+ zX8gO8_93YU3n&na(FF05ZX;;P!ne} zmr^h-`_Ky$C&_RYU1{Y@u4SjTqmRj%gC$v)(|MC3U3oI*?!6=9$f7?R+t8>ZrHM&PR#dsDA6Y(;@K?=iKqV@kH;e)?0% z5bj}PrC<{Z_7^}T)UYC_b1RSYJ`Lmm$nz<;a3D)jql(ys7kzT#>(;H?uQ}+I^q^(e QV*mgE07*qoM6N<$g8s1uasU7T diff --git a/app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png deleted file mode 100644 index a2f99e7d5dcd10ac5ab778a6b3385e25d62f46fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^20$#q!3HGv{H?nKq&N#aB8wRqxP?KOkzv*x383Iw zPZ!6Kh}O4L9Qhg)cvx;vU#b5&^Tp|F&0)?it}Ic)&)jyL5r|skc36+Wiox%;GADyF zpG%8Vvp$(hLG{_ZG4T5k1XC0NfGB;f1@H9R{N@@bVU6p{55O%xUhpmh1BQ=0!v| zW9<(B3X{{~RCjKrT{GFKRjRA_Wx`olF{&mNYWXhNl8FX2OmS2r{PZdTq2f0pPMHwC z=ac&bF&w*MQi)##%~}(}*pT}yjj&QPCKMqWML3^B{EB3PIUbXH4k0G_#jhw$#5U~_ zkRO0@<(`Ady^HvsPh{7$+26uk{ojbtLH=`_K;1H$YbB}_zmlgPAm=`}34?ebx*yPH z*Dl5c&gGt?ZdxZZ vn}F@l>MU)dgz<{Wm+Y^YBIh0q20eHK@-M~JfK5(r00000NkvXXu0mjfU@on* diff --git a/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png deleted file mode 100644 index fadca3b59c8927f9eb25e336484cc3529cdfb734..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1632 zcmV-m2A}zfP)ZqSmBcwZk>oGKSl4A1K#KknfL0Vz?I+i1Y{L?2nnM$pSpZ3TTGEPZr4@)X ztj;t{r3`SH1yIS}5`gx#(moeQ$mV;3UFI?ipn}~jX=MPwV%m!%Y{x=uULnV2m_4m4 zWxxcs6erX%SNn-|eWiWKD)Fq67ISFgCC!cv*pt(EkWcxU3Ctr&DYF^Fx4gj}oXG&T zvClO;icKlK{+2XWW*`qUm-?8=lN`aC5`fc5VRNb1G#W9GPe_uka-N}!D0HXT`GLfm z)=dJjHWx9AD8_Io4Wt%!WCk`rv8JStE-WTUCEcvkNOTi9f`(E9Yw-g%Gif5};UJO# zX{Ht9!g#t$4dn2;lLHA^T#toH(@VA+FR_7CA;Hzyq_|k>gFIdb2$|N^Sy~|n8{1F? zHjhf(*o!1YN-M{eXIZJ%_OOs(2S|O;Ct}*3R004=zTk3>rZ;WalpJzdpPlK(={&$U zB&pkEwybm5x>2ljS|zo8N=X`NJ(*7s z06eEXK#+UH9kwNf_9GQ>rjf;4XeqW8SNIfdDl4&D%xSAI3+;VzgI;Kr>?psAJ*^`t zw6@{`U!h%6Yd(oH?H07RB|3IS8$&~>LgzTsC}0{|6N!qa(E3Xi4{3eT?v`j+fpSbE zNQn4LBf&6C3uz=#upiofqQsoGFIqo|f|oGOAWOt=8d*%m^n!#(LrO56E{cb=>o6@M zAz{%DZCw%nX*5A=DPeIorV*leN*j;qJPC_8Y?r$Hr*W^tWtwTW70iDcgD_2!aL7hm zUlc!StcR8@VX!Txg`#*&E5x*utBV0Yh@_QP;xdizF!hu$I1tnGk`~&!Oye2!3={^( zMHxNar*R*qV_dCb*NfsWjhir?DPeFCrYl78m&WCoE|M@fy^iJCa~d~dI#t5pXiWEu z;xCQ+99=$Te@xGc;xCQoF%6I~=z-}QQT(Ox6Q2>Br9wkSJ)xQcS}{ z^OLq`RazM<$MFzEUk_=0miuJgy%H78(58_ads@X>_6>Dg55>p z-=6k3!Ja2u9HKcXuW4j6gkZzjP8?wiegg2DwlVVvR>sLBBq9==N-2Q$B;WENXV8r%Y)BsYY(iUlaTJ&E9AimQm#=BXEWc^1@G^0GjD{j? z&RpM1_R*9Qmm&_9Ke4s{w2gU(IDEkdQq4=6LJub4(p(NBAqKW)A=;M`CmM4sGjXAm zE6K0-E9c)(AnvKSqZv;WLphaI#h}tumIox*jTcFhu6f)>QwgNf7OT(M_`=#8$M8mAxSAS8Nuf~$z>c&8?q$?n(~o@EdMex eGBPqUGJXNmlT=$=!I`%J0000i;Nc;kft!HQ~z!X>~Ne2KUV8%WZU|>C) zIlvg$aGWJDvYye5AZHzsvn#24NeUG@h3-fysZ~*u+Fdtb0A!Tcsz_31y~jlea!yT6 zj2!4&?^GN3pYdf)a<*ixkc3Z8-Ey|%*880e(8njIu3AMUh3E9Fcdks3lU-QMAv5c} zD-+(T1yk$Y3&AHR=km3RvBCeRYhK;3sa1^T)eXB^#jvj%(8EW1gI%p+Y-gHS3YytE zsLb^*;PAJ9x5D*qDcP^pEpb-e+=+6=lAa{Jocf>!@ha)VIrmxRaAiS3&YPtB^X6(4 zD@o7JxkcH*N`gW(r&Z722uK>1NxCcjmcQh*Nsi?AnNxC0S-5n|Y87Lpg1Q|Qgufuq zi_WwRBrW7ceeZtouVNu`b9pgckR$m$A0@qWa7(!-AS7ol>EUXlHIFan+|YW6M4}`7 Y02kUXNE^F7Gynhq07*qoM6N<$f{Vb>Y5)KL diff --git a/app/src/main/res/drawable-xxhdpi/ic_timer.png b/app/src/main/res/drawable-xxhdpi/ic_timer.png deleted file mode 100644 index d662b66e99cb9f18f83875934ae31062205bcb7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 847 zcmV-V1F-ywP)x`vlt;BJs^kZh225~UM3 zoj~pc%>@4X1No_+rZT7F5JKVo9mMegcie#kR4SE9rBW(R(}?5(z|z)~>Y#{SRFWNqY z+yYn!{^kw9SLfXK#J2o}qH2# zG46LE5U0&5&V{j!K%gh%KJNwMm`;isk}HxYfk+RA{k4I<^7x%Tghro8-W&82nv8?h zxJ+Sq*^|ngsQdm#FbV4KCxR?g5cpWPpg0`&()a_$k0@u>zmSARs^>G^;3Rv?Rp zw(lBS&S@o4{=i|VNae32%I>qYlwESAyowk@xusW*^PW0seL6`l#_lEqz!;A77QmJz zQF$ahawBhVXwqp=-haD=yg5ZeE|ut9mhoqrkXe=3zqrBbQP Znm=m5m4lcfIX?gZ002ovPDHLkV1iQBjlKW? diff --git a/app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png deleted file mode 100644 index 222be58d08e730b63efb67e409c4fe7611eb60b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2131 zcmV-Z2(0&sP)4V`N$uHwj-9-xPpP3u zBoc{4B9TZW67d{$xQ%+sBJ#P3I`R|k84LWD%|yHijHQh-iAJghx=;X+%|u+ye=Mep zGKJo(Vs{1La7qEPnTW%PE9JmU;_ziiv(w=y;Lj ziaF4Io)wr?ad--emeEfkqbXAfcD>vo#!P^;6HR3kWdIHMhG6edORlgzOVdvDISrH{ z#CVEeBWNR6*qTLYCAyDXWfbR7iCH)UHk$<}N*B!-&Xv5+&x~Oj3s^w~r7U9(6ZxGl zc!EnffDY7EH87af5aNJsNHi~uMC7m&=kh8usJ>C$L~mkBifx!fuxskkt zA>wX=Eue!^!!Qal@H`Rxk+?zTSSkqenNq{Pl!Nm`XAr(siDy>yV` zO9`oXpPC8h)<0rW$uPw^N%SGTS(Zkkz3D@29hMvi@G@(tt{Wl zj>PuCiNZil_GbjuGbZs0=jkB6El0K@s7>iCn|`WtqmFn*PhFS$#! zm@e)PW*z*h#RU5>@nn-7SYVjD(oJMKAYf}svzVw6PZ8`f3pkRTT*0k!C^u+fn+$a40m(e5@R?^XZxU_8a+2wy%pi}k03IglN-=h$i76Af6u{F&!>PdT zY=w^oti?fi=GqEY9jl#sk z*i_L$lDtUNnJR4V4tM-1#O5BwWk1pV*c8z?%!ib0=21`bClU2oip`DTZ7-%_bC}}% zNOUYV%ZMoq48vwRxsqRr$YC-zdnydPjLpF^%Wk40v3XtYQJW&nCdn+ziO6Fh8Iq@o&cNm*xyEal6;em?GZA$u#_R+4munGb4~75SbqMcqtRYV>(G!~i-aL10 zzz}Tu$|WwuY$Y+t-$dlF0JH1m67OR6tjzpL^ekpS%OwheSI~YY;%LlDMdoa62@;?!GWA=bt;X}+$mi$k| zshE8%SNI*Xp_2cJ7=+o6a)pVQZR_1Ddj{-;*%-OPT+G@lO>7)~A~wTprd(k;W=$mj z6VV*A0=YsZX0;^$6HyzpO1VNQW;G=L6OkYKW`n;lYbyDlh{l*LmMhE--p%-%i1wIG zl`D+HY$wV8L~M)MA996XFdHcOpNOHDeJNM?IC!h!Zz4{`>}|QieVE-P`Jae8Fnd_8 za3*FSNd70{UCd4o|E~N@8Tj_i5DGBsn~5XWRtg1eT_s|3Y#PZODlj`n@;ebnVK!eb z@e^jxOMWNf1rn6ikj}pvYl>AM^>6k5* zYkZ1XF?GF8^cW^j$Td#H=1j@!ME8?uAGt<7$}pQx-g=g(lsa;cH?cWN%6g&$Qh3AU zC53@~v6)Ox))Q5vkf^7^Kt9W|bPdH5O?QxJyu!jw*es>KGJuw8CAtcL;}sT~Q-sa^ zlK+XgfR)r#c(@OnDmtwfi8?4uw4ofEnbh|_QTTWQySJnbJ`t^1h23dUB5^);6%60t z6A@z~cExm!67?dPEBiLegms8Z@8VWJ< zEKyx1P#xbeR8Ek~G0exz%S5f2NcD_hKWe1;7{xWr!OY`Cjrf)7TE$E3PaUO*h8)kg z1oJdeZ9XLxMZC*#G*KX8?7(rnN(reb@GnswFOaHAe&#uD;6#SdnJsBSO={7a?dZiJ zT+UN`Pa&x))Zj-jCf1tgkEbNP#W`g1$uslFM!!nyRKmVyN*no29J4`@I~4&+jv zB6C?r1*H@)ld*iy8{EK=bfK=(N#keV^F$(%NF)-8L?V$$*2<1FxqEM{Qf z76xHPhFNnYfP(BLp1!W^kC-`lnb_~-ns?eUARReQtV+ti*{SCa2y+82Mn-{H>HkB$PBpKUpg*u_*cP5ddx zlJxm4r_1wb;f}uTZWAWwyDMnl?{bLS$J=tAHdE=N^@1U%|EmY+|DWz~^v~Y^5_|9M{>J#3%ST11=#nbXYYd*Q KelF{r5}E)zhIy9& diff --git a/app/src/main/res/drawable-xxxhdpi/ic_timer.png b/app/src/main/res/drawable-xxxhdpi/ic_timer.png deleted file mode 100644 index 1c68403a70a695594bf253d802c0afc7f3190ed2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 773 zcmV+g1N!`lP)`#(#OBi4u)^)xdn+IhZ(F1vq$o%$)|fzS>Ky|d z$p?WV-lF4-kYZ=>q4q$m0{3A0v!5csDQIZS{0BaqB1)D~4~0G{RGHY)k#+X9*M4Y( zOvjIV;C{%B9-EQuTRIaz6Jtby6(fMyz?xO6wi zL4X4IHgeoI0;}H&ZP_P|P=ICxD1tVT*)9`v%T_GBxqt{hkndAC0=xES0t8qpIcf=@ zIGeWrL2Y7|nU`u4_Zx)_{;!!C0@!l7%4eU+<1j5cL|QY)cm0skriumP;M!u($y-9W z2lazPaGzlEb{ajr70*4LLk1iIZIddq;PLt?DHtFz5a8oy)aL&)g72CqIBSr#*kMBA zszQH8foo($V@I$T7pz*e0FG0h4gxFGKd%_m)9cs|-^I*xMu%IGcD}T)Ou0MRh|I)W z#bY}DclZT}IU1OX&emH@`8Dz8TTF=~XQy0<3m$kn={{c{%h%jEJkq?1CFSAu>EYGK za&Qn4c-A6{G!Fd;JatudnPbV)m9J{|#*G^{ZVciZP}J6JoV+Nv00000NkvXXu0mjf Dkj+og diff --git a/app/src/main/res/drawable/ic_alarm_off_vector.xml b/app/src/main/res/drawable/ic_alarm_off_vector.xml new file mode 100644 index 00000000..3ed91869 --- /dev/null +++ b/app/src/main/res/drawable/ic_alarm_off_vector.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/src/main/res/drawable/ic_alarm_vector.xml b/app/src/main/res/drawable/ic_alarm_vector.xml index a1ba6700..c02d78ba 100644 --- a/app/src/main/res/drawable/ic_alarm_vector.xml +++ b/app/src/main/res/drawable/ic_alarm_vector.xml @@ -1,11 +1,3 @@ - - - + + diff --git a/app/src/main/res/drawable/ic_hourglass_vector.xml b/app/src/main/res/drawable/ic_hourglass_vector.xml new file mode 100644 index 00000000..3b724473 --- /dev/null +++ b/app/src/main/res/drawable/ic_hourglass_vector.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/src/main/res/drawable/ic_sorting_triangle_vector.xml b/app/src/main/res/drawable/ic_sorting_triangle_vector.xml new file mode 100644 index 00000000..3d549803 --- /dev/null +++ b/app/src/main/res/drawable/ic_sorting_triangle_vector.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/src/main/res/drawable/ic_stopwatch_vector.xml b/app/src/main/res/drawable/ic_stopwatch_vector.xml index 166f126b..f35f4d5a 100644 --- a/app/src/main/res/drawable/ic_stopwatch_vector.xml +++ b/app/src/main/res/drawable/ic_stopwatch_vector.xml @@ -1,9 +1,4 @@ - - + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ec3574aa..8097fc96 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -38,7 +38,7 @@ android:id="@+id/tab_timer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:icon="@drawable/ic_timer"/> + android:icon="@drawable/ic_hourglass_vector"/> - + tools:text="@string/time_expired" /> + tools:text="14:00" /> + app:layout_constraintTop_toTopOf="@+id/reminder_draggable" /> + app:layout_constraintTop_toBottomOf="@+id/reminder_text" /> + app:layout_constraintTop_toBottomOf="@+id/reminder_text" /> + app:layout_constraintTop_toTopOf="@+id/reminder_draggable" /> + app:layout_constraintTop_toBottomOf="@+id/reminder_draggable" /> + app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/dialog_edit_timer.xml b/app/src/main/res/layout/dialog_edit_timer.xml index f72ba1b4..7eee2199 100644 --- a/app/src/main/res/layout/dialog_edit_timer.xml +++ b/app/src/main/res/layout/dialog_edit_timer.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - android:drawableLeft="@drawable/ic_timer" + android:drawableStart="@drawable/ic_hourglass_vector" android:drawablePadding="@dimen/normal_margin" android:padding="@dimen/activity_margin" android:textSize="@dimen/bigger_text_size" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:background="@null" android:clickable="false" - android:drawableLeft="@drawable/ic_vibrate_vector" + android:drawableStart="@drawable/ic_vibrate_vector" android:drawablePadding="@dimen/normal_margin" android:text="@string/vibrate" android:textSize="@dimen/bigger_text_size" /> @@ -51,7 +51,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - android:drawableLeft="@drawable/ic_bell_vector" + android:drawableStart="@drawable/ic_bell_vector" android:drawablePadding="@dimen/normal_margin" android:padding="@dimen/activity_margin" android:textSize="@dimen/bigger_text_size"