new gui, responsive for all devices.
added activity buttons to app and in csv output
This commit is contained in:
toni
15
.idea/misc.xml
generated
15
.idea/misc.xml
generated
@@ -1,8 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="EntryPointsManager">
|
||||
<entry_points version="2.0" />
|
||||
</component>
|
||||
<component name="NullableNotNullManager">
|
||||
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
|
||||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||
@@ -27,17 +24,7 @@
|
||||
</value>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
||||
<OptionsSetting value="true" id="Add" />
|
||||
<OptionsSetting value="true" id="Remove" />
|
||||
<OptionsSetting value="true" id="Checkout" />
|
||||
<OptionsSetting value="true" id="Update" />
|
||||
<OptionsSetting value="true" id="Status" />
|
||||
<OptionsSetting value="true" id="Edit" />
|
||||
<ConfirmationsSetting value="0" id="Add" />
|
||||
<ConfirmationsSetting value="0" id="Remove" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
||||
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion '25.0.0'
|
||||
buildToolsVersion '26.0.2'
|
||||
|
||||
defaultConfig {
|
||||
applicationId "de.fhws.indoor.sensorreadout"
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="de.fhws.indoor.sensorreadout">>
|
||||
|
||||
package="de.fhws.indoor.sensorreadout">
|
||||
>
|
||||
|
||||
<!-- <uses-feature android:name="android.hardware.type.watch" /> -->
|
||||
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
||||
<uses-permission android:name="android.permission.BLUETOOTH" />
|
||||
@@ -19,14 +18,21 @@
|
||||
<uses-feature android:name="android.hardware.location.gps" />
|
||||
|
||||
<uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||
<application android:allowBackup="true" android:icon="@drawable/icon"
|
||||
android:label="@string/app_name" android:theme="@style/AppTheme">
|
||||
|
||||
<uses-library android:name="com.google.android.wearable"
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@drawable/icon"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/AppTheme">
|
||||
<uses-library
|
||||
android:name="com.google.android.wearable"
|
||||
android:required="false" />
|
||||
|
||||
<activity android:name=".MainActivity" android:configChanges="orientation"
|
||||
android:label="@string/app_name" android:screenOrientation="nosensor">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:configChanges="orientation"
|
||||
android:label="@string/app_name"
|
||||
android:screenOrientation="nosensor">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
|
||||
@@ -22,6 +22,8 @@ import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
import android.view.ViewGroup.LayoutParams;
|
||||
|
||||
import com.google.android.gms.vision.text.Line;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@@ -29,6 +31,8 @@ import de.fhws.indoor.sensorreadout.sensors.Gps;
|
||||
import de.fhws.indoor.sensorreadout.sensors.GpsNew;
|
||||
import de.fhws.indoor.sensorreadout.sensors.GroundTruth;
|
||||
import de.fhws.indoor.sensorreadout.sensors.Logger;
|
||||
import de.fhws.indoor.sensorreadout.sensors.PedestrianActivity;
|
||||
import de.fhws.indoor.sensorreadout.sensors.PedestrianActivityButton;
|
||||
import de.fhws.indoor.sensorreadout.sensors.PhoneSensors;
|
||||
import de.fhws.indoor.sensorreadout.sensors.WiFi;
|
||||
import de.fhws.indoor.sensorreadout.sensors.iBeacon;
|
||||
@@ -44,6 +48,15 @@ public class MainActivity extends Activity {
|
||||
private Button btnStart;
|
||||
private Button btnStop;
|
||||
private Button btnGround;
|
||||
private PedestrianActivityButton btnWalk;
|
||||
private PedestrianActivityButton btnStand;
|
||||
private PedestrianActivityButton btnStairsUp;
|
||||
private PedestrianActivityButton btnStairsDown;
|
||||
private PedestrianActivityButton btnElevatorUp;
|
||||
private PedestrianActivityButton btnElevatorDown;
|
||||
private PedestrianActivity currentPedestrianActivity;
|
||||
private PedestrianActivity pastPedestrianActivity;
|
||||
|
||||
private int groundTruthCounter = 0;
|
||||
private boolean isInitialized = false;
|
||||
|
||||
@@ -88,11 +101,23 @@ public class MainActivity extends Activity {
|
||||
btnStop = (Button) findViewById(R.id.btnStop);
|
||||
btnGround = (Button) findViewById(R.id.btnGround);
|
||||
|
||||
//get activity Buttons
|
||||
btnWalk = new PedestrianActivityButton((LinearLayout) findViewById(R.id.btnWalk), PedestrianActivity.WALK);
|
||||
btnStand = new PedestrianActivityButton((LinearLayout) findViewById(R.id.btnStanding), PedestrianActivity.STANDING);
|
||||
btnStairsUp = new PedestrianActivityButton((LinearLayout) findViewById(R.id.btnStairsUp), PedestrianActivity.STAIRS_UP);
|
||||
btnStairsDown = new PedestrianActivityButton((LinearLayout) findViewById(R.id.btnStairsDown), PedestrianActivity.STAIRS_DOWN);
|
||||
btnElevatorUp = new PedestrianActivityButton((LinearLayout) findViewById(R.id.btnElevatorUp), PedestrianActivity.ELEVATOR_UP);
|
||||
btnElevatorDown = new PedestrianActivityButton((LinearLayout) findViewById(R.id.btnElevatorDown), PedestrianActivity.ELEVATOR_DOWN);
|
||||
|
||||
//set current activity
|
||||
btnStand.toggleActivity(); //first activity is standing!
|
||||
currentPedestrianActivity = PedestrianActivity.STANDING;
|
||||
|
||||
//Click Sound
|
||||
final MediaPlayer mpStart = MediaPlayer.create(this, R.raw.go);
|
||||
final MediaPlayer mpStop = MediaPlayer.create(this, R.raw.go);
|
||||
final MediaPlayer mpGround = MediaPlayer.create(this, R.raw.go);
|
||||
final MediaPlayer mpFailure = MediaPlayer.create(this, R.raw.go);
|
||||
final MediaPlayer mpFailure = MediaPlayer.create(this, R.raw.error);
|
||||
|
||||
// log GroundTruth ButtonClicks using sensor number 99
|
||||
final GroundTruth grndTruth = new GroundTruth(this);
|
||||
@@ -118,6 +143,9 @@ public class MainActivity extends Activity {
|
||||
//Write the first groundTruthPoint
|
||||
grndTruth.writeGroundTruth(groundTruthCounter);
|
||||
|
||||
//Write first activity
|
||||
add(SensorType.PEDESTRIAN_ACTIVITY, PedestrianActivity.STANDING.toString() + ";" + PedestrianActivity.STANDING.ordinal());
|
||||
|
||||
//Disable the spinners
|
||||
groundSpinner.setEnabled(false);
|
||||
pathSpinner.setEnabled(false);
|
||||
@@ -144,6 +172,9 @@ public class MainActivity extends Activity {
|
||||
//Enable the spinners
|
||||
groundSpinner.setEnabled(true);
|
||||
pathSpinner.setEnabled(true);
|
||||
|
||||
//reset activity buttons
|
||||
setActivityBtn(PedestrianActivity.STANDING);
|
||||
}
|
||||
else{
|
||||
mpFailure.start();
|
||||
@@ -171,6 +202,72 @@ public class MainActivity extends Activity {
|
||||
});
|
||||
|
||||
|
||||
btnWalk.getLayout().setOnClickListener(new View.OnClickListener() {
|
||||
@Override public void onClick(View v) {
|
||||
if(isInitialized) {
|
||||
setActivityBtn(PedestrianActivity.WALK);
|
||||
}
|
||||
else{
|
||||
mpFailure.start();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
btnStand.getLayout().setOnClickListener(new View.OnClickListener() {
|
||||
@Override public void onClick(View v) {
|
||||
if(isInitialized) {
|
||||
setActivityBtn(PedestrianActivity.STANDING);
|
||||
}
|
||||
else{
|
||||
mpFailure.start();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
btnStairsUp.getLayout().setOnClickListener(new View.OnClickListener() {
|
||||
@Override public void onClick(View v) {
|
||||
if(isInitialized) {
|
||||
setActivityBtn(PedestrianActivity.STAIRS_UP);
|
||||
}
|
||||
else{
|
||||
mpFailure.start();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
btnStairsDown.getLayout().setOnClickListener(new View.OnClickListener() {
|
||||
@Override public void onClick(View v) {
|
||||
if(isInitialized) {
|
||||
setActivityBtn(PedestrianActivity.STAIRS_DOWN);
|
||||
}
|
||||
else{
|
||||
mpFailure.start();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
btnElevatorUp.getLayout().setOnClickListener(new View.OnClickListener() {
|
||||
@Override public void onClick(View v) {
|
||||
if(isInitialized) {
|
||||
setActivityBtn(PedestrianActivity.ELEVATOR_UP);
|
||||
}
|
||||
else{
|
||||
mpFailure.start();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
btnElevatorDown.getLayout().setOnClickListener(new View.OnClickListener() {
|
||||
@Override public void onClick(View v) {
|
||||
if(isInitialized) {
|
||||
setActivityBtn(PedestrianActivity.ELEVATOR_DOWN);
|
||||
}
|
||||
else{
|
||||
mpFailure.start();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
//all Sensors
|
||||
final PhoneSensors phoneSensors = new PhoneSensors(this);
|
||||
sensors.add(phoneSensors);
|
||||
@@ -231,6 +328,40 @@ public class MainActivity extends Activity {
|
||||
}
|
||||
|
||||
|
||||
private void setActivityBtn(PedestrianActivity act){
|
||||
|
||||
// set and write new activity
|
||||
if(currentPedestrianActivity != act){
|
||||
|
||||
// toggle past and current activity
|
||||
PedestrianActivity[] tmpActArray = new PedestrianActivity[] {currentPedestrianActivity, act};
|
||||
|
||||
for(PedestrianActivity a : tmpActArray){
|
||||
switch (a) {
|
||||
case WALK: btnWalk.toggleActivity();
|
||||
break;
|
||||
case STANDING: btnStand.toggleActivity();
|
||||
break;
|
||||
case STAIRS_UP: btnStairsUp.toggleActivity();
|
||||
break;
|
||||
case STAIRS_DOWN: btnStairsDown.toggleActivity();
|
||||
break;
|
||||
case ELEVATOR_UP: btnElevatorUp.toggleActivity();
|
||||
break;
|
||||
case ELEVATOR_DOWN: btnElevatorDown.toggleActivity();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
currentPedestrianActivity = act;
|
||||
add(SensorType.PEDESTRIAN_ACTIVITY, act.toString() + ";" + act.ordinal());
|
||||
} else {
|
||||
//do nothin
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void start() {
|
||||
loadCounterAny = 0;
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package de.fhws.indoor.sensorreadout.sensors;
|
||||
|
||||
/**
|
||||
* Created by toni on 10/01/18.
|
||||
*/
|
||||
|
||||
public enum PedestrianActivity {
|
||||
|
||||
WALK(0),
|
||||
STANDING(1),
|
||||
STAIRS_UP(2),
|
||||
STAIRS_DOWN(3),
|
||||
ELEVATOR_UP(4),
|
||||
ELEVATOR_DOWN(5),
|
||||
;
|
||||
|
||||
private int id;
|
||||
|
||||
PedestrianActivity(final int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public final int id() {return id;}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package de.fhws.indoor.sensorreadout.sensors;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.view.View;
|
||||
import android.widget.LinearLayout;
|
||||
|
||||
/**
|
||||
* Created by toni on 10/01/18.
|
||||
*/
|
||||
|
||||
public class PedestrianActivityButton {
|
||||
|
||||
private LinearLayout btn;
|
||||
private boolean isActivated = false;
|
||||
private PedestrianActivity whatActivity;
|
||||
|
||||
public PedestrianActivityButton(LinearLayout btn, PedestrianActivity act){
|
||||
this.btn = btn;
|
||||
this.whatActivity = act;
|
||||
}
|
||||
|
||||
public void toggleActivity(){
|
||||
isActivated = !isActivated;
|
||||
|
||||
if(isActivated){
|
||||
btn.setBackgroundColor(Color.parseColor("#F9D737"));
|
||||
} else {
|
||||
btn.setBackgroundColor(Color.parseColor("#B2B2B2"));
|
||||
}
|
||||
}
|
||||
|
||||
public LinearLayout getLayout(){
|
||||
return btn;
|
||||
}
|
||||
}
|
||||
@@ -139,6 +139,7 @@ public class PhoneSensors extends mySensor implements SensorEventListener{
|
||||
@Override
|
||||
public void onSensorChanged(SensorEvent event) {
|
||||
|
||||
/*
|
||||
// to compare with the other orientation
|
||||
if(event.sensor.getType() == Sensor.TYPE_ORIENTATION) {
|
||||
|
||||
@@ -152,8 +153,9 @@ public class PhoneSensors extends mySensor implements SensorEventListener{
|
||||
}
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
else if(event.sensor.getType() == Sensor.TYPE_HEART_RATE) {
|
||||
if(event.sensor.getType() == Sensor.TYPE_HEART_RATE) {
|
||||
|
||||
// inform listeners
|
||||
if (listener != null){
|
||||
|
||||
@@ -23,6 +23,7 @@ public enum SensorType {
|
||||
HEART_RATE(15),
|
||||
GPS(16),
|
||||
|
||||
PEDESTRIAN_ACTIVITY(50),
|
||||
GROUND_TRUTH(99),
|
||||
GROUND_TRUTH_PATH(-1),
|
||||
|
||||
|
||||
4
app/src/main/res/drawable/ic_elevator_down.xml
Normal file
4
app/src/main/res/drawable/ic_elevator_down.xml
Normal file
@@ -0,0 +1,4 @@
|
||||
<vector android:height="48dp" android:viewportHeight="529.297"
|
||||
android:viewportWidth="529.297" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#010002" android:pathData="m427.1,164.7c5.7,-5.7 8.6,-12.6 8.6,-20.8 0,-8.2 -2.9,-15.1 -8.6,-20.8 -5.7,-5.7 -12.6,-8.6 -20.8,-8.6 -8.2,0 -15.1,2.9 -20.8,8.6 -5.7,5.7 -8.6,12.6 -8.6,20.8 0,8.2 2.9,15.1 8.6,20.8 5.7,5.7 12.6,8.6 20.8,8.6 8.2,0 15.1,-2.9 20.8,-8.6zM464.7,305.2c-1.8,1.4 -4,2.1 -6.4,2.1 -2.4,0 -4.6,-0.7 -6.4,-2.1 -1.8,-1.4 -2.8,-3.8 -2.8,-7v-75.9,-3.7c0,-1.2 -0.6,-2 -1.8,-2.4 -1.2,-0.4 -2.2,-0.6 -3.1,-0.6 -0.8,0 -1.8,0.2 -3.1,0.6 -1.2,0.4 -1.8,1.2 -1.8,2.4v183c0,3.7 -1.3,6.7 -4,9.2 -2.7,2.4 -5.8,3.7 -9.5,3.7 -3.7,0 -6.8,-1.2 -9.5,-3.7 -2.7,-2.4 -4,-5.5 -4,-9.2v-71.6,-40.4c0,-2 -0.8,-3.4 -2.4,-4 -1.6,-0.6 -2.9,-0.9 -3.7,-0.9 -0.8,0 -1.9,0.3 -3.4,0.9 -1.4,0.6 -2.1,1.9 -2.1,4v40.4,71.6c0,3.7 -1.3,6.7 -4,9.2 -2.7,2.4 -5.8,3.7 -9.5,3.7 -4.1,0 -7.3,-1.2 -9.8,-3.7 -2.4,-2.4 -3.7,-5.5 -3.7,-9.2l-0.6,-183c0,-1.2 -0.6,-2 -1.8,-2.4 -1.2,-0.4 -2.2,-0.6 -3.1,-0.6 -0.8,0 -1.8,0.2 -3.1,0.6 -1.2,0.4 -1.8,1.2 -1.8,2.4v3.7,75.9c0,3.3 -0.9,5.6 -2.8,7 -1.8,1.4 -3.9,2.1 -6.1,2.1 -2.2,0 -4.3,-0.7 -6.1,-2.1 -1.8,-1.4 -2.8,-3.8 -2.8,-7v-84.5c0,-8.2 2.8,-15.5 8.3,-22 5.5,-6.5 13,-9.8 22.3,-9.8h33,0.6 30.6c9.4,0 16.2,3.3 20.5,9.8 4.3,6.5 6.4,13.9 6.4,22v84.5c0,3.3 -0.9,5.6 -2.8,7zM147.4,67.1c-3.7,3.5 -5.5,7.9 -5.5,13.2v364.8c0,5.3 1.8,9.7 5.5,13.2 3.7,3.5 8.2,5.2 13.5,5.2h349.5c5.3,0 9.8,-1.7 13.5,-5.2 3.7,-3.5 5.5,-7.9 5.5,-13.2L529.3,80.3c0,-5.3 -1.8,-9.7 -5.5,-13.2 -3.7,-3.5 -8.2,-5.2 -13.5,-5.2h-349.5c-5.3,0 -9.8,1.7 -13.5,5.2zM172.5,92.5h326.2v340.3h-326.2zM265.5,173.3c-8.2,0 -15.1,-2.9 -20.8,-8.6 -5.7,-5.7 -8.6,-12.6 -8.6,-20.8 0,-8.2 2.9,-15.1 8.6,-20.8 5.7,-5.7 12.6,-8.6 20.8,-8.6 8.2,0 15.1,2.9 20.8,8.6 5.7,5.7 8.6,12.6 8.6,20.8 0,8.2 -2.9,15.1 -8.6,20.8 -5.7,5.7 -12.6,8.6 -20.8,8.6zM324,305.2c-1.8,1.4 -4,2.1 -6.4,2.1 -2.4,0 -4.6,-0.7 -6.4,-2.1 -1.8,-1.4 -2.8,-3.8 -2.8,-7v-75.9,-3.7c0,-1.2 -0.6,-2 -1.8,-2.4 -1.2,-0.4 -2.2,-0.6 -3.1,-0.6 -0.8,0 -1.8,0.2 -3.1,0.6 -1.2,0.4 -1.8,1.2 -1.8,2.4v183c0,3.7 -1.3,6.7 -4,9.2 -2.7,2.4 -5.8,3.7 -9.5,3.7 -3.7,0 -6.8,-1.2 -9.5,-3.7 -2.7,-2.4 -4,-5.5 -4,-9.2v-71.6,-40.4c0,-2 -0.8,-3.4 -2.4,-4 -1.6,-0.6 -2.9,-0.9 -3.7,-0.9 -0.8,0 -2,0.3 -3.7,0.9 -1.6,0.6 -2.4,1.9 -2.4,4v40.4,71.6c0,3.7 -1.2,6.7 -3.7,9.2 -2.4,2.4 -5.7,3.7 -9.8,3.7 -3.7,0 -6.8,-1.2 -9.5,-3.7 -2.7,-2.4 -4,-5.5 -4,-9.2L232.5,218.6c0,-1.2 -0.6,-2 -1.8,-2.4 -1.2,-0.4 -2.2,-0.6 -3.1,-0.6 -0.8,0 -1.8,0.2 -3.1,0.6 -1.2,0.4 -1.8,1.2 -1.8,2.4v3.7,75.9c0,3.3 -0.9,5.6 -2.8,7 -1.8,1.4 -4,2.1 -6.4,2.1 -2.4,0 -4.6,-0.7 -6.4,-2.1 -1.8,-1.4 -2.8,-3.8 -2.8,-7v-84.5c0,-8.2 2.9,-15.5 8.6,-22 5.7,-6.5 13.3,-9.8 22.6,-9.8h32.4,0.6 0.6,30c9.4,0 16.3,3.3 20.8,9.8 4.5,6.5 6.7,13.9 6.7,22v84.5c0,3.3 -0.9,5.6 -2.8,7zM5.5,391.9L32.9,391.9v-11.6,-79.9c0,0 -0.1,-3.8 4.8,-3.8h41.8c6.9,0 5.7,4.5 5.7,4.5v79.7,12.9h29.7c8.7,0 0.7,7.5 0.7,7.5l-52.7,63.7c0,0 -4.3,5.1 -8.8,0.5 -6.2,-6.2 -51,-65.7 -51,-65.7 0,0 -8,-7.9 2.6,-7.9z"/>
|
||||
</vector>
|
||||
4
app/src/main/res/drawable/ic_elevator_up.xml
Normal file
4
app/src/main/res/drawable/ic_elevator_up.xml
Normal file
@@ -0,0 +1,4 @@
|
||||
<vector android:height="48dp" android:viewportHeight="529.297"
|
||||
android:viewportWidth="529.297" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#010002" android:pathData="m102.2,164.7c-5.7,-5.7 -8.6,-12.6 -8.6,-20.8 0,-8.2 2.9,-15.1 8.6,-20.8 5.7,-5.7 12.6,-8.6 20.8,-8.6 8.2,0 15.1,2.9 20.8,8.6 5.7,5.7 8.6,12.6 8.6,20.8 0,8.2 -2.9,15.1 -8.6,20.8 -5.7,5.7 -12.6,8.6 -20.8,8.6 -8.2,0 -15.1,-2.9 -20.8,-8.6zM64.6,305.2c1.8,1.4 4,2.1 6.4,2.1 2.4,0 4.6,-0.7 6.4,-2.1 1.8,-1.4 2.8,-3.8 2.8,-7v-75.9,-3.7c0,-1.2 0.6,-2 1.8,-2.4 1.2,-0.4 2.2,-0.6 3.1,-0.6 0.8,0 1.8,0.2 3.1,0.6 1.2,0.4 1.8,1.2 1.8,2.4v183c0,3.7 1.3,6.7 4,9.2 2.7,2.4 5.8,3.7 9.5,3.7 3.7,0 6.8,-1.2 9.5,-3.7 2.7,-2.4 4,-5.5 4,-9.2v-71.6,-40.4c0,-2 0.8,-3.4 2.4,-4 1.6,-0.6 2.9,-0.9 3.7,-0.9 0.8,0 1.9,0.3 3.4,0.9 1.4,0.6 2.1,1.9 2.1,4v40.4,71.6c0,3.7 1.3,6.7 4,9.2 2.7,2.4 5.8,3.7 9.5,3.7 4.1,0 7.3,-1.2 9.8,-3.7 2.4,-2.4 3.7,-5.5 3.7,-9.2l0.6,-183c0,-1.2 0.6,-2 1.8,-2.4 1.2,-0.4 2.2,-0.6 3.1,-0.6 0.8,0 1.8,0.2 3.1,0.6 1.2,0.4 1.8,1.2 1.8,2.4v3.7,75.9c0,3.3 0.9,5.6 2.8,7 1.8,1.4 3.9,2.1 6.1,2.1 2.2,0 4.3,-0.7 6.1,-2.1 1.8,-1.4 2.8,-3.8 2.8,-7v-84.5c0,-8.2 -2.8,-15.5 -8.3,-22 -5.5,-6.5 -13,-9.8 -22.3,-9.8h-33,-0.6 -30.6c-9.4,0 -16.2,3.3 -20.5,9.8 -4.3,6.5 -6.4,13.9 -6.4,22v84.5c0,3.3 0.9,5.6 2.8,7zM381.9,67.1c3.7,3.5 5.5,7.9 5.5,13.2v364.8c0,5.3 -1.8,9.7 -5.5,13.2 -3.7,3.5 -8.2,5.2 -13.5,5.2L19,463.4c-5.3,0 -9.8,-1.7 -13.5,-5.2C1.8,454.7 0,450.3 0,445L0,80.3c0,-5.3 1.8,-9.7 5.5,-13.2 3.7,-3.5 8.2,-5.2 13.5,-5.2h349.5c5.3,0 9.8,1.7 13.5,5.2zM356.8,92.5L30.6,92.5v340.3h326.2zM263.8,173.3c8.2,0 15.1,-2.9 20.8,-8.6 5.7,-5.7 8.6,-12.6 8.6,-20.8 0,-8.2 -2.9,-15.1 -8.6,-20.8 -5.7,-5.7 -12.6,-8.6 -20.8,-8.6 -8.2,0 -15.1,2.9 -20.8,8.6 -5.7,5.7 -8.6,12.6 -8.6,20.8 0,8.2 2.9,15.1 8.6,20.8 5.7,5.7 12.6,8.6 20.8,8.6zM205.3,305.2c1.8,1.4 4,2.1 6.4,2.1 2.4,0 4.6,-0.7 6.4,-2.1 1.8,-1.4 2.8,-3.8 2.8,-7v-75.9,-3.7c0,-1.2 0.6,-2 1.8,-2.4 1.2,-0.4 2.2,-0.6 3.1,-0.6 0.8,0 1.8,0.2 3.1,0.6 1.2,0.4 1.8,1.2 1.8,2.4v183c0,3.7 1.3,6.7 4,9.2 2.7,2.4 5.8,3.7 9.5,3.7 3.7,0 6.8,-1.2 9.5,-3.7 2.7,-2.4 4,-5.5 4,-9.2v-71.6,-40.4c0,-2 0.8,-3.4 2.4,-4 1.6,-0.6 2.9,-0.9 3.7,-0.9 0.8,0 2,0.3 3.7,0.9 1.6,0.6 2.4,1.9 2.4,4v40.4,71.6c0,3.7 1.2,6.7 3.7,9.2 2.4,2.4 5.7,3.7 9.8,3.7 3.7,0 6.8,-1.2 9.5,-3.7 2.7,-2.4 4,-5.5 4,-9.2L296.8,218.6c0,-1.2 0.6,-2 1.8,-2.4 1.2,-0.4 2.2,-0.6 3.1,-0.6 0.8,0 1.8,0.2 3.1,0.6 1.2,0.4 1.8,1.2 1.8,2.4v3.7,75.9c0,3.3 0.9,5.6 2.8,7 1.8,1.4 4,2.1 6.4,2.1 2.4,0 4.6,-0.7 6.4,-2.1 1.8,-1.4 2.8,-3.8 2.8,-7v-84.5c0,-8.2 -2.9,-15.5 -8.6,-22 -5.7,-6.5 -13.3,-9.8 -22.6,-9.8h-32.4,-0.6 -0.6,-30c-9.4,0 -16.3,3.3 -20.8,9.8 -4.5,6.5 -6.7,13.9 -6.7,22v84.5c0,3.3 0.9,5.6 2.8,7zM416,143.1h27.4v11.6,79.9c0,0 -0.1,3.8 4.8,3.8h41.8c6.9,0 5.7,-4.5 5.7,-4.5v-79.7,-12.9h29.7c8.7,0 0.7,-7.5 0.7,-7.5L473.3,70c0,0 -4.3,-5.1 -8.8,-0.5 -6.2,6.2 -51,65.7 -51,65.7 0,0 -8,7.9 2.6,7.9z"/>
|
||||
</vector>
|
||||
5
app/src/main/res/drawable/ic_stairs_down.xml
Normal file
5
app/src/main/res/drawable/ic_stairs_down.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<vector android:height="48dp" android:viewportHeight="365.14"
|
||||
android:viewportWidth="439.75" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#000000" android:pathData="m0,324h80.1v-81.5h79.5v-82h80.8v-80.5h80.2v-80h119.1v40.8h-79.2v80.3h-80.3v81.4h-80.2v81h-80.5v81.7h-119.6v-41.2z"/>
|
||||
<path android:fillColor="#000000" android:pathData="m101.2,126h70.8c19.5,0 20.3,-30 0,-30h-36.3l69,-69c15.3,-15.3 -6.3,-37.4 -22.6,-21.2l-68,68.2v-35.9c0.1,-19.5 -30.1,-20.3 -30.2,0v70.4c0,10.5 7.1,17.6 17.3,17.6z"/>
|
||||
</vector>
|
||||
5
app/src/main/res/drawable/ic_stairs_up.xml
Normal file
5
app/src/main/res/drawable/ic_stairs_up.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<vector android:height="48dp" android:viewportHeight="365.14"
|
||||
android:viewportWidth="439.75" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#000000" android:pathData="m0,324h80.1v-81.5h79.5v-82h80.8v-80.5h80.2v-80h119.1v40.8h-79.2v80.3h-80.3v81.4h-80.2v81h-80.5v81.7h-119.6v-41.2z"/>
|
||||
<path android:fillColor="#000000" android:pathData="m358.8,237.9h-70.8c-19.5,0 -20.3,30 0,30h36.3l-69,69c-15.3,15.3 6.3,37.4 22.6,21.2l68,-68.2v35.9c-0.1,19.5 30.1,20.3 30.2,0v-70.4c0,-10.5 -7.1,-17.6 -17.3,-17.6z"/>
|
||||
</vector>
|
||||
5
app/src/main/res/drawable/ic_standing.xml
Normal file
5
app/src/main/res/drawable/ic_standing.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<vector android:height="48dp" android:viewportHeight="497.0"
|
||||
android:viewportWidth="497.0" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#010002" android:pathData="M197,476c0,14 6.8,21 20.5,21s20.5,-7 20.5,-21V282h21v194c0,14 6.8,21 20.5,21s20.5,-7 20.5,-21V149h10v121c0,7.3 2.5,12.7 7.5,16s10.2,3.3 15.5,0s8,-8.7 8,-16V145c0,-14 -4.7,-25.5 -14,-34.5S305,97 289,97h-81c-15.3,0 -27.8,4.3 -37.5,13S156,130 156,144v127c0,6.7 2.7,11.3 8,14c5.3,2.7 10.5,2.7 15.5,0s7.5,-7.3 7.5,-14V149h10V476z"/>
|
||||
<path android:fillColor="#010002" android:pathData="M205,42.5c0,11.7 4.2,21.7 12.5,30s18.3,12.5 30,12.5S269,80.8 277,72.5s12,-18.3 12,-30s-4,-21.7 -12,-30S259.2,0 247.5,0s-21.7,4.2 -30,12.5S205,30.8 205,42.5z"/>
|
||||
</vector>
|
||||
5
app/src/main/res/drawable/ic_walk.xml
Normal file
5
app/src/main/res/drawable/ic_walk.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<vector android:height="48dp" android:viewportHeight="470.642"
|
||||
android:viewportWidth="470.642" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#010002" android:pathData="M223.8,76c10.3,-0.3 19,-4.3 26,-12s10.3,-16.7 10,-27c-0.3,-10.3 -4.2,-19.2 -11.5,-26.5c-7.3,-7.3 -16.2,-10.8 -26.5,-10.5s-19,4.3 -26,12s-10.5,16.7 -10.5,27s3.8,19.2 11.5,26.5S213.5,76.4 223.8,76z"/>
|
||||
<path android:fillColor="#010002" android:pathData="M350.3,202.5l-55,-30l-45,-72c-8.7,-10.7 -19.3,-16 -32,-16c-8.7,0 -17,3.7 -25,11l-68,69c-2,2.7 -3.3,5.7 -4,9l-9,77v2c0,4.7 1.7,8.7 5,12c3.3,3.3 7.3,5 12,5s8.5,-1.7 11.5,-5c3,-3.3 4.8,-7 5.5,-11l7,-66l24,-24l-22,184l-39,87c-1.3,4 -2,7.7 -2,11c0,7.3 2.5,13.5 7.5,18.5s11.2,7.2 18.5,6.5c10,0 17.3,-4.7 22,-14l42,-94c0,-0.7 0.3,-1.8 1,-3.5c0.7,-1.7 1.3,-3.2 2,-4.5c0.7,-1.3 1,-2.7 1,-4l5,-45l43,148c4.7,12 13,17.7 25,17c6.7,0 12.5,-2.5 17.5,-7.5s7.5,-11.2 7.5,-18.5c0,-0.7 -0.2,-1.5 -0.5,-2.5s-0.5,-1.8 -0.5,-2.5l-60,-205l7,-67l17,27c1.3,2 3,3.7 5,5l59,33c4,1.3 6.7,2 8,2c4.7,0 8.7,-1.8 12,-5.5c3.3,-3.7 5,-7.8 5,-12.5C358.3,210.5 355.7,205.9 350.3,202.5z"/>
|
||||
</vector>
|
||||
@@ -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
|
||||
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>
|
||||
|
||||
Binary file not shown.
BIN
app/src/main/res/raw/error.wav
Normal file
BIN
app/src/main/res/raw/error.wav
Normal file
Binary file not shown.
11
build.gradle
11
build.gradle
@@ -2,10 +2,15 @@
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
maven {
|
||||
url 'https://maven.google.com/'
|
||||
name 'Google'
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.3.3'
|
||||
classpath 'com.android.tools.build:gradle:3.0.0'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
@@ -15,6 +20,10 @@ buildscript {
|
||||
allprojects {
|
||||
repositories {
|
||||
jcenter()
|
||||
maven {
|
||||
url 'https://maven.google.com/'
|
||||
name 'Google'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
#Tue Oct 10 15:36:44 CEST 2017
|
||||
#Mon Nov 13 09:30:52 CET 2017
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
|
||||
Reference in New Issue
Block a user