diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java index 944774baaa..8a11baee16 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java @@ -248,10 +248,12 @@ public class WatchUpdaterService extends WearableListenerService implements dataMap.putString("slopeArrow", ""); dataMap.putString("delta", "--"); dataMap.putString("avgDelta", "--"); + dataMap.putString("glucoseUnits", "-"); } else { dataMap.putString("slopeArrow", slopeArrow(glucoseStatus.delta)); dataMap.putString("delta", deltastring(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)); dataMap.putString("avgDelta", deltastring(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units)); + dataMap.putString("glucoseUnits", units); } dataMap.putLong("sgvLevel", sgvLevel); diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java index 8512a9faeb..bc0ffc82ce 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java @@ -103,6 +103,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferen public String sBgi = "--"; public String sMinute = "0"; public String sHour = "0"; + public String sUnits = "-"; @Override public void onCreate() { @@ -257,6 +258,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferen sDirection = dataMap.getString("slopeArrow"); sDelta = dataMap.getString("delta"); sAvgDelta = dataMap.getString("avgDelta"); + sUnits = dataMap.getString("glucoseUnits"); if (chart != null) { addToWatchSet(dataMap); setupCharts(); diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java index 85aa9040e7..d34c0cc7ed 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/Steampunk.java @@ -57,9 +57,24 @@ public class Steampunk extends BaseWatchFace { protected void setColorDark() { + //ensure the glucose dial is the right units + if (!sUnits.equals("-")) { + if (sUnits.equals("mmol")) { + mGlucoseDial.setImageResource(R.drawable.steampunk_dial_mmol); + } else { + mGlucoseDial.setImageResource(R.drawable.steampunk_dial_mgdl); + } + } + //rotate glucose dial. float rotationAngle = 0f; //by default, show ? on the dial (? is at 0 degrees on the dial) - if (!sSgv.equals("---")) rotationAngle = Float.valueOf(sSgv); //if glucose a value is received, use it to determine the amount of rotation of the dial. + if (!sSgv.equals("---")) { + if (sUnits.equals("mmol")) { + rotationAngle = Float.valueOf(sSgv) * 18f; + } else { + rotationAngle = Float.valueOf(sSgv); //if glucose a value is received, use it to determine the amount of rotation of the dial. + } + } if (rotationAngle > 330) rotationAngle = 330; //if the glucose value is higher than 330 then show "HIGH" on the dial. ("HIGH" is at 330 degrees on the dial) if (rotationAngle != 0 && rotationAngle < 30) rotationAngle = 30; //if the glucose value is lower than 30 show "LOW" on the dial. ("LOW" is at 30 degrees on the dial) diff --git a/wear/src/main/res/drawable/steampunk_dial.png b/wear/src/main/res/drawable/steampunk_dial_mgdl.png similarity index 100% rename from wear/src/main/res/drawable/steampunk_dial.png rename to wear/src/main/res/drawable/steampunk_dial_mgdl.png diff --git a/wear/src/main/res/drawable/steampunk_gauge_mgdl_10.png b/wear/src/main/res/drawable/steampunk_gauge_mgdl_10.png new file mode 100644 index 0000000000..72b4a4e828 Binary files /dev/null and b/wear/src/main/res/drawable/steampunk_gauge_mgdl_10.png differ diff --git a/wear/src/main/res/drawable/steampunk_gauge.png b/wear/src/main/res/drawable/steampunk_gauge_mgdl_20.png similarity index 100% rename from wear/src/main/res/drawable/steampunk_gauge.png rename to wear/src/main/res/drawable/steampunk_gauge_mgdl_20.png diff --git a/wear/src/main/res/drawable/steampunk_gauge_mgdl_5.png b/wear/src/main/res/drawable/steampunk_gauge_mgdl_5.png new file mode 100644 index 0000000000..0a524283d8 Binary files /dev/null and b/wear/src/main/res/drawable/steampunk_gauge_mgdl_5.png differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mmol_03.png b/wear/src/main/res/drawable/steampunk_gauge_mmol_03.png new file mode 100644 index 0000000000..6ddadae8da Binary files /dev/null and b/wear/src/main/res/drawable/steampunk_gauge_mmol_03.png differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mmol_05.png b/wear/src/main/res/drawable/steampunk_gauge_mmol_05.png new file mode 100644 index 0000000000..7fe3babc0c Binary files /dev/null and b/wear/src/main/res/drawable/steampunk_gauge_mmol_05.png differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mmol_10.png b/wear/src/main/res/drawable/steampunk_gauge_mmol_10.png new file mode 100644 index 0000000000..5533e84eda Binary files /dev/null and b/wear/src/main/res/drawable/steampunk_gauge_mmol_10.png differ diff --git a/wear/src/main/res/layout/rect_steampunk.xml b/wear/src/main/res/layout/rect_steampunk.xml index 0600c37aac..cf26b61d1c 100644 --- a/wear/src/main/res/layout/rect_steampunk.xml +++ b/wear/src/main/res/layout/rect_steampunk.xml @@ -16,7 +16,7 @@ android:id="@+id/glucose_dial" android:layout_width="match_parent" android:layout_height="match_parent" - android:src="@drawable/steampunk_dial" + android:src="@drawable/steampunk_dial_mgdl" android:layout_gravity="center" android:gravity="center"/> @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="@drawable/steampunk_gauge" + android:background="@drawable/steampunk_gauge_mgdl_20" android:gravity="center" android:orientation="vertical" android:weightSum="1"> diff --git a/wear/src/main/res/layout/round_steampunk.xml b/wear/src/main/res/layout/round_steampunk.xml index 2ce7e99fdb..d47052d8b5 100644 --- a/wear/src/main/res/layout/round_steampunk.xml +++ b/wear/src/main/res/layout/round_steampunk.xml @@ -16,7 +16,7 @@ android:id="@+id/glucose_dial" android:layout_width="match_parent" android:layout_height="match_parent" - android:src="@drawable/steampunk_dial" + android:src="@drawable/steampunk_dial_mgdl" android:layout_gravity="center" android:gravity="center"/> @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="@drawable/steampunk_gauge" + android:background="@drawable/steampunk_gauge_mgdl_20" android:gravity="center" android:orientation="vertical" android:weightSum="1">