From 1fed867eb3846e40a3ababae63682d66962df87c Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Thu, 29 Apr 2021 22:00:50 +0200
Subject: [PATCH] Revert "Combo: show pump id in UI."

This reverts commit 76568cac
---
 .../plugins/pump/combo/ComboFragment.java     |  3 --
 .../main/res/layout/combopump_fragment.xml    | 45 -------------------
 combo/src/main/res/values/strings.xml         |  1 -
 3 files changed, 49 deletions(-)

diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
index ef21aea9f1..e6d8b990bf 100644
--- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
+++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
@@ -54,7 +54,6 @@ public class ComboFragment extends DaggerFragment {
     private Button refreshButton;
     private TextView bolusCount;
     private TextView tbrCount;
-    private TextView serialNumber;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
@@ -71,7 +70,6 @@ public class ComboFragment extends DaggerFragment {
         tempBasalText = view.findViewById(R.id.combo_temp_basal);
         bolusCount = view.findViewById(R.id.combo_bolus_count);
         tbrCount = view.findViewById(R.id.combo_tbr_count);
-        serialNumber= view.findViewById(R.id.combo_serial_number);
 
         refreshButton = view.findViewById(R.id.combo_refresh_button);
         refreshButton.setOnClickListener(v -> {
@@ -244,7 +242,6 @@ public class ComboFragment extends DaggerFragment {
             // stats
             bolusCount.setText(String.valueOf(comboPlugin.getBolusesDelivered()));
             tbrCount.setText(String.valueOf(comboPlugin.getTbrsSet()));
-            serialNumber.setText(comboPlugin.serialNumber());
         }
     }
 }
\ No newline at end of file
diff --git a/combo/src/main/res/layout/combopump_fragment.xml b/combo/src/main/res/layout/combopump_fragment.xml
index 2ee9e41508..8e13a5fb8f 100644
--- a/combo/src/main/res/layout/combopump_fragment.xml
+++ b/combo/src/main/res/layout/combopump_fragment.xml
@@ -462,51 +462,6 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="2dip"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="5dp"
-                android:background="@color/list_delimiter" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.5"
-                    android:gravity="end"
-                    android:paddingRight="5dp"
-                    android:text="@string/combo_serial_number"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:layout_width="5dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:gravity="center_horizontal"
-                    android:paddingEnd="2dp"
-                    android:paddingStart="2dp"
-                    android:text=":"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/combo_serial_number"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="start"
-                    android:paddingLeft="5dp"
-                    android:textColor="@android:color/white"
-                    android:textSize="14sp" />
-
-            </LinearLayout>
-
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
diff --git a/combo/src/main/res/values/strings.xml b/combo/src/main/res/values/strings.xml
index 144d9de921..dd844055ee 100644
--- a/combo/src/main/res/values/strings.xml
+++ b/combo/src/main/res/values/strings.xml
@@ -54,7 +54,6 @@
     <string name="combo_tbr_count">TBR count</string>
     <string name="bolusstopped">Bolus stopped</string>
     <string name="bolusstopping">Stopping bolus</string>
-    <string name="combo_serial_number">Pump identifier</string>
     <string name="combo_pump_serial" translatable="false">combo_pump_serial</string>
     <string name="combo_tbrs_set" translatable="false">combo_tbrs_set</string>
     <string name="combo_boluses_delivered" translatable="false">combo_boluses_delivered</string>