From e0fee213f00fc0ceea6c4f990956f870b24e6d83 Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Tue, 18 Oct 2016 15:55:10 +0200
Subject: [PATCH] Bugs fixed in proximity, adjusting layout for smaller screens

---
 .../nrftoolbox/proximity/DeviceAdapter.java   |  16 ++--------------
 .../proximity/ProximityService.java           |   4 +---
 .../res/drawable-xxxhdpi/ic_battery_alert.png | Bin 276 -> 249 bytes
 .../res/drawable-xxxhdpi/ic_battery_full.png  | Bin 251 -> 228 bytes
 .../ic_stat_notify_proximity_find.png         | Bin 878 -> 1451 bytes
 .../ic_stat_notify_proximity_silent.png       | Bin 1005 -> 1449 bytes
 .../activity_feature_proximity_item.xml       |  14 +++++---------
 app/src/main/res/values/strings_proximity.xml |   7 ++++---
 8 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java
index 3062789e..76c8c953 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java
@@ -85,7 +85,6 @@ public class DeviceAdapter extends RecyclerView.Adapter<DeviceAdapter.ViewHolder
 	}
 
 	public class ViewHolder extends RecyclerView.ViewHolder {
-		private ImageView iconView;
 		private TextView nameView;
 		private TextView addressView;
 		private TextView batteryView;
@@ -94,7 +93,6 @@ public class DeviceAdapter extends RecyclerView.Adapter<DeviceAdapter.ViewHolder
 		public ViewHolder(final View itemView) {
 			super(itemView);
 
-			iconView = (ImageView) itemView.findViewById(R.id.icon);
 			nameView = (TextView) itemView.findViewById(R.id.name);
 			addressView = (TextView) itemView.findViewById(R.id.address);
 			batteryView = (TextView) itemView.findViewById(R.id.battery);
@@ -119,24 +117,14 @@ public class DeviceAdapter extends RecyclerView.Adapter<DeviceAdapter.ViewHolder
 					final int position = getAdapterPosition();
 					final BluetoothDevice device = mDevices.get(position);
 					mService.disconnect(device);
+					// The device might have not been connected, so there will be no callback
+					onDeviceRemoved(device);
 				}
 			});
 		}
 
 		private void bind(final BluetoothDevice device) {
 			final int state = mService.getConnectionState(device);
-			switch (state) {
-				case BluetoothGatt.STATE_DISCONNECTED:
-				case BluetoothGatt.STATE_DISCONNECTING:
-					DrawableCompat.setTint(iconView.getDrawable(), ContextCompat.getColor(iconView.getContext(), android.R.color.black));
-					break;
-				case BluetoothGatt.STATE_CONNECTING:
-					DrawableCompat.setTint(iconView.getDrawable(), ContextCompat.getColor(iconView.getContext(), R.color.actionBarColor));
-					break;
-				case BluetoothGatt.STATE_CONNECTED:
-					DrawableCompat.setTint(iconView.getDrawable(), ContextCompat.getColor(iconView.getContext(), R.color.actionBarColorDark));
-					break;
-			}
 
 			String name = device.getName();
 			if (TextUtils.isEmpty(name))
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java
index 5f0e6268..5bb65393 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java
@@ -38,10 +38,8 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.app.NotificationCompat;
 import android.text.TextUtils;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import no.nordicsemi.android.log.LogContract;
 import no.nordicsemi.android.nrftoolbox.FeaturesActivity;
@@ -170,7 +168,6 @@ public class ProximityService extends BleMulticonnectProfileService implements P
 
 	@Override
 	protected void onBluetoothEnabled() {
-		super.onBluetoothEnabled();
 		// Start the GATT Server only if Bluetooth is enabled
 		mServerManager = new ProximityServerManager(this);
 		mServerManager.setLogger(mBinder);
@@ -188,6 +185,7 @@ public class ProximityService extends BleMulticonnectProfileService implements P
 		super.onBluetoothDisabled();
 		if (mServerManager != null) {
 			mServerManager.closeGattServer();
+			mServerManager = null;
 		}
 	}
 
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_battery_alert.png b/app/src/main/res/drawable-xxxhdpi/ic_battery_alert.png
index 3d8f9378edf62199e4c9688c20b6b77ada7a1130..6dfdb8f734e3c6daeef6416ac7cbf13b22dd5821 100644
GIT binary patch
literal 249
zcmV<V00#ewP)<h;3K|Lk000e1NJLTq001Wd002P<1ONa4_y=|Q0002MNkl<ZSi@sr
z7(sv$pQO=D?BeIrap_>9uIomPqf*QoNiqa6XfUvmp#LYs4TiPnUScuMNRpwPfs+g;
zePif=8HnuJAhHZ&VBlg1#uj!OWCxiBHsjdHHjaHX8IKw_Y8)=WLRblMMT4s{8jXrk
z<3^1eHEuu(C_;tOXjF_=J)==EnrBCi8$rhXB-@mq*o?bQwsF_68Mlt%8(D^ZWmpGe
zG9yHvf0ewzAjBX@OvZzQ9}Jfm=A3)QFeCr~!jB*ti{k>A00000NkvXXu0mjfY`I}|

literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawZhN{ohGg7(du=!GAp?=thliaV
zFE~!;jY*$kz@of?Nn2qfljKn+kppZUUphV9y%{GJHwUu(*Hpg!Qz-s)xKhiJvkOi?
z$@%?jXZ+3UGT+|vGctX-8a!?3si#x6%((Po(cb;8jHxTH&62X)bxm!~m9*1E!tS#&
zC6~9&*=Z0X6OhE_Yw@jt0jSA(LE(4RdC|YhbM2$qI0O_NfTF(=eqY@CG~qNu;i-&I
zjEs-;7PkQfg#(i7yoK3I%$ofQ9a^)5mj?;jRfyPqiCW68Ym#4j_fF}RbJLYtzNqm_
XoK}!p_1#Js=uHMsS3j3^P6<r_*6VOT

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_battery_full.png b/app/src/main/res/drawable-xxxhdpi/ic_battery_full.png
index cbf2148d8e1bbbefec61eb98b702b02614f9190a..3503f6f62c1ac687354ccc1d84df6d5f414cf0be 100644
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^>Okzs!2%?Iu$TS>QmZ{(977@wzrD1P_mF`=>qGeo
ztg*99rX;ewf8cwAc_X{>2FDo(O&1k-v*s?k5a7DRfWt4dp?qrTwc1_Q(*HEn*6aOM
zo8NysUG#F{ZejCFr+-ayX#Kt5pWC9o={(Q9ubtu5-TJ1gz#_*Waf8B>vhbPV+fEgp
zJ7Za!T=?inr?9%;919TRcjh`{?btr=G`*)gnAdV<ulW7=%|u)C)5@$z4Za_nq5kdT
csqiDRx>8c}k18*%13H_*)78&qol`;+04h^pcK`qY

literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tcsbhGg7(dwC=8Ap?QdhwLYs
z^n9gG88nrjP<zvOqgn8V!kGzDfjgEqnFU_jz|dO!VnX--sngE?%bBn0)R7;yU*!1Z
z?;ro=#23fj;$>v|ay?!wdux`6*pxF~uYOJE*0^Ssm2L55g|}Vi$;n&Q`nCkWzU<t)
z(~!?@K>{1=K3fHc1_nkZ77hUnM!?4fC-<Cw!t9k6@QLxR$t;WJU4Kr_{<HFYVtx41
lEYDsw+mg5Um0Cn5^KYFfHUGAQC_m6Q44$rjF6*2UngBY=WJmx2

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_proximity_find.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_proximity_find.png
index 82972b4e59ebd6648f6132267d70e0eb3ed2645a..e676b175d634778f8c2d7f8100e19dc2221d5ae4 100644
GIT binary patch
delta 1434
zcmV;L1!el~2CEB@BYy>QNkl<Zc-rk-T})I*6#gzOu-k$yTTLpZX;Y&}Y6A!sf*OJL
z$yTF0nAVU!^raz9TS)s-Nk|MuP}}q;O&c4Zj6qHP<)KX<YK^T)!4k1QDpdRlYpOye
z7PJa1Umx~zUD(}w=PomM@22}bY?hfbXU=zae$Jd3fD}?lA%BGw{?E{4D`Yy#unL7J
zz>~;94uDaNVi0{ehg0}P3%b@9%w#PO@ixtHn+LgpneH=wK3n-WMKR14KIR_dA7(r6
z&@RT<%7@%w{zeWmUR>q+#2WAASDY)pU{<2c&u1@Xpoe*hFn=kpQWh?AiSy>)q)gm!
zlmhc5djG+%uz%3GsoP5x=y7N|a~D<Nb7$6lm3UckFvo11N4~K53H$({8dbtAuHaei
zu1f#6+wx~K0I=Csn-+T(rP(rn0p7BuJw5DG6b<w%BY*~ohhP0Tf^GmnH;&>@;da@0
zM_s%x8Zhr;F>~pq1_0FPrJp4{AlQ0{8EOdB3Uz;)1%EL$6tYK1$9g5J5D%f&Qs@J;
zXyX9Dc__zX<N_E$Kf1J00ALoHvBgr$*V-oe{`c@7OV7P(Nblq|jxk7*404PCZa3=c
zEcJ{qO+JBg(FKsDG3Lq;OLU1gOI>C13A}4L_A_<=24l)ha<d*yow3l?AfLc)i!KXv
z?*~n#CVxY}0-v+cwo5*NAI%p|UFw!mGRnOy0st1XgQG_IO<nS^slF5P30yJluvnkE
z)40Hj8LcbXXVkR=0Lx7EU6N10Y!mBaF2EdKGrV6B(S9Yz^x6Qk0s1*$wwcKfC2~ya
z{=mNgD)5N@_c86~hz;iyI`yxQq8z|o{BELgo`0xW9$^BL$cPazr=uJ90W5}3FWnhc
z!-oj%6Fw}#_ZY`+^dcA|*w*9^p~2Vzvo6szT^LixG@8Q7q6ga}@`uo{qiK&}`9mnW
z%4!1X=*Bl1F@mX(Ls+c!M)7~C{$&cc0H)z3lp%=fsCozG51}tj){G<c0({X}XF8&4
z*ne-Nb!z~6+3D;?_PR-T{qzIOVZc~MD<j&kvbBu9DWAYH(~Tz-AZ!oY87gO)-*41y
z0|2ft)mJW`Kw4Nh5Qzi2)KFL`(ZS_<e6-*2K6yizJZgG(pyEu%Z%utx2mmbMq^Z<|
z9v>B%N`0s1Nco0HVvw6nC`|Ab0HBX&O@DR0t%ktk7NK&hE>{vZkY;9}i*$({7Qyt>
zs`3&)S#(?%mH-RPI#O;k>Rz+Z(xomh*JybZY@>HN3CR~&&n7mpo;A$YOMRB!CmYof
zn9qBb-JjvInC*)!#y&}obAig-=w6|`&S93(Pj4u<z%+X4=L*w>^8pU3O|GvLPJhx4
z@EF$t0N1h8bl07U8rAm$zuL$&Zv_Buwb9}?yY|>mAbo5@HW>CPUweEfA9`>RPbs?K
z2w+htF{ySC)hoMTiX*We$JvuvxC9k<>wn=H?VkEM0PQ~7mHf1A_RWv;^v?{O$0Et*
zU&c}g#=k*fll1Xl2WP=9spg-i=6^JS)lvzphVx*DH1qc%5#U0L7mDJq=bk`fAaFhq
z!Fxy)=&=>rMaNlskT|g1;+$-SAfHEK!H?!d;1eVo^zmZc<`1~z>1!3I;xd1VRd5IR
zX<P(8gIho^&)GKr0)21~xSZp*%pW(dJ6uCyi!B20!);(1j|-cBT)}G;34avwVkC7V
zU#;Z9o#0x51$ByR;a&)&Zg;@Vpob?-%|DsY&`t1^a6P8^*ByJIJ|_xmI1%H5X$_JC
zY;foqnL-MCBFx`|WCFdj(k@-oS5L`9A<uZfMFx^$@<vc7)&IZmPUyxy87XXJkU?%h
o@`8;?wf3ZtLJBFQkaYMDt`qE$^W$YZaR2}S07*qoM6N<$f`CS`vj6}9

delta 856
zcmV-e1E>6}3+@JxBYy)mNkl<ZcmeI3T}zZ(6o3bDrYOt4GsD!pKIi7ZL6L(N{emz*
zD5xMyEh>V7pmJYSR~eKS{(!oQ$RJCIh#(`Wz*HnCx`?o&;uIG7G1K&P;oX|`PNO+9
zd&7SA?b>Vk!28a-KbE2F;qiDp9*@W4A)nAvju6=%Q{1JEVt;o9=1K67y+qs<m}ivJ
zthQUgBnt?l93$UW0RyUlWQ6~06fmF&=p?wpGP?u}1PiDPQf`lcfpi1}lkBiVz(Alt
z1KrFKM4ZOl3m6ara%|!P6X+z^pIZR~LO>q{wDS#(pETu8z#vE&y^Z^5%u$mY0RxiX
z&S_<qWWG?5eSZOiLK^e_;S<TcB9dJJgHAegOL;>w*Rm;KKqt-lMZ8sB=IU$-7=lSR
zM+u`yh6!gwz>tdc^Zd&Ul2e%%Ft8wjycD@wkW5gJSpfqJ6c}b_ihMmt&Sp};z=8z;
zx>z3gCVUt3#|URiz`!B}pr4I;R?Z`7$c%u2KM;TsHh-vjS28IwJXxH;QW2cDU*Cgq
zPJR#AVy6If>5FY*B1em@0<cT1eOpBJ+AA=kei!OR)K~Is6+qoW77`axf7>hYOs)Q0
zL>;zQ0QE5Cx`?@Ivp}0t{eXz+wprk&QoTmRytY|D`{T+)%txCACY9=IMa*ZL1>#Ee
zh=_@Kfq!89BQ)UpOMFAAUhC4&Xsc5Fpi3XJQl)yQi0QCb;Hg@@Uqm(AD^Rc0UPD|&
z{bj4bu)0-g6j4+5ZfNvFt~(;?fvsE0PPOu8`2camPJuomYUOr$tU{5E2U|m|Q}eDO
zDl$B_@o2G+^=W6_W8dL!XJB7MDbr&9|Ag&2UVk5=HbuT(BxhW@;5dq8j1}%&F;y{(
z<b*qyd}WLw86@A8Yu2s2N0Ok@m5c5Q-jPg)E3F1qjFZd@!frHsoFqmvQOaFtx7p4k
zG-jx_zu~En%S@w@pw9M|vtlk0MJG;^-A#Y{=pjZBbL@7x?Q)!Imm6PSQsQpw@eeK%
zc2T$adw@!J+waF|CePJ>fcU_1x!!k0AkIDN<YL(kfhe~)B)f%N5|Gcka{?hR;03H1
iUcd`@0WaVMyudHO%$i;PUBv4E0000<MNUMnLSTYftCzR{

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_proximity_silent.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_proximity_silent.png
index df06b06b53981604fbefaad7b694736068676264..419d1ef147ca9514df4636db0b787fa164d51961 100644
GIT binary patch
delta 1432
zcmV;J1!wy02dN8?BYy>ONkl<Zc-rloUu+ar6vn^lA3H^CpqNM@@kt>hn6grAVnryL
zm{^PY0+BR6XwbCONFU^ZCTp6e6i_f~7g{9Im<A=9R-2$NN(m7RXoDIdX+zOMF+!_N
zv$aBH_w%9Su<hQtGt<4ZGaL7NXm)1LJ@@=}?%Y4;-U3-=m48)MS^b}-sdmT$JcM$T
z;yx_JBIt-AiYTt29~W>6-)phJ{uV6YW_ELeGL7?7KEpeL7yLbJ;V7MIl+9ceoZ#nk
z7yqJLO|XUYybP<J?>MsC$g7;IhPctY@JaGr8>>RT$5eHI1?t1!X1bRka4Gw!LVaAK
zHvGC7?ky0woPU?8O22TK%JAc}+zSwx&q1oxHDw5l2;7ShHq4>tkw1kJH2@k9_=M1>
z=ymoHp-ojY@(<xDZxPyDBJ?uMFne9S3G;%45C#B-T|I+lbsef3gj>R3ngD=Jt^lGe
z_5)!@l2t#uSOoyAVmAj|AT+5QmFI@=5m#{`b!vtWoqxp)@u)+95$5}Y@ES?-J1)2M
zwZh@-$;BL1bAo^fYLjk9wE85=M(AkPrT~CND98O+2w)5YIHN_41!ovLZL9o5+oX1S
z=lCg@CEnmwPB2E2jB$d)++%)MWBUZgn4@}vt?{s+qKMFTHUF?^+abfE)fS;l{TgAr
zu%d`?jelmPTigNw)OpSZV7q#N4=k#3ix2_;K41gTp&sD0Wo2T7C_7mS09?f*jGETh
z4T~-*zzOvLS0vSm5Ejh1dYJvD^=<%QnH1oXdVonub^Z2JFjkl;uVKyySS(%BjW~_V
zd3RMP`R+X8wgb*7^cWu(pd7#?ewLUQISnh%F@M0{LWC3OMJ~?bCcsCvlTr_F;yL4|
zScb1Lg~Rv(F;rr`z&1Bs??5<l9A<>lk=-oSm~c-#*&bKlghn0M)S-=P^4+8An~>OL
zC4pR=#TObehB)c~)@u}x(8h;2{sfqVDwH9HN}=B&^-buYq|fN44)AfKpRs62{MbzE
zZhru%vq$2wT|K}HlIjLn4Dc=v8`t{<<%?W(qubO2tdtHs(-VX}=Jo3W59P*py8wV|
zr2f{Z2gpg74kYWSVKrjj*`M5yxR&HK<MU_Iy@Ncc7r&JLW-9=Ip@ikV;9cPJ#{8&M
z>g$*{dj>B%NepsJ0>VLy*SU~CN`2LP1AnmCSYcVI#jpz{G^9f!1n#w&OyBF(zRfo_
z71x-SyE$wuDFq08QR?Nicl%}ywoAcQ>gLwpW2|K(8@W#4X>(e;P_x>*dBYar99KH>
zWrc7<VP;NHZKtEWP8Z8qOno}Hz#QtlQ-~nSsdmCkvBGhJaFCy~8UR?$9u5lM1%FXm
zxB}jaKe^3vn#o-!2z_qjai2hX%Y|($;V-Zi9kUU%<EX}D!i|0KTFm3Gj-NpC28aA9
zTw*S~7i&}6M3N!Agmj1nDV&awAq=JM7!F@aaVt-ZP=j=d`MjteA+6%3ls8m;M>vz=
z2wbaRTia)ZBN>js5{_p&LIau62!G6THMI*QLb=U4IRg;(DLQE57Xk}Y9+iDZSf6xE
zFyj#3o>RCN1A{=F7hH#bo`u4cy-x@aa>`ZsHyHw`1qorND}WtFDUIy`L0}G#I}ZP=
z+ow^2gs>zbsVmd<nP+r^gz%(;4mHjvlF9`LVXrMftFWBLjzAzVk0<4)P=Bm4KNbk>
z>3;?#{M|DA-?&&(G8rMxt$uW<>-di_{3$+SQ&Qt0-@^wikEc1<xJW?oFMI&the_eT
z@37=Fg1_Md)Muq#zIFc34b<4~bNI%vb~}T5S@!Y<R$Oi5oG1P}FPeD>&oagspGM}2
m4SW?@WtCM{S!Ly!{sp)E7!jykApx2I0000<MNUMnLSTZze65rK

delta 984
zcmV;}11J2c3+)GxBYy+5Nkl<ZcmeI&%WEEW6vpv0xvA73iWVzg8oCn^K@dTuSnEIF
zA`utj!qz6;C@8q_60L|JVi8QzdRe&?BGOU>!Bw#o7cDgiF17ViLZK~vtx4YZ>qgKs
zIng<pXPC`=pItV;-)E6z2F5n7tE;Q4tE;Q4i)lWjz+@Z2lz%h+d(#YnIU(U9UogXM
z%>w-OkrDu)&sRLfm>v*cUrG3PXL*rvIly1PCSf)J_?Fqva1($zfSQC^hykU(=V3jd
zV7?~d4X6l!KJRi(4M2i0Pm#EO42V0$ga{xYya{OlEc2)Y;0OyDg1deUm|~GX*{D^f
z@&GmA0F(ixZGYu8&J(xB(|LfBZ~&hX?|NS6GEoDb%mY+}9rR*AxH~yY)Kzxo0V=}d
zCBpwdZCz!37uX>IIKrWdgx&NK0ONjsVSV2*mH^ZsEX0Haz_^PaSl_`sKu36tUIJj;
z%8!&A@K7G0Cs@VZ!8yvEVN?ys6Rh$c;19~ZpaOWp;eU#RUG%WhhOiB{k8<bPq6g#%
zR@xc=v(k=G?qxk7K?nvg&$S!=CS1Yy8>2#ifB*m|xCIOMD&-~xfCS+XMFjvXaWfWd
z3(NSv*&HBMg78l#h~L3p!8c%=3?Lx*2a)(;dj;P<89+er?Z$$Aj_;TZARzdb!v71C
z_%1Od0)GeyJ$%v2%MGmJyH^j$6XN%U<5;k7@$GE~0Ea6OCW6yH!1taWpd-u#r$2*l
zQ4i1&J_}CYiSLvipd&<=+m7#NJwQiT4o<%j-vvEDM_36?AH%nz2j~cE!RbTz`g(wl
za5gx79A8fl&=KwqPM^T{s~#XERQNM`x?Mn?@P8b>qwN9aHbq##cd$J`u_?k5zGvG5
zSf0S`l)JA@K%TH4-zA3I1mp?F@qLN42uKsgxq@$RyMR1lmm{pPH4Uh+*&Lt-;TV<&
z=m=Ju@I)S<Bv?(tPYmY)N`loSJdfo8N`loQJi>K(fR<ocLT*OW1Z$RHG)=H(2}aWd
zYk!ttG)=H(35JxA28{3))FBvRLJDvXCjsgZ3_YP5;3nQ@6`&r$XqFHIw(&L>HLw3h
zql5r3$s(%&pdc6x6H@OPD|v#^7$FTf$#y=?5{w232|%BB7{w^~Bu6lsCR72O=0WW5
z#e@YtK=t|k@6425SqeVJH(-wdAejf8<54C5K~qSGuirAD&(};bip8Vgqxkym11@uf
z>G=DTfDm85Rlo?DuZ8zudO$nt0Qz-+4$uKQKnLgm9pEn$qgoOo;uuK)0000<MNUMn
GLSTa4rnqtd

diff --git a/app/src/main/res/layout/activity_feature_proximity_item.xml b/app/src/main/res/layout/activity_feature_proximity_item.xml
index c777cc29..0a289f4f 100644
--- a/app/src/main/res/layout/activity_feature_proximity_item.xml
+++ b/app/src/main/res/layout/activity_feature_proximity_item.xml
@@ -21,6 +21,7 @@
   ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="?android:attr/listPreferredItemHeightSmall"
 	android:paddingBottom="2dp"
@@ -29,13 +30,6 @@
 	android:paddingTop="2dp"
 	android:gravity="center_vertical">
 
-	<ImageView
-		android:id="@+id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:src="@drawable/ic_proximity_tag"
-		android:layout_marginRight="8dp"/>
-
 	<RelativeLayout
 		android:layout_width="0dp"
 		android:layout_weight="1"
@@ -46,6 +40,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:ellipsize="marquee"
+			android:layout_toRightOf="@+id/icon"
 			android:gravity="center_vertical"
 			android:lines="1"
 			android:textSize="20sp"
@@ -56,7 +51,6 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textSize="12sp"
-			android:layout_marginTop="2dp"
 			android:layout_below="@+id/name"
 			android:lines="1"/>
 
@@ -69,7 +63,7 @@
 			android:gravity="center"
 			android:layout_toRightOf="@+id/address"
 			android:drawableLeft="@drawable/ic_battery"
-			android:layout_marginLeft="8dp"
+			android:layout_marginLeft="4dp"
 			android:visibility="gone"/>
 
 	</RelativeLayout>
@@ -79,6 +73,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:backgroundTint="@color/actionBarColorDark"
+		app:backgroundTint="@color/actionBarColorDark"
 		android:src="@drawable/ic_stat_notify_proximity_find"
 		android:visibility="gone"/>
 
@@ -87,6 +82,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:backgroundTint="@color/orange"
+		app:backgroundTint="@color/orange"
 		android:src="@drawable/ic_action_disconnect"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/values/strings_proximity.xml b/app/src/main/res/values/strings_proximity.xml
index 5cb62795..45ce6153 100644
--- a/app/src/main/res/values/strings_proximity.xml
+++ b/app/src/main/res/values/strings_proximity.xml
@@ -50,7 +50,8 @@
 	<string name="proximity_devices_title">YOUR TAGS</string>
 	<string name="proximity_enable_server">GATT Server enabled</string>
     
-    <string name="proximity_about_text">PROXIMITY profile allows you to connect to your Proximity sensor.
-        \nYou can find your valuables attached with Proximity tag by pressing FindMe button on screen and you can find your phone by pressing relevant button on your tag.
-        \n\nYou may close this activity when connected without being disconnected from the sensor. A notification will be shown.</string>
+    <string name="proximity_about_text">PROXIMITY profile allows you to connect to multiple Proximity sensors.
+        \nYou can find your valuables attached with Proximity tag by pressing the Locate button next to your device.
+		You can also find your phone by pressing relevant button on your tag.
+        \n\nYou may close this activity when connected without being disconnected from the sensors. A notification will be shown.</string>
 </resources>
\ No newline at end of file