new icons
|
@ -575,7 +575,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
overview_apsmode?.visibility = View.VISIBLE
|
overview_apsmode?.visibility = View.VISIBLE
|
||||||
when {
|
when {
|
||||||
loopPlugin.isEnabled() && loopPlugin.isSuperBolus -> {
|
loopPlugin.isEnabled() && loopPlugin.isSuperBolus -> {
|
||||||
overview_apsmode.setImageResource(R.drawable.remove)
|
overview_apsmode.setImageResource(R.drawable.loop_superbolus)
|
||||||
overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
|
overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
|
||||||
//overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend())
|
//overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend())
|
||||||
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
|
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
|
||||||
|
@ -583,7 +583,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
loopPlugin.isDisconnected -> {
|
loopPlugin.isDisconnected -> {
|
||||||
overview_apsmode.setImageResource(R.drawable.closedloop_disconnected)
|
overview_apsmode.setImageResource(R.drawable.loop_disconnected)
|
||||||
overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
|
overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
|
||||||
// overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopdisconnectedfor), loopPlugin.minutesToEndOfSuspend())
|
// overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopdisconnectedfor), loopPlugin.minutesToEndOfSuspend())
|
||||||
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonCritical))
|
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonCritical))
|
||||||
|
@ -591,7 +591,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
loopPlugin.isEnabled() && loopPlugin.isSuspended -> {
|
loopPlugin.isEnabled() && loopPlugin.isSuspended -> {
|
||||||
overview_apsmode.setImageResource(R.drawable.closedloop_pause)
|
overview_apsmode.setImageResource(R.drawable.loop_paused)
|
||||||
overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
|
overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
|
||||||
// overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())
|
// overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())
|
||||||
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
|
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
|
||||||
|
@ -599,8 +599,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
pump.isSuspended -> {
|
pump.isSuspended -> {
|
||||||
overview_apsmode_text?.setCompoundDrawables(null, resourceHelper.gd(R.drawable.closedloop_pause), null, null)
|
overview_apsmode.setImageResource(R.drawable.loop_paused)
|
||||||
overview_apsmode.setImageResource(R.drawable.closedloop_pause)
|
|
||||||
overview_apsmode_text?.text = ""
|
overview_apsmode_text?.text = ""
|
||||||
// overview_apsmode_text?.text = resourceHelper.gs(R.string.pumpsuspended)
|
// overview_apsmode_text?.text = resourceHelper.gs(R.string.pumpsuspended)
|
||||||
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
|
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
|
||||||
|
@ -608,7 +607,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
loopPlugin.isEnabled() && closedLoopEnabled.value() && loopPlugin.isLGS -> {
|
loopPlugin.isEnabled() && closedLoopEnabled.value() && loopPlugin.isLGS -> {
|
||||||
overview_apsmode.setImageResource(R.drawable.remove)
|
overview_apsmode.setImageResource(R.drawable.loop_lgs)
|
||||||
overview_apsmode_text?.text = ""
|
overview_apsmode_text?.text = ""
|
||||||
// overview_apsmode_text?.text = resourceHelper.gs(R.string.closedloop)
|
// overview_apsmode_text?.text = resourceHelper.gs(R.string.closedloop)
|
||||||
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
|
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
|
||||||
|
@ -616,7 +615,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
loopPlugin.isEnabled() && closedLoopEnabled.value() -> {
|
loopPlugin.isEnabled() && closedLoopEnabled.value() -> {
|
||||||
overview_apsmode.setImageResource(R.drawable.closedloop)
|
overview_apsmode.setImageResource(R.drawable.loop_closed)
|
||||||
overview_apsmode_text?.text = ""
|
overview_apsmode_text?.text = ""
|
||||||
// overview_apsmode_text?.text = resourceHelper.gs(R.string.closedloop)
|
// overview_apsmode_text?.text = resourceHelper.gs(R.string.closedloop)
|
||||||
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
|
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
|
||||||
|
@ -624,7 +623,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
loopPlugin.isEnabled() && !closedLoopEnabled.value() -> {
|
loopPlugin.isEnabled() && !closedLoopEnabled.value() -> {
|
||||||
overview_apsmode.setImageResource(R.drawable.openloop)
|
overview_apsmode.setImageResource(R.drawable.loop_open)
|
||||||
overview_apsmode_text?.text = ""
|
overview_apsmode_text?.text = ""
|
||||||
// overview_apsmode_text?.text = resourceHelper.gs(R.string.openloop)
|
// overview_apsmode_text?.text = resourceHelper.gs(R.string.openloop)
|
||||||
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
|
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
|
||||||
|
@ -632,7 +631,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
overview_apsmode.setImageResource(R.drawable.remove)
|
overview_apsmode.setImageResource(R.drawable.loop_disabled)
|
||||||
overview_apsmode_text?.text = ""
|
overview_apsmode_text?.text = ""
|
||||||
// overview_apsmode_text?.text = resourceHelper.gs(R.string.disabledloop)
|
// overview_apsmode_text?.text = resourceHelper.gs(R.string.disabledloop)
|
||||||
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonCritical))
|
// overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonCritical))
|
||||||
|
|
BIN
app/src/main/res/drawable-hdpi/bad.png
Normal file
After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 4 KiB |
Before Width: | Height: | Size: 3.2 KiB |
BIN
app/src/main/res/drawable-hdpi/good.png
Normal file
After Width: | Height: | Size: 4.5 KiB |
BIN
app/src/main/res/drawable-hdpi/loop_closed.png
Normal file
After Width: | Height: | Size: 3.1 KiB |
BIN
app/src/main/res/drawable-hdpi/loop_disabled.png
Normal file
After Width: | Height: | Size: 3.9 KiB |
BIN
app/src/main/res/drawable-hdpi/loop_disconnected.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
app/src/main/res/drawable-hdpi/loop_lgs.png
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
app/src/main/res/drawable-hdpi/loop_open.png
Normal file
After Width: | Height: | Size: 4.1 KiB |
BIN
app/src/main/res/drawable-hdpi/loop_pause.png
Normal file
After Width: | Height: | Size: 3.3 KiB |
BIN
app/src/main/res/drawable-hdpi/loop_superbolus.png
Normal file
After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 3.8 KiB |
BIN
app/src/main/res/drawable-hdpi/soso.png
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
app/src/main/res/drawable-mdpi/bad.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.1 KiB |
BIN
app/src/main/res/drawable-mdpi/good.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
BIN
app/src/main/res/drawable-mdpi/loop_closed.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
app/src/main/res/drawable-mdpi/loop_disabled.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
app/src/main/res/drawable-mdpi/loop_disconnected.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
BIN
app/src/main/res/drawable-mdpi/loop_lgs.png
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
app/src/main/res/drawable-mdpi/loop_open.png
Normal file
After Width: | Height: | Size: 2.8 KiB |
BIN
app/src/main/res/drawable-mdpi/loop_paused.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
app/src/main/res/drawable-mdpi/loop_superbolus.png
Normal file
After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 2.5 KiB |
BIN
app/src/main/res/drawable-mdpi/soso.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
app/src/main/res/drawable-xhdpi/bad.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 4.3 KiB |
BIN
app/src/main/res/drawable-xhdpi/good.png
Normal file
After Width: | Height: | Size: 6.1 KiB |
BIN
app/src/main/res/drawable-xhdpi/loop_closed.png
Normal file
After Width: | Height: | Size: 4.1 KiB |
BIN
app/src/main/res/drawable-xhdpi/loop_disabled.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
app/src/main/res/drawable-xhdpi/loop_disconnected.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
BIN
app/src/main/res/drawable-xhdpi/loop_lgs.png
Normal file
After Width: | Height: | Size: 5.2 KiB |
BIN
app/src/main/res/drawable-xhdpi/loop_open.png
Normal file
After Width: | Height: | Size: 5.2 KiB |
BIN
app/src/main/res/drawable-xhdpi/loop_paused.png
Normal file
After Width: | Height: | Size: 4.3 KiB |
BIN
app/src/main/res/drawable-xhdpi/loop_superbolus.png
Normal file
After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 4.8 KiB |
BIN
app/src/main/res/drawable-xhdpi/soso.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
app/src/main/res/drawable-xxhdpi/bad.png
Normal file
After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 8.7 KiB |
Before Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 7.6 KiB |
BIN
app/src/main/res/drawable-xxhdpi/good.png
Normal file
After Width: | Height: | Size: 9.4 KiB |
BIN
app/src/main/res/drawable-xxhdpi/loop_closed.png
Normal file
After Width: | Height: | Size: 6.8 KiB |
BIN
app/src/main/res/drawable-xxhdpi/loop_disabled.png
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
app/src/main/res/drawable-xxhdpi/loop_disconnected.png
Normal file
After Width: | Height: | Size: 8.5 KiB |
BIN
app/src/main/res/drawable-xxhdpi/loop_lgs.png
Normal file
After Width: | Height: | Size: 8 KiB |
BIN
app/src/main/res/drawable-xxhdpi/loop_open.png
Normal file
After Width: | Height: | Size: 8.5 KiB |
BIN
app/src/main/res/drawable-xxhdpi/loop_paused.png
Normal file
After Width: | Height: | Size: 7.2 KiB |
BIN
app/src/main/res/drawable-xxhdpi/loop_superbolus.png
Normal file
After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 7.8 KiB |
BIN
app/src/main/res/drawable-xxhdpi/soso.png
Normal file
After Width: | Height: | Size: 7.9 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/bad.png
Normal file
After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 10 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/good.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/loop_closed.png
Normal file
After Width: | Height: | Size: 9 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/loop_disabled.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/loop_disconnected.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/loop_lgs.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/loop_open.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/loop_paused.png
Normal file
After Width: | Height: | Size: 9.5 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/loop_superbolus.png
Normal file
After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 10 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/soso.png
Normal file
After Width: | Height: | Size: 10 KiB |
|
@ -83,7 +83,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:layout_marginBottom="-4dp"
|
android:layout_marginBottom="-4dp"
|
||||||
android:src="@drawable/closedloop" />
|
android:src="@drawable/loop_closed" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/overview_apsmode_text"
|
android:id="@+id/overview_apsmode_text"
|
||||||
|
|