aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2015-01-04 23:48:53 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2015-01-04 23:48:53 +0100
commit4a2ca2d94c827566f8682e8dbd6fbdf17d70b4dd (patch)
tree10c9fe3e9b3c829cfc675d3184ce122964441fb5 /app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
parent31fc64bec1c5286c27bdc1f683d037ae0e91418d (diff)
downloadio.trygvis.soilmoisture-android-4a2ca2d94c827566f8682e8dbd6fbdf17d70b4dd.tar.gz
io.trygvis.soilmoisture-android-4a2ca2d94c827566f8682e8dbd6fbdf17d70b4dd.tar.bz2
io.trygvis.soilmoisture-android-4a2ca2d94c827566f8682e8dbd6fbdf17d70b4dd.tar.xz
io.trygvis.soilmoisture-android-4a2ca2d94c827566f8682e8dbd6fbdf17d70b4dd.zip
o Adding a way to prepend callbacks on the promise's queue. Needed for devices that give you [disconnect, connect] events when connecting. Yay.
o Reading meta data from the Soil Moisture device.
Diffstat (limited to 'app/src/main/java/io/trygvis/soilmoisture/MainActivity.java')
-rw-r--r--app/src/main/java/io/trygvis/soilmoisture/MainActivity.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
index 2e6df76..7aa3534 100644
--- a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
+++ b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java
@@ -222,6 +222,7 @@ public class MainActivity extends ListActivity {
final TextView deviceName;
final TextView deviceAddress;
final TextView rssi;
+ final TextView info;
final ProgressBar spinner;
final Button connect;
@@ -229,6 +230,7 @@ public class MainActivity extends ListActivity {
this.deviceName = (TextView) view.findViewById(R.id.device_name);
this.deviceAddress = (TextView) view.findViewById(R.id.device_address);
this.rssi = (TextView) view.findViewById(R.id.device_rssi);
+ this.info = (TextView) view.findViewById(R.id.device_info);
this.spinner = (ProgressBar) view.findViewById(R.id.device_spinner);
this.connect = (Button) view.findViewById(R.id.button_connect);
}
@@ -241,7 +243,7 @@ public class MainActivity extends ListActivity {
private LayoutInflater inflater = MainActivity.this.getLayoutInflater();
private boolean groupByDevice = true;
- private boolean showAll = false;
+ private boolean showAll = true;
public void sort() {
Log.i(TAG, "sort(), groupByDevice=" + groupByDevice + ", showAll=" + showAll);
@@ -400,6 +402,12 @@ public class MainActivity extends ListActivity {
item.rssi.setText(getText(R.string.rssi) + ": " +
(smDevice.getBtDevice().getRssi() != 0 ? valueOf(smDevice.getBtDevice().getRssi()) : getText(R.string.unknown)));
+ if (smDevice.isUseful()) {
+ item.info.setText("number of sensors: " + smDevice.getSensors().size());
+ } else {
+ item.info.setText("");
+ }
+
boolean useful = smDevice.isUseful();
item.spinner.setVisibility(useful ? View.GONE : View.VISIBLE);
item.connect.setVisibility(useful ? View.VISIBLE : View.GONE);