aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/io/trygvis/soilmoisture/MainActivity.java')
-rw-r--r--app/src/main/java/io/trygvis/soilmoisture/MainActivity.java21
1 files changed, 9 insertions, 12 deletions
diff --git a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
index 79b09c4..e838f01 100644
--- a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
+++ b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
@@ -216,7 +216,7 @@ public class MainActivity extends ListActivity {
//
// -----------------------------------------------------------------------
- public static class BtDeviceDialogFragment extends DialogFragment {
+ public static class ProbeDeviceDialogFragment extends DialogFragment {
private MainActivity mainActivity;
@@ -243,17 +243,19 @@ public class MainActivity extends ListActivity {
}
private boolean onBtDeviceLongClick(BtDevice<SmDevice> device) {
- Log.i(TAG, "onBtDeviceClick, device=" + device.getId());
-
- BtDeviceDialogFragment dialog = new BtDeviceDialogFragment();
+ ProbeDeviceDialogFragment dialog = new ProbeDeviceDialogFragment();
Bundle arguments = new Bundle();
arguments.putString("address", device.getAddress());
dialog.setArguments(arguments);
- dialog.show(getFragmentManager(), "BtDeviceDialogFragment");
+ dialog.show(getFragmentManager(), "ProbeDeviceDialogFragment");
return true;
}
+ private boolean onSmDeviceLongClick(SmDevice device) {
+ return onBtDeviceLongClick(device.getBtDevice());
+ }
+
private void onSmDeviceClick(SmDevice device) {
Log.i(TAG, "onSmDeviceClick, device=" + device.getBtDevice().getId());
}
@@ -509,13 +511,8 @@ public class MainActivity extends ListActivity {
if (view == null) {
view = inflater.inflate(R.layout.fragment_device, null);
view.setTag(new DeviceItem(view));
- view.setOnClickListener(v -> {
- Log.i(TAG, "onClick: SmDevice, " +
-// "position=" + position + ", " +
- "device=" + smDevice /*+ ", " +
- "tag=" + v.getTag()*/);
- onSmDeviceClick(smDevice);
- });
+ view.setOnClickListener(v -> onSmDeviceClick(smDevice));
+ view.setOnLongClickListener(v -> onSmDeviceLongClick(smDevice));
}
DeviceItem item = (DeviceItem) view.getTag();