diff --git a/app/src/main/java/com/example/sensortestingapp/DeviceListAdapter.kt b/app/src/main/java/com/example/sensortestingapp/DeviceListAdapter.kt index 5ee545c..a72b96d 100644 --- a/app/src/main/java/com/example/sensortestingapp/DeviceListAdapter.kt +++ b/app/src/main/java/com/example/sensortestingapp/DeviceListAdapter.kt @@ -135,7 +135,7 @@ class DeviceListAdapter( val measurement = measurements[position] val measurementView = convertView ?: LayoutInflater.from(parent.context) .inflate(R.layout.row_measurements_list, parent, false) - val labelView = measurementView.findViewById(R.id.measurement_label) + val labelView = measurementView.findViewById(R.id.measurement_title) labelView.text = measurement.getLabel() labelView.setCompoundDrawablesWithIntrinsicBounds( measurement.getIcon() ?: 0, @@ -143,7 +143,7 @@ class DeviceListAdapter( 0, 0 ) - measurementView.findViewById(R.id.measurement_value).text = + measurementView.findViewById(R.id.measurement_body).text = measurement.getFormattedValue() return measurementView } diff --git a/app/src/main/java/com/example/sensortestingapp/KirbyDevice.kt b/app/src/main/java/com/example/sensortestingapp/KirbyDevice.kt index a377549..6529803 100644 --- a/app/src/main/java/com/example/sensortestingapp/KirbyDevice.kt +++ b/app/src/main/java/com/example/sensortestingapp/KirbyDevice.kt @@ -187,11 +187,11 @@ class KirbyDevice( measurements.reversed().forEach { m -> result.addAll(payloadToMeasurements(m))} - /* + var pl = Payload(payload = "006b04ab74a1ed0d101404", ts = "2000") result.addAll(payloadToMeasurements(pl)) result.addAll(payloadToMeasurements(pl)) - */ + return result } @@ -358,19 +358,7 @@ fun bytesToInt32(arr: ByteArray, start: Int): Int { private fun payloadToMeasurements(payload: Payload): List { return listOf(object : Measurement { override fun getLabel(): String { - return "TS" - } - - override fun getFormattedValue(): String { - return "${payload.ts}" - } - - override fun getIcon(): Int? { - return R.drawable.baseline_numbers_24 - } - }, object : Measurement { - override fun getLabel(): String { - return "" + return payload.ts.toString() } override fun getFormattedValue(): String { @@ -378,7 +366,7 @@ private fun payloadToMeasurements(payload: Payload): List { } override fun getIcon(): Int? { - return null + return R.drawable.baseline_numbers_24 } } ) diff --git a/app/src/main/java/com/example/sensortestingapp/MainActivity.kt b/app/src/main/java/com/example/sensortestingapp/MainActivity.kt index 7649c94..d6b8592 100644 --- a/app/src/main/java/com/example/sensortestingapp/MainActivity.kt +++ b/app/src/main/java/com/example/sensortestingapp/MainActivity.kt @@ -130,7 +130,7 @@ class MainActivity : AppCompatActivity() { } - //addDummyDevices() + addDummyDevices() } private fun addBondedDevices(): Unit { diff --git a/app/src/main/res/layout/row_measurements_list.xml b/app/src/main/res/layout/row_measurements_list.xml index bf99ce7..566eb69 100644 --- a/app/src/main/res/layout/row_measurements_list.xml +++ b/app/src/main/res/layout/row_measurements_list.xml @@ -1,38 +1,36 @@ - + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical"> +android:paddingVertical="5sp" + android:text="Title" + android:textAppearance="@style/TextAppearance.AppCompat.Title" + android:textSize="16sp" /> - + /> + + +