FHWS/SensorReadout
Archived
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed design for tablet and smartwatch

Browse Source
This commit is contained in:
toni
2016-06-03 12:20:08 +02:00
parent 29a616c3df
commit bbbaf8622e
6 changed files with 90 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/encodings.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

9
.idea/gradle.xml generated
View File

@@ -3,8 +3,9 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
<option name="gradleJvm" value="1.8" /> <option name="gradleJvm" value="1.8" />
<option name="modules"> <option name="modules">
<set> <set>
@@ -12,6 +13,12 @@
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
</set> </set>
</option> </option>
<option name="myModules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>

2
.idea/vcs.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>

133
app/src/main/res/layout/activity_main.xml
View File

@@ -7,71 +7,82 @@ android:keepScreenOn="true"
tools:context="de.fhws.indoor.sensorreadout.MainActivity"> tools:context="de.fhws.indoor.sensorreadout.MainActivity">
<LinearLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:orientation="vertical" android:orientation="vertical"
tools:context=".MainActivity" tools:context=".MainActivity"
android:background="#333"> android:background="#333">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<LinearLayout
android:layout_width="50dp"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="stop"
android:id="@+id/btnStop"
android:background="@drawable/btnstopcolor"/>
<Button
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="start"
android:id="@+id/btnStart"
android:background="@drawable/btnstartcolor"/>
</LinearLayout>
<LinearLayout
android:layout_width="50dp"
android:layout_height="wrap_content"
android:orientation="vertical">
<Spinner
android:layout_width="58dip"
android:layout_height="48dip"
android:id="@+id/pathspinner"
android:background="#64bbe5"
/>
<Spinner
android:layout_width="58dip"
android:layout_height="48dip"
android:id="@+id/groundspinner"
android:background="#64bbe5"
android:layout_alignBottom="@+id/btnGround" />
</LinearLayout>
<Button <Button
android:layout_width="50dp" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="96dip"
android:text="stop" android:text="Ground Truth"
android:id="@+id/btnStop" android:id="@+id/btnGround"
android:background="@drawable/btnstopcolor"/> android:layout_gravity="right"
android:background="#64bbe5"
<Button />
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="start"
android:id="@+id/btnStart"
android:background="@drawable/btnstartcolor"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
<Spinner <LinearLayout
android:layout_width="58dip" android:layout_width="fill_parent"
android:layout_height="48dip" android:layout_height="fill_parent"
android:id="@+id/pathspinner" android:background="#222"
android:layout_marginLeft="66dip" android:layout_marginTop="126dip"
android:layout_marginTop="16dip" android:orientation="horizontal"
android:background="#64bbe5" android:id="@+id/layoutMain">
/> </LinearLayout>
<Spinner
android:layout_width="58dip"
android:layout_height="48dip"
android:id="@+id/groundspinner"
android:layout_marginLeft="66dip"
android:layout_marginTop="64dip"
android:background="#64bbe5"
android:layout_alignBottom="@+id/btnGround" />
<Button
android:layout_width="fill_parent"
android:layout_height="96dip"
android:text="Ground Truth"
android:id="@+id/btnGround"
android:layout_gravity="right"
android:layout_marginLeft="125dip"
android:layout_marginTop="16dip"
android:layout_marginRight="16dip"
android:background="#64bbe5"
/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#222"
android:layout_marginTop="126dip"
android:orientation="horizontal"
android:id="@+id/layoutMain">
</LinearLayout>
</RelativeLayout> </RelativeLayout>

2
build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.5.0' classpath 'com.android.tools.build:gradle:2.1.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Wed Oct 21 11:34:03 PDT 2015 #Thu Jun 02 19:04:18 CEST 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip