diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-30 23:51:53 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-30 23:51:53 +0100 |
| commit | 61bdbbdc3f81b89ce1679075664fe50012ccd78d (patch) | |
| tree | 97c4fa0190406812cb5159433fc398c950f1da3c /app/src/main/res/layout | |
| parent | 991620666551c1eaf655a0aa0b1fe08d2bc19681 (diff) | |
| download | io.trygvis.soilmoisture-android-61bdbbdc3f81b89ce1679075664fe50012ccd78d.tar.gz io.trygvis.soilmoisture-android-61bdbbdc3f81b89ce1679075664fe50012ccd78d.tar.bz2 io.trygvis.soilmoisture-android-61bdbbdc3f81b89ce1679075664fe50012ccd78d.tar.xz io.trygvis.soilmoisture-android-61bdbbdc3f81b89ce1679075664fe50012ccd78d.zip | |
o Activating the sensor view.
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/fragment_sensor.xml | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/app/src/main/res/layout/fragment_sensor.xml b/app/src/main/res/layout/fragment_sensor.xml index 4d911ca..47aa61f 100644 --- a/app/src/main/res/layout/fragment_sensor.xml +++ b/app/src/main/res/layout/fragment_sensor.xml @@ -6,18 +6,47 @@ android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" - tools:context="io.trygvis.soilmoisture.SensorActivity$PlaceholderFragment"> + tools:context="io.trygvis.soilmoisture.SensorActivity.SensorFragment"> - <TextView - android:text="@string/hello_world" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + <GridLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_alignParentTop="true" + android:layout_alignParentStart="true" + android:layout_above="@+id/button_refresh"> + + <TextView + android:text="@string/value" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + <TextView + android:text="@string/warning_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_row="1" + android:layout_column="0"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/current_value" + android:layout_row="0" + android:layout_column="1"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/warning_value" + android:layout_row="1" + android:layout_column="1"/> + </GridLayout> <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/refresh" - android:id="@+id/button" + android:id="@+id/button_refresh" android:layout_alignParentBottom="true" android:layout_alignParentStart="true" android:layout_alignParentEnd="true"/> |