From 5f7108317f4aa2a347b531dec56a1cafe4fe3f23 Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 11 Dec 2020 10:23:04 +0100 Subject: [PATCH 1/2] Move Ago below Arrow --- .../general/overview/OverviewFragment.kt | 4 +- .../main/res/layout/overview_info_layout.xml | 145 ++++++++++-------- 2 files changed, 88 insertions(+), 61 deletions(-) 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 022f82a025..4cf9f304ca 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 @@ -582,10 +582,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList 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)}" + overview_avgdelta?.text = "${Profile.toSignedUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units)}" + overview_long_avgdelta?.text = "${Profile.toSignedUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units)}" } else { overview_delta?.text = "Δ " + resourceHelper.gs(R.string.notavailable) overview_avgdelta?.text = "" + overview_long_avgdelta?.text = "" } // strike through if BG is old diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml index 998a06148b..6fc79c29f5 100644 --- a/app/src/main/res/layout/overview_info_layout.xml +++ b/app/src/main/res/layout/overview_info_layout.xml @@ -27,97 +27,122 @@ android:textStyle="bold" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/overview_bg" - app:layout_constraintEnd_toStartOf="@+id/overview_arrow" + app:layout_constraintEnd_toStartOf="@+id/overview_arrows_llayout" app:layout_constraintStart_toEndOf="@+id/overview_bg" app:layout_constraintTop_toTopOf="@+id/overview_bg" /> - - + + - + + + + + + + android:layout_gravity="end" + android:textAlignment="textEnd" + android:text="Δ: " + android:textAppearance="@style/TextAppearance.AppCompat.Small" /> - + - + - + - + - + - + - + - + - + - + + + Date: Fri, 11 Dec 2020 14:06:59 +0100 Subject: [PATCH 2/2] Improve vertical position of apsmode icon apsmode_text TextView visible only if necessary --- .../plugins/general/overview/OverviewFragment.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 4cf9f304ca..dbc0195fee 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 @@ -612,16 +612,19 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList loopPlugin.isEnabled() && loopPlugin.isSuperBolus -> { overview_apsmode?.setImageResource(R.drawable.ic_loop_superbolus) overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper) + overview_apsmode_text?.visibility = View.VISIBLE } loopPlugin.isDisconnected -> { overview_apsmode?.setImageResource(R.drawable.ic_loop_disconnected) overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper) + overview_apsmode_text?.visibility = View.VISIBLE } loopPlugin.isEnabled() && loopPlugin.isSuspended -> { overview_apsmode?.setImageResource(R.drawable.ic_loop_paused) overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper) + overview_apsmode_text?.visibility = View.VISIBLE } pump.isSuspended -> { @@ -632,27 +635,27 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList } else { R.drawable.ic_loop_paused }) - overview_apsmode_text?.text = "" + overview_apsmode_text?.visibility = View.GONE } loopPlugin.isEnabled() && closedLoopEnabled.value() && loopPlugin.isLGS -> { overview_apsmode?.setImageResource(R.drawable.ic_loop_lgs) - overview_apsmode_text?.text = "" + overview_apsmode_text?.visibility = View.GONE } loopPlugin.isEnabled() && closedLoopEnabled.value() -> { overview_apsmode?.setImageResource(R.drawable.ic_loop_closed) - overview_apsmode_text?.text = "" + overview_apsmode_text?.visibility = View.GONE } loopPlugin.isEnabled() && !closedLoopEnabled.value() -> { overview_apsmode?.setImageResource(R.drawable.ic_loop_open) - overview_apsmode_text?.text = "" + overview_apsmode_text?.visibility = View.GONE } else -> { overview_apsmode?.setImageResource(R.drawable.ic_loop_disabled) - overview_apsmode_text?.text = "" + overview_apsmode_text?.visibility = View.GONE } } } else {