From 6493ef18b87d4127e1f0b7b188d9dbc21c698400 Mon Sep 17 00:00:00 2001 From: aglebionek Date: Wed, 26 Aug 2020 01:20:01 +0200 Subject: [PATCH] Fixed naming, added preview png Everything related this widget was renamed to Timed Checkmark, a unique preview for this widget was added --- .../uhabits-android/src/main/AndroidManifest.xml | 6 +++--- .../isoron/uhabits/widgets/StackWidgetType.java | 4 +--- ...WidgetWithTime.kt => TimedCheckmarkWidget.kt} | 6 +++--- ...ovider.kt => TimedCheckmarkWidgetProvider.kt} | 4 ++-- .../org/isoron/uhabits/widgets/WidgetUpdater.kt | 2 +- ...etView.java => TimedCheckmarkWidgetView.java} | 14 +++++++++++--- .../widget_preview_timed_checkmark.png | Bin 0 -> 7205 bytes ....xml => timed_checkmark_stackview_widget.xml} | 0 ...ckmarktime.xml => widget_timed_checkmark.xml} | 0 ..._info.xml => widget_timed_checkmark_info.xml} | 2 +- 10 files changed, 22 insertions(+), 16 deletions(-) rename android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/{CheckmarkWidgetWithTime.kt => TimedCheckmarkWidget.kt} (94%) rename android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/{CheckmarkWidgetWithTimeProvider.kt => TimedCheckmarkWidgetProvider.kt} (87%) rename android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/{CheckmarkTimeWidgetView.java => TimedCheckmarkWidgetView.java} (88%) create mode 100644 android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_timed_checkmark.png rename android/uhabits-android/src/main/res/layout/{checkmarktime_stackview_widget.xml => timed_checkmark_stackview_widget.xml} (100%) rename android/uhabits-android/src/main/res/layout/{widget_checkmarktime.xml => widget_timed_checkmark.xml} (100%) rename android/uhabits-android/src/main/res/xml/{widget_checkmarktime_info.xml => widget_timed_checkmark_info.xml} (97%) diff --git a/android/uhabits-android/src/main/AndroidManifest.xml b/android/uhabits-android/src/main/AndroidManifest.xml index 904b5bb9c..c86f2bc3e 100644 --- a/android/uhabits-android/src/main/AndroidManifest.xml +++ b/android/uhabits-android/src/main/AndroidManifest.xml @@ -137,15 +137,15 @@ + android:name=".widgets.TimedCheckmarkWidgetProvider" + android:label="Timed Checkmark"> + android:resource="@xml/widget_timed_checkmark_info" /> jan_xfJn=Q?v;&vTx0&U2r0KIgtapL=2r^|e?Sc^DxO2+J*P4J-sg z0|h@PI6bIoLTw>Bv6#JgG|Tod&!qeyADdqMYQJ7*K37D}rTCuF+u^sKvs{(4)^ssC z)Ku#>Ybf^`;o|sM%f?sq;q=&Y^VhYt2}*D8+EEzx<;0j{)E4Dy*qhn_dZgh0&6TDy zgKK+qUe2vf4>uScfv}>fw1ihNtMaIJxZck_`-P@XApZir2T$91qBEaj$o}uE6)XfK z3ga(Vxu-(AcN>ys8jy=X<-a_B)8o+UH`5V$s-mNeGXjYq5C{f3qQ`o0&uCMd z+{)DA%gWbfWPV#g-kSa~F>Gd(8JnJ-p1LL4DjA_2`06raUXk5Fl|4B*o`sE#e^+dZ zv5XmN@8Lm(JaLRfUqq(}5+4t?*C+!rqVm3Y#+E2j0`p`~wV z=(?P;a`4xZ?5ulUmnZ8y=Lm7RO%f4?OhH@^9w`30IorW-BkViY^QE$RNw zx+2_0-!C(%#h@#^G(4qnZ$sQ|#7)77zRG9HYAdDbV@R%5kss=Mu&=!GU=Z0y( z=xNx)L5=nQ?<2&?l1@ZfMvssyf>2Y1)7&&#XyQ^+#o?59$Gtx-Zb=`dkbkZXU4Jy$ zIap%qdARRumi%+u;Lay0xSB3J+({-56zxmUn?aa#sa zWMArBeo40f!95BgAg3b`FRn3+XW$g3>PM8_M$v3K*7sMt!qP%gu{MI1O=UK0n}y)qqB- z(fkRXJlYklI~(@iNF97&si7tNajSEhND3LHcRJZV2V0blE&4vbVA{Hm>-iQG6jbH2 zj1|B84hE2ER_(yDzrXMC=hx4)F`Q@|UPCb4Upc|HD#lHYtO`fbW0+0}tU+EIB!=Z< zG4nt$KY!<5oKf>68S9 z(hxNAJ5Yi1dgbNiNl&__Ib6Tm&>h2y}PdWnH+}tdy zo^38+=jK*QQMYbzlY3fKB?XW*bgj5JkX}TVkC5G7oN4V&u@$|1EtUCWcem27V#m8@ z!Hw%-L02N+4bD8 zr-*pXBwZn1l@epI*BKe5BkKCnXP({!jlihgLMF<5(Fka&?nlp{d-6N%;?IkV%U2I^ zN_6L-Tc#2zu8#{%3MB8?Nx{z+mXwgI81M7)&GpDIIi@-E%-~2U`ES|n+%TqTxp`cX zF-l5mrd|Xdu(f~xhxZ2kU?K)(5UbJQ$!;Wic@ZvSRulVEX0uRnIfjRTL9r!icW%<> zy1*+H`uvH`4N>96#moeH8^rfpMw~;v?dB5Q3GG5+Ddh6o88|MB{4Vh3^TQw3MaHua z1o*);hqf6Ps^`xu*de~Rm)U)JCqAjNk@xxYt!^~;O(XL~Z^IC77+;H>_ zUl56#9mbehxM$$o%d&`pDS}`jrrRj0ws2VDzy;P?2i|%+#8+&H)1q6ly=Qn5M2wR$ zp$1yO^I!d}-0k>k1_HUvq%DE8F9mn-EMf7eL)DGD&^0mSgfiou!BKIg75Mp^x2Sl< zpDf?gg?#;SnGrZtv-9w9;JxH4p48y?QE(zKMBX&hV2OpTpm*F!W@W$h)PC4sCOywa zuSz)tpZnAqEku(PoG4#&`6_u=%XdH z<;y`*2yyrxijrMfwj6yp8Do3*Y|3Re0rI;G=?v!Y-~LzE(WOlyFE`r7XMadwgBG;V zcnqVykE@MS8imlX!OiLC*eF3bM=Xrbf10NBUJWB~oqW)%oQxpC(o2}vJ@K0iC|GYv z(A=oNeffFq?MrV(xUAls$a5yEMl1sZ18wcUj$*IU?mU#yJ8frYS3U-7UsO2`SetAf z^UiG9-1Pjr=BPp{x>Mki?E3rYURgnbqy8tZr(LS$iihis8~cHLiksUrp1{E#&*MHm zin95d8nEy|$kNbls)cuI@8fj`UHq2^*XjbcguqD$ZX|?bsUac${PmMib=`fOY9EG~ zmbqgLXa6KH1FnsLSI!?29`V%Os6ZCd)6-KwT}&Kq-7ULcOI<0cn4SOp;&Cc)XwiIu zaHYp~N#^rU?pz`BftN^l}?T&!}qtueh+tQMVW#}LK ziXL;>z_7B9NRN+5C+UM73aPCPg7W>=d0Vns#*U*e7`)}wWyZ_B^V_g2wQA*i&7-K~ zPelUgPS>QCXl^9pOY#WWnGSC#0FvupUtnjqhpf6c=enEaya$&KYt)8?p4DLG6Zh$z zQ`qsmN{_7ey9sfPtol2|-p}6jBg#6v} z{QGxNWq0%|E^l{8M}Nv*=^3M}I+)CGI{oU8GSceR}h$5czm(&}pUR5~$M_>F(=g51CvM!F_y2h+~MNsn=8 zCMo)43&%~wOmMQ5nCJQhj!jvi_dRZ0Oa1z6_r!pRhvynhR+or0YU2i~HT7lsJ;ZQn ztHw`%o}B*0#P4xUrIZ~+*W`>A5>n+oaZnKr&lr8C21jcub%N787mV0pt6SYedNk^w z;2mU2qaEVp@i|s83gg=x#>ii=kGR>Xs88l&~U;}H4DqxRTYLT{N}{W$hRzE z$|TU4(GO#6F%w@HR%zqGJY>cfeaIVFYX99GaYtT0#1S}l%^U{$cFuw;n%nHtoUCcY zs=Jk{%y`j3M@a8SeG=89q+MZ~rXL_l)V+t`ue@&d2H#y|(EU!F_56=;3@U!0tX2&k zg@FU!*sb4DIi*kGqHmXpRBPWPa?)d{3L#opogpFq9^kIKitIqpOhCe3m#-#xqq(8m zAi&H%rdFCD%-yG02-zTP+|?cM$#nj74?|sQSXX@Tsh$=zlKewbM6fof1yrA0yD08HCdJLuyvK>LQVdmq=P5;m52R#UDz3lqon1|0-7(cl)_$c#f zUE*k;pTCsSmxj&ErTj<{%-0ZlF>?ckwvNvZkL$`^?Gq#_b_50n$}@Qui}no+%<({h z<~e=(G&4;W3eHmscye&?_;#^mgzB}_wPAseD=|7{#3%N5xzC@UJN+yKuy*KxjB6AP zk=VQQ`?t?`mfKM_*#!j!3&v|ekpXGadzyOg0G{?1TV(Cy!)ak*QLY{{i1W9r;`XXH zA2T6<8)gzU!!woq(|<$tDGHwEW^3EArBV1et!r*G?Ydl~p7>dHWxm}EGhAlT=UBBe z5|WCkGSdJO$kf!d$HmjvB-8#b5T-f2*9Lqid@b5XTv(d_3FC&L0SycezR*xkLOn~n zol#UA_uyJA&=|pJ{1wr{CqO`wP|DHlXKseuaHE)Me|nwk zvX%0vfmsYK9+oof(7_B2r}$)beRFluS+z<`%^HI2pa2FAGzpLpuZhbCXK({DVEeT% zVTU#>F6V1hnfZixFxQ+VWJeYc&H>H&;M(0?ob1`BJ@Ti>Kd%AW^Pk`ZV0y|IdWVxP zE*D7c!eSSO{@`1pMq;m?_c(AJDj98k_nSAmlS+&QVg(Ej6rGcdVuk&`6Z-$Upo}Zp zusVR{A2cJNak<0C$%qd0CRYhioQ5Kxpde~bFbE`2;9g!FYVbx%^XnJyjD)v?fys^h z5gh~!LKUkM^d6jVAV4~8rKSv40#k|3D%KIE#~wgTo7bqLQpi9Eg4ZWSFeyNmpXZj2 z!rZ*$qSYP{{tp5h&sPUhW%XR|#kb4onI+pFht-=ee4cXPh6$LIUDeIHZ^#nqQlUbO zhgcU+SvRc28x1B!trU`ev%_7&K#0A=t8*!hZKFP0bKCH>fuH|NoG=8j(Rk8XY5hXLp7RqB=weo0h^rr z_!7=70as#T17a@ZIr(Q(TTz)<3_zf;@2@DpyDrIF^DJ+PF_N zMDialX<2rOJdqF9)+l9vpFTNhIUcZ>3EVeGHC()SvCdd&d*83@?3=*_AtA(mES<+P^O`= zkyph)=*8Zzl-6fHit)4ztn$f4It2s64Zc@S0=c7s@+M41j}&`a_(E*~fMi5QaWUA8 z3f_~)H5H-a2=F9DtW>A^LS9|Vb} zB?_giJ~7fvSDJv2#2~zAX=#U>gKBx9DUwznE5Z&}Z=KBjc6Pc*u&+1sq7=4;Qi zA>s7^a-&-Zl9o*|i&38qQ?gJB}|c050rCa|qtIRa9TI_~{#1{_K# zQGaEm2BhP7ckkHWJqtWc6fj`ek6*&7JvW3{)Eq)*CnHUl`aWVO0rOdT6(f9Ce~erg&L3DlCk(QR?frRLn{BjgkUOrYK|mY2ACq`N z0snC9gU!f0`vhqo5UW`EllNkT<@^+nJ*v%t^i89+^U)dREy3r2xbVnOR904g2G002P%a5$Kjwe{ln1Jc zF|y-X)@@OX+MIz6ekB>5y`x$L4#tC)nE-e^NUb{@!0>p{Ljl@DotP5eW9X1 zw}kaG;GN!+!7NaS2q)t)qxJe}xmZPVjC0!YEbfzJ3&V*c6Uu)XCXt`jUIBl`NKt*oOH-!3ib_$ t+TRMq?BEMw1FzQ^G5`0MV%sr|DcL;L)9ZaA`1=oX>!!X&xtcZp{{i-qRsaA1 literal 0 HcmV?d00001 diff --git a/android/uhabits-android/src/main/res/layout/checkmarktime_stackview_widget.xml b/android/uhabits-android/src/main/res/layout/timed_checkmark_stackview_widget.xml similarity index 100% rename from android/uhabits-android/src/main/res/layout/checkmarktime_stackview_widget.xml rename to android/uhabits-android/src/main/res/layout/timed_checkmark_stackview_widget.xml diff --git a/android/uhabits-android/src/main/res/layout/widget_checkmarktime.xml b/android/uhabits-android/src/main/res/layout/widget_timed_checkmark.xml similarity index 100% rename from android/uhabits-android/src/main/res/layout/widget_checkmarktime.xml rename to android/uhabits-android/src/main/res/layout/widget_timed_checkmark.xml diff --git a/android/uhabits-android/src/main/res/xml/widget_checkmarktime_info.xml b/android/uhabits-android/src/main/res/xml/widget_timed_checkmark_info.xml similarity index 97% rename from android/uhabits-android/src/main/res/xml/widget_checkmarktime_info.xml rename to android/uhabits-android/src/main/res/xml/widget_timed_checkmark_info.xml index 5e988f548..bea1159d3 100644 --- a/android/uhabits-android/src/main/res/xml/widget_checkmarktime_info.xml +++ b/android/uhabits-android/src/main/res/xml/widget_timed_checkmark_info.xml @@ -22,7 +22,7 @@ android:minHeight="40dp" android:minWidth="40dp" android:initialLayout="@layout/widget_wrapper" - android:previewImage="@drawable/widget_preview_checkmark" + android:previewImage="@drawable/widget_preview_timed_checkmark" android:resizeMode="none" android:updatePeriodMillis="3600000" android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog"