Merge pull request #1300 from Andries-Smit/feat/list-group-by-date

Group lists treatments and BG by date

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt

@@ -271,6 +271,8 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
         _binding = null
     }
 
+    private fun timestamp(ml: MealLink): Long = ml.bolusCalculatorResult?.let { it.timestamp } ?: ml.bolus?.let { it.timestamp } ?: ml.carbs?.let { it.timestamp } ?: 0L
+
     inner class RecyclerViewAdapter internal constructor(var mealLinks: List<MealLink>) : RecyclerView.Adapter<RecyclerViewAdapter.MealLinkLoadedViewHolder>() {
 
         override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): MealLinkLoadedViewHolder =
@@ -280,16 +282,20 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
             val profile = profileFunction.getProfile() ?: return
             val ml = mealLinks[position]
 
+            val sameDayPrevious = position > 0 && dateUtil.isSameDay(timestamp(ml), timestamp(mealLinks[position - 1]))
+            holder.binding.date.visibility = sameDayPrevious.not().toVisibility()
+            holder.binding.date.text = dateUtil.dateString(timestamp(ml))
+
             // Metadata
             holder.binding.metadataLayout.visibility = (ml.bolusCalculatorResult != null && (ml.bolusCalculatorResult.isValid || binding.showInvalidated.isChecked)).toVisibility()
             ml.bolusCalculatorResult?.let { bolusCalculatorResult ->
-                holder.binding.date.text = dateUtil.dateAndTimeString(bolusCalculatorResult.timestamp)
+                holder.binding.calcTime.text = dateUtil.timeString(bolusCalculatorResult.timestamp)
             }
 
             // Bolus
             holder.binding.bolusLayout.visibility = (ml.bolus != null && (ml.bolus.isValid || binding.showInvalidated.isChecked)).toVisibility()
             ml.bolus?.let { bolus ->
-                holder.binding.bolusDate.text = dateUtil.timeString(bolus.timestamp)
+                holder.binding.bolusTime.text = dateUtil.timeString(bolus.timestamp)
                 holder.binding.insulin.text = rh.gs(R.string.formatinsulinunits, bolus.amount)
                 holder.binding.bolusNs.visibility = (bolus.interfaceIDs.nightscoutId != null).toVisibility()
                 holder.binding.bolusPump.visibility = (bolus.interfaceIDs.pumpId != null).toVisibility()
@@ -317,7 +323,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
             // Carbs
             holder.binding.carbsLayout.visibility = (ml.carbs != null && (ml.carbs.isValid || binding.showInvalidated.isChecked)).toVisibility()
             ml.carbs?.let { carbs ->
-                holder.binding.carbsDate.text = dateUtil.timeString(carbs.timestamp)
+                holder.binding.carbsTime.text = dateUtil.timeString(carbs.timestamp)
                 holder.binding.carbs.text = rh.gs(R.string.format_carbs, carbs.amount.toInt())
                 holder.binding.carbsDuration.text = if (carbs.duration > 0) rh.gs(R.string.format_mins, T.msecs(carbs.duration).mins().toInt()) else ""
                 holder.binding.carbsNs.visibility = (carbs.interfaceIDs.nightscoutId != null).toVisibility()
@@ -330,6 +336,8 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() {
             holder.binding.bolusRemove.tag = ml
             holder.binding.carbsRemove.tag = ml
             holder.binding.calculation.tag = ml
+            val nextTimestamp = if (mealLinks.size != position + 1) timestamp(mealLinks[position + 1]) else 0L
+            holder.binding.delimiter.visibility = dateUtil.isSameDay(timestamp(ml), nextTimestamp).toVisibility()
         }
 
         override fun getItemCount(): Int {

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt

@@ -152,7 +152,7 @@ class TreatmentsCareportalFragment : DaggerFragment() {
         _binding = null
     }
 
-    inner class RecyclerViewAdapter internal constructor(private var list: List<TherapyEvent>) : RecyclerView.Adapter<TherapyEventsViewHolder>() {
+    inner class RecyclerViewAdapter internal constructor(private var therapyList: List<TherapyEvent>) : RecyclerView.Adapter<TherapyEventsViewHolder>() {
 
         override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): TherapyEventsViewHolder {
             val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.treatments_careportal_item, viewGroup, false)
@@ -160,18 +160,23 @@ class TreatmentsCareportalFragment : DaggerFragment() {
         }
 
         override fun onBindViewHolder(holder: TherapyEventsViewHolder, position: Int) {
-            val therapyEvent = list[position]
+            val therapyEvent = therapyList[position]
             holder.binding.ns.visibility = (therapyEvent.interfaceIDs.nightscoutId != null).toVisibility()
             holder.binding.invalid.visibility = therapyEvent.isValid.not().toVisibility()
-            holder.binding.date.text = dateUtil.dateAndTimeString(therapyEvent.timestamp)
+            val sameDayPrevious = position > 0 && dateUtil.isSameDay(therapyEvent.timestamp, therapyList[position - 1].timestamp)
+            holder.binding.date.visibility = sameDayPrevious.not().toVisibility()
+            holder.binding.date.text = dateUtil.dateString(therapyEvent.timestamp)
+            holder.binding.time.text = dateUtil.timeString(therapyEvent.timestamp)
             holder.binding.duration.text = if (therapyEvent.duration == 0L) "" else dateUtil.niceTimeScalar(therapyEvent.duration, rh)
             holder.binding.note.text = therapyEvent.note
             holder.binding.type.text = translator.translate(therapyEvent.type)
             holder.binding.remove.tag = therapyEvent
+            val nextTimestamp = if (therapyList.size != position + 1) therapyList[position + 1].timestamp else 0L
+            holder.binding.delimiter.visibility = dateUtil.isSameDay(therapyEvent.timestamp, nextTimestamp).toVisibility()
         }
 
         override fun getItemCount(): Int {
-            return list.size
+            return therapyList.size
         }
 
         inner class TherapyEventsViewHolder(view: View) : RecyclerView.ViewHolder(view) {

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt

@@ -125,13 +125,16 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
             holder.binding.ns.visibility = (extendedBolus.interfaceIDs.nightscoutId != null).toVisibility()
             holder.binding.ph.visibility = (extendedBolus.interfaceIDs.pumpId != null).toVisibility()
             holder.binding.invalid.visibility = extendedBolus.isValid.not().toVisibility()
+            val sameDayPrevious = position > 0 && dateUtil.isSameDay(extendedBolus.timestamp, extendedBolusList[position-1].timestamp)
+            holder.binding.date.visibility = sameDayPrevious.not().toVisibility()
+            holder.binding.date.text = dateUtil.dateString(extendedBolus.timestamp)
             @SuppressLint("SetTextI18n")
             if (extendedBolus.isInProgress(dateUtil)) {
-                holder.binding.date.text = dateUtil.dateAndTimeString(extendedBolus.timestamp)
+                holder.binding.time.text = dateUtil.timeString(extendedBolus.timestamp)
-                holder.binding.date.setTextColor(rh.gc(R.color.colorActive))
+                holder.binding.time.setTextColor(rh.gc(R.color.colorActive))
             } else {
-                holder.binding.date.text = dateUtil.dateAndTimeString(extendedBolus.timestamp) + " - " + dateUtil.timeString(extendedBolus.end)
+                holder.binding.time.text = dateUtil.timeRangeString(extendedBolus.timestamp, extendedBolus.end)
-                holder.binding.date.setTextColor(holder.binding.insulin.currentTextColor)
+                holder.binding.time.setTextColor(holder.binding.insulin.currentTextColor)
             }
             val profile = profileFunction.getProfile(extendedBolus.timestamp) ?: return
             holder.binding.duration.text = rh.gs(R.string.format_mins, T.msecs(extendedBolus.duration).mins())
@@ -141,6 +144,8 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
             holder.binding.ratio.text = rh.gs(R.string.pump_basebasalrate, extendedBolus.rate)
             if (iob.iob != 0.0) holder.binding.iob.setTextColor(rh.gc(R.color.colorActive)) else holder.binding.iob.setTextColor(holder.binding.insulin.currentTextColor)
             holder.binding.remove.tag = extendedBolus
+            val nextTimestamp = if (extendedBolusList.size != position + 1) extendedBolusList[position + 1].timestamp else 0L
+            holder.binding.delimiter.visibility = dateUtil.isSameDay(extendedBolus.timestamp, nextTimestamp).toVisibility()
         }
 
         override fun getItemCount(): Int = extendedBolusList.size

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt

@@ -181,7 +181,10 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
             val profileSwitch = profileSwitchList[position]
             holder.binding.ph.visibility = (profileSwitch is ProfileSealed.EPS).toVisibility()
             holder.binding.ns.visibility = (profileSwitch.interfaceIDs_backing?.nightscoutId != null).toVisibility()
-            holder.binding.date.text = dateUtil.dateAndTimeString(profileSwitch.timestamp)
+            val sameDayPrevious = position > 0 && dateUtil.isSameDay(profileSwitch.timestamp, profileSwitchList[position - 1].timestamp)
+            holder.binding.date.visibility = sameDayPrevious.not().toVisibility()
+            holder.binding.date.text = dateUtil.dateString(profileSwitch.timestamp)
+            holder.binding.time.text = dateUtil.timeString(profileSwitch.timestamp)
             holder.binding.duration.text = rh.gs(R.string.format_mins, T.msecs(profileSwitch.duration ?: 0L).mins())
             holder.binding.name.text = if (profileSwitch is ProfileSealed.PS) profileSwitch.value.getCustomizedName() else if (profileSwitch is ProfileSealed.EPS) profileSwitch.value.originalCustomizedName else ""
             if (profileSwitch.isInProgress(dateUtil)) holder.binding.date.setTextColor(rh.gc(R.color.colorActive))
@@ -196,6 +199,8 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
             holder.binding.clone.visibility = (profileSwitch is ProfileSealed.PS).toVisibility()
             holder.binding.spacer.visibility = (profileSwitch is ProfileSealed.PS).toVisibility()
             holder.binding.root.setBackgroundColor(rh.gc(if (profileSwitch is ProfileSealed.PS) R.color.defaultbackground else R.color.list_delimiter))
+            val nextTimestamp = if (profileSwitchList.size != position + 1) profileSwitchList[position + 1].timestamp else 0L
+            holder.binding.delimiter.visibility = dateUtil.isSameDay(profileSwitch.timestamp, nextTimestamp).toVisibility()
         }
 
         override fun getItemCount(): Int {

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt

@@ -164,18 +164,23 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
             holder.binding.ns.visibility = (tempTarget.interfaceIDs.nightscoutId != null).toVisibility()
             holder.binding.invalid.visibility = tempTarget.isValid.not().toVisibility()
             holder.binding.remove.visibility = tempTarget.isValid.toVisibility()
-            holder.binding.date.text = dateUtil.dateAndTimeString(tempTarget.timestamp) + " - " + dateUtil.timeString(tempTarget.end)
+            val sameDayPrevious = position > 0 && dateUtil.isSameDay(tempTarget.timestamp, tempTargetList[position-1].timestamp)
+            holder.binding.date.visibility = sameDayPrevious.not().toVisibility()
+            holder.binding.date.text = dateUtil.dateString(tempTarget.timestamp)
+            holder.binding.time.text = dateUtil.timeRangeString(tempTarget.timestamp, tempTarget.end)
             holder.binding.duration.text = rh.gs(R.string.format_mins, T.msecs(tempTarget.duration).mins())
             holder.binding.low.text = tempTarget.lowValueToUnitsToString(units)
             holder.binding.high.text = tempTarget.highValueToUnitsToString(units)
             holder.binding.reason.text = translator.translate(tempTarget.reason)
-            holder.binding.date.setTextColor(
+            holder.binding.time.setTextColor(
                 when {
                     tempTarget.id == currentlyActiveTarget?.id -> rh.gc(R.color.colorActive)
                     tempTarget.timestamp > dateUtil.now()      -> rh.gc(R.color.colorScheduled)
                     else                                       -> holder.binding.reasonColon.currentTextColor
                 })
             holder.binding.remove.tag = tempTarget
+            val nextTimestamp = if (tempTargetList.size != position + 1) tempTargetList[position + 1].timestamp else 0L
+            holder.binding.delimiter.visibility = dateUtil.isSameDay(tempTarget.timestamp, nextTimestamp).toVisibility()
         }
 
         override fun getItemCount(): Int = tempTargetList.size

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt

@@ -15,7 +15,6 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.ExtendedBolus
 import info.nightscout.androidaps.database.entities.TemporaryBasal
-import info.nightscout.androidaps.database.entities.UserEntry.*
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
@@ -165,12 +164,15 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
             holder.binding.ns.visibility = (tempBasal.interfaceIDs.nightscoutId != null).toVisibility()
             holder.binding.invalid.visibility = tempBasal.isValid.not().toVisibility()
             holder.binding.ph.visibility = (tempBasal.interfaceIDs.pumpId != null).toVisibility()
+            val sameDayPrevious = position > 0 && dateUtil.isSameDay(tempBasal.timestamp, tempBasalList[position-1].timestamp)
+            holder.binding.date.visibility = sameDayPrevious.not().toVisibility()
+            holder.binding.date.text = dateUtil.dateString(tempBasal.timestamp)
             if (tempBasal.isInProgress) {
-                holder.binding.date.text = dateUtil.dateAndTimeString(tempBasal.timestamp)
+                holder.binding.time.text = dateUtil.timeString(tempBasal.timestamp)
-                holder.binding.date.setTextColor(rh.gc(R.color.colorActive))
+                holder.binding.time.setTextColor(rh.gc(R.color.colorActive))
             } else {
-                holder.binding.date.text = dateUtil.dateAndTimeRangeString(tempBasal.timestamp, tempBasal.end)
+                holder.binding.time.text = dateUtil.timeRangeString(tempBasal.timestamp, tempBasal.end)
-                holder.binding.date.setTextColor(holder.binding.duration.currentTextColor)
+                holder.binding.time.setTextColor(holder.binding.duration.currentTextColor)
             }
             holder.binding.duration.text = rh.gs(R.string.format_mins, T.msecs(tempBasal.duration).mins())
             if (tempBasal.isAbsolute) holder.binding.rate.text = rh.gs(R.string.pump_basebasalrate, tempBasal.rate)
@@ -186,6 +188,9 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
             holder.binding.superBolusFlag.visibility = (tempBasal.type == TemporaryBasal.Type.SUPERBOLUS).toVisibility()
             if (abs(iob.basaliob) > 0.01) holder.binding.iob.setTextColor(rh.gc(R.color.colorActive)) else holder.binding.iob.setTextColor(holder.binding.duration.currentTextColor)
             holder.binding.remove.tag = tempBasal
+
+            val nextTimestamp = if (tempBasalList.size != position + 1) tempBasalList[position + 1].timestamp else 0L
+            holder.binding.delimiter.visibility = dateUtil.isSameDay(tempBasal.timestamp, nextTimestamp).toVisibility()
         }
 
         override fun getItemCount(): Int = tempBasalList.size

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt

@@ -20,6 +20,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.events.EventTreatmentUpdateGui
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
@@ -131,14 +132,19 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
 
         override fun onBindViewHolder(holder: UserEntryViewHolder, position: Int) {
             val current = entries[position]
-            holder.binding.date.text = dateUtil.dateAndTimeAndSecondsString(current.timestamp)
+            val sameDayPrevious = position > 0 && dateUtil.isSameDay(current.timestamp, entries[position-1].timestamp)
+            holder.binding.date.visibility = sameDayPrevious.not().toVisibility()
+            holder.binding.date.text = dateUtil.dateString(current.timestamp)
+            holder.binding.time.text = dateUtil.timeStringWithSeconds(current.timestamp)
             holder.binding.action.text = userEntryPresentationHelper.actionToColoredString(current.action)
-            holder.binding.s.text = current.note
+            holder.binding.notes.text = current.note
-            holder.binding.s.visibility = if (current.note != "") View.VISIBLE else View.GONE
+            holder.binding.notes.visibility = if (current.note != "") View.VISIBLE else View.GONE
             holder.binding.iconSource.setImageResource(userEntryPresentationHelper.iconId(current.source))
             holder.binding.iconSource.visibility = View.VISIBLE
             holder.binding.values.text = userEntryPresentationHelper.listToPresentationString(current.values)
             holder.binding.values.visibility = if (holder.binding.values.text != "") View.VISIBLE else View.GONE
+            val nextTimestamp = if (entries.size != position + 1) entries[position + 1].timestamp else 0L
+            holder.binding.delimiter.visibility = dateUtil.isSameDay(current.timestamp, nextTimestamp).toVisibility()
         }
 
         inner class UserEntryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt

@@ -7,8 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.work.ListenableWorker
-import androidx.work.workDataOf
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.AppRepository
@@ -118,7 +116,10 @@ class BGSourceFragment : DaggerFragment() {
             val glucoseValue = glucoseValues[position]
             holder.binding.ns.visibility = (glucoseValue.interfaceIDs.nightscoutId != null).toVisibility()
             holder.binding.invalid.visibility = (!glucoseValue.isValid).toVisibility()
-            holder.binding.date.text = dateUtil.dateAndTimeString(glucoseValue.timestamp)
+            val sameDayPrevious = position > 0 && dateUtil.isSameDay(glucoseValue.timestamp, glucoseValues[position-1].timestamp)
+            holder.binding.date.visibility = sameDayPrevious.not().toVisibility()
+            holder.binding.date.text = dateUtil.dateString(glucoseValue.timestamp)
+            holder.binding.time.text = dateUtil.timeString(glucoseValue.timestamp)
             holder.binding.value.text = glucoseValue.valueToUnitsString(profileFunction.getUnits())
             holder.binding.direction.setImageResource(glucoseValue.trendArrow.directionToIcon())
             holder.binding.remove.tag = glucoseValue

app/src/main/res/layout/bgsource_item.xml

@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bg_card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     card_view:cardBackgroundColor="@color/cardColorBackground"
-    card_view:cardCornerRadius="6dp"
+    card_view:cardUseCompatPadding="true">
-    card_view:cardUseCompatPadding="true"
+
-    card_view:contentPadding="6dp">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/list_delimiter"
+            android:gravity="center"
+            android:text="1.1.2000"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-        android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:padding="6dp">
 
             <TextView
-            android:id="@+id/date"
+                android:id="@+id/time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="16:55"
@@ -66,4 +80,6 @@
 
         </LinearLayout>
 
+    </LinearLayout>
+
 </androidx.cardview.widget.CardView>

app/src/main/res/layout/treatments_bolus_carbs_item.xml

@@ -12,6 +12,20 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter"
+            android:gravity="center"
+            android:text="1.1.2000"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:ignore="HardcodedText" />
+
         <LinearLayout
             android:id="@+id/metadata_layout"
             android:layout_width="match_parent"
@@ -29,11 +43,11 @@
                 tools:ignore="HardcodedText,RtlSymmetry" />
 
             <TextView
-                android:id="@+id/date"
+                android:id="@+id/calc_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="5dp"
-                android:text="1.1.2000"
+                android:text="11:45"
                 tools:ignore="HardcodedText,RtlSymmetry" />
 
             <TextView
@@ -65,17 +79,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="15dp"
+                android:layout_marginStart="5dp"
                 android:gravity="center"
                 android:text="{fa-clock-o}"
                 tools:ignore="HardcodedText,RtlSymmetry" />
 
             <TextView
-                android:id="@+id/bolus_date"
+                android:id="@+id/bolus_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="5dp"
-                android:text="1.1.2000"
+                android:text="11:45"
                 tools:ignore="HardcodedText,RtlSymmetry" />
 
             <TextView
@@ -173,17 +187,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="15dp"
+                android:layout_marginStart="5dp"
                 android:gravity="center"
                 android:text="{fa-clock-o}"
                 tools:ignore="HardcodedText,RtlSymmetry" />
 
             <TextView
-                android:id="@+id/carbs_date"
+                android:id="@+id/carbs_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="5dp"
-                android:text="1.1.2000"
+                android:text="11:45"
                 tools:ignore="HardcodedText,RtlSymmetry" />
 
             <TextView
@@ -258,6 +272,7 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
             android:layout_marginLeft="5dp"

app/src/main/res/layout/treatments_careportal_item.xml

@@ -12,13 +12,26 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter"
+            android:gravity="center"
+            android:text="1.1.2000"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:ignore="HardcodedText" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:baselineAligned="true"
             android:orientation="horizontal">
 
-
             <com.joanzapata.iconify.widget.IconTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -30,11 +43,11 @@
                 tools:ignore="HardcodedText" />
 
             <TextView
-                android:id="@+id/date"
+                android:id="@+id/time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingEnd="10dp"
-                android:text="1.1.2000 18:00"
+                android:text="18:00"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 tools:ignore="HardcodedText,RtlSymmetry" />
 
@@ -111,6 +124,7 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
             android:layout_marginStart="5dp"

app/src/main/res/layout/treatments_extendedbolus_item.xml

@@ -12,13 +12,26 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter"
+            android:gravity="center"
+            android:text="1.1.2000"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:ignore="HardcodedText" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:baselineAligned="true"
             android:orientation="horizontal">
 
-
             <com.joanzapata.iconify.widget.IconTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -30,10 +43,10 @@
                 tools:ignore="HardcodedText" />
 
             <TextView
-                android:id="@+id/date"
+                android:id="@+id/time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="1.1.2000 18:00"
+                android:text="18:00"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 tools:ignore="HardcodedText" />
 
@@ -158,6 +171,7 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
             android:layout_marginBottom="5dp"

app/src/main/res/layout/treatments_profileswitch_item.xml

@@ -12,13 +12,26 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter"
+            android:gravity="center"
+            android:text="1.1.2000"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:ignore="HardcodedText" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:baselineAligned="true"
             android:orientation="horizontal">
 
-
             <com.joanzapata.iconify.widget.IconTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -30,11 +43,11 @@
                 tools:ignore="HardcodedText" />
 
             <TextView
-                android:id="@+id/date"
+                android:id="@+id/time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="10dp"
-                android:text="1.1.2000 18:00"
+                android:text="18:00"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 tools:ignore="HardcodedText,RtlSymmetry" />
 
@@ -124,6 +137,7 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
             android:layout_marginLeft="5dp"

app/src/main/res/layout/treatments_tempbasals_item.xml

@@ -12,13 +12,26 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter"
+            android:gravity="center"
+            android:text="1.1.2000"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:ignore="HardcodedText" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:baselineAligned="true"
             android:orientation="horizontal">
 
-
             <com.joanzapata.iconify.widget.IconTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -30,10 +43,10 @@
                 tools:ignore="HardcodedText" />
 
             <TextView
-                android:id="@+id/date"
+                android:id="@+id/time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="1.1.2000 18:00"
+                android:text="18:00"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 tools:ignore="HardcodedText" />
 
@@ -178,6 +191,7 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
             android:layout_marginLeft="5dp"

app/src/main/res/layout/treatments_temptarget_item.xml

@@ -12,13 +12,26 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter"
+            android:gravity="center"
+            android:text="1.1.2000"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:ignore="HardcodedText" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:baselineAligned="true"
             android:orientation="horizontal">
 
-
             <com.joanzapata.iconify.widget.IconTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -30,7 +43,7 @@
                 tools:ignore="HardcodedText" />
 
             <TextView
-                android:id="@+id/date"
+                android:id="@+id/time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="10dp"
@@ -146,6 +159,7 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
             android:layout_marginLeft="5dp"

app/src/main/res/layout/treatments_user_entry_item.xml

@@ -7,18 +7,33 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-
     <TextView
         android:id="@+id/date"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginBottom="5dp"
+        android:background="@color/list_delimiter"
+        android:gravity="center"
+        android:text="1.1.2000"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="HardcodedText,RtlSymmetry" />
+
+    <TextView
+        android:id="@+id/time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="10dp"
         android:paddingTop="3dp"
-                android:text="1.1.2021 09:00"
+        android:text="09:00"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        app:layout_constraintBottom_toBottomOf="@+id/iconSource"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/iconSource"
-                app:layout_constraintBottom_toBottomOf="@+id/iconSource"
-                android:textAppearance="?android:attr/textAppearanceSmall"
         tools:ignore="HardcodedText,RtlSymmetry" />
 
     <TextView
@@ -28,10 +43,10 @@
         android:paddingStart="10dp"
         android:paddingTop="3dp"
         android:text="USER ENTRY"
-                app:layout_constraintStart_toEndOf="@id/date"
+        android:textAppearance="?android:attr/textAppearanceSmall"
         app:layout_constraintEnd_toStartOf="@+id/iconSource"
-                app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toEndOf="@id/time"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
+        app:layout_constraintTop_toBottomOf="@id/date" />
 
     <ImageView
         android:id="@+id/iconSource"
@@ -39,12 +54,11 @@
         android:layout_height="24dp"
         android:layout_marginEnd="8dp"
         android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="@+id/action"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/action"
-                app:layout_constraintBottom_toBottomOf="@+id/action"
         app:srcCompat="@drawable/ic_cp_bolus_carbs" />
 
-
     <TextView
         android:id="@+id/values"
         android:layout_width="wrap_content"
@@ -52,35 +66,35 @@
         android:layout_gravity="center_vertical"
         android:paddingStart="20dp"
         android:paddingEnd="10dp"
+        android:text="Values with units"
         android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/action"
         android:visibility="gone"
-            android:text="Values with units" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/action" />
 
     <TextView
-            android:id="@+id/s"
+        android:id="@+id/notes"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="20dp"
         android:paddingEnd="10dp"
-            app:layout_constraintStart_toStartOf="parent"
+        android:text="Notes"
-            app:layout_constraintTop_toBottomOf="@id/values"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:visibility="gone"
-            android:text="Notes"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/values"
         tools:ignore="HardcodedText,RtlSymmetry" />
 
     <View
+        android:id="@+id/delimiter"
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-            android:layout_marginBottom="5dp"
         android:layout_marginStart="5dp"
-            android:layout_marginEnd="5dp"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="5dp"
+        android:background="@color/list_delimiter"
         app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/s"
+        app:layout_constraintTop_toBottomOf="@id/notes" />
-            android:background="@color/list_delimiter" />
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>

core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt

@@ -6,6 +6,7 @@ import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.shared.SafeParse
+import org.apache.commons.lang3.time.DateUtils.isSameDay
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
 import org.joda.time.format.ISODateTimeFormat
@@ -131,6 +132,10 @@ class DateUtil @Inject constructor(private val context: Context) {
         return dateAndTimeString(start) + " - " + timeString(end)
     }
 
+    fun timeRangeString(start: Long, end: Long): String {
+        return timeString(start) + " - " + timeString(end)
+    }
+
     fun dateAndTimeString(mills: Long): String {
         return if (mills == 0L) "" else dateString(mills) + " " + timeString(mills)
     }
@@ -207,6 +212,8 @@ class DateUtil @Inject constructor(private val context: Context) {
         return TimeZone.getDefault().getOffset(timestamp) / 60000
     }
 
+    fun isSameDay(timestamp1: Long, timestamp2: Long) = isSameDay(Date(timestamp1), Date(timestamp2))
+
     //Map:{DAYS=1, HOURS=3, MINUTES=46, SECONDS=40, MILLISECONDS=0, MICROSECONDS=0, NANOSECONDS=0}
     fun computeDiff(date1: Long, date2: Long): Map<TimeUnit, Long> {
         val units: MutableList<TimeUnit> = ArrayList(EnumSet.allOf(TimeUnit::class.java))