summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2014-12-03 23:39:15 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2014-12-03 23:39:15 +0100
commit2d887e4226d60347a97518c8efafa507d7ab7bed (patch)
treef9158683edef81fb81b0de7914fe4b666d7508c7 /app/src/main/res
parent1784a0ee9bfc3937aef6f8cb1f9404c4817ee946 (diff)
downloadfiken-display-android-2d887e4226d60347a97518c8efafa507d7ab7bed.tar.gz
fiken-display-android-2d887e4226d60347a97518c8efafa507d7ab7bed.tar.bz2
fiken-display-android-2d887e4226d60347a97518c8efafa507d7ab7bed.tar.xz
fiken-display-android-2d887e4226d60347a97518c8efafa507d7ab7bed.zip
o Rewritten how the BT callbacks are handled. Now with a small queue of actions.
o Can successfully read bytes from a BT device.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_display_control.xml8
-rw-r--r--app/src/main/res/values/strings.xml1
2 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/res/layout/activity_display_control.xml b/app/src/main/res/layout/activity_display_control.xml
index 4151184..7b19429 100644
--- a/app/src/main/res/layout/activity_display_control.xml
+++ b/app/src/main/res/layout/activity_display_control.xml
@@ -22,12 +22,18 @@
android:textSize="12sp"
android:layout_below="@+id/device_name"/>
+ <TextView
+ android:id="@+id/gauge_count"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/device_rssi"/>
+
<Button
android:id="@+id/button_disconnect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/disconnect"
- android:layout_below="@+id/device_rssi"
+ android:layout_below="@+id/gauge_count"
/>
<LinearLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0cea3b4..3a1c3a8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
<string name="unknown_characteristic">Unknown characteristic</string>
<string name="unknown_service">Unknown service</string>
<string name="rssi">RSSI</string>
+ <string name="gauge_count">Gauge count</string>
<string name="name_unknown">Unknown name</string>
<string name="rssi_unknown">unknown</string>
<string name="connect">Connect</string>