From 53f9b30b3e7f7360ca66e2b3f9394b9ca284cc93 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 21 Jan 2017 11:22:03 +0100
Subject: [PATCH] temp target display update

---
 .../TempTargetRangeFragment.java              | 28 ++++++++++++-------
 .../main/res/layout/temptargetrange_item.xml  |  2 ++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/TempTargetRange/TempTargetRangeFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/TempTargetRange/TempTargetRangeFragment.java
index 6693bbd717..4fbe7a56d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/TempTargetRange/TempTargetRangeFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/TempTargetRange/TempTargetRangeFragment.java
@@ -76,19 +76,23 @@ public class TempTargetRangeFragment extends Fragment implements View.OnClickLis
             NSProfile profile = ConfigBuilderPlugin.getActiveProfile().getProfile();
             if (profile == null) return;
             TempTarget tempTarget = tempTargetList.get(position);
-            holder.date.setText(DateUtil.dateAndTimeString(tempTarget.timeStart) + " - " + DateUtil.timeString(tempTargetList.get(position).getPlannedTimeEnd()));
-            holder.duration.setText(DecimalFormatter.to0Decimal(tempTarget.duration) + " min");
-            holder.low.setText(tempTarget.lowValueToUnitsToString(profile.getUnits()));
-            holder.high.setText(tempTarget.highValueToUnitsToString(profile.getUnits()));
-            holder.reason.setText(tempTarget.reason);
-            if (tempTarget.isInProgress())
-                holder.dateLinearLayout.setBackgroundColor(MainApp.instance().getResources().getColor(R.color.colorInProgress));
-            else if (tempTarget.duration == 0){
+            if (tempTarget.duration != 0) {
+                holder.date.setText(DateUtil.dateAndTimeString(tempTarget.timeStart) + " - " + DateUtil.timeString(tempTargetList.get(position).getPlannedTimeEnd()));
+                holder.duration.setText(DecimalFormatter.to0Decimal(tempTarget.duration) + " min");
+                holder.low.setText(tempTarget.lowValueToUnitsToString(profile.getUnits()));
+                holder.high.setText(tempTarget.highValueToUnitsToString(profile.getUnits()));
+                holder.reason.setText(tempTarget.reason);
+            } else {
+                holder.date.setText(DateUtil.dateAndTimeString(tempTarget.timeStart));
+                holder.duration.setText(R.string.cancel);
                 holder.low.setText("");
                 holder.high.setText("");
-                holder.duration.setText(R.string.cancel);
-                holder.dateLinearLayout.setBackgroundColor(MainApp.instance().getResources().getColor(R.color.notificationUrgent));
+                holder.reason.setText("");
+                holder.reasonLabel.setText("");
+                holder.reasonColon.setText("");
             }
+            if (tempTarget.isInProgress())
+                holder.dateLinearLayout.setBackgroundColor(MainApp.instance().getResources().getColor(R.color.colorInProgress));
             else
                 holder.dateLinearLayout.setBackgroundColor(MainApp.instance().getResources().getColor(R.color.cardColorBackground));
             holder.remove.setTag(tempTarget);
@@ -111,6 +115,8 @@ public class TempTargetRangeFragment extends Fragment implements View.OnClickLis
             TextView low;
             TextView high;
             TextView reason;
+            TextView reasonLabel;
+            TextView reasonColon;
             TextView remove;
             LinearLayout dateLinearLayout;
 
@@ -122,6 +128,8 @@ public class TempTargetRangeFragment extends Fragment implements View.OnClickLis
                 low = (TextView) itemView.findViewById(R.id.temptargetrange_low);
                 high = (TextView) itemView.findViewById(R.id.temptargetrange_high);
                 reason = (TextView) itemView.findViewById(R.id.temptargetrange_reason);
+                reasonLabel = (TextView) itemView.findViewById(R.id.temptargetrange_reason_label);
+                reasonColon = (TextView) itemView.findViewById(R.id.temptargetrange_reason_colon);
                 remove = (TextView) itemView.findViewById(R.id.temptargetrange_remove);
                 remove.setOnClickListener(this);
                 remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
diff --git a/app/src/main/res/layout/temptargetrange_item.xml b/app/src/main/res/layout/temptargetrange_item.xml
index 7e69f6bb2f..25f941f0ec 100644
--- a/app/src/main/res/layout/temptargetrange_item.xml
+++ b/app/src/main/res/layout/temptargetrange_item.xml
@@ -85,6 +85,7 @@
             android:orientation="horizontal">
 
             <TextView
+                android:id="@+id/temptargetrange_reason_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
@@ -93,6 +94,7 @@
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
+                android:id="@+id/temptargetrange_reason_colon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingRight="5dp"