From 6309c9e324cb660befd451ded51bc233f2950837 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 7 Aug 2019 21:03:52 +0200 Subject: [PATCH] lets replace an icon with a vector drawable for testing --- app/build.gradle | 1 + .../clock/activities/ReminderActivity.kt | 3 +++ .../clock/extensions/Context.kt | 2 +- .../clock/fragments/ClockFragment.kt | 2 +- app/src/main/res/drawable-hdpi/ic_alarm.png | Bin 610 -> 0 bytes app/src/main/res/drawable-hdpi/ic_alarm_big.png | Bin 895 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_alarm.png | Bin 821 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_alarm_big.png | Bin 1112 -> 0 bytes app/src/main/res/drawable-xxhdpi/ic_alarm.png | Bin 1201 -> 0 bytes .../main/res/drawable-xxhdpi/ic_alarm_big.png | Bin 1616 -> 0 bytes app/src/main/res/drawable-xxxhdpi/ic_alarm.png | Bin 1668 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_alarm_big.png | Bin 2238 -> 0 bytes app/src/main/res/drawable/ic_alarm_vector.xml | 11 +++++++++++ app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_reminder.xml | 2 +- app/src/main/res/layout/widget_date_time.xml | 2 +- .../res/layout/widget_date_time_pre_oreo.xml | 2 +- .../res/layout/widget_date_time_with_shadow.xml | 2 +- .../widget_date_time_with_shadow_pre_oreo.xml | 2 +- 19 files changed, 23 insertions(+), 8 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_alarm.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_alarm_big.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_alarm.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_alarm_big.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_alarm.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_alarm_big.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_alarm.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_alarm_big.png create mode 100644 app/src/main/res/drawable/ic_alarm_vector.xml diff --git a/app/build.gradle b/app/build.gradle index 0de0b439..6ed322cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,7 @@ android { versionCode 13 versionName "5.0.2" setProperty("archivesBaseName", "clock") + vectorDrawables.useSupportLibrary = true } signingConfigs { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt index 976ad44e..fb785a1d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -77,6 +77,9 @@ class ReminderActivity : SimpleActivity() { reminder_stop.beGone() reminder_draggable_background.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulsing_animation)) reminder_draggable_background.applyColorFilter(getAdjustedPrimaryColor()) + + reminder_dismiss.applyColorFilter(config.textColor) + reminder_draggable.applyColorFilter(config.textColor) reminder_snooze.applyColorFilter(config.textColor) var minDragX = 0f 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 b4072574..eae2f57c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -336,7 +336,7 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No val builder = NotificationCompat.Builder(this) .setContentTitle(label) .setContentText(getFormattedTime(getPassedSeconds(), false, false)) - .setSmallIcon(R.drawable.ic_alarm) + .setSmallIcon(R.drawable.ic_alarm_vector) .setContentIntent(pendingIntent) .setPriority(Notification.PRIORITY_HIGH) .setDefaults(Notification.DEFAULT_LIGHTS) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt index b831684f..468e9e11 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt @@ -2,10 +2,10 @@ package com.simplemobiletools.clock.fragments import android.os.Bundle import android.os.Handler -import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.Fragment import com.simplemobiletools.clock.R import com.simplemobiletools.clock.activities.SimpleActivity import com.simplemobiletools.clock.adapters.TimeZonesAdapter diff --git a/app/src/main/res/drawable-hdpi/ic_alarm.png b/app/src/main/res/drawable-hdpi/ic_alarm.png deleted file mode 100644 index 6dc94d2b5204538271ce82a2324c8b90bf2bcc7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)Q@5$p3i|w;6QI0y3Pb((*r_y$hZYt4jtO^jWL&n@UY(i zBMOyJvo8RP&I>(Oq-M#p!X17BeD2I~=qtdqX1AJ?H?z*U$t+;*ICMn`V+!uK4%qdv zr?hI+s8y#=6al}wSA!{(JX*PU%XYxqLg)h5L<$-M--(P` ze5j~hDEI-4q@nXl;3bjSSs}az4&0W8!UWjUA#!@eJ{T5RP?Hs~>uM(RxFT3|V>T4- zv<=GM*OK@teBcOdXs`88d!IEx(Wjo)rqK=BboYtmqb?K>E}Wl;8_vzFt6Erxn;A~rPZUVxa6JHHy<-rYGLbzs6D7o>rg1&Z z`Bf$`% zT!meaX_QoFbJ|>mosL;aK5T&5Z?3}j!)zcQHpA?c8n(K;*a@?_d{`TERBG5bPWDY` zI1012eCU9=L>?^1FwD=aAtesT9puM!oJZtEA$L-RQ^ma$sTLl_nXV*!gEK^lScC5| z!#PxOVkpkHO2W;UHI;~*_{@vXW0Tc2F*hj*TVrliDq8Ru)i^`Rt5fN1((ZQ*&J@}y z02}Z(00(O}+A#%ZEICTX&6pPyggnmV4LRZk%*{$eE6OmtDvCbd{3^zupDKWF>I#*Y|W^Q6FI{XRAZ`nm=-A&c$oO{2Pqp4 zpq$7=&ZWq+fIOFpM9SD-*x zXv|eiC&VfKf6TN=vY(nuKH?A%{66&VI)gZ+$idTxvsYedP` zs1%(mIIPEqCUlE*s;0cBsyyIU--5F$B2mQ$VA3sRfxG+xU^odp58yXjr2%`*0=TFz z39K^#;JQ7Hfr?iEa9XEWYLjQ3F=fWQc{3)RvQNKQs@qurnHP(JZtnufydZ>C9yg|F zE_g(%Q1L1N-qC3#V4ZOQ*X}U!Y1WXhIGl1TvfEwUx zF)$BkZwlxD%>7qjTl2sSpsyj2Ic9Bhw`dZuvjBL|FMvNixBR7G7hpWSrUykqonG=6 z;5&BTei-BhVBceF{J_2yYy8QSk;HhF@BOo&%8upN1m%V##lYz|oVjx@u92JSW zylhrxyIAT?z^G^h>;){^B9aZ*FP6Gf2H4XWXjKQ)^@x(KHVwF>r7;lh18`28kgm;V z0PYbfARHqn(%<4Hp8|MYNCUb|0H`N^i*0@aFs7p%5PIbwv*@@@1^;0uECRUfW+4sa z#5e#l=N&SrrbCCCU51Uy0PuBw`I12BazxpAO@~k($Qx3ZnoIfSGy#NGkNV0#PiE9^ zEuv{4Z=-!qnQ+ydSyzlZ=}GHFy72#Y14#Eb@1%;*CbMxa00000NkvXXu0mjfw`*YS diff --git a/app/src/main/res/drawable-xhdpi/ic_alarm_big.png b/app/src/main/res/drawable-xhdpi/ic_alarm_big.png deleted file mode 100644 index b45924d4eb9018306d8a8b8995031d2ce57d7028..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1112 zcmV-e1gHCnP)`C3&Ck+fUM&+0*tQzw6*lGFVy5 z=1?^?Y)g}M0ZnXc@o*wJ23Qv`fE*`U4AgNue>>X(aUp-ZojU6p=H^*SGHhu9*q$6E z&oZ}#V<|pEU?j_!Cst()AfK_6g<(T}A!!EtnkNn+OVTfFX#UuXDI|?%i@+T^mZT}{ z<-ZK`Bz?;Ysl~ntSJREh`G6LtGnp3NIO!92c4^>gh$=^UP~S%)^27 zV>s0erw<1*j}X$n^gYX2Wo*XqN(-6I_<>MAuvx_gKAg?05?&%{U}+(95Yy<2 zX&h8u;6q7z*(zZXh9b|Geqk<0q`=qQ%V8{LMJ&Og+{;%K5V_3$!h*bt3}q3kjFlP7 z-|j3gijT>0H%1XSRHd1t#(ZId@Z7eHWb!7(z=;x zfis;PNJjU!Um#&q zGRRQs%?Bp~a*0`JAmL&_PVy`4TaZCCLFtI;~^HRe(Z8_*yZYsy%>hT7|x|W)$GY6FIWG4 zcDi|>nX8$Cz<21!GfodEKT_B0$L5LUc?6lrGFHaN9xF)LFBi+uVxXQ&1A~wj^T8I;##r*NSTeCr&n+;FT+U*$O1d@J;(y%(t!qGjXr6-kJdV#2;A88*rHa+*@L(=-i z7;!#8XKh^1a#b#m>u9I52P_V*L!`i0+?{BgFUg_Y$Cnfkxx(V%&{(5|XxNg0g!+L^ zEj}7Ji{beCjWemYxPC}?9xWrum0000 diff --git a/app/src/main/res/drawable-xxhdpi/ic_alarm.png b/app/src/main/res/drawable-xxhdpi/ic_alarm.png deleted file mode 100644 index 75e5a46ee3ae8e23bb2eb6042d56f920ce42e3e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1201 zcmV;i1Wx;jP)oK!C1DYn9vp$gK+7PX9>FTFtrnMF6s&h)hsda%{a_VjOgmOs%=vw!WNuh3m(Yx+t9vjj22q4aNh zlw0V&UOQ+beIR{7UV8Q0Sj_@moT7$OqJ#+(rIcDu)6D{_`7nKxZ{iY2H`$cw9(sr| z0G4Q#@9EE3=?5Cwj96nH;3(Hw=`(T=2(tJH0QiGP$oyBvQ_Pc;A8=@uoIds;3}!$5 zE0g4-;0;pD^Nh)Js8;!BZRqA`Aq!zR*~CbC7fxQ?&C7mYt_|pZq8#CKDi}cbitWp_ zgjrPIQGl?RLV8jC&33z>9#76j#HzC_j#y*zxr(aWCg_M~u?i5@L4rch!Zr8}itsx~ zbCe?j1qmuig7h0MZo7!tNWFE8^)jouiAVD>% z=gfo7YcC1mEJ)A?(x;|DA*MiTbQ;tI(l{Zrpem3S*z7c@fJKlh%z|Pdbs?Mv2@)W+ zm<62$>6G)JI7sbgK?#s*oCno`)MXYl0#d2-pfZq#&4Q*tiaHM}0%^i5CejFa*7y4br|6{C`1pcUh=JT z^0|iUvYX?WUdvCZ$dfbeeXZCZSPfX*OH~Y_s}J)3Wo_t^#C$viayY>Px(^UmK^YD` z`>8g{IlwKvIuQ0jnU00~Xv%Pe6{VRQtkg+%@E}2mk6Fzk3F6dIMiCJr6j4SUae7GM zB^N7TkepYUA&6<}5iWxSB_yzQnPP;)AUUryhF_!VQ`vQpAVM=km>Q&!T!i}|eL_4> z2Y->tIOo_UHy9Q{Hd&RtMLS&#Gsz;0OfXCr?X-CJ%JxC-XFX^=Xg%m(XF{7Vc$$S@ P00000NkvXXu0mjfEk!fo diff --git a/app/src/main/res/drawable-xxhdpi/ic_alarm_big.png b/app/src/main/res/drawable-xxhdpi/ic_alarm_big.png deleted file mode 100644 index 602a74063ad8b0a5c4244d0fa9469f131025617f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1616 zcmV-W2Cw;vP) zDEL337;mtVctnEJCD+)L_CQM#;tlTuZ%Hn(2crOh_rw!!2LKvUR&s-rn9tv?77sX; zwft!aJBWYW!fO6$B}a=f_Gc0QG>gN z2=<2fz_#=y%v=r-BOJ(l!Zf6`*y0eT5oQECd&;?5f73+5MJyvs8#eM(B{kbb!jq&3 z^ASl2!NFY3(|k=!dNYbytYrl=8AUIe@)b{WHT$ROYbp_D1(!;;(!RhNZj=CQ$KBLm zHc?Ec8h5cx#vkbG{(cg3IYE~L&ZaJF$oyiVNi=*B5LVXzx5 z@u5CD7kNkT5+=o~5)IV}GrwrU;2u`s%Mxyl{2QtyQE)?O!q`pz!sax0f`7 zM8j+AOBfswDOs$gC*^pG3pkuzC`}o5;xI1cNq(Ydq_QxPeb$?&KbGjIMp2*qGhuK# zOGs}TA9H^CwJ#fS9v?G}^cHebk;>YIqFR!a=qN$=(1dX-YYDfCA2^vr2C3>Keqa^h zR&#xkcUFnNjn24JWpgG3CXCBT5oQT*v31Nv(c3H`%sMUzY_{gJyJU{NnO`Jf{DR|H zMVPMHEnnD~u7p{^5vti*%ZU;XN3fC8WX&hoN**O)FnV~Dl?0o^u1>RctKFh~Fu_K0 zpy3L7B*6w#N{pp1+%+j}JX@(nuoBw#Y?QOWHew3e;gT)BN4rWCv%nOtK>Jp* zLkX7R8cHIkfh8D%Yd$3;8(fWcy(p%EDO`_srDTJ8xF(a#d0vY#`SSt1N#Km(-H?S<9aKvf$6!`D={~&c=^UImYDb$*OOKw(jN^1 zTglt;_Kfl)u6wPrVl9Kf0H$)INmjhks*d%HADGfJ)ACABt2%bDQRlHG-;qLF$B%3! zk+BrlLAmY~6^@`6K^E{B#p3shcHRBeS**tIWFA3AaB8gS%XrIC>35O^Hs>qW5u_oz zN?Lq}t3@7H&>Dx(3q_Ry&nxKT&<-(ptalr;0iu@y4naFs;v&fsT<;t0`u&`B(aQku z;aW;U;-hZxT+srD(2XD~*vxpYsBtCQHDZRFn1Sp0Nb~5+vYp*8#x+C?u?e5BmcNap zxHuT9>mMZ~JN$@tg_z<1I`OCD#lhtUPg^vOM4LhxF~;@G0LqJlGE6m?M+c!L+Gk>p zjrc%6*XC2SW@3R8(NdfuIlxJz&<+TI=HeNfneH0UIGhxk-rH%4B+ZQXd1#a) z$WP)C6$tW!SYm4y6XYH7gtrK?n61SYcW)58-)jk_-V^)?s|YrSoy8xHVmV>DvYXdk++~6!0o1JZ$oWa=^|2Qz>X{271<0&rWaCV_AW!ag-|2U1*E0fbm{^jBPSRQaM zEAVA0cS;`kKBL)yoh9G6*!)!Oxw2uPB=<8N3lq3oO{wx8+`Wt?8>6_BVzMD3!P(S{ zb=N>G&X5gPjN2h*P>nm;M*dAWNZseL@~`_mzE<~n{Pz_U6ciK`6#NXpw!+w!lPewo O0000c|o%lPCigiDD#KoGheJf`CCcf?#2?jU`JY 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 M07*qoM6N<$g1a_53IG5A diff --git a/app/src/main/res/drawable/ic_alarm_vector.xml b/app/src/main/res/drawable/ic_alarm_vector.xml new file mode 100644 index 00000000..a1ba6700 --- /dev/null +++ b/app/src/main/res/drawable/ic_alarm_vector.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2a0ce1d7..3895a204 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -26,7 +26,7 @@ android:id="@+id/tab_alarm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:icon="@drawable/ic_alarm"/> + android:icon="@drawable/ic_alarm_vector"/> + android:src="@drawable/ic_alarm_vector"/> + android:src="@drawable/ic_alarm_vector"/> + android:src="@drawable/ic_alarm_vector"/> + android:src="@drawable/ic_alarm_vector"/>