Permalink
Browse files

Merge branch 'sensors'

fixed

Signed-off-by: Stefan Nussbaumer <st9fan@gmail.com>
  • Loading branch information...
nuss committed Feb 24, 2017
2 parents ff26cd4 + 2594451 commit aa356adb9bd1a2bd1f757227aba94db3effc0f7e
Showing with 3,882 additions and 568 deletions.
  1. +2 −1 app/build.gradle
  2. +5 −2 app/src/main/AndroidManifest.xml
  3. BIN app/src/main/assets/activate_pixels.png
  4. BIN app/src/main/assets/deactivate_pixels.png
  5. BIN app/src/main/assets/light_on.png
  6. BIN app/src/main/assets/sensors.png
  7. +4 −4 app/src/main/java/net/videosc/{ → APWidgetExtend}/APText.java
  8. +1 −1 app/src/main/java/net/videosc/PreloaderSquare.java
  9. +155 −343 app/src/main/java/net/videosc/VideOSC.java
  10. +200 −28 app/src/main/java/net/videosc/VideOSCDB.java
  11. +200 −0 app/src/main/java/net/videosc/VideOSCImageHandling.java
  12. +55 −0 app/src/main/java/net/videosc/VideOSCOscHandling.java
  13. +385 −83 app/src/main/java/net/videosc/VideOSCPreferences.java
  14. +4 −9 app/src/main/java/net/videosc/VideOSCPreload.java
  15. +358 −0 app/src/main/java/net/videosc/VideOSCSensors.java
  16. +223 −97 app/src/main/java/net/videosc/VideOSCUI.java
  17. +51 −0 app/src/main/java/net/videosc/runnable/VideOSCAccelerationRunnable.java
  18. +52 −0 app/src/main/java/net/videosc/runnable/VideOSCGravityRunnable.java
  19. +48 −0 app/src/main/java/net/videosc/runnable/VideOSCHumidityRunnable.java
  20. +50 −0 app/src/main/java/net/videosc/runnable/VideOSCLightsensorRunnable.java
  21. +52 −0 app/src/main/java/net/videosc/runnable/VideOSCLinearAccelerationRunnable.java
  22. +52 −0 app/src/main/java/net/videosc/runnable/VideOSCLocationRunnable.java
  23. +52 −0 app/src/main/java/net/videosc/runnable/VideOSCMagnetismRunnable.java
  24. +52 −0 app/src/main/java/net/videosc/runnable/VideOSCOrientationRunnable.java
  25. +50 −0 app/src/main/java/net/videosc/runnable/VideOSCPressureRunnable.java
  26. +50 −0 app/src/main/java/net/videosc/runnable/VideOSCProximityRunnable.java
  27. +48 −0 app/src/main/java/net/videosc/runnable/VideOSCTemperatureRunnable.java
  28. +1,488 −0 client_testing/max_tests/VideOSC-Controller.maxpat
  29. +110 −0 client_testing/pd_tests/VideOSC-Controller_scott.pd
  30. +135 −0 client_testing/pd_tests/isRGB.pd
  31. 0 { → client_testing}/sc_tests/test_videOSC.scd
  32. 0 {app/src/main/assets → layout_data}/locked_pixel.svg
View
@@ -16,7 +16,8 @@ android {
applicationVariants.all { variant ->
variant.outputs.each { output ->
output.outputFile = new File(output.outputFile.parent,
output.outputFile.name.replace("app-", "VideOSC-")
output.outputFile.name.replace("app-release", "VideOSC-1.1")
// output.outputFile.name.replace("app-", "VideOSC-")
)
}
}
@@ -1,13 +1,16 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.videosc"
android:versionCode="2"
android:versionName="1.0.1" >
android:versionCode="4"
android:versionName="1.1" >
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"
android:maxSdkVersion="25"/>
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<!-- Android 7 wants this permission to be declared explicitely -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:icon="@drawable/icon"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,4 @@
package net.videosc;
package net.videosc.APWidgetExtend;
import android.view.Gravity;
import android.widget.TextView;
@@ -11,7 +11,7 @@
* Package: net.videosc
* Created by Stefan Nussbaumer on Okt 05 2016, 12:01.
*/
class APText extends APTextView {
public class APText extends APTextView {
private String TAG = "APText";
/**
@@ -21,7 +21,7 @@
* @param width The text field's width.
* @param height The text field's height.
*/
APText(int x, int y, int width, int height) {
public APText(int x, int y, int width, int height) {
super(x, y, width, height, "");
this.shouldNotSetOnClickListener = true; //otherwise ime options done, next etc doesn't work
}
@@ -45,7 +45,7 @@ public void init(PApplet pApplet) {
* Hack: set horizontal alignment
* Must be called after addWidget
*/
void setTextCentered() {
public void setTextCentered() {
((TextView) view).setGravity(Gravity.CENTER_HORIZONTAL);
}
}
@@ -13,6 +13,6 @@
applet.noStroke();
applet.fill((int) applet.random(256), (int) applet.random(256), (int) applet.random(256),
alpha);
applet.rect(x, y, 50, 50);
applet.rect(x, y, VideOSCUI.dc(50), VideOSCUI.dc(50));
}
}
Oops, something went wrong.

0 comments on commit aa356ad

Please sign in to comment.