feat: more layout improvements
This commit is contained in:
@@ -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<TextView>(R.id.measurement_label)
|
||||
val labelView = measurementView.findViewById<TextView>(R.id.measurement_title)
|
||||
labelView.text = measurement.getLabel()
|
||||
labelView.setCompoundDrawablesWithIntrinsicBounds(
|
||||
measurement.getIcon() ?: 0,
|
||||
@@ -143,7 +143,7 @@ class DeviceListAdapter(
|
||||
0,
|
||||
0
|
||||
)
|
||||
measurementView.findViewById<TextView>(R.id.measurement_value).text =
|
||||
measurementView.findViewById<TextView>(R.id.measurement_body).text =
|
||||
measurement.getFormattedValue()
|
||||
return measurementView
|
||||
}
|
||||
|
||||
@@ -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<Measurement> {
|
||||
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<Measurement> {
|
||||
}
|
||||
|
||||
override fun getIcon(): Int? {
|
||||
return null
|
||||
return R.drawable.baseline_numbers_24
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
@@ -130,7 +130,7 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
|
||||
//addDummyDevices()
|
||||
addDummyDevices()
|
||||
}
|
||||
|
||||
private fun addBondedDevices(): Unit {
|
||||
|
||||
Reference in New Issue
Block a user