From 8f3ddfffa9535b836770f9c6607cc13b4856fa96 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 12 Jan 2019 17:08:53 +0100
Subject: [PATCH] adding a Draw bottom action at the editor

---
 .../gallery/pro/activities/EditActivity.kt    |  18 +++++++++++++++++-
 app/src/main/res/drawable-hdpi/ic_draw.png    | Bin 0 -> 464 bytes
 app/src/main/res/drawable-xhdpi/ic_draw.png   | Bin 0 -> 601 bytes
 app/src/main/res/drawable-xxhdpi/ic_draw.png  | Bin 0 -> 867 bytes
 app/src/main/res/drawable-xxxhdpi/ic_draw.png | Bin 0 -> 1160 bytes
 .../layout/bottom_editor_primary_actions.xml  |  16 +++++++++++++---
 6 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_draw.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_draw.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_draw.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_draw.png

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt
index 64784c34c..e0f76780f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt
@@ -63,6 +63,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
     private val PRIMARY_ACTION_NONE = 0
     private val PRIMARY_ACTION_FILTER = 1
     private val PRIMARY_ACTION_CROP_ROTATE = 2
+    private val PRIMARY_ACTION_DRAW = 3
 
     private val CROP_ROTATE_NONE = 0
     private val CROP_ROTATE_ASPECT_RATIO = 1
@@ -208,6 +209,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
 
                         if (isCropIntent) {
                             bottom_primary_filter.beGone()
+                            bottom_primary_draw.beGone()
                         }
 
                         return false
@@ -287,6 +289,10 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
         bottom_primary_crop_rotate.setOnClickListener {
             bottomCropRotateClicked()
         }
+
+        bottom_primary_draw.setOnClickListener {
+            bottomDrawClicked()
+        }
     }
 
     private fun bottomFilterClicked() {
@@ -307,6 +313,15 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
         updatePrimaryActionButtons()
     }
 
+    private fun bottomDrawClicked() {
+        currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_DRAW) {
+            PRIMARY_ACTION_NONE
+        } else {
+            PRIMARY_ACTION_DRAW
+        }
+        updatePrimaryActionButtons()
+    }
+
     private fun setupCropRotateActionButtons() {
         bottom_rotate.setOnClickListener {
             crop_image_view.rotateImage(90)
@@ -375,13 +390,14 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
             loadDefaultImageView()
         }
 
-        arrayOf(bottom_primary_filter, bottom_primary_crop_rotate).forEach {
+        arrayOf(bottom_primary_filter, bottom_primary_crop_rotate, bottom_primary_draw).forEach {
             it.applyColorFilter(Color.WHITE)
         }
 
         val currentPrimaryActionButton = when (currPrimaryAction) {
             PRIMARY_ACTION_FILTER -> bottom_primary_filter
             PRIMARY_ACTION_CROP_ROTATE -> bottom_primary_crop_rotate
+            PRIMARY_ACTION_DRAW -> bottom_primary_draw
             else -> null
         }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_draw.png b/app/src/main/res/drawable-hdpi/ic_draw.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2c5131749923a85998f1113e04d50b0b75ba13a
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004(Nkl<ZcmeIy
z1FRiU6ouhk+qP}nHiFu=Z6h{n+jd;rwr$_Plefxi#Ob$#nPc03p&~YQ8A*HMSR`o9
zOXMZxEL`+M<T^1e9CXKBEei+fxdOleHX&UsJfz?>D~V1kq_u^M#KdsoG*a9m!3gAv
zMS?<nMQYe@M5iVb*~CJI1~pEiaTZx(ztM^7@SBT~76{#tr=(B{u~>trX66quxs9~?
zJ*6#pbKmb3q9t<JOjrWQaT=45Qd~sZns4ku>gu1#2rT|J0!q8Bp(hgXO~WRdIcSBz
zYMc}y6D|PmFfl5snmdXib9D^(gzVMjB^Bejg1d?4j>^dRsL@?TZj#s>wBs!ju%S%I
zR+6v_c}s3{Fa!zIkZ_)VeW#H*sE-SQL&#aGMnzWhL?`~$#T+E!A##U0WC^fq!fd`H
zE_x}A8OUYQo6!atYyOdsAxvZpxy%F|!7pgFb|9rJG(<;^{&O53Sm@BUzoI$ad5R3R
z(6JDA*NJDLBMr~on#p3}Aqxi(7wbqJ=@Z<aapbWG{PzP4aI&X$?TZco0000<MNUMn
GLSTY?ddxTg

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_draw.png b/app/src/main/res/drawable-xhdpi/ic_draw.png
new file mode 100644
index 0000000000000000000000000000000000000000..534bf7180bccc594949aa27372a769f3d26d9bd8
GIT binary patch
literal 601
zcmV-f0;c_mP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0006YNkl<ZcmeI!
z1FT(H6adgYwr$(CZ95v<Gr`z4!?A7Ktc|F)zO~xiWGBUY>BnvO*ENq3-4=vy*7UGG
zYBYJ*`cXE=s*$L7Y?R4;QmVC9l*Lmjxhu+HEfZAoTa?8XGKjC8CJm3$WDt*A#D-F@
zD3dK*Q5+wXK8o_$L6dYzluu8o#;Q>^HzM5;DTO5*>>78t!!gluw$&{4vuLD(W4x;d
zsh@44WBewy*g9roB_ATC24_b5IRfeVn2n>1S6Q0_qrLno)mS-FI7zeW{*CsrAJW~C
z!ciKLYCPo*_vnjsc(jLirKy(5yY|wG^qV!KU~xZ6FUI^?N{e($-nD@VNFQ4)QrKM@
z7W3zHsloD5u$rMruUI%{V{t9gAr4e5QH=+sSE67cza#x%kx1cSj~bwYsK%SpMN#l7
z(qER1f`y%DkkqLFPL5ezg*4KNQLw4Mqz(q~h;(O!>$FKtc8h{N%%HOY951yPYId1r
z+p7Ni-~6Olq8dw^q>@LXU=h8{uBYpyhG-9`A*Dz2sVk7`Ty7!TN&TXI+-!C&uE{5s
zG)bCZyW-x((g)FAPWG=RG<d@nv)`AR?GOc@N!LV2Sk#V|t2Qmme#g36r46I2yeFL#
z1#e4zqU*dQ{b1<`w;`PxUFS-qR>P70iZWP3txBfbFv{T!EmCT7T$IOI+RSd81EO5E
n@QB|`H`x2GwRCjrw!qB<9q^6g?R$W%00000NkvXXu0mjfQF<WO

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_draw.png b/app/src/main/res/drawable-xxhdpi/ic_draw.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e42d092311392bdc3a4971da221f368db08ebd8
GIT binary patch
literal 867
zcmV-p1DyPcP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0009jNkl<ZcmeI$
z1JE5w6o%pNx3RWudkbsZwr$(CZQHiZ*tVU_8{g{FbB&4S=`s)6%1JC1i^W)mi+P)l
z1dQQxHqflZ3cN{xE8rm-G%HZXsf;9<_b6BNc#71{QPjAfbcWNaC~-HL9I5EA1(`js
zC~+>Cd@0SkkS1~iOYs!0f2CO!(onY46x@dEYiZVm)R)yY1!eq?>lMukoX+x^hGVgA
z(X7M*48Yn{vl0(ub=9oIF8B`DtV1IMvHqc4X|OQ6a2yw~A8SyhV&gu1n<xe9IhAh-
zAYl}bv#E-Q4GFOBS5nk+6+=nxGnQ2`P{u!4U1?Mj>`Hgi8Oz=(94ABO<xVqCkl8r4
zR$*vn5Y`I{VR71%odL9}5L}Nnj78;PX}XiW2bDh-W(?Ma@~{%U$i*ZUQogtXt1q=O
zXrU9y^yV^l<xsBYD|{CzKUC5e>v$QI@d;rgIo;h1*@FPr-^vgBV|Ala2KNxwo~7mC
zHH<u)#`9RG$lx5peq#ZJuqW33${iI9!!?|GIoO6t_<o>SNw5UgrOF+fVLjljzdrbW
zqE1P$IEP^M;!AfZ8yteQy}7Kl#n*|}BuPC)J2Fx>xCp~-7@y)Bz>;3W_v06`q-<~p
zu0cxRCVZpWP!5*ocYxvsbQ!KOnt>AuJ3tPOW)u`ZpyRRD*AyH_fbXVcl`VciTVnml
zPCQK58<Z)58=zDHl`(+Kexq6moJw|jXS?hT9wU=ZEMPwW#t;_p9p_@*pnR|-qe-VP
zOPh-RNZ5z0DX|vTiOLVBliE<$l!JZn4PbXo!vR>^Dqq|}a(!4s2LEF9VyToXuSNOe
z3dZ64oh4<kIo3GVRswBtbyi_miaYp=0Duv^#x_}0@)9MmI@aSV25MP_^(dE>ykSG#
zbDu}C4pZqdDpd_wp7FRwQLj>?Db?GAO1{8)NTo*^0j_s64K=)i6|jn;Ku4_S*@r7>
zi|?gb{_k&$WHCj9^~lEliVkm+$vuh^3)7i&UZ+CQVj0?!+$3(GT+yS2r<sVaEt_c8
tVHwWi13EE*v3$kVY)hF66^q4UvB_b50ege%rau4x002ovPDHLkV1mNPmYM(n

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_draw.png b/app/src/main/res/drawable-xxxhdpi/ic_draw.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c1924bdfaa3761db6eb32f6acb740d2470be7c1
GIT binary patch
literal 1160
zcmV;31b6$1P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000C}Nkl<ZcmeI&
z1CTRI7=_`pwsCFSwr$(CZQHhO+qP}ncM-goe`+`V%_ftb>~^Z=Ntwg%%;}C|u~;k?
zi^XF3U_!R!2Hv6v_?lCgR;7bQcp2ACw8(!<z*PkKgsJ2=cBF@)e908@73G{qZm&@0
z>)~HVezx}W@GmD{AIU$QNEkE7FKkFSd&w`f@(N*`Dc{h{^SJ)xd_Ko@ll(&ik22UD
zOd>H6NwPgAA5p{oWUzl`KJ}69KKY3%?gRjK)&H0q*Y)xhm0U}j?Uli`xQ>>;C}VMD
zFf%D!YpXO+#&cN4R%u{+ERU-+Fe^P+)>kQ@l6SFuLb*x-dtqBmd836%nVW@Kc*L6=
z<MRhVVG%|xD{>J(FwhrV%xY9=WN<&0-x*gqFc~NC3qihQ7iv^&tcPtY4T*8Mi8Q%<
z#=I&fy7?vi_@s<2`IY=6Sxd#kg;>64JO!ejn+YSqLMjes!nU0PF#)d;)(?!YV&E1m
z?@^%u%**!_;t9$WHD<xKSa6>vL7}!$)VK-4R7kdAIDUwDq%sYbKN(vlHfFdsQ<OL#
z%YHI31N{W+;WXx?g9fHy6|SHU%ZrK*9rWV*npzoX<70x|#W)&-DR>Xd<cbP=VA)9q
zDtLq-z3d<Z)6$P?TSbNUaD7KzaM+oCX8{G^99)+cHNfoWpX~_pBeN+GE8u!v(cmCl
z3EIuzN@DwlX*C4K!<C3A&Ug&hHRfl-x7a>o66L^exQ^%G>|Y^ETK%|IFh1H|#P&Ut
zDiD)%2)FSmc`Bs9yHeCTJ^3MQzcQ0dw6nQAv7$YJRdBsvOc7g(#bjV=?j#9N{1ey&
z*JT=nEy8Sg(7?$gDNr;e@(c~Yx}>mOCkIRM8MY#wz+$*ARt77Q#`X#|My97>WKUpv
zT(9bXEKfhSFB#kE#%E(I>It-A`8QSBjTE+CW^uM_uOtErkC$=%%6Ytj$zCPpA{ea`
zIFPUoP!^7$5T_YQ93C?e&IQWCstoN}cB2nhTXB~YZTC{)>^1*HkX}w>Qi*YK^(ZP#
zN-z0&nkHr841!$2c={KM<9b`sVPEp`JdMi2jHI#r$>z#nM_e~5N}NV6FVZ3h*J4R9
zzXsqcdlZc1DcnM<9CVSuvR+oi{fujQMU5qR3Cnk^DHFS3Il*ait~3oQ2A1YJ`UeEs
z1MEtt0`MfRH>lJgoNj-z7Y*$!%)%_hL>dweq;ak8bh$rp9k0>HT)6&la$<KZ^J(<4
zCayc3{{i>l`cOV#lUyZ-8lK0pzkI+7xW1uwz*4|fSpK9<K43O1H_|Rq#rnL9?Iihu
zYW~F1$BX<%ke_IkFA8d5Tgx9TN?7;HFFZ;ZpVBG6FbjR;>nEm?e^`+e`S^<I<R{jm
zmt3A;0{M%Xc#mLx>`J-(Mm2l#yZPW8!xSnFG_nR)@G{?!CdE74$WGL0m}0S5EEbE!
aVt)b9-F*&;Q?K;^0000<MNUMnLSTZZ`XK25

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/bottom_editor_primary_actions.xml b/app/src/main/res/layout/bottom_editor_primary_actions.xml
index ecbe0193b..20d8035fd 100644
--- a/app/src/main/res/layout/bottom_editor_primary_actions.xml
+++ b/app/src/main/res/layout/bottom_editor_primary_actions.xml
@@ -16,7 +16,6 @@
         android:src="@drawable/ic_photo_filter"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_primary_crop_rotate"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
@@ -28,9 +27,20 @@
         android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_crop_rotate"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintEnd_toStartOf="@+id/bottom_primary_draw"
         app:layout_constraintStart_toEndOf="@+id/bottom_primary_filter"
         app:layout_constraintTop_toTopOf="parent"/>
 
+    <ImageView
+        android:id="@+id/bottom_primary_draw"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:padding="@dimen/normal_margin"
+        android:src="@drawable/ic_draw"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/bottom_primary_crop_rotate"
+        app:layout_constraintTop_toTopOf="parent"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>