fix: layout and theme issues
This commit is contained in:
@@ -88,14 +88,14 @@ object DecoderIaq {
|
||||
override fun toString(): String {
|
||||
return "M{" +
|
||||
"type=" + msgType +
|
||||
"co2=" + co2 +
|
||||
", co2=" + co2 +
|
||||
", voc=" + voc +
|
||||
", hum=" + humidity +
|
||||
", temp=" + temperature +
|
||||
", press=" + pressure +
|
||||
", occ=" + occupancy +
|
||||
", pm25=" + pm25 +
|
||||
", pm10=" + pm10 +
|
||||
", occ=" + occupancy +
|
||||
'}'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,8 +120,6 @@ class DeviceListAdapter(
|
||||
}
|
||||
|
||||
val measurements = result.getMeasurements()
|
||||
|
||||
val measurementsRowHeight = 100
|
||||
val measurementsAdapter = object :
|
||||
ArrayAdapter<Measurement>(
|
||||
context,
|
||||
@@ -147,7 +145,6 @@ class DeviceListAdapter(
|
||||
)
|
||||
measurementView.findViewById<TextView>(R.id.measurement_value).text =
|
||||
measurement.getFormattedValue()
|
||||
measurementView.layoutParams.height = measurementsRowHeight
|
||||
return measurementView
|
||||
}
|
||||
|
||||
@@ -158,13 +155,11 @@ class DeviceListAdapter(
|
||||
}
|
||||
|
||||
measurementsListView.adapter = measurementsAdapter
|
||||
measurementsListView.divider = null
|
||||
|
||||
if (measurements.isEmpty()) {
|
||||
measurementsListView.visibility = GONE
|
||||
} else {
|
||||
measurementsListView.visibility = VISIBLE
|
||||
measurementsListView.layoutParams.height = measurementsRowHeight * measurements.size
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,8 +185,14 @@ class KirbyDevice(
|
||||
override fun getMeasurements(): List<Measurement> {
|
||||
val result = mutableListOf<Measurement>()
|
||||
|
||||
measurements.forEach { m -> result.addAll(payloadToMeasurements(m))}
|
||||
return result.reversed()
|
||||
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
|
||||
}
|
||||
|
||||
override fun getActions(): List<Action> {
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.example.sensortestingapp;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ListView;
|
||||
|
||||
public class NonScrollListView extends ListView {
|
||||
|
||||
public NonScrollListView(Context context) {
|
||||
super(context);
|
||||
}
|
||||
public NonScrollListView(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
}
|
||||
public NonScrollListView(Context context, AttributeSet attrs, int defStyle) {
|
||||
super(context, attrs, defStyle);
|
||||
}
|
||||
@Override
|
||||
public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
||||
int heightMeasureSpec_custom = MeasureSpec.makeMeasureSpec(
|
||||
Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
|
||||
super.onMeasure(widthMeasureSpec, heightMeasureSpec_custom);
|
||||
ViewGroup.LayoutParams params = getLayoutParams();
|
||||
params.height = getMeasuredHeight();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user