diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 39df181b7d..022f82a025 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -579,6 +579,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val glucoseStatus = GlucoseStatus(injector).glucoseStatusData if (glucoseStatus != null) { + overview_delta_large?.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + overview_delta_large?.setTextColor(color) overview_delta?.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) overview_avgdelta?.text = "${Profile.toSignedUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units)}\n${Profile.toSignedUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units)}" } else { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java index afb86e999e..b4114c1c5e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java @@ -771,7 +771,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog @SuppressWarnings("UNCHECKED") private void executeTask(AsyncTask task, DataMap... parameters) { - task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, parameters); + task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Object) parameters); // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { // task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); // } else { diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinInterface.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinInterface.kt index d2c595b246..c9f8e7d1ca 100644 --- a/app/src/main/java/info/nightscout/androidaps/skins/SkinInterface.kt +++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinInterface.kt @@ -51,7 +51,7 @@ interface SkinInterface { asLayoutParams.topToTop = ConstraintLayout.LayoutParams.PARENT_ID if (isTablet) { - for (v in listOf( + for (v in listOf( view.overview_bg, view.overview_time, view.overview_timeagoshort, @@ -60,8 +60,8 @@ interface SkinInterface { view.overview_basebasal, view.overview_extendedbolus, view.overview_sensitivity - )) v.setTextSize(COMPLEX_UNIT_PX, v.textSize * 1.5f) - for (v in listOf( + )) v?.setTextSize(COMPLEX_UNIT_PX, v.textSize * 1.5f) + for (v in listOf( view.overview_pump, view.overview_openaps, view.overview_uploader, @@ -72,9 +72,13 @@ interface SkinInterface { view.careportal_sensorage, view.careportal_pbage, view.careportal_batterylevel - )) v.setTextSize(COMPLEX_UNIT_PX, v.textSize * 1.3f) - view.overview_time_llayout.orientation = LinearLayout.HORIZONTAL - view.overview_timeagoshort.setTextSize(COMPLEX_UNIT_PX, view.overview_time.textSize) + )) v?.setTextSize(COMPLEX_UNIT_PX, v.textSize * 1.3f) + view.overview_time_llayout?.orientation = LinearLayout.HORIZONTAL + view.overview_timeagoshort?.setTextSize(COMPLEX_UNIT_PX, view.overview_time.textSize) + + view.overview_delta_large?.visibility = View.VISIBLE + } else { + view.overview_delta_large?.visibility = View.GONE } } } diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml index 147b468ff9..998a06148b 100644 --- a/app/src/main/res/layout/overview_info_layout.xml +++ b/app/src/main/res/layout/overview_info_layout.xml @@ -13,11 +13,25 @@ android:text="00.0" android:textSize="60sp" android:textStyle="bold" - app:layout_constraintEnd_toStartOf="@+id/overview_arrow" + app:layout_constraintEnd_toStartOf="@+id/overview_delta_large" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + +