From 908c666d5f9674da2e3fb3865793bc8dbe5c42a2 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Wed, 26 Aug 2020 14:57:40 +0200
Subject: [PATCH] Show Suspend & resume button in the same place and don't show
 suspend button when the Pod is suspended

---
 .../pump/omnipod/ui/OmnipodFragment.kt        |  3 ++-
 .../src/main/res/layout/omnipod_fragment.xml  | 24 +++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
index d8c5692bb0..fff4d32ce2 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
@@ -394,7 +394,8 @@ class OmnipodFragment : DaggerFragment() {
     }
 
     private fun updateSuspendDeliveryButton() {
-        if (aapsOmnipodManager.isSuspendDeliveryButtonEnabled) {
+        // If the Pod is currently suspended, we show the Resume delivery button instead.
+        if (aapsOmnipodManager.isSuspendDeliveryButtonEnabled && !(podStateManager.isPodRunning && podStateManager.isSuspended)) {
             omnipod_button_suspend_delivery.visibility = View.VISIBLE
             omnipod_button_suspend_delivery.isEnabled = podStateManager.isPodRunning && !podStateManager.isSuspended && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
         } else {
diff --git a/omnipod/src/main/res/layout/omnipod_fragment.xml b/omnipod/src/main/res/layout/omnipod_fragment.xml
index 6f9e9755a7..e74383d9f4 100644
--- a/omnipod/src/main/res/layout/omnipod_fragment.xml
+++ b/omnipod/src/main/res/layout/omnipod_fragment.xml
@@ -714,18 +714,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <Button
-                    android:id="@+id/omnipod_button_resume_delivery"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_local_activate"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/omnipod_resume_delivery"
-                    android:visibility="gone" />
-
                 <Button
                     android:id="@+id/omnipod_button_refresh_status"
                     style="@style/ButtonSmallFontStyle"
@@ -794,6 +782,18 @@
                     android:text="@string/omnipod_suspend_delivery_short"
                     android:visibility="gone" />
 
+                <Button
+                    android:id="@+id/omnipod_button_resume_delivery"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_local_activate"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/omnipod_resume_delivery"
+                    android:visibility="gone" />
+
             </LinearLayout>
 
         </LinearLayout>