diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b3dee90..51d881c 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,5 +19,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/PassiveDataKit-Android b/PassiveDataKit-Android index 8d95a2e..1b79282 160000 --- a/PassiveDataKit-Android +++ b/PassiveDataKit-Android @@ -1 +1 @@ -Subproject commit 8d95a2e5dbb4a53242972cc84162a610bf8f50c8 +Subproject commit 1b792823349dbcab5378921a737a82d297f9af28 diff --git a/build.gradle b/build.gradle index a5b1c5c..038ef6f 100755 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,13 @@ apply plugin: 'com.android.application' buildscript { repositories { jcenter() + flatDir { + dirs 'libs' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.3.0' } } @@ -13,12 +16,15 @@ allprojects { repositories { jcenter() maven { url "https://jitpack.io" } + flatDir { + dirs 'libs' + } } } android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.2" sourceSets { main { @@ -31,14 +37,14 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.0.0' + compile 'com.android.support:appcompat-v7:25.3.0' compile 'net.hockeyapp.android:HockeySDK:3.7.2' compile project(':PassiveDataKit') } defaultConfig { applicationId "com.audacious_software.pennyworth" - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 25 versionCode 1 versionName "1.0" @@ -54,4 +60,7 @@ android { dependencies { compile project(':PassiveDataKit') +// compile project(':libraries-base') +// compile project(':libraries-common') +// compile project(':libraries-controller') } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755 diff --git a/src/com/audacious_software/pennyworth/MainActivity.java b/src/com/audacious_software/pennyworth/MainActivity.java index 0777192..6b16b31 100755 --- a/src/com/audacious_software/pennyworth/MainActivity.java +++ b/src/com/audacious_software/pennyworth/MainActivity.java @@ -13,6 +13,7 @@ import com.audacious_software.passive_data_kit.activities.DataStreamActivity; import com.audacious_software.passive_data_kit.activities.PdkActivity; import com.audacious_software.passive_data_kit.generators.Generators; +import com.audacious_software.passive_data_kit.generators.wearables.WithingsDevice; import com.audacious_software.passive_data_kit.transmitters.HttpTransmitter; import net.hockeyapp.android.CrashManager; @@ -28,14 +29,19 @@ protected void onCreate(Bundle savedInstanceState) { this.setContentView(R.layout.activity_main); + WithingsDevice.getInstance(this).setProperty(WithingsDevice.OPTION_OAUTH_CONSUMER_KEY, this.getString(R.string.withings_api_key)); + WithingsDevice.getInstance(this).setProperty(WithingsDevice.OPTION_OAUTH_CONSUMER_SECRET, this.getString(R.string.withings_api_secret)); + WithingsDevice.getInstance(this).setProperty(WithingsDevice.OPTION_OAUTH_CALLBACK_URL, "pdk://pennyworth/oauth/withings"); +// WithingsDevice.getInstance(this).setProperty(WithingsDevice.OPTION_OAUTH_CALLBACK_URL, "https://pennyworthproject.org/foo"); + PassiveDataKit.getInstance(this).start(); - Generators.getInstance(this).addNewDataPointListener(new Generators.NewDataPointListener() { - @Override - public void onNewDataPoint(String identifier, Bundle data) { - Log.e("Pennyworth", "DATA[" + identifier + "] = " + data.toString()); - } - }); +// Generators.getInstance(this).addNewDataPointListener(new Generators.NewDataPointListener() { +// @Override +// public void onNewDataPoint(String identifier, Bundle data) { +// Log.e("Pennyworth", "DATA[" + identifier + "] = " + data.toString()); +// } +// }); CrashManager.register(this, this.getString(R.string.hockeyapp_api_key));