From 7eaeb9f6037c7bdbeed61e6416dc1ab2730b33a0 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 19 Apr 2019 12:26:03 +0200
Subject: [PATCH] move location-icon to upper right corner and make it a bit
 larger

---
 res/drawable-xhdpi/ic_location_chat.png | Bin 828 -> 0 bytes
 res/layout/conversation_fragment.xml    |  67 +++++++++++-------------
 2 files changed, 32 insertions(+), 35 deletions(-)
 delete mode 100644 res/drawable-xhdpi/ic_location_chat.png

diff --git a/res/drawable-xhdpi/ic_location_chat.png b/res/drawable-xhdpi/ic_location_chat.png
deleted file mode 100644
index 4f40c82bca5454371bc09d5d043cae1e9e6f423f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{*~GI|Ojx4!ZyV0?A24
zK~z}7?U>C@+dvS<XV+gbBmuQ5>Hz_Lk<tTx6@n58B!t?&0c}COpajUPScvi@B?zI4
z5Fqi!AN%3$p^d}=+v^QgRh7Bf9*=&W{qM}I0iNw2Go<rU!*BH*!<n@V%QcZ<BZLhA
z04Y<!rJzi(C=to{*lREUQJ{6d`Q0@ub=P#~5g?rBD?z3akM1KLkGfvx&65K){8q1K
zS6^A!a?5-KOIZ|9(pSwEQq0WxoIUs2#D=4@#5@(rkPd%zz0OLJFIEXywW=?5VE_P3
zY&cbG_JxXXAyD&V^U5*o>a@GZF`QcSWb>*JzQ|$5bm#NM3sOkIK!P-|VWS)wxTZTd
zRfZaVtCuHYma^zRzPsFeyX)+&?pE&OyGxd`D9hi%mfP@KJ#8QhTa`?qN<l|7xIXgQ
zOOty?UVCXogKI7Y&DcT6#HOPSWMG`RqzO-g$97HE>#QU^333E(X#?dIKOqIzc?N)x
zHjo6FW@Zl=rp_}dvtt$l@l>$PZEQNVb-#K3SP`w5mAYQ`3W0c%sRd-%b-T8(;kPa(
z_cr|2Mcu9~7zkTBF_l`!&e_Mv!e*tg4*gmxE3Xc*l*jw4pWLY`H5GJR@I}Z(hHaw!
zqNox}2`CZCI8WTFCPAi&NTvrm_S(ydpk!L0L{OqKf+%(Sh=oH5Aoa5YGGgKINxJ={
zCB!@)=>o+(9zAR^Qv(42L_8X%Qi`%Lsgxq((NNW28R*z+FNZw5EejO#@V3mbU;5Os
zbM_%rovT^OqW#s+GiBoAvOt8A8<jF3L8gR~o3ims108wor7;T!MSf!z4pfCa^+6E;
zVEfzqAZyl61SMbJeW~fh#kxR*k-=k=A(w&@Mh3cZwSl@`XN6GGf2gP5y6LN&zn&Zj
z0N`-#U@@SiKe-Ml=^w5gEdKRB7F(y=gRRr;0X*CPXg>jF7hgS?-A7FT0000<MNUMn
GLSTaRGIogo

diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 8dc4d11bd..0efa0a8d4 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -33,41 +33,38 @@
           android:background="@drawable/compose_divider_background"
           android:alpha="1" />
 
-    <LinearLayout android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_marginEnd="16dp"
-                  android:layout_marginRight="16dp"
-                  android:layout_marginBottom="20dp"
-                  android:layout_gravity="bottom|end"
-                  android:orientation="vertical">
+    <ImageButton
+        android:id="@+id/floating_location_button"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        android:layout_marginRight="6dp"
+        android:layout_marginTop="8dp"
+        android:layout_gravity="top|end"
+        android:padding="5dp"
+        android:background="@drawable/circle_floating_mini_button"
+        android:elevation="1dp"
+        android:alpha="0.9"
+        android:contentDescription="Location streaming enabled"
+        android:src="@drawable/ic_location_on_white_24dp"
+        android:tint="@color/location_icon"/>
 
-        <ImageButton
-                android:id="@+id/scroll_to_bottom_button"
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:background="@drawable/circle_floating_mini_button"
-                android:tint="@color/gray50"
-                android:elevation="1dp"
-                android:alpha="0.9"
-                android:contentDescription="@string/menu_scroll_to_bottom"
-                android:src="@drawable/ic_scroll_down"/>
-
-        <ImageButton
-            android:id="@+id/floating_location_button"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="15dp"
-            android:padding="5dp"
-            android:background="@drawable/circle_floating_mini_button"
-            android:elevation="1dp"
-            android:alpha="0.9"
-            android:contentDescription="Location streaming enabled"
-            android:src="@drawable/ic_location_chat"/>
-
-    </LinearLayout>
+    <ImageButton
+        android:id="@+id/scroll_to_bottom_button"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="20dp"
+        android:layout_gravity="bottom|end"
+        android:padding="5dp"
+        android:background="@drawable/circle_floating_mini_button"
+        android:tint="@color/gray50"
+        android:elevation="1dp"
+        android:alpha="0.9"
+        android:contentDescription="@string/menu_scroll_to_bottom"
+        android:src="@drawable/ic_scroll_down"/>
 
 </FrameLayout>