Add confirm dialog on Wear. Convert Ketone reading from long to double. Add methods to delete advanced metrics.

Paolo Rotolo · Paolo Rotolo · commit 6dd98593bbb5 · 2016-01-05T21:19:54.000+01:00
diff --git a/app/src/main/java/org/glucosio/android/db/DatabaseHandler.java b/app/src/main/java/org/glucosio/android/db/DatabaseHandler.java
@@ -310,6 +310,13 @@ public void deleteHB1ACReadingReading(HB1ACReading reading) {
         realm.commitTransaction();
     }
 
+    public HB1ACReading getHB1ACReading(long id) {
+        return realm.where(HB1ACReading.class)
+                .equalTo("id", id)
+                .findFirst();
+    }
+
+
     public ArrayList<HB1ACReading> getHB1ACReadings() {
         RealmResults<HB1ACReading> results =
                 realm.where(HB1ACReading.class)
@@ -374,6 +381,12 @@ public void addKetoneReading(KetoneReading reading) {
         realm.commitTransaction();
     }
 
+    public KetoneReading getKetoneReading(long id) {
+        return realm.where(KetoneReading.class)
+                .equalTo("id", id)
+                .findFirst();
+    }
+
     public void deleteKetoneReading(KetoneReading reading) {
         realm.beginTransaction();
         reading.removeFromRealm();
@@ -406,13 +419,13 @@ public ArrayList<Long> getKetoneIdAsArray(){
         return idArray;
     }
 
-    public ArrayList<Long> getKetoneReadingAsArray(){
+    public ArrayList<Double> getKetoneReadingAsArray(){
         List<KetoneReading> readings = getKetoneReadings();
-        ArrayList<Long> readingArray = new ArrayList<Long>();
+        ArrayList<Double> readingArray = new ArrayList<Double>();
         int i;
 
         for (i = 0; i < readings.size(); i++){
-            long reading;
+            double reading;
             KetoneReading singleReading = readings.get(i);
             reading = singleReading.getReading();
             readingArray.add(reading);
@@ -444,6 +457,12 @@ public void addPressureReading(PressureReading reading) {
         realm.commitTransaction();
     }
 
+    public PressureReading getPressureReading(long id) {
+        return realm.where(PressureReading.class)
+                .equalTo("id", id)
+                .findFirst();
+    }
+
     public void deletePressureReading(PressureReading reading) {
         realm.beginTransaction();
         reading.removeFromRealm();
@@ -529,6 +548,12 @@ public void addWeightReading(WeightReading reading) {
         realm.commitTransaction();
     }
 
+    public WeightReading getWeightReading(long id) {
+        return realm.where(WeightReading.class)
+                .equalTo("id", id)
+                .findFirst();
+    }
+
     public void deleteWeightReading(WeightReading reading) {
         realm.beginTransaction();
         reading.removeFromRealm();
@@ -599,6 +624,12 @@ public void addCholesterolReading(CholesterolReading reading) {
         realm.commitTransaction();
     }
 
+    public CholesterolReading getCholesterolReading(long id) {
+        return realm.where(CholesterolReading.class)
+                .equalTo("id", id)
+                .findFirst();
+    }
+
     public void deleteCholesterolReading(CholesterolReading reading) {
         realm.beginTransaction();
         reading.removeFromRealm();
diff --git a/app/src/main/java/org/glucosio/android/db/KetoneReading.java b/app/src/main/java/org/glucosio/android/db/KetoneReading.java
@@ -9,22 +9,22 @@ public class KetoneReading extends RealmObject {
     @PrimaryKey
     private long id;
 
-    private long reading;
+    private double reading;
     private Date created;
 
     public KetoneReading() {
     }
 
-    public KetoneReading(long reading,Date created) {
+    public KetoneReading(double reading,Date created) {
         this.reading=reading;
         this.created=created;
     }
 
-    public long getReading() {
+    public double getReading() {
         return reading;
     }
 
-    public void setReading(long reading) {
+    public void setReading(double reading) {
         this.reading = reading;
     }
 
diff --git a/app/src/main/java/org/glucosio/android/db/Migration.java b/app/src/main/java/org/glucosio/android/db/Migration.java
@@ -54,7 +54,7 @@ class KetoneReading
                  @PrimaryKey
                  long id;
 
-                 long reading;
+                 double reading;
                  Date created;
 
              class PressureReading
@@ -94,7 +94,7 @@ class HB1ACReading
             RealmObjectSchema ketoneSchema = schema.create("KetoneReading")
                     .addField("id", Long.class, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
                     .addField("created", Date.class)
-                    .addField("reading", Long.class, FieldAttribute.REQUIRED);
+                    .addField("reading", Double.class, FieldAttribute.REQUIRED);
 
             RealmObjectSchema HB1ACSchema = schema.create("HB1ACReading")
                     .addField("id", Long.class, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
diff --git a/app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java b/app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java
@@ -119,7 +119,7 @@ public void onDismissed(Snackbar snackbar, int event) {
                                         // Do nothing, see Undo onClickListener
                                         break;
                                     case Snackbar.Callback.DISMISS_EVENT_TIMEOUT:
-                                        presenter.onDeleteClicked(idToDelete);
+                                        presenter.onDeleteClicked(idToDelete, historySpinner.getSelectedItemPosition());
                                         break;
                                 }
                             }
diff --git a/app/src/main/java/org/glucosio/android/presenter/AddKetonePresenter.java b/app/src/main/java/org/glucosio/android/presenter/AddKetonePresenter.java
@@ -63,7 +63,7 @@ public void dialogOnAddButtonPressed(String time, String date, String reading){
             Calendar cal = Calendar.getInstance();
             cal.set(Integer.parseInt(readingYear), Integer.parseInt(readingMonth)-1, Integer.parseInt(readingDay), Integer.parseInt(readingHour), Integer.parseInt(readingMinute));
             Date finalDateTime = cal.getTime();
-            long finalReading = Long.parseLong(reading);
+            double finalReading = Double.parseDouble(reading);
             KetoneReading kReading = new KetoneReading(finalReading, finalDateTime);
 
             dB.addKetoneReading(kReading);
diff --git a/app/src/main/java/org/glucosio/android/presenter/HistoryPresenter.java b/app/src/main/java/org/glucosio/android/presenter/HistoryPresenter.java
@@ -1,7 +1,6 @@
 package org.glucosio.android.presenter;
 
 import org.glucosio.android.db.DatabaseHandler;
-import org.glucosio.android.db.GlucoseReading;
 import org.glucosio.android.fragment.HistoryFragment;
 
 import java.util.ArrayList;
@@ -25,17 +24,43 @@ public String convertDate(String date){
         return fragment.convertDate(date);
     }
 
-    public void onDeleteClicked(int idToDelete){
-        removeReadingFromDb(dB.getGlucoseReadingById(idToDelete));
+    public void onDeleteClicked(int idToDelete, int metricID){
+        switch (metricID) {
+            // Glucose
+            case 0:
+                dB.deleteGlucoseReadings(dB.getGlucoseReading(idToDelete));
+                fragment.reloadFragmentAdapter();
+                break;
+            // HB1AC
+            case 1:
+                dB.deleteHB1ACReadingReading(dB.getHB1ACReading(idToDelete));
+                fragment.reloadFragmentAdapter();
+                break;
+            // Cholesterol
+            case 2:
+                dB.deleteCholesterolReading(dB.getCholesterolReading(idToDelete));
+                fragment.reloadFragmentAdapter();
+                break;
+            // Pressure
+            case 3:
+                dB.deletePressureReading(dB.getPressureReading(idToDelete));
+                fragment.reloadFragmentAdapter();
+                break;
+            //Ketones
+            case 4:
+                dB.deleteKetoneReading(dB.getKetoneReading(idToDelete));
+                fragment.reloadFragmentAdapter();
+                break;
+            // Weight
+            case 5:
+                dB.deleteWeightReading(dB.getWeightReading(idToDelete));
+                fragment.reloadFragmentAdapter();
+                break;
+        }
         fragment.notifyAdapter();
         fragment.updateToolbarBehaviour();
     }
 
-    private void removeReadingFromDb(GlucoseReading gReading) {
-        dB.deleteGlucoseReadings(gReading);
-        fragment.reloadFragmentAdapter();
-    }
-
     // Getters
     public String getUnitMeasuerement(){
         return dB.getUser(1).getPreferred_unit();
@@ -61,7 +86,7 @@ public int getGlucoseReadingsNumber(){
         return dB.getGlucoseReadingAsArray().size();
     }
 
-    public ArrayList<Long> getKetoneReading() {
+    public ArrayList<Double> getKetoneReading() {
         return dB.getKetoneReadingAsArray();
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -105,7 +105,7 @@
     </string-array>
     <string name="tip_example" translatable="false">Use less cheese in your recipes and meals. Fresh mozzarella packed in water and Swiss cheese are usually lower in sodium.</string>
     <string name="preferences_about">About</string>
-    <string name="version" translatable="false">0.8.3 (Noce)</string>
+    <string name="version" translatable="false">0.9.0 (Imli)</string>
     <string name="preferences_version">Version</string>
     <string name="preferences_terms">Terms of use</string>
     <string name="glucose_reading_type">Type</string>
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
@@ -15,10 +15,12 @@
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="android.support.wearable.activity.ConfirmationActivity">
+        </activity>
     </application>
 
 </manifest>
diff --git a/wear/src/main/java/org/glucosio/android/MainActivity.java b/wear/src/main/java/org/glucosio/android/MainActivity.java
@@ -5,6 +5,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
+import android.support.wearable.activity.ConfirmationActivity;
 import android.support.wearable.view.DelayedConfirmationView;
 import android.support.wearable.view.WearableListView;
 import android.util.Log;
@@ -118,6 +119,11 @@ public void run() {
                     client.disconnect();
                 }
             }).start();
+            // Show Success ConfirmationActivity
+            Intent intent = new Intent(this, ConfirmationActivity.class);
+            intent.putExtra(ConfirmationActivity.EXTRA_ANIMATION_TYPE,
+                    ConfirmationActivity.SUCCESS_ANIMATION);
+            startActivity(intent);
         } else {
             Toast.makeText(MainActivity.this, getResources().getString(R.string.wear_error), Toast.LENGTH_SHORT).show();
         }

Original file line number	Diff line number	Diff line change
`@@ -9,22 +9,22 @@ public class KetoneReading extends RealmObject {`
`9`	`9`	`@PrimaryKey`
`10`	`10`	`private long id;`
`11`	`11`
`12`		`- private long reading;`
	`12`	`+ private double reading;`
`13`	`13`	`private Date created;`
`14`	`14`
`15`	`15`	`public KetoneReading() {`
`16`	`16`	`}`
`17`	`17`
`18`		`- public KetoneReading(long reading,Date created) {`
	`18`	`+ public KetoneReading(double reading,Date created) {`
`19`	`19`	`this.reading=reading;`
`20`	`20`	`this.created=created;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public long getReading() {`
	`23`	`+ public double getReading() {`
`24`	`24`	`return reading;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public void setReading(long reading) {`
	`27`	`+ public void setReading(double reading) {`
`28`	`28`	`this.reading = reading;`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public void onDismissed(Snackbar snackbar, int event) {`
`119`	`119`	`// Do nothing, see Undo onClickListener`
`120`	`120`	`break;`
`121`	`121`	`case Snackbar.Callback.DISMISS_EVENT_TIMEOUT:`
`122`		`- presenter.onDeleteClicked(idToDelete);`
	`122`	`+ presenter.onDeleteClicked(idToDelete, historySpinner.getSelectedItemPosition());`
`123`	`123`	`break;`
`124`	`124`	`}`
`125`	`125`	`}`