From 70eaca8883f179de33c8468e78a0901f97cdbd50 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Sun, 1 May 2016 23:56:14 +0200
Subject: [PATCH] Further WIP towards greendao:

- for now, use a custom version of greendao with the fix 39ac07be550c5f5b6fd265c8870f58015c95e908
- use a superclass for activity sample classes that provides value normalization using SampleProvider
---
 GBDaoGenerator/build.gradle                   |  3 +-
 .../gadgetbridge/daogen/GBDaoGenerator.java   |  1 +
 app/build.gradle                              |  2 +-
 .../gadgetbridge/model/ActivitySample.java    | 32 +++++++++----------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/GBDaoGenerator/build.gradle b/GBDaoGenerator/build.gradle
index 0b29e083..e95e421a 100644
--- a/GBDaoGenerator/build.gradle
+++ b/GBDaoGenerator/build.gradle
@@ -6,7 +6,8 @@ archivesBaseName = 'gadgetbridge-daogenerator'
 //version = '0.9.2-SNAPSHOT'
 
 dependencies {
-    compile 'org.greenrobot:greendao-generator:2.2.0'
+//    compile 'org.greenrobot:greendao-generator:2.2.0'
+    compile 'com.github.freeyourgadget:greendao:c3830951e5dd3d1e63d7bac600d5f773b81df363'
 }
 
 sourceSets {
diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index cb4f111a..cb2c96c1 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -115,6 +115,7 @@ public class GBDaoGenerator {
     }
 
     private static void addCommonAcivitySampleProperties(Schema schema, Entity activitySample, Entity user, Entity device) {
+        activitySample.setSuperclass("AbstractActivitySample");
         activitySample.addImport(MODEL_PACKAGE + ".ActivitySample");
         activitySample.addImport(MAIN_PACKAGE + ".devices.SampleProvider");
         activitySample.implementsInterface("ActivitySample");
diff --git a/app/build.gradle b/app/build.gradle
index 4561cce6..920f9e0b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@ dependencies {
     compile 'com.github.PhilJay:MPAndroidChart:v2.2.4'
     compile 'com.github.pfichtner:durationformatter:0.1.1'
     compile 'de.cketti.library.changelog:ckchangelog:1.2.2'
-    compile 'org.greenrobot:greendao:2.2.0'
+    compile 'com.github.freeyourgadget:greendao:c3830951e5dd3d1e63d7bac600d5f773b81df363'
 }
 
 preBuild.dependsOn(":GBDaoGenerator:genSources")
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java
index 9abeeb23..24569d30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java
@@ -3,34 +3,34 @@ package nodomain.freeyourgadget.gadgetbridge.model;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 
 public interface ActivitySample extends TimeStamped {
-//    /**
-//     * Returns the provider of the data.
-//     *
-//     * @return who created the sample data
-//     */
-//    SampleProvider getProvider();
+    /**
+     * Returns the provider of the data.
+     *
+     * @return who created the sample data
+     */
+    SampleProvider getProvider();
 
     /**
      * Returns the raw activity kind value as recorded by the SampleProvider
      */
     int getRawKind();
 
-//    /**
-//     * Returns the activity kind value as recorded by the SampleProvider
-//     *
-//     * @see ActivityKind
-//     */
-//    int getKind();
+    /**
+     * Returns the activity kind value as recorded by the SampleProvider
+     *
+     * @see ActivityKind
+     */
+    int getKind();
 
     /**
      * Returns the raw intensity value as recorded by the SampleProvider
      */
     int getRawIntensity();
 
-//    /**
-//     * Returns the normalized intensity value between 0 and 1
-//     */
-//    float getIntensity();
+    /**
+     * Returns the normalized intensity value between 0 and 1
+     */
+    float getIntensity();
 
     /**
      * Returns the number of steps performed during the period of this sample