From a82d940bcc831cb160cd2ab2d2d319fc4cccabd8 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Wed, 29 Sep 2021 06:37:06 -0500 Subject: [PATCH] Small tweaks to checkmark size --- .../render_implicit_check.png | Bin 1054 -> 1227 bytes .../habits/list/views/CheckmarkButtonView.kt | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png index 86e6a540609cb2ef1622c4125d6126be24e601ae..c45314e037b683bbeb91d9be236b259699766f0a 100644 GIT binary patch delta 1207 zcmV;o1W5ay2+IkOB!2{RLP=Bz2nYy#2xN!=00e?bL_t(|obB0vXw-Ea$MNU;ySw2{ z%Rln>xhOT;-Az*`XyGDSq0C8hMpQ(C6#Y>e7=ea=MnMtPU(p|e1re;ao!#wpEPo~u zxZIp_idcaXh*@q!x7_`B_s4BIchk+e+kI#6$6xz?_x-~A^M88r`QE-aFvb{Tj4{R- zV~jDz7-Nhv#u#IaF~%5Uj4{R-V~jDzm{F5_50FcdNa(?YuuD{zgLET$sL1Qtw0d>> z)qKy^@18AS_nt==r;`Qy5Scdcyeg+B7ZxmcO9@WC2grrGNMKnyWbd4Ht-$C3x~JSG61d=D_z>LP(N}QI^^Ku5c^ntGhYF~R1y)K* znuiMi28RXnUb}Imx@=sB9D?f}LE*-dMXFMvFxf#4SASQ^;HGriX#wX`!FgYi!{JEqqubpRjt0wBW$#GB@8~?quWj#S z4wP;@PHe2#aHm{TKtnY6iXb~hq;TMQ6?wNl8v0f>`%mVENU%ax_97IGB>bbt-l8|r z38;#rTYsxppFE$F#oPf`6cBCrffpMZL*EZ9p&=5i zP$4?9@K4+nKIog(YvW($d|@My_ZP8nQ)#jG>S=_cBA=h-OF!qnDf0nHCa=)izMYGg zj$|%YqQ$c()ttZB^Ngmc7i7}N!ry#T`0J}qeSa}Ns~cY4cYr2RRR~1@WlKJ}9zKA_ zGliv#KV-(VRhbh))wv5jU78{~%J5%zQ~2P50>HWcRe{epC+oL^OUMK-&T!#h?rgsv zzACA{@OS2B4WpO$0z_%+|M~Qp&q${eS=VHhFoN(~j%^tj{zf;34=(r&0BDE?e*swm zP=D;Np){}!$MI%emrP!v?Zgg>{nd9Ae$Bf0H#uFvU2sJKjg6sMy{d;m7Q*dIP)#B- z^!sD~V<(a5%7icaQcYF-yWCEHcU(~bKrFUk`n7c7L69IovA>$qz;+y`@b)+Mx!iG_ zqpe#=B)R~SioWdj@WBP20sSf~&;I45V1Jb=#{tg&8Rq1v4@jqbhrKr|e9`A8LipgK z9ni0~dEQj-HQzp<44~Nm9HoKxZn+bN41aBW_xMeGcU)HhKvUD=$=$uFW`xH9=FVBi zqTr6K5-xYNakTaAzGuGn;_$*m3Ljir06^`}bA8@_?r#DqhwKsthc5+Gudj^n$$#t6 zqu|;C0BUPPgeE|Rm4&dpy8a&efvX-G;D!e+;p811Khynmqk=@bY26YH& zS}v(1_H3v+^LxJMGR7EVj4{R-V=#;{#u#IaF~%5Uj4{R-V~jDz7-Nhv#u)Se^&eG) V&^>E@I;j8v002ovPDHLkV1l%cRyY6v delta 1033 zcmX@jIgew4NGZx^prw85kH?ik&<|IDnvrBc+3Zf%$}|i(^Q|oVPdb=Le_C zuzh&`yG+m^(QUWxv9g#OIc2WqVTL!G3>6vGKC8z*5_&w9P3YZMFNZ*Vg=5)zKbTDv zbrsfiWJYXi@nCuslWT2SaWG7vtY9jZ`obwG2mzv$@i;%1G#9ES8vzH9@={Hdtjm1g2u?4H95vV zXI==gUJ&<#;ljmj%ztZ-GknhoIosaWqqA*QCRc>_k9prdT$+4b@b3P+?k^XUJ{=7| z1$4t7>8gXjPtB-W`r&QV`snN*3<3Lg)|W&F?)V`v?caelKY2XTtJ#hOE@$b`le_Y( zdhf}~w{_=V96NkI$>{&W>gokkso*jIDAI;^hs{hgOQg*>p_xJBVo!uCkw)PI^ zx?d0Lb8CMv2pIi*6kl7ZZvU(7_zH%%+u!*-xacdmC9m#S`Z9$-E<#MLJNK`@##_Iv zMl86s|8C>ahs2XRqy!Q6vQtygC8{?ezXy{{_j);GDt9$AwDL!UF+2!Alvv^xwEEnB!`Y7eB+h(bO;gy%YQZH0z&i?D-P~FE@pqE90FqP5!!rr*?Yvgv0Di8DTw#!$&_ayYB3Q3#8nr=NCU_Z&}A~56tQep00i_>ztSpngFb-?6v>^ diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt index 339cc46b4..71fc18bd8 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt @@ -37,9 +37,9 @@ import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.inject.ActivityContext -import org.isoron.uhabits.utils.dim import org.isoron.uhabits.utils.getFontAwesome import org.isoron.uhabits.utils.showMessage +import org.isoron.uhabits.utils.sp import org.isoron.uhabits.utils.sres import org.isoron.uhabits.utils.toMeasureSpec import javax.inject.Inject @@ -145,6 +145,11 @@ class CheckmarkButtonView( } else -> R.string.fa_check } + paint.textSize = when { + id == R.string.fa_question -> sp(12.0f) + value == YES_AUTO -> sp(13.0f) + else -> sp(14.0f) + } if (value == YES_AUTO) { paint.strokeWidth = 5f paint.style = Paint.Style.STROKE @@ -153,11 +158,6 @@ class CheckmarkButtonView( paint.style = Paint.Style.FILL } - paint.textSize = when (id) { - UNKNOWN -> dim(R.dimen.smallerTextSize) - else -> dim(R.dimen.smallTextSize) - } - val label = resources.getString(id) val em = paint.measureText("m")