From 0a761b94f67d665869cd24d20432933a8c7f276e Mon Sep 17 00:00:00 2001 From: Alexander Pacha Date: Sun, 28 Feb 2016 18:30:08 +0100 Subject: [PATCH] Migrated project to Android Studio --- .checkstyle | 10 -- .classpath | 9 - .gitignore | 38 ++++- .project | 33 ---- .settings/org.eclipse.jdt.core.prefs | 4 - Checkstyle.xml | 72 -------- app/build.gradle | 23 +++ .../src/main/AndroidManifest.xml | 0 .../src/main/assets}/about/de/index.html | 22 +-- .../src/main/assets}/about/en/index.html | 0 .../sensor_fusion_demo/AboutActivity.java | 0 .../org/hitlabnz/sensor_fusion_demo/Cube.java | 0 .../sensor_fusion_demo/CubeRenderer.java | 0 .../sensor_fusion_demo/HardwareChecker.java | 0 .../OrientationVisualisationFragment.java | 0 .../sensor_fusion_demo/SensorChecker.java | 2 +- .../SensorSelectionActivity.java | 0 .../AccelerometerCompassProvider.java | 0 .../CalibratedGyroscopeProvider.java | 0 .../GravityCompassProvider.java | 0 .../ImprovedOrientationSensor1Provider.java | 0 .../ImprovedOrientationSensor2Provider.java | 0 .../OrientationProvider.java | 0 .../RotationVectorProvider.java | 0 .../representation/EulerAngles.java | 0 .../representation/Matrix.java | 0 .../representation/Matrixf4x4.java | 0 .../representation/Quaternion.java | 0 .../representation/Renderable.java | 0 .../representation/Vector3f.java | 0 .../representation/Vector4f.java | 0 .../main/res}/drawable-hdpi/ic_launcher.png | Bin .../main/res}/drawable-mdpi/ic_launcher.png | Bin .../main/res}/drawable-xhdpi/ic_launcher.png | Bin .../main/res}/drawable-xxhdpi/ic_launcher.png | Bin .../src/main/res}/layout/activity_about.xml | 0 .../res}/layout/activity_sensor_selection.xml | 0 .../src/main/res}/menu/sensor_selection.xml | 0 .../src/main/res}/values-de/strings.xml | 0 .../src/main/res}/values-sw600dp/dimens.xml | 0 .../main/res}/values-sw720dp-land/dimens.xml | 0 .../src/main/res}/values-v11/styles.xml | 0 .../src/main/res}/values-v14/styles.xml | 0 {res => app/src/main/res}/values/dimens.xml | 0 {res => app/src/main/res}/values/strings.xml | 0 {res => app/src/main/res}/values/styles.xml | 0 build.gradle | 15 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 160 ++++++++++++++++++ gradlew.bat | 90 ++++++++++ libs/android-support-v4.jar | Bin 556198 -> 0 bytes proguard-project.txt | 20 --- project.properties | 14 -- settings.gradle | 1 + suppressions.xml | 14 -- 56 files changed, 341 insertions(+), 192 deletions(-) delete mode 100644 .checkstyle delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 Checkstyle.xml create mode 100644 app/build.gradle rename AndroidManifest.xml => app/src/main/AndroidManifest.xml (100%) rename {assets => app/src/main/assets}/about/de/index.html (76%) rename {assets => app/src/main/assets}/about/en/index.html (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/AboutActivity.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/Cube.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/CubeRenderer.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/HardwareChecker.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/OrientationVisualisationFragment.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/SensorChecker.java (86%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/SensorSelectionActivity.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/orientationProvider/AccelerometerCompassProvider.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/orientationProvider/GravityCompassProvider.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/orientationProvider/OrientationProvider.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/orientationProvider/RotationVectorProvider.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/representation/EulerAngles.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/representation/Matrix.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/representation/Matrixf4x4.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/representation/Quaternion.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/representation/Renderable.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/representation/Vector3f.java (100%) rename {src => app/src/main/java}/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/layout/activity_about.xml (100%) rename {res => app/src/main/res}/layout/activity_sensor_selection.xml (100%) rename {res => app/src/main/res}/menu/sensor_selection.xml (100%) rename {res => app/src/main/res}/values-de/strings.xml (100%) rename {res => app/src/main/res}/values-sw600dp/dimens.xml (100%) rename {res => app/src/main/res}/values-sw720dp-land/dimens.xml (100%) rename {res => app/src/main/res}/values-v11/styles.xml (100%) rename {res => app/src/main/res}/values-v14/styles.xml (100%) rename {res => app/src/main/res}/values/dimens.xml (100%) rename {res => app/src/main/res}/values/strings.xml (100%) rename {res => app/src/main/res}/values/styles.xml (100%) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 libs/android-support-v4.jar delete mode 100644 proguard-project.txt delete mode 100644 project.properties create mode 100644 settings.gradle delete mode 100644 suppressions.xml diff --git a/.checkstyle b/.checkstyle deleted file mode 100644 index 06605a6..0000000 --- a/.checkstyle +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.classpath b/.classpath deleted file mode 100644 index 7bc01d9..0000000 --- a/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.gitignore b/.gitignore index 7461d20..5e92ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,46 @@ -# built application files +# Built application files *.apk *.ap_ -# files for the dex VM +# Files for the Dalvik VM *.dex # Java class files *.class -# generated files +# Generated files bin/ gen/ +out/ + +# Gradle files +.gradle/ +build/ +/build # Local configuration file (sdk path, etc) -local.properties \ No newline at end of file +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# Android Studio +*.iml +.idea +#.idea/workspace.xml - remove # and delete .idea if it better suit your needs. + +# Intellij +*.iml +/.idea/workspace.xml +/.idea/libraries + +.DS_Store \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index b9b62aa..0000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Sensor-Fusion-Demo - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2d..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/Checkstyle.xml b/Checkstyle.xml deleted file mode 100644 index 7ec9535..0000000 --- a/Checkstyle.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..0c10eb6 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,23 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.2" + + defaultConfig { + applicationId "org.hitlabnz.sensor_fusion_demo" + minSdkVersion 11 + targetSdkVersion 23 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + compile 'com.android.support:support-v4:23.2.0' +} diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/assets/about/de/index.html b/app/src/main/assets/about/de/index.html similarity index 76% rename from assets/about/de/index.html rename to app/src/main/assets/about/de/index.html index 97d1843..ea23a43 100644 --- a/assets/about/de/index.html +++ b/app/src/main/assets/about/de/index.html @@ -5,17 +5,17 @@ Diese App wurde von Alexander Pacha am Human Interface Technology Laboratory New Zealand entwickelt und demonstriert die - Leistungsfähigkeit von verschiedenen Sensoren und Sensorfusionen. + Leistungsfähigkeit von verschiedenen Sensoren und Sensorfusionen. Messungen von dem Gyroskop, Akzelerometer und Kompass werden in - verschiedenen Weisen kombiniert und das Ergebnis wird als Würfel - visualisiert, der durch rotieren des Gerätes gedreht werden kann. + verschiedenen Weisen kombiniert und das Ergebnis wird als Würfel + visualisiert, der durch rotieren des Gerätes gedreht werden kann.

- Die große Neuheit in dieser Applikation ist die Fusion von zwei + Die große Neuheit in dieser Applikation ist die Fusion von zwei virtuellen Sensoren: Improved Orientation Sensor 1 und Improved Orientation Sensor 2 nutzen den Android Rotation Vector mit dem - kalibrierten Gyroskopsensor und erreichen eine nie zuvor dagewesenen Präzision - und Reaktionsfähigkeit. + kalibrierten Gyroskopsensor und erreichen eine nie zuvor dagewesenen Präzision + und Reaktionsfähigkeit.

Neben diesen beiden Sensorfusionen gibt es noch weitere Sensoren @@ -23,12 +23,12 @@