aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-21 23:54:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugs fixed in proximity, adjusting layout for smaller screens

Browse Source
This commit is contained in:
Aleksander Nowakowski
2016-10-18 15:55:10 +02:00
parent ea6dfac97c
commit e0fee213f0
8 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java
View File

@@ -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))

4
app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java
View File

@@ -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;
}
}