new gui, responsive for all devices.

added activity buttons to app and in csv output
This commit is contained in:
toni
2018-01-10 17:08:36 +01:00
parent 4a70287d31
commit e74e390010
19 changed files with 549 additions and 112 deletions

View File

@@ -1,103 +1,317 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="#333"
android:keepScreenOn="true"
tools:context="de.fhws.indoor.sensorreadout.MainActivity"
android:background="#333">
<Button
android:layout_width="50dp"
android:layout_height="48dp"
android:text="stop"
android:id="@+id/btnStop"
android:background="@drawable/btnstopcolor"/>
<Button
android:layout_width="50dp"
android:layout_height="48dp"
android:layout_below="@+id/btnStop"
android:text="start"
android:id="@+id/btnStart"
android:background="@drawable/btnstartcolor"/>
<Spinner
android:layout_width="68dip"
android:layout_height="48dip"
android:layout_toRightOf="@+id/btnStop"
android:id="@+id/pathspinner"
android:background="#64bbe5"
/>
<Spinner
android:layout_width="68dp"
android:layout_height="48dp"
android:layout_below="@+id/pathspinner"
android:layout_toRightOf="@id/btnStart"
android:id="@+id/groundspinner"
android:background="#64bbe5"
/>
<Button
android:layout_width="fill_parent"
android:layout_height="96dip"
android:layout_toRightOf="@+id/pathspinner"
android:text="Ground Truth"
android:id="@+id/btnGround"
android:layout_gravity="right"
android:background="#64bbe5"
/>
<TextView
android:layout_below="@+id/btnGround"
android:id="@+id/txtFile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffff"
android:text="-"
/>
android:orientation="vertical"
android:weightSum="4.5"
tools:context="de.fhws.indoor.sensorreadout.MainActivity">
<LinearLayout
android:layout_below="@+id/txtFile"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginTop="0dip"
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginEnd="10dip"
android:layout_marginStart="10dip"
android:layout_marginTop="10dip"
android:layout_weight="1"
android:orientation="horizontal"
android:id="@+id/layoutMain">
android:weightSum="3">
<Button
android:id="@+id/btnStop"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/btnstopcolor"
android:text="stop" />
<Button
android:id="@+id/btnStart"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="@drawable/btnstartcolor"
android:text="start" />
<LinearLayout
android:id="@+id/layoutSpinner"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:orientation="vertical"
android:weightSum="2">
<Spinner
android:id="@+id/pathspinner"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_weight="1"
android:background="#64bbe5" />
<Spinner
android:id="@+id/groundspinner"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_weight="1"
android:background="#64bbe5" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/txtFile"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_below="@+id/layout"
android:layout_marginEnd="10dip"
android:layout_marginStart="20dip"
android:layout_marginTop="10dip"
android:layout_weight="0.25"
android:text="-"
android:textColor="#ffffff" />
<LinearLayout
android:id="@+id/layoutMain"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_below="@+id/txtFile"
android:layout_marginEnd="10dip"
android:layout_marginStart="20dip"
android:layout_weight="0.25"
android:orientation="horizontal">
<TextView
android:id="@+id/txtWifi"
android:textColor="#ffffff"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:text="-"
/>
<TextView
android:id="@+id/txtBeacon"
android:textColor="#ffffff"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:text="-"
/>
<TextView
android:id="@+id/txtGPS"
android:textColor="#ffffff"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:text="-"
/>
<TextView
android:id="@+id/txtBuffer"
android:textColor="#ffffff"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/txtBeacon"
android:layout_width="30dp"
android:layout_height="match_parent"
android:text="-"
/>
android:textColor="#ffffff" />
<TextView
android:id="@+id/txtGPS"
android:layout_width="30dp"
android:layout_height="match_parent"
android:text="-"
android:textColor="#ffffff" />
<TextView
android:id="@+id/txtBuffer"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="-"
android:textColor="#ffffff" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutActivity1"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_above="@+id/layoutGround"
android:layout_marginEnd="10dip"
android:layout_marginTop="10dip"
android:layout_weight="1"
android:orientation="horizontal"
android:weightSum="3">
<LinearLayout
android:id="@+id/btnWalk"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_walk" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Laufen" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnStairsUp"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_stairs_up" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Treppe rauf" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnStairsDown"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_stairs_down" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Treppe runter" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/layoutActivity2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_above="@+id/layoutGround"
android:layout_marginEnd="10dip"
android:layout_marginTop="10dip"
android:layout_weight="1"
android:orientation="horizontal"
android:weightSum="3">
<LinearLayout
android:id="@+id/btnStanding"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_standing" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Stehen" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnElevatorUp"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_elevator_up" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Aufzug rauf" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnElevatorDown"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginStart="10dip"
android:layout_weight="1"
android:background="#B2B2B2"
android:orientation="vertical"
android:weightSum="3">
<ImageView
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="2"
android:src="@drawable/ic_elevator_down" />
<TextView
android:layout_width="match_parent"
android:textStyle="bold"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:text="Aufzug runter" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/layoutGround"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="10dip"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:id="@+id/btnGround"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#64bbe5"
android:text="Ground Truth" />
</RelativeLayout>
</LinearLayout>