Skip to content

Commit

Permalink
Further progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamorham
jamorham committed Jan 15, 2016
1 parent 1b4e01a commit 8c00f29
Show file tree
Hide file tree
Showing 9 changed files with 373 additions and 2 deletions.
42 changes: 42 additions & 0 deletions app/google-services.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"project_info": {
"project_id": "xdrip-plus",
"project_number": "10591810485",
"name": "xDrip plus"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:10591810485:android:b70845957aa2e415",
"client_id": "android:com.eveningoutpost.dexdrip",
"client_type": 1,
"android_client_info": {
"package_name": "com.eveningoutpost.dexdrip"
}
},
"oauth_client": [],
"api_key": [],
"services": {
"analytics_service": {
"status": 1
},
"cloud_messaging_service": {
"status": 2,
"apns_config": []
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"google_signin_service": {
"status": 1
},
"ads_service": {
"status": 1
}
}
}
],
"client_info": [],
"ARTIFACT_VERSION": "1"
}
11 changes: 11 additions & 0 deletions app/src/main/java/com/eveningoutpost/dexdrip/Models/CobCalc.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.eveningoutpost.dexdrip.Models;

/**
* Created by jamorham on 04/01/16.
*/
public class CobCalc {
double initialCarbs;
double decayedBy;
double isDecaying;
double carbTime;
}
17 changes: 17 additions & 0 deletions app/src/main/java/com/eveningoutpost/dexdrip/Models/Iob.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.eveningoutpost.dexdrip.Models;

/**
* Created by jamorham on 02/01/16.
*/
public class Iob {
public long timestamp;
public double iob = 0;
public CobCalc cobCalc;
public double cob = 0;
public double rawCarbImpact = 0;
public double jCarbImpact = 0;
public double activity = 0;
public double jActivity = 0;
}


34 changes: 34 additions & 0 deletions app/src/main/java/com/eveningoutpost/dexdrip/Models/JoH.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.eveningoutpost.dexdrip.Models;

import java.text.DecimalFormat;

/**
* Created by jamorham on 06/01/16.
*
* lazy helper class for utilities
*/
public class JoH {
final protected static char[] hexArray = "0123456789ABCDEF".toCharArray();

// qs = quick string conversion of double for printing
public static String qs(double x) {
return qs(x, 2);
}

public static String qs(double x, int digits) {
DecimalFormat df = new DecimalFormat("#");
df.setMaximumFractionDigits(digits);
df.setMinimumIntegerDigits(1);
return df.format(x);
}

public static String bytesToHex(byte[] bytes) {
char[] hexChars = new char[bytes.length * 2];
for (int j = 0; j < bytes.length; j++) {
int v = bytes[j] & 0xFF;
hexChars[j * 2] = hexArray[v >>> 4];
hexChars[j * 2 + 1] = hexArray[v & 0x0F];
}
return new String(hexChars);
}
}
140 changes: 139 additions & 1 deletion app/src/main/res/layout/activity_home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,152 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="100%"
android:layout_marginTop="-1dp"
android:text=""
android:id="@+id/textBridgeBattery"
android:textStyle="normal"
android:textSize="12sp"
android:inputType="none"
android:layout_below="@+id/notices"
android:layout_alignParentStart="true"
android:background="@android:color/transparent"/>

<ImageButton
android:layout_marginTop="7dp"
android:background="@android:color/transparent"
android:gravity="right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnSpeak"
android:src="@android:drawable/ic_btn_speak_now"
android:contentDescription="@string/speaktreatment"
android:layout_below="@+id/currentBgValueRealTime"
android:layout_marginRight="10dp"
android:layout_alignRight="@+id/currentBgValueRealTime"/>

<TextView

android:background="@android:color/transparent"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Treatment voice data appears here"
android:gravity="right"
android:textAlignment="gravity"
android:textSize="14dp"
android:textColor="@android:color/holo_green_light"

android:shadowColor="@android:color/black"
android:shadowDy="1"
android:shadowDx="1"
android:shadowRadius="0"
android:id="@+id/treatmentTextView"
android:layout_alignTop="@+id/btnSpeak"
android:layout_toStartOf="@+id/btnSpeak" />

<ImageButton
android:layout_marginStart="29dp"
android:src="@android:drawable/ic_input_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/approveTreatment"
android:contentDescription="Confirm Treatment"
android:layout_below="@+id/btnSpeak"
android:layout_alignParentStart="true" />

<ImageButton
android:src="@android:drawable/ic_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/cancelTreatment"
android:layout_alignTop="@+id/approveTreatment"
android:layout_toEndOf="@+id/approveTreatment" />

<ImageButton
android:src="@drawable/ic_touch_app_white_48dp"
android:layout_width="wrap_content"

android:layout_height="wrap_content"
android:id="@+id/bloodTestButton"
android:layout_alignBottom="@+id/cancelTreatment"
android:layout_toEndOf="@+id/cancelTreatment"
android:layout_marginStart="29dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22dp"
android:textColor="@android:color/holo_green_light"
android:textStyle="bold"
android:text="102 mg/dl"
android:id="@+id/textBloodGlucose"
android:background="@android:color/transparent"
android:layout_alignBottom="@+id/bloodTestButton"
android:layout_marginBottom="12dp"
android:layout_toEndOf="@+id/bloodTestButton" />

<ImageButton
android:src="@drawable/ic_local_dining_white_48dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/buttonCarbs"
android:layout_below="@+id/bloodTestButton"
android:layout_alignStart="@+id/bloodTestButton" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22dp"
android:textColor="@android:color/holo_green_light"
android:textStyle="bold"
android:text="65 grams"
android:id="@+id/textCarbohydrate"
android:background="@android:color/transparent"
android:layout_marginBottom="12dp"
android:layout_alignBottom="@+id/buttonCarbs"
android:layout_toEndOf="@+id/buttonCarbs" />

<ImageButton
android:src="@drawable/ic_colorize_white_48dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/buttonInsulin"
android:layout_below="@+id/buttonCarbs"
android:layout_alignStart="@+id/buttonCarbs" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22dp"
android:textColor="@android:color/holo_green_light"
android:background="@android:color/transparent"
android:textStyle="bold"
android:text="14 units"
android:id="@+id/textInsulinUnits"
android:layout_marginBottom="12dp"
android:layout_alignBottom="@+id/buttonInsulin"
android:layout_toEndOf="@+id/buttonInsulin" />

<ImageButton
android:src="@drawable/ic_av_timer_white_36dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/timeButton"
android:layout_below="@+id/bloodTestButton"
android:layout_alignStart="@+id/approveTreatment" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22dp"
android:textColor="@android:color/holo_green_light"
android:textStyle="bold"
android:text="00:00"
android:id="@+id/textTimeButton"
android:background="@android:color/transparent"
android:layout_marginBottom="12dp"
android:layout_alignBottom="@+id/timeButton"
android:layout_toEndOf="@+id/timeButton" />

</RelativeLayout>

<lecho.lib.hellocharts.view.PreviewLineChartView
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/res/menu/menu_home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,28 @@
android:orderInCategory="1"
android:showAsAction="never"/>

<item android:id="@+id/importsettings"
android:title="Import Settings"
android:checkable="false"
android:orderInCategory="1"
android:showAsAction="never"/>

<item android:id="@+id/exportsettings"
android:title="Export Settings (warning!)"
android:checkable="false"
android:orderInCategory="1"
android:showAsAction="never"/>

<item android:id="@+id/synctreatments"
android:title="Sync Treatments"
android:checkable="false"
android:orderInCategory="1"
android:showAsAction="never"/>

<item android:id="@+id/action_toggle_speakreadings"
android:title="@string/menu_toggle_speakreadings"
android:checkable="true"
android:orderInCategory="2"
android:visible="false"
android:showAsAction="never"/>
</menu>
104 changes: 104 additions & 0 deletions app/src/main/res/raw/initiallexicon.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{"entries":[
{"lexicon": "stop",
"matchWords":[
"stop",
"cancel",
"done",
"end",
"top",
"ansell",
"finished",
"finish",
"quit"
]},

{"lexicon": "rapid",
"matchWords":[
"rapid",
"rapid acting",
"rapid-acting",
"nova rapid",
"nova log",
"rapido",
"fast-acting",
"fast",
"resurrecting",
"reflecting",
"units",
"unit",
"u",
"you"
]},

{"lexicon": "long",
"matchWords":[
"long",
"long acting",
"lantus"
]},

{"lexicon": "carbs",
"matchWords":[
"carbs",
"cards",
"carbohydrate",
"carbohydrates",
"grams",
"gram",
"carb",
"g",
"gee"
]},

{"lexicon": "time",
"matchWords":[
"time",
"times",
"clock",
"o'clock",
"oclock",
"hour",
"hours",
"at"
]},

{"lexicon": "ago",
"matchWords":[
"ago"
]},


{"lexicon": "blood",
"matchWords":[
"mmol",
"mmols",
"animal",
"miles",
"mile",
"memo",
"mobile",
"month",
"mm",
"mg",
"bg",
"milligram",
"milligrams",
"normal",
"mole",
"moles",
"sugar",
"blood",
"test",
"blood sugar",
"obsessed"
]},

{"lexicon": "grams",
"matchWords":[
]},

{"lexicon": "units",
"matchWords":[
]}

]}
Loading

0 comments on commit 8c00f29

Please sign in to comment.