From 691ca26daa004b8a8bd78618642696c84c18d368 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 8 Feb 2016 22:59:40 +0100
Subject: [PATCH] Added share device ID button to drawer, always show
 scrollbar.

---
 .../fragments/DrawerFragment.java             |  19 +++++++++---------
 .../res/drawable-hdpi/ic_share_black_24dp.png | Bin 0 -> 543 bytes
 .../res/drawable-mdpi/ic_share_black_24dp.png | Bin 0 -> 377 bytes
 .../drawable-xhdpi/ic_share_black_24dp.png    | Bin 0 -> 684 bytes
 .../drawable-xxhdpi/ic_share_black_24dp.png   | Bin 0 -> 989 bytes
 .../drawable-xxxhdpi/ic_share_black_24dp.png  | Bin 0 -> 1266 bytes
 src/main/res/layout/fragment_drawer.xml       |  13 ++++++++++--
 7 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_share_black_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_share_black_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_share_black_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_share_black_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png

diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java
index b991002c..a61dbd90 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java
@@ -30,15 +30,10 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI
         RestApi.OnReceiveConnectionsListener, View.OnClickListener {
 
     private TextView mDeviceId;
-
     private TextView mCpuUsage;
-
     private TextView mRamUsage;
-
     private TextView mDownload;
-
     private TextView mUpload;
-
     private TextView mAnnounceServer;
 
     private TextView mExitButton;
@@ -95,10 +90,10 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI
         mAnnounceServer = (TextView) view.findViewById(R.id.announce_server);
         mExitButton     = (TextView) view.findViewById(R.id.drawerActionExit);
 
-        view.findViewById(R.id.deviceIdContainer)
-                .setOnClickListener(this);
         view.findViewById(R.id.drawerActionWebGui)
                 .setOnClickListener(this);
+        view.findViewById(R.id.drawerActionShareId)
+                .setOnClickListener(this);
         view.findViewById(R.id.drawerActionDonate)
                 .setOnClickListener(this);
         view.findViewById(R.id.drawerActionRestart)
@@ -190,13 +185,17 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.deviceIdContainer:
-                RestApi.shareDeviceId(getActivity(), mDeviceId.getText().toString());
-                break;
             case R.id.drawerActionWebGui:
                 startActivity(new Intent(mActivity, WebGuiActivity.class));
                 mActivity.closeDrawer();
                 break;
+            case R.id.drawerActionShareId:
+                Intent i = new Intent(android.content.Intent.ACTION_SEND);
+                i.setType("text/plain");
+                i.putExtra(android.content.Intent.EXTRA_TEXT, mDeviceId.getText());
+                startActivity(Intent.createChooser(i, "Share device ID with"));
+                mActivity.closeDrawer();
+                break;
             case R.id.drawerActionDonate:
                 startActivity(new Intent(ACTION_VIEW, Uri.parse(
                         getString(R.string.donate_url))));
diff --git a/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/src/main/res/drawable-hdpi/ic_share_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9079041a69f207492a70dc5c1a1598bacfc310eb
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~tF0H3vgn{38GW0kBC#K~zY`
z-PX%%6Hyq(;U^buy;NK4LTzFYm2A8qC@4~OQ7|sL(WQT$>ulTvu`Z;7;G#-Fu%ReT
z+pMgyir55dTsWOflNM$suKKOc`998X&gDJt84he@5|1dkuZV`%8tFk-JPyZnRejtk
zWD{YIn2mfoW7cRoP}$*K{SoDKpc4a`lj%Um1~T7w8u{3ef=ABv<=X1WKx1ZH10DHr
z6<yD5#XtU>JEnt8e(#kD51bElv>IPWWe-h&H8sun$}T9%YFNc-6&Jxza~9)Ykx@@v
z3fjvy+>*t%x8`+{+_k46rWZ?IXvH~?d}LAmn6GL+$5ls9ki~)8LVQdVlpW5Ga*_6p
zzS_8!Z^=PF6rI{tJL;+_O}~@QsP1fts#`K8W716{)@>)X+Cm`zHB71mC;7{q55sx(
zWtCu-O*L!7n19Y~_kv5i=%quZm2@@CN2MCi{EwS)J+Kj>-L^fmzSm~&A03}8J7Y{P
zG9vGScgaBi9AH6Ksqa<!Vl$1NTmQ@aH}^OHWT2J4Ic@aJHW}!Ts&?4hQq@iW6EW_t
h5>~v~W2px*{sPgtTppxwm`eZv002ovPDHLkV1mV6?@<5%

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/src/main/res/drawable-mdpi/ic_share_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a2b2abf3f38eaf21a47b40ed7de5cd0aadb0864
GIT binary patch
literal 377
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad7K3vkw8&y
zVGw3ym^BBap1s7=*OmPN6Njj&z=8hCCkzaXT%InDAr`0iUbgi<6ez;>A%5S4=9ia*
z>Z7EjnraxYt94JXi<4J#lBtqiWDpy*NKt9Y#y7q~(r4^dUzV=ie5d%`Q_DNgEzdt(
zpRD&`-lnw)3v%P-Cowwsx(0cvJeCq-bWl9kbvW57Ax`TY`(k^)wD7RM*EX2W{jzD6
z>U+K?Q+c*rX<t&$taD>i-?Fyno}2idE`EBlZHsmFyX9vS-BtI!UX|@HcV<UT?e40{
zt=@k`bZ!1#TvEJfhwIJNejEkL$rsy;!^74@etl3F_Bl0IYth<u)~lnHO()KC_Dp4-
z-q&WcTu^7_sbiss3s2mW71z2HA9^qH##-C_$9cSOor`U_bMLI(H%DCE?{9Do)0uzP
Vzu2G2F#!XL!PC{xWt~$(696JFn8*MC

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xhdpi/ic_share_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b63ed3443ee6269cb7f61ec887bdce19d5a1135
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~tF0H5Xp%>_-3q0zFAYK~z}7
z?U&DM6G0TmKiQ4gR;e^LYcy6Qspz3et(tn!i}-`~fAHkNKTPy4B2*DUp$LYSZGy!{
zLZND!-2|!>v^8zIUY2!d-Nj^QqzZkfeeVtLJHwm#zVE_;?YAYQD<ru}fi%#jN|{}?
z0LQq?sLyZnkWK#rU2^yLgz|8NJSNVsfF=bn9VicAQ1ZKS0EN(KQ5`_~&r$7fUsD-?
zGr=qAnl0Xgcs9&!CL(fGSpc1DT<1_k)?z^p-~x9Talai*PLUDHKVmQbOCDvGoacRH
z4hx;j6ftmUQDspq-w(iHZcy?r#U?L!r;h9rOmUMT*W2X{^X$ZB(<IXrU3RQcrpp+!
zob>W5Jm+hCx(>2q3)@EsZJx0zGY^v7k9hv@gIAP;E$oGG{Z@)7?_lzh@9`Ktk_SE8
z<^fGLT$GM@xy}6{yBGki&^2AM@d5NeN5(_@bcqo@(~$?TIM310bs4U($GU%<#{qDt
zkrN;+>MmRA<eA_L8!`aU!Q>l*4A7;?JWpAn&IyJA7^Fa!b+*(iyGd?&C+qT-*S&V6
zSK(!|h(;C-&=_NiEiCogG{p?(Jg>nV4Isxw44}o*?^M{oHXUb%<DOSR7l!{bk43G~
zzc$@qfexo#7Rz7+gky^Lvf|g_6DC8#u=hi(`3F*5b-hE4I(Y^{vo$qj*I+y14F8KZ
zjbdM09l%m(w4x4RmE{oWyQc0R4L*<(np)+FNa+a$eLTw~24GVWcYk32hW!M2>VlNE
S6cW<_0000<MNUMnLSTZmOfC)p

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab7c509c10c0b6f6a5bb402c23097a92256c2257
GIT binary patch
literal 989
zcmV<310wv1P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~tF0H6AB7RO0{u18zw~K~!ko
z?V8U|6G0TmKW%}6N-GqiDQyiPN(d#87{wTZ(HQUqS5KV$*N8_*OoWJpKmY{^X-Tjo
zqUjF=lwU0hv=r(AY;1ShEoEoRq3^acZ@ZtJeKYfYZwf^#TG8a1L6@gA;l_!D1QCKP
z@wJdZwe(|8Yg=Q8EwQ^vGEO}M+*Gt$XeY#;{y?=1P?}*NTJUk8>@Z3N>d$}!P)47q
z*(f!X?OFRBH0lfF&c{P0kW<yer7w^r9}go}%wz)Xsd|K!O(l|GOmtGI>J`)r=pH>(
z=iukn1IR`%cXRR#@=Z37nQk8C7?&}IMa^0Qb?}_)ihbQixe#ZNZJF}J!Ar$PvCkM@
zs_9cKfI)`EINAW+;00}IZ70k!MeO{lfi_%NNf0K8R}?#10hxGA7iDR!D~z&R2nl<i
z9;(vXwiscx5SqG%UWI&!GQk|D@<jeWaSjmzc$05#<|z-;rgwrxK8Q4+RzM<g9%P7J
zI(Vj--a+26E;9|P=ao=?M%m@IVtT)4Np4<N%j+y^ICXl@FvYQUt82-H#rgl{V>Abm
zacLkmaeijM7|FK4X$hn*&SQ)-f4S*>5g>JO9^sRo5>{QDSLv&%6IV^-M^x|Hkq0Cy
zHrTnPa#ty*tjQTk5l~#AZj^U5(#npEkunKCNK+1heT_EiSmRJW5Cmw?sd8lF0cJv+
z$ObwfM2oQRh@UA5pb;k>9I_!72=?${S9~}>gG>{~ks?~lXr_rx_GQYCGi$_+3kwFq
z1n}@ZiO@}_V#)9@#&5Ym7tK&(O!Dz^5tV<@^N=OhsiPw0*BWSLFH_DX7YJaR1!6c-
zex(98PJZO8u4N^Pr_3=y^!%!vmh(h0LV#tC<N{?%rT;L_A_ls6lA=J5nPoClq-l4w
zV4z)4Y*;5Q)K?(}#cRBlmHZ7BD8Zicl9gD6z7||~MBB5rM++ycvP?}*0?tYTzignh
zZO6+-+HxQ^JM+p&l5_a7&1d3i%YkSxw%F7M2oeOaDRNxp;<}QHgw@KdsvbI5^7E3o
zGJ({Sg|NOr0aXvbzCg<=Rgow@eSwac$=W}itkUWP1XF~ve6DHPdzomSec_I9`ulk!
z{-CnY?c;bzU{85Ylu6!ZiZ6ZsYGI}s7giul0AEtL6|HDRD}en4$^+91eF$Gb00000
LNkvXXu0mjfj-;|9

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d2410c14a7b2a7ed039825a58baf850091a1b7a
GIT binary patch
literal 1266
zcmV<O1P%L%P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~tF0G#t<(1dadz1cOOLK~#9!
z?VIaUTSXX$pKvJ+DUd(|;-!{AEp35TQPGarP8C{u8UIK9qK+SwQCraJDAv(&It(;a
z7;4bAX@{g-ga(olh#!odmYm&lHj{I9>zv=m?7KVrB<KA0-FG+O%a<=-zWzrF5K!%4
zhFa*QgD62@lQaw5VCh)_Xl9th7N5^D&WiZ}C%8b3plyq<n38v|);#@p7@<lsyKeH_
zF&E%C=WSzRERzy9S81GngbR-1F41Hrz!0^L;%XT(5g@`5$FWBVn+MRNv|9C;2hgDu
zeb79Bs8V#Rc>wj5iPi^Dp&URTz(b|zjClYnO3}i#xJJ_pJi-B`9tm>*_Hvpx6o2_0
z;${E@c#SiP{sS=0x(NU;F+zJ8{jyvYH+luoz_3#C@T9(wIhGdy)tqEdka=bZN&6P~
znpwSD%5H{<ShnQ3#x*+mfW5+p=X2(C?uqv^LQK&1J7fF}z&_4!yu_DwnBuB<0dpUq
zj?=s;u*(#e`SYny_Hm3DQ9=~RkS4)RXKS@P00Ca*J%L?j`JUe>7?x5ww95k5`HoEk
zbHXR=a)@3*+h1H}(a@x}XqRs@$R5kKHO86InUzP1waa<}Y>*<s4OX9uILuk8U2f^y
zR)iV0s2~)W;TzV9c6p9Yp<RyeLiHG+kBh?kO^#9i;1mNwyS&1J-i_T!Sy2gqO@dz7
zWqG+!pY8OqoW2WoSq?y$i)D@Jid~ii@V>*^r6+c&4iM(3;#hfp<|nu8QXQaIaglS`
zF4X}JDpn0X)l;1jR|i^^#%Tf50Mu#+4dwwnBN78-l*U;%4<My9&XO*GYROX_Qy3>g
zJ4v!80jx2gv=Z#+b!thnZ3;k+7TOda#{--o<6Ryk2Y@8~$|w1C9HEOv?_O%z1aqt?
z=R*LE^wY#$Z?Yo!H=HI*m(2(pmN{!X{cLm3{SA%XBa$RdmoQ_>@)=jC;spykuA!4-
ztgx&X0MbkmqP4`4c9`N5?z2sTI1$TisGdHa=boE;Gp9z`Ko1>62@xPeiUc#eUeqqm
z2~xUke&I(R=>>3RqXV3x&a&+x-`d^1a_bRtt^#+NBxqR|-9xuK_FCy1TU*RAPaBN_
zdkt6GUfsBIw$3E0yl7b^eU5&1NSa+<|L>uBm$w98&=O<JmlP3Vv=t9HQY4)2uiZUj
zYUV7j2-@Zudz^%KGRVuj+HW(#E!_Zi_WCP7P{k!-!ZORK-5TP>#aFq#ZV8I=|7w{J
zi${STzQk(w8kF`8a)@d2dI9Y0RjzuPxv3w(&R%7Taz}i-$m^@ei(D6EuQD}>(-80P
zPRp`ak-|)pGX(%(lQ>l+&M*Jv7FFv)ZcFV=F!0`}S~WFf9zccCIeh?`%0%k}NL40U
zA3&lq(fR;Zx$QW1LA({!dB8DIiAbFQx8(N`A1f}qZ=v^yY1Bd8?g3xw-VcbCXO2VC
z<HQGi#D=*5kYk!=;oni>d@P^7DgS1TF<5f2zQBZ&yGEw`9Tytupp_65%PQ;m^5x5y
cFJHF$2R{-Ko`X>XzW@LL07*qoM6N<$f~RLj2mk;8

literal 0
HcmV?d00001

diff --git a/src/main/res/layout/fragment_drawer.xml b/src/main/res/layout/fragment_drawer.xml
index 862f8b42..7cc19d80 100644
--- a/src/main/res/layout/fragment_drawer.xml
+++ b/src/main/res/layout/fragment_drawer.xml
@@ -30,7 +30,8 @@
         android:layout_height="match_parent"
         android:layout_above="@+id/bottomActions"
         android:layout_alignParentTop="true"
-        android:fillViewport="true">
+        android:fillViewport="true"
+        android:fadeScrollbars="false">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -38,7 +39,6 @@
             android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/deviceIdContainer"
                 style="@style/Widget.Syncthing.TextView.Label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -207,6 +207,15 @@
                 android:drawableStart="@drawable/ic_web_black_24dp"
                 android:text="@string/web_gui_title" />
 
+            <TextView
+                android:id="@+id/drawerActionShareId"
+                style="@style/Widget.Syncthing.TextView.Label"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableLeft="@drawable/ic_share_black_24dp"
+                android:drawableStart="@drawable/ic_share_black_24dp"
+                android:text="@string/share_device_id" />
+
             <TextView
                 android:id="@+id/drawerActionDonate"
                 style="@style/Widget.Syncthing.TextView.Label"