Skip to content
This repository was archived by the owner on Jan 20, 2025. It is now read-only.

Fix #78: Overlapping Sensor Fields #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #78: Overlapping Sensor Fields #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ android {

dependencies {
implementation "androidx.annotation:annotation:1.1.0"
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
}
36 changes: 18 additions & 18 deletions app/src/main/java/ch/fixme/status/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.SectionIndexer;
import android.widget.TextView;
Expand All @@ -60,6 +59,7 @@
import java.util.regex.Pattern;

import androidx.annotation.UiThread;
import androidx.constraintlayout.widget.ConstraintLayout;

public class Main extends Activity {

Expand Down Expand Up @@ -700,65 +700,65 @@ private void populateDataHs() {
ArrayList<HashMap<String, String>> sensorsData = sensors
.get(name);
for (HashMap<String, String> elem : sensorsData) {
RelativeLayout rl = (RelativeLayout) iftr.inflate(
ConstraintLayout sensorView = (ConstraintLayout) iftr.inflate(
R.layout.entry_sensor, null);
if (elem.containsKey(ParseGeneric.API_SENSOR_VALUE)) {
((TextView) rl.findViewById(R.id.entry_value))
((TextView) sensorView.findViewById(R.id.entry_value))
.setText(elem.get(ParseGeneric.API_SENSOR_VALUE));
} else {
rl.findViewById(R.id.entry_value).setVisibility(
sensorView.findViewById(R.id.entry_value).setVisibility(
View.GONE);
}
if (elem.containsKey(ParseGeneric.API_SENSOR_UNIT)) {
((TextView) rl.findViewById(R.id.entry_unit))
((TextView) sensorView.findViewById(R.id.entry_unit))
.setText(elem.get(ParseGeneric.API_SENSOR_UNIT));
} else {
rl.findViewById(R.id.entry_unit).setVisibility(
sensorView.findViewById(R.id.entry_unit).setVisibility(
View.GONE);
}
if (elem.containsKey(ParseGeneric.API_SENSOR_NAME)) {
((TextView) rl.findViewById(R.id.entry_name))
((TextView) sensorView.findViewById(R.id.entry_name))
.setText(elem.get(ParseGeneric.API_SENSOR_NAME));
} else {
rl.findViewById(R.id.entry_name).setVisibility(
sensorView.findViewById(R.id.entry_name).setVisibility(
View.GONE);
}
if (elem.containsKey(ParseGeneric.API_SENSOR_LOCATION)) {
((TextView) rl.findViewById(R.id.entry_location))
((TextView) sensorView.findViewById(R.id.entry_location))
.setText(elem
.get(ParseGeneric.API_SENSOR_LOCATION));
} else {
rl.findViewById(R.id.entry_location).setVisibility(
sensorView.findViewById(R.id.entry_location).setVisibility(
View.GONE);
}
if (elem.containsKey(ParseGeneric.API_SENSOR_DESCRIPTION)) {
((TextView) rl.findViewById(R.id.entry_description))
((TextView) sensorView.findViewById(R.id.entry_description))
.setText(elem
.get(ParseGeneric.API_SENSOR_DESCRIPTION));
} else {
rl.findViewById(R.id.entry_description)
sensorView.findViewById(R.id.entry_description)
.setVisibility(View.GONE);
}
if (elem.containsKey(ParseGeneric.API_SENSOR_PROPERTIES)) {
((TextView) rl.findViewById(R.id.entry_properties))
((TextView) sensorView.findViewById(R.id.entry_properties))
.setText(elem
.get(ParseGeneric.API_SENSOR_PROPERTIES));
} else {
rl.findViewById(R.id.entry_properties)
sensorView.findViewById(R.id.entry_properties)
.setVisibility(View.GONE);
}
if (elem.containsKey(ParseGeneric.API_SENSOR_MACHINES)) {
((TextView) rl.findViewById(R.id.entry_other))
((TextView) sensorView.findViewById(R.id.entry_other))
.setText(elem
.get(ParseGeneric.API_SENSOR_MACHINES));
} else if (elem.containsKey(ParseGeneric.API_SENSOR_NAMES)) {
((TextView) rl.findViewById(R.id.entry_other))
((TextView) sensorView.findViewById(R.id.entry_other))
.setText(elem.get(ParseGeneric.API_SENSOR_NAMES));
} else {
rl.findViewById(R.id.entry_other).setVisibility(
sensorView.findViewById(R.id.entry_other).setVisibility(
View.GONE);
}
vg.addView(rl);
vg.addView(sensorView);
}
}
}
Expand Down
75 changes: 38 additions & 37 deletions app/src/main/res/layout/entry_sensor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,96 +3,97 @@
Copyright (C) 2012 Aubort Jean-Baptiste (Rorist)
Licensed under GNU's GPL 3, see README
-->
<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="2dip"
android:paddingTop="2dip"
android:layout_marginBottom="2dip"
android:layout_marginTop="2dip">

<ImageView
android:id="@+id/entry_img"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_alignParentLeft="true"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:paddingTop="8dip"
android:paddingRight="8dip"
android:paddingStart="0dip"
android:paddingEnd="8dip"
android:paddingBottom="8dip"
android:src="@android:drawable/sym_contact_card"/>
android:src="@android:drawable/sym_contact_card" />
<TextView
android:id="@+id/entry_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/entry_img"
android:layout_alignParentTop="true"
android:layout_alignWithParentIfMissing="true"
android:layout_marginRight="4dip"
app:layout_constraintStart_toEndOf="@id/entry_img"
app:layout_constraintTop_toTopOf="parent"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textIsSelectable="true"
android:text="20" />
<TextView
android:id="@+id/entry_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/entry_value"
android:layout_alignParentTop="true"
android:layout_alignWithParentIfMissing="true"
android:layout_marginStart="4dp"
android:text="°C"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textIsSelectable="true"
android:text="°C" />
app:layout_constraintBaseline_toBaselineOf="@id/entry_value"
app:layout_constraintStart_toEndOf="@id/entry_value" />
<TextView
android:id="@+id/entry_properties"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/entry_img"
android:layout_below="@id/entry_value"
android:layout_marginRight="4dip"
app:layout_constraintStart_toEndOf="@id/entry_img"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/entry_value"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textIsSelectable="true"
android:text="speed: 0 m/s, gust: 0 m/s" />
<TextView
android:id="@+id/entry_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/entry_img"
android:layout_below="@id/entry_properties"
android:layout_alignWithParentIfMissing="true"
android:layout_marginRight="8dip"
app:layout_constraintStart_toEndOf="@id/entry_img"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/entry_properties"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="true"
android:text="Sensor1" />
<TextView
android:id="@+id/entry_location"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/entry_name"
android:layout_below="@id/entry_properties"
android:layout_alignWithParentIfMissing="true"
app:layout_constraintStart_toEndOf="@id/entry_img"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/entry_name"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="true"
android:text="Outside" />
<TextView
android:id="@+id/entry_description"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/entry_img"
android:layout_below="@id/entry_name"
android:layout_alignWithParentIfMissing="true"
app:layout_constraintStart_toEndOf="@id/entry_img"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/entry_location"
android:autoLink="all"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="true"
android:text="Description of the sensor" />
<TextView
android:id="@+id/entry_other"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/entry_img"
android:layout_below="@id/entry_description"
android:layout_alignParentBottom="true"
android:layout_alignWithParentIfMissing="true"
app:layout_constraintStart_toEndOf="@id/entry_img"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/entry_description"
app:layout_constraintBottom_toBottomOf="parent"
android:autoLink="all"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textIsSelectable="true"
android:text="{other: stuff}" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>