From d4dcd21f656295b975e63ce337609a4130799a79 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 29 Aug 2017 22:08:55 +0200 Subject: [PATCH] fix #40, add an eraser --- .../com/simplemobiletools/draw/MyCanvas.kt | 22 ++++++++++++++---- .../simplemobiletools/draw/PaintOptions.kt | 14 +---------- .../draw/activities/MainActivity.kt | 18 +++++++++++--- app/src/main/res/drawable-hdpi/ic_eraser.png | Bin 531 -> 0 bytes .../main/res/drawable-hdpi/ic_eraser_off.png | Bin 0 -> 534 bytes .../main/res/drawable-hdpi/ic_eraser_on.png | Bin 0 -> 1012 bytes app/src/main/res/drawable-xhdpi/ic_eraser.png | Bin 488 -> 0 bytes .../main/res/drawable-xhdpi/ic_eraser_off.png | Bin 0 -> 483 bytes .../main/res/drawable-xhdpi/ic_eraser_on.png | Bin 0 -> 1094 bytes .../main/res/drawable-xxhdpi/ic_eraser.png | Bin 1053 -> 0 bytes .../res/drawable-xxhdpi/ic_eraser_off.png | Bin 0 -> 1038 bytes .../main/res/drawable-xxhdpi/ic_eraser_on.png | Bin 0 -> 2404 bytes .../main/res/drawable-xxxhdpi/ic_eraser.png | Bin 1253 -> 0 bytes .../res/drawable-xxxhdpi/ic_eraser_off.png | Bin 0 -> 1082 bytes .../res/drawable-xxxhdpi/ic_eraser_on.png | Bin 0 -> 2303 bytes app/src/main/res/layout/activity_main.xml | 2 +- 16 files changed, 35 insertions(+), 21 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_eraser.png create mode 100644 app/src/main/res/drawable-hdpi/ic_eraser_off.png create mode 100644 app/src/main/res/drawable-hdpi/ic_eraser_on.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_eraser.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_eraser_off.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_eraser_on.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_eraser.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_eraser_off.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_eraser_on.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_eraser.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_eraser_off.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_eraser_on.png diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt b/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt index 250b167..5dcb4df 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt @@ -30,6 +30,8 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) { private var mStartY = 0f private var mIsSaving = false private var mIsStrokeWidthBarEnabled = false + private var mIsEraserOn = false + private var mBackgroundColor = 0 init { mPaint.apply { @@ -59,8 +61,10 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) { invalidate() } - fun toggleEraser() { - + fun toggleEraser(isEraserOn: Boolean) { + mIsEraserOn = isEraserOn + mPaintOptions.isEraser = isEraserOn + invalidate() } fun setColor(newColor: Int) { @@ -70,6 +74,12 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) { } } + fun updateBackgroundColor(newColor: Int) { + mBackgroundColor = newColor + setBackgroundColor(newColor) + mBackgroundBitmap = null + } + fun setStrokeWidth(newStrokeWidth: Float) { mPaintOptions.strokeWidth = newStrokeWidth if (mIsStrokeWidthBarEnabled) { @@ -152,7 +162,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) { var y = height - res.getDimension(R.dimen.preview_dot_offset_y) canvas.drawCircle((width / 2).toFloat(), y, mPaintOptions.strokeWidth / 2, mPaint) mPaint.style = Paint.Style.STROKE - mPaint.color = mPaintOptions.color.getContrastColor() + mPaint.color = if (mPaintOptions.isEraser) mBackgroundColor.getContrastColor() else mPaintOptions.color.getContrastColor() mPaint.strokeWidth = res.getDimension(R.dimen.preview_dot_stroke_size) y = height - res.getDimension(R.dimen.preview_dot_offset_y) @@ -162,7 +172,11 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) { } private fun changePaint(paintOptions: PaintOptions) { - mPaint.color = paintOptions.color + if (paintOptions.isEraser) + mPaint.color = mBackgroundColor + else + mPaint.color = paintOptions.color + mPaint.strokeWidth = paintOptions.strokeWidth } diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/PaintOptions.kt b/app/src/main/kotlin/com/simplemobiletools/draw/PaintOptions.kt index 96aede7..e29002e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/PaintOptions.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/PaintOptions.kt @@ -2,18 +2,6 @@ package com.simplemobiletools.draw import android.graphics.Color -class PaintOptions { - var color = Color.BLACK - var strokeWidth = 5f - var isEraser = false - - constructor() - - constructor(color: Int, strokeWidth: Float, isEraser: Boolean) { - this.color = color - this.strokeWidth = strokeWidth - this.isEraser = isEraser - } - +data class PaintOptions(var color: Int = Color.BLACK, var strokeWidth: Float = 5f, var isEraser: Boolean = false) { fun getColorToExport() = if (isEraser) "none" else Integer.toHexString(color).substring(2) } diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt index 1b45ef0..81879d5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt @@ -44,6 +44,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener { private var strokeWidth = 0f private var suggestedFileExtension = PNG private var openFileIntentPath = "" + private var isEraserOn = false override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -60,7 +61,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener { color_picker.setOnClickListener { pickColor() } undo.setOnClickListener { my_canvas.undo() } - eraser.setOnClickListener { my_canvas.toggleEraser() } + eraser.setOnClickListener { eraserClicked() } storeStoragePaths() if (intent?.action == Intent.ACTION_VIEW && intent.data != null) { @@ -159,6 +160,16 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener { } } + private fun eraserClicked() { + isEraserOn = !isEraserOn + updateEraserState() + } + + private fun updateEraserState() { + eraser.setImageDrawable(resources.getDrawable(if (isEraserOn) R.drawable.ic_eraser_on else R.drawable.ic_eraser_off)) + my_canvas.toggleEraser(isEraserOn) + } + private fun changeBackgroundClicked() { val oldColor = (my_canvas.background as ColorDrawable).color ColorPickerDialog(this, oldColor) { @@ -232,8 +243,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener { fun setBackgroundColor(pickedColor: Int) { undo.setColorFilter(pickedColor.getContrastColor(), PorterDuff.Mode.SRC_IN) eraser.setColorFilter(pickedColor.getContrastColor(), PorterDuff.Mode.SRC_IN) - my_canvas.setBackgroundColor(pickedColor) - my_canvas.mBackgroundBitmap = null + my_canvas.updateBackgroundColor(pickedColor) suggestedFileExtension = PNG } @@ -241,6 +251,8 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener { color = pickedColor color_picker.setBackgroundColor(color) my_canvas.setColor(color) + isEraserOn = false + updateEraserState() } override fun pathsChanged(cnt: Int) { diff --git a/app/src/main/res/drawable-hdpi/ic_eraser.png b/app/src/main/res/drawable-hdpi/ic_eraser.png deleted file mode 100644 index 5849413223e991dcfb0d760a47dfc4f5d5937dab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmV+u0_^>XP)CdthE=6&->R^&f32v7#LfVEk( zgfJc88~6g+fSMId6*$r`VFti<;ZV9WahNbepj|Xf#{d(i7<~p!rc75~il#|W{`F?Cw)IP0pQ(Pg5UQk9@~gpPMFK?9_1jKKA>5l=^U3_p9$5 z_>4{yums!z?+&j6CzuFS30Tn`6QBvaq+I+-IgZ!J^$5av?3Z(F@urk|&BO5b@&lS` V!O0R4m{I@$002ovPDHLkV1l^K=l1{r diff --git a/app/src/main/res/drawable-hdpi/ic_eraser_off.png b/app/src/main/res/drawable-hdpi/ic_eraser_off.png new file mode 100644 index 0000000000000000000000000000000000000000..2f6292be11eeded3004af2fb2712d389d88902eb GIT binary patch literal 534 zcmV+x0_pvUP)M_a++BL@f#LoirKsUkeL~E)6`@lx-y9RJN4o#zA^4-(} z)(g+Ngq^3Xo1%B7*iEm%YVJ3o`reEzY?x5UXv}d$na0km0k&yOJBUE0@Q__ z%oSgK@tO)ib>Pecs!ZR2ziM(oH9erp^j!isNp_|Lst#NQ>YD@RlEW0BeDtl44Wa~U zl)eFQGBF?vRi!UYH|64Wp9SiYP9^Q+#ym>el=Lm>OH!j^ioP-CB^i)~T9kAyY0HlL zk@RLCe@m)Y41YGpEc@2-j_suDibL+olW&dSR}ibOt>LAuFR5lft1euh#+ZlDTK_4_ YFH%x!m;WA(;Q#;t07*qoM6N<$g2mGDXaE2J literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_eraser_on.png b/app/src/main/res/drawable-hdpi/ic_eraser_on.png new file mode 100644 index 0000000000000000000000000000000000000000..3b1c5a9299e3755e934673a663b83c75beb5bbee GIT binary patch literal 1012 zcmVXRlzQR(99n9UBNIAq8qf>7vI z5Gmqj1*Pp$H?r4F}if>;Lx#MO2G_**imB)7!^#>Brm^@!#zK8-p&2J{N67K z^uUkDyMNC4{LVS|-gAFJ4Fw32K9RIf(x^4RmNX~nO$dP|dc%Ma9Z8={nv`@*(wL-< zq!AnPPSRURuO$5;>32zgg%I90f$Im-2F?Lb7+jv%+;$yXeLV!UBpsJDC24=sT_}cU zUecnq?UuAxF^sA1=aSA!`YnV|)PYN3I>0Sp$-V6gFaul!#(^f2*}fk_Sjwc?6-j?*6R?>e>8blaS-yDy9vS5-Furc)=2ufrrh&sw z=OZ8p7zO66@fk3dzy!8tHI-5r%ueFb^UT`kfYFxXL0Bf#yrlm!?j6arH4!A;mGo5z zp=-A0t*;|#UrVvLDh)15TJ{>O&^jaOmn{IgFX>bWp?v9OtyKyml18)JHZf-|0Y?q$ zy`cThJy6tNsG&&J-v)du+Tqbiq5$%XGW@GF+U#Om`jy#?QtjcpT4oKkwr4^xm9 zXx$B<((nzFuM*BCP&a^UPItaQv&p`M?E(umppImf_3AwZymL^c&gv4@x!Eu0r4678 z;ARb=mO-U@`WN{&IlTsTsSaP|rkCh!6IYtwA~wDTB?>%LF3D$r1Hfm%r}mpZ2Y@e# z3GCP)IRB!a}xP$ZUCf!Le)?XE3(N-JK^IB!>$T3VV1unSxR+o@e<2IvAq zMht{tzMc^?%GYb0=9I5TL`8WwBK|lT$)|}h zmUknnyxl+C%KOu| zmR|&38Y%BYYyz*1l#di)J~mz8JW@mu`62KPTm+5?CZ7{BBDj3Wi0J3MWrVr>3h?If zV2cR*qY_wS^x5h|m56ZXJa7zr28^&Bn<){!KoQ~P14e}XJSd3xGKjd1F7F7OR*gsw z2IG{RIU@E`JO2UyJrRGy`a=1hsIPoZ!8pY`=f`C8-U#$0-AU?e*FVu<0U)EQ0y0000p$5SoxcFn9zK1&%9FEDT z10$x4fWy*G!OY3yMf6L%)v`do9T7G1enj)eDNw$d5&x8L);LAVHzOiZ-jB#XPD=7+ zB9!I*2>Wp|lFt)iEMGAMw&$`x>gMvBC@NxVx~J^@dPB_@RIU+zi=lX z&a<|B4|s2-yce+pe6&(NQ-u21^nvqC5hn5@;0L%cjxdw2u#7O5w~WYs&TB@f%dZ39 z0T@`e$%j|WR4CJGVv+2uWflhlaf zpfFCwiHJBV?feJA_eA~;8w&M%qPg-FOUCIXx4et}B5)-lH*;%zipZPy{!2u*0+)Pn z&JALHq5v*u8&-qs7>A^Px}0-&B660pMk=eR3pnQnz)(c?W*?13r02b!1TOWO>eA5> Z!7r&_A|{yG;GX~h002ovPDHLkV1kqe(*ytj literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_eraser_on.png b/app/src/main/res/drawable-xhdpi/ic_eraser_on.png new file mode 100644 index 0000000000000000000000000000000000000000..6df05675ae2bcb40f97b1ceef15bba8095cea893 GIT binary patch literal 1094 zcmV-M1iAZ(P)6%*{P{@0>Y*dd_V_ zpVd8QX5M+8`SYH4-nr5thpWQ~FeYhE(xRj(Nz;HH^P z1-Jst0F%C5%m1DMZUL_f2w4VNb&;O{)-yVK?nzG8@lqKKC25`J8`H2kjZD6*9ovP&1BFfDK$+`_Kn=bI-2+8-cPMJMHe8X-7r$

zkL9A|=L3y<=6NS3q5<-K#9b`ON6Py7Hn0f%84z)1gyiwuvOjhtU&Ayy_zeqO0Cr9J z3*h|`k?-SrZ1in-uwv?*%MkIwh{)qP4$lHfP?g4W0)C!kkNj@x?outFtBQp_pR{Yb zYPf#ooZGPioO6#PeJp7=_4=5kBf+U{2K!u{v>(s^VMx5^oNH%U0Olm!mvpotk}>=x z>6mk_+n<3s9VEXIBk%FHq_HO01+XUR=hX8NC7kz{(4uK@FJ=u`lJt#6vuxHRU6yp$ zykC?C0;Wvi_gU6b&(a5i15kusCpDk0bQ%C^G7xwcJi3pM}A|SYg z7=#Bs;ERSuWRmxNMVHV6Q#iwLY}2HOD0$z{jA`>AU3l9R-Xa{BH6h|o9(mu#71Qpv zG;pI^rv43uU1dwsmsW&xZd1}nlAh!dF?gtfpU=ZN^L$_loi90RbsiRc10l(9CaO`AQE0Q5km)sh0LiujIUuh#`Wi3nIR^;bic?182U5qE%b zk`a9x5U~`nbAse>mB#S0BYdQ+Q^WyR3A_^!(E~oq8U65)(pR>J`d1W7#^#Cmns9iK zCE}tlpJg~o2p{TGvtZLIJ(B6IEFuOk;z_{HHHKG2Jgwplh7w!PfWI3Q5!x@InJ;#C zKsdFySyIHO6+~=CY!*u`dShA1-DebAPPws7M!%;RUh_~kx$BK(rPq7JH+EI>vxL21 z`Sg0qXx0TsmVkR@$&>i`m5h_V};hHAG0(-|{X}2><{9 M07*qoM6N<$f+F(=zyJUM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_eraser.png b/app/src/main/res/drawable-xxhdpi/ic_eraser.png deleted file mode 100644 index 8909a9c5f90396f99b52a78488c4ce08e1e63655..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1053 zcmV+&1mgRNP)&mRQ5?p<@m7dps;6U<|kh{9>AKz;0lkb^lC>D(5ON z#cU>legCaUkvQi&Dkn)h5^1+}U%eCA>S~5KNxlKQ{+mjQD(6~?t>qlOB5}^; ztehmnZ#TN9RZ)gB-N;U>q6}BM(L1e*GCX#pSXvcju}+( zTd_byZ48FpaGO>|nWWB(N&ML=jW*$mdzZBqvtVXg`LI& zIFe3DIwGk~N2Qx39hI~)?SaY#0>&g=kaSGa{Hoh4$XrRABrQvOpi=)um2*bYVMzYsLImg6S3#s2CFi8uzPYGMODzmnv5!GuEnB=9Tlak(<^#B+lyf3d)6~$?_ z+)S7xz&LQ5ddxv_T5Yw~Wd?+m^vG5lAe@lR(&{J~6CN;1SV>d(uO`#9ijORQ01tsR z8PARr&PhH6DxFq+!|dzeHgE@6o$;Gd;IT)Mo&sAjvQ@Y1;5K0;rA~zSNjJN+qW9h^ z7RkzPc4&BDqSpdhM-%^}s#gPoE;W zN;jLd$^uvg+;AXLFT0JBZa3Ss>O~}yi%Ke!ZnkNa7ht0!k@BS5ql8EkSf*7G2rKEj z1Ce?yCP#pqkx=$&RRpH(R&~0qCF7K!*5J-=ndvsr;3?e(8r-JaVA`n{xU<_?1|g}+ zK!0|t&)%v^D3@;W0sC;yL7h58NS3SW{;@<-AW zNhg9JnC$Y~6_Pf(?o$S@gCO{w^?>u2ID;Vg0-TJ#c8c^u(g}5W%K{jebXw95*L})h zr=%|)+nXk`+eP3L@R@K|-qlvX9^g6QCe`On>{zdHIJa2Gz!yu}tFVe*1VQk%v0c(ZNgtw*1ye@tHZ(LeG`Qd& Xy5Gw`78kXH00000NkvXXu0mjfd5`N) diff --git a/app/src/main/res/drawable-xxhdpi/ic_eraser_off.png b/app/src/main/res/drawable-xxhdpi/ic_eraser_off.png new file mode 100644 index 0000000000000000000000000000000000000000..8e1d09bcf9e368b16271e41f55bf106c764cb4ae GIT binary patch literal 1038 zcmV+p1o8WcP)ps;6U@LF~_{$uVz!UxYgVJ3mm|E7}s%DE9?t0>+BNBUkQUz|$`D<@3< z+l{5uDlPq)Zp5cmTKX&9=$%$+=^wk1F0IniY`c*ytfzn4`dj->OF zj!CN1R_R_zCnRl(dZ2WHfUT0QN;)NJW!deeWVxhaN$aB?DAj*{X%vMhkH)CxJ=m08fB@R^rs%R^z}vpppa+i&K|L zU=$s^F~`JKtEt~4FiZz{Oa@yORc2jD1FF{~FwAR7XC-|w>j5x;cV1qnDhkqSgPAa4 zfL*{{>M;fdX*FW4%RKNZ>6xuIfHxqUrPT>y20UO8uac&zzM4$aD%i6413U$`$2_|W zZ%nFEpv-BN8x|i2cY%ArwwQMYf#(&9^b#1s$W}`o2Y2x*DRLmBnsl>ED|)Z30+Foj zW|vkZUt4v7`#nS&z_VM?)M9OwgrJg=rdwX@wk-UQxt8HWlG-irWYTWS!vBat;CIH( z2k90kQr>j4NvqHY>;$GVc0LfPjC2bof%a=Fyz!?~fJjB9TfNp+z;56HFq2cHqSDPK zt>OSS1Gfqgsh8abiME?JFv=iIRz?^g#f z3_Qe(@ubX>Z?F1A(ce+p0O_3jDCwl6NAm6uC3;OIRdrTMO%UhYXGv!yJuS1HGAaEZ zIh=E!faCHmlN00XT;DCI@Pl8`h3fl_S6{-fBr zGoKIZ+}k_1``mlZy=SHa_Ltmba%bPO*8ZKf_F8-Gbq*XyU!-FpR9ynB09FE%z$)Mr zV5}H&2zU#44cH0n0`{boTJx>zyb+|10~Z79fz`k`a1t<4e3k)Ai{VqiJHY3~iD_fuT@QR4_(YBCO#wTID76dNO)SEPi~pZMEaImDrvqmLAFiqIbHGO6;rUw7 zXF*-6-lguUacBRc-lkrru2s)cSEys%ciXVavEqMg)koBsAuMTEp<`3Qp%O8R)eF^a z6%^d3KBL~Eol?rA%7S-6YA}bZaKYpNnPDEFKxG4H-Maj>VxW<5oN71ET?I5 zx=C7RlkVo=HRrIg_)d-}XTn%>nsTc$Y*R06ikzhb$Wd*n-)VrHJDfYq>BTljjc)3= z5hkl(ulhsvq#@)q6|L&xE+dy4ik!vjmDbC1cB?m8Bh|P0XjKQhj5*d{kBn6P*^&#l z)ajD{?Nz^F1(KY9x5{CwdTw2ElChu3Wv>U-pQt~x{I2g+e`Ftbb9S^ECQEJ#Gsax2 zZ)1#nrwk9OlZFfa(jY8{J?gDF!OmZ_s)K6jiMqrn8{}}H`$Fo;Mnd;?$@u+7Hl4bD zvk=@Whx@IP*s7PBujd?6H)O^yQg5`}k`5Ry`95byt7GX_IlQ7?+B?4`J(C?HDuHKa zxZ4Ii)ca*hX-2&rI2E{#s55tCIdFX;>vZ6YL^)%j;Y{Fib#rO?Ry|+co?&;N;VPvj zsJ>tQx#gC0(1qt#z1VI~)nQT3JTD?@$h~-hC_I(cds9k#fgb?30=WX!I1AHqx^W)C zK?l7AT}i%b_h?G#?Y5wc$&>SR9dZgx03QJ6zJfO#TEJ$aZrzKe1Q)<;g4UN@?1?&( z)d}D>7H+g^5p((`@My`H4i}4{bJ&-wv`qm|SCw3la|`fg;wX6`;%VS}z(0z=r!r$! z7o2n~Xax~vda(m|wTe`A6>t~uEt)%GZW1lxxcYM`rN0*eQ>JH8wj`R#zElC%=ignJ{^Kqktb+3`J`_aiUjg1U=z`{vQW^DR#&8y{#LkEH{J&R zmHFKS!AXapQ^?=_?&ILTNGa_k7UPMk%Eo!1t+{8q5)%A)-}j4p+=AX8=nn65QUc#y}V)i>uYOB|>)sUnQEG-eLZ& zsU5A>cSWnA(I)5+`F!96XEzm05YcKQaHpCpi;z-!9k`iHd1Q`J7Ok=<=9WulrwC3u z1ieLmaqaBD3vzBIHgn@d_t@>~hjPLTce@ez6Z2<9Wznh(?KYcUyhCu(A?P*oyYJJ0 z@gfP_Nb~`<8D9i^9=KP%ASb=Bq_1$q-R25|qE#8%JxIOSPjJ#9XeW7sPABq#vc1(J z!jkUj<8JNf_7HPpNmZg%8I}`s?8Sb9lYqKXeJ)dBd&y{C8dM3KHcmUTBo#6y)yIdd z^!3A2Mw8Vr0cWlHV&WM%44kogaeZ3-qb1R;kaLE*$!3mwW{l>n6?KW} z(&sXx@uC+`+PzsVGU4r+Yb2`gtJ>~XCAu}0Ouh;n7~%JyB%l9nKdQW}Uedr_)v%-o z%1A0?ong4!s7F6j#^L2qdqAUSGKWiYgU8LA+c0RmTQ<5C@+Q^aI=Z{H)ce#A)+FbA z^Ec?QWgQ>t6C*0yjW$XBEa@DBq$-v)ZCFeWZIUY2zm3MyoZRwll6qB55~@t9spz&v z{i)GnlS510Xa$ngvyBBlN6=OMepq&JI0~w`+ZmR-+msQ?R}^EvpuX8h)+YP30vZwf z2IDZa7e^f&_WpQGy?b~rN>SC_HaYvQPN|RDlRBu^s{bsJ)iN3pmiLjfrR2AFJIDep zZ(bM`RioQu9wF%|^#Xg6Ky{h=b<4Zorqy4W=}$6RlyjDvZC=PJ*{}VjPU2Xm_@HER z(pYdGQ%@bB>lOBQw+D=UWPAJ?quV5hYV9vw7b-))_PZ*m;%;YIQYFZYz1DJzZ>hgi zPcn#q(DEBxy}#QdEqFQ17`eizB=wDMHFRC3USofEyU%F!D(gI{*Me6FKG$e)%;A7x z+O6UE=_uYey4BS8v+5fqvidCz^_w^gfrHwBcN?bN1WA?Lse;Z|t1s7(KYSZ-A#hM5 z`5QJv(k~pMT#?atnff*L^@_5GZzS&$+V4?>8N-s^bhtHXO5N;$Xf=e+>n-1wv@!al z2wegPJ-*_hWVdmw{8@&+g}A;C$+S%>v*ESn+?Bz?IbfE1GWR z?+X5A5-z3gXORF`x&R-dR)TN3;P=h^nuJhvvSTyzcO{|9(HPioxVEfnB@BeahU=1q zS_v*-Z@9KBfy=4KH3@JxT$dzNIqCy{veTD@Do49uyy3bep;p2sgp-}VBven3M&0Mv zB#ec4veTCYZ*pXOT_^_K?7JoDLgKEhBt378`C;sZ?(@)@D0H(fhu}-nqmpjcKqosT2EUPXHER#( z47bGKFD1Qb6MQLA0y5iJ^T|T(-jMZTEV=|0aG$@ArP@8A#^pm%E1+=Mx$YW#DPjc_ zY`6=xvf~_lDN+IoTH$W9l%wWv6I_A{*8GJ=244zX0l+y)U#Yy{4>H_cgsy;}C4Ch5 zJ7P1~aCZ^Q15PBp8{@kIv(N~`-9^m1pqrB3iS>N}7;U(_c);hy4sfIU{kAguJA?&6 zf}aH7B*yVIk1T-4Qpc?q+OwK3S++I6&7>i%}5^^!-hKbC4oAdc+z$*^d zO)W>0F=}dR*q5`bHhY}Kjg`j+>LqChHJ|`+>JQ~MHsFv_sGkb8zwOG4e+JM zLAx&2LRCWkhAT&g-q57vxba}dA1PNn5~bz%o@U0!neSKsmGW-gzjNY$2GjUQ541`6X{+;Ah6}s}{1rR0mN+FK z^()KHt9^j`s-)YJ-ZRGB?P+f$eIV%#N%u$Tq&r8p?+leD^t>+cu%r(q<-Ql>lz^BI zY7Yi@MA9dco=)8t-(;TvT2J^)(m6@LB<_w4f2Zz1rBbO>DwRs5a)5sUJ11u^(DSC@ P00000NkvXXu0mjfgM3?K diff --git a/app/src/main/res/drawable-xxxhdpi/ic_eraser_off.png b/app/src/main/res/drawable-xxxhdpi/ic_eraser_off.png new file mode 100644 index 0000000000000000000000000000000000000000..0106a6a18e5c529c421b612ef12a62c582e5f78e GIT binary patch literal 1082 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 Z{Rh-2w@dBGNZ0@X002ovPDHLkV1ms8A~yg4 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d21f7fe..1bac9a9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,7 +17,7 @@ android:layout_height="@dimen/normal_icon_size" android:layout_toLeftOf="@+id/color_picker" android:padding="@dimen/normal_margin" - android:src="@drawable/ic_eraser"/> + android:src="@drawable/ic_eraser_off"/>