From 1bf5e223faafc09c0c30b22dbec344ab1cccf387 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 9 Jan 2018 22:30:33 +0100
Subject: [PATCH] add a map button to the location field

---
 .../calendar/activities/EventActivity.kt      |   6 +++++
 app/src/main/res/drawable-hdpi/ic_map.png     | Bin 0 -> 437 bytes
 app/src/main/res/drawable-xhdpi/ic_map.png    | Bin 0 -> 528 bytes
 app/src/main/res/drawable-xxhdpi/ic_map.png   | Bin 0 -> 781 bytes
 app/src/main/res/drawable-xxxhdpi/ic_map.png  | Bin 0 -> 1082 bytes
 app/src/main/res/layout/activity_event.xml    |  23 +++++++++++++++---
 6 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_map.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_map.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_map.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_map.png

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index edefe1e9b..1917cb051 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -80,6 +80,7 @@ class EventActivity : SimpleActivity() {
         updateCalDAVCalendar()
         updateLocation()
 
+        event_location_button.setOnClickListener { setupLocation() }
         event_start_date.setOnClickListener { setupStartDate() }
         event_start_time.setOnClickListener { setupStartTime() }
         event_end_date.setOnClickListener { setupEndDate() }
@@ -650,6 +651,10 @@ class EventActivity : SimpleActivity() {
         event_end_time.setTextColor(textColor)
     }
 
+    private fun setupLocation() {
+
+    }
+
     @SuppressLint("NewApi")
     private fun setupStartDate() {
         hideKeyboard()
@@ -750,5 +755,6 @@ class EventActivity : SimpleActivity() {
         event_reminder_image.applyColorFilter(textColor)
         event_type_image.applyColorFilter(textColor)
         event_caldav_calendar_image.applyColorFilter(textColor)
+        event_location_button.applyColorFilter(config.primaryColor)
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_map.png b/app/src/main/res/drawable-hdpi/ic_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..272d185addd3ee23f3cbc6ca44054d801308a535
GIT binary patch
literal 437
zcmV;m0ZRUfP)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0004eNkl<ZcmeI#
zyK7WI9LLcCaW{zwiufXE<0jgs(K7i1Vtm9dAczQJCxUhsf<@56!pcfC#8(pwwUU6u
zM(}}+g{4HaQL`pO*z6vQ+bk}_&TTFT^ZC|4&a@M9x&JLg8bZkp8x^|O|76f9kFDW@
zEA}Tbn@xMJZNo?^HsGX(R(030<bs{?D~H_l9l%6?tnQe3O|e>DIBn}cS6iI%8c4%x
zj=FC}N`E|YLR}CXaYqx<u|2+tHEY4T-hP?$5h#a^L;TD(XT8)GFC8<Hbhg(;Z>qwI
zHC*+nDy-O;8@^P4rCen!V;Rd>#xj<%jAbm+SGOFl3Ijg7=3rGA@YW^6RbkM!=$!3+
zuEv$eymQwNy{&s{R;*>a%3(j<HYNyaraZ7Fr4{!~stKuB$D$bnJ)hYb&$Ps9nlq&?
z6idODU3Wl;Zin+;>FDmadB=Mm7sW<xXjw36laR1|E_;tvk4zgBilt$}h}}ZTH4F(U
f3o2R0GM2Ev7Ai+hS1YTi00000NkvXXu0mjfFHORa

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_map.png b/app/src/main/res/drawable-xhdpi/ic_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c38abeecc1814d8cdc677bbf3b4da09bbb44738
GIT binary patch
literal 528
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKNz<Ax$#WAFU@$F4}kI+P!;}45{
ze<_Ddc@i|`lDuY7H(RzgM`njYmsqA?lSc>3#TCb7TBNk1xRe$t%B)%%#pEb-<WZU_
zt9izRB94<AuGC1~Q}x_Cuh{Y2hq`@_tIzkR@Aq7DC~0HFnY{2?gGJGMRUU^~y=?W|
z`+xsZ%gZk|3I6|ftFlznusYUU&1A0VmdmQHpUodHHNG}=f6`jB=4aESw!}`~e#(61
zdCt}1doI73$9aM;>q2J4u48x0k91j<o4x!Xc!F!y)kKeP`*y92bet+yyKI5c1?#8T
zMZPDKrq(cOu}3~y*u<RobD7U+cCOXe9yQAUWNckqcuIKxXJ)S33(jiSe*)5P7Cp3S
zJS6p*%}Yt62^%`Tz_yY(@JeR(JO_i-_anCg4OwPW9OYZ*u#l5qHgv9hK*pI|cF}3l
zA)ihr)m~fd`Lj)%{qLs}iL9M}^CYHjjby&Hc0EtXmAuDu;=?STtb2dS^hJ~IL#MC{
zJFLIymK@SLZfmx(#@Q-|J3f{DYj)`7CHtR8*_!A6yZ7RX0;f0kEJ3NO$<tM?zM5m4
zAlA~g>n+FnNXNZ(Rj+1bc^<p^+UU_<ZK=z3vrim^IR4X?{ZAGve}CQ-r3{Q|22WQ%
Jmvv4FO#rk9?rs18

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_map.png b/app/src/main/res/drawable-xxhdpi/ic_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..47db929383eb192a118360a5c98189fd78ae08a8
GIT binary patch
literal 781
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=esd5FkSI<aSW+oe0$B`BP3R){o~?m
z0$D7P`b&8yP4){C2od|Dr?S#j;F_9~O88$#W#P?%6Qx$V>YmczFgoq(=;5uI6`t0)
zG%d{~DIh>eByyJ53S<B7&5|xxW>)*3c=)|$d-0Etk!M3Esd$2sWmk^Zhs8Yl6P-gI
z&3<eCPWE&0wDK3bRwVQ)UNL(m$(GQ<vw1`5l?#Wz9NJRQBO>mpIp>M)L{^`JMk^kf
zZZ<v0%;j0+(UolO`zNt#>$}63EPdHO=k}<5`go+|r1ymLFM1B`neus3gw&!&n@7)U
zPabBJ6J|2t_Fmj$cE}>TLHo&>%53J+8uxU8ZC%1!gpTd~WqJIUWWH+gjIt88#Q%YZ
zf}LipoXv2rBilM7MdW~vPUCGK!Ccudg1(7Sng{(^-(Qq$7iBzBlEXdyXV+(*gH3&X
zM>kKN&7<oQv6lO|&6CSVX4D$&P2s9Mu>?qqihS<bP-|eT&v@?!$K}({Y~*uWUgkd6
zYW{Zci_i^M<^5}#T<>k-QZs1e^hsb6o^gPMNap^Xr{%<MvR|%!Z1rC_UEb$=CwI;k
z!DX+P&MJ{kWJruFm^1a;!IH@~i#nD9>Bo1{?d5(a?3#Z^slUQ~dlR?dGU)|<YYp#f
z{RrP6=k>9$MZKkCnVnU~HUVCh8ST8q&2u`oubgtZbLJtN<x@gxPpYhGRT2s`)|spz
zAEUZ8&`rwgyiCr7?v%5YDaO-(G+n->dA$3QG5hRAGiw8DULBk0ZEN4LG(5zmW~W5U
z*WjaBAw1D%;@%mas(HO=($-&VBX3xgpK!H|5n?qlKA2M)+{?f8x!IaYC#*EnBu{PC
zeg2}Sp4;}ygw9LG%%2UJ4hUSo(PFg8#P4F~y6MJ00;|*#yLgynQaDe2*rcH*{q&j0
hHeZy$o1I+G=*4qQ>?)V&JYX_s@O1TaS?83{1OVQ{Q9}R#

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_map.png b/app/src/main/res/drawable-xxxhdpi/ic_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..11a1cdb4db72e4d7a8d8ea3d2c3efba2098c2077
GIT binary patch
literal 1082
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zurPYMIEGZ*dVBYOc4(>0@sFF$
z=1$G*n0@$&$bN$jDjVce9`P?u5mxmwYDrlpF>7t_wvuhzzBzA66f`LmaXq?7L&=p(
z?A-dEn^zQ91Z#4zuk~=fD?Tgw-RaHpW>0s$ou~i3=A3Q#_o{!4^UwdbE89P(xbDXB
zO;durG?zjNt%FLFx%4hLX%;)pRqo8$w{W)Ks+lt+Ot>``x1N|)(fma~ZKkJYy~~+E
zS+lb?UY3V%d<{OY?bCT#MbqZ|`7ix57TVg(+Bu~_>Uq_T)7?H?CDU5pJet38JAZSU
zS$-i`erb?5-^pX?l^wh$H*#g-XGMw>HaRA}<*GiRbn=3U|7Xp)e$mI?pI$%Vv0a8z
z_R_AS`<BggV@$uBD`w-%_R~aSQRf?*_Xg%|^FO5j=!^S)o5geTxonx_1_f(JM&p?J
z1E+UBDQ!;3Shl(K@Zvh7=2i2Xb5d5FwGobRj?Jmpx@>a!hL3ISk^OPsHkN&P$}qF$
z#MB$pO*<!_)?awR<(jMR&Lt7kQa>6<XMWkez;d2%TihezkV~(MdskoiAQ`K6%#i&`
z+OhPCtvcU+{7jf}T4ut>Mi0gIDC76dzlAa??s~3Coj+ZBdLf(1o?jtmg&GgCS5-^C
zI2T%}sLuN256{Xu-AqNd-fP-D@MpBVTc!70cpc}7y62p09!38Xop5>c!O}lRbb&HD
z`%eW<p3eMT^1=t5{y?1t)j4vEoE{ELLK7NTR1~Pn6rXAk?eLBF(h0L=+$Z+gy^1)W
z!g%xg+3z;ur*E=6X3bb3UE^oQ&v9bk{vRExOhvEEwIUQ0me0~mTGsGJ`T@u6$`FTd
ze~;J2J#qwUJ9>Tlf8m`Ci^``;P2-jINy<2S?FduW^0xlPb2mNy=Nfo)a$CbEA=Zou
zi}%=k@pUpf|B3aj;(qDhmL7ens!SK|hZyBwsam<`0RJ7H)@K~io}15zJ?4E`7j}E@
z&m+oDj(#-gV(i;^_N}MBBlF*Ld`2<r<{o=(!d74xpyJE?Gw(U4)QZ_r(~fUA{P;~t
z^|Hy!^Y=d%xe-70xbTXZy8rl|CJVl=wm+o7<tv<Tbh^vG?{Q4}_Wi*J-`&d9+`aP+
z^K+G>X>xC8F-ScTc<o`jFWE@@M;G7u?K^KfTP`y>Ws$q*`QI5P{=b)PYLkCi=vX{!
zQbPJh`I0A@joWXW_R9BXtbJqG$}7`Rwdkg#*UbD@>8pawu}dtbB&S?H`TY9sjB|m<
zoU{d#l&)^Md~kY7tIbK7d&^os@9|y+%Xr`{$a(Gm_vJx-KkqxQ0G0_1p00i_>zopr
E0K!4-bpQYW

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml
index ebb196339..bb5890335 100644
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@@ -14,7 +14,7 @@
 
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/event_title"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/activity_margin"
             android:layout_marginRight="@dimen/activity_margin"
@@ -29,12 +29,12 @@
 
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/event_location"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_title"
             android:layout_marginLeft="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
             android:layout_marginTop="@dimen/activity_margin"
+            android:layout_toLeftOf="@+id/event_location_button"
             android:hint="@string/location"
             android:inputType="textCapWords"
             android:maxLength="80"
@@ -43,9 +43,24 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/day_text_size"/>
 
+        <ImageView
+            android:id="@+id/event_location_button"
+            style="@style/MyBorderlessBackgroundStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignBottom="@+id/event_location"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/event_location"
+            android:layout_marginEnd="@dimen/activity_margin"
+            android:layout_marginRight="@dimen/activity_margin"
+            android:paddingLeft="@dimen/medium_margin"
+            android:paddingRight="@dimen/medium_margin"
+            android:src="@drawable/ic_map"/>
+
         <com.simplemobiletools.commons.views.MyEditText
             android:id="@+id/event_description"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_location"
             android:layout_marginLeft="@dimen/activity_margin"