[new feature] Enhanced Time In Range (TIR) Visualization

app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt

@@ -22,6 +22,7 @@ import app.aaps.core.interfaces.rx.events.EventIobCalculationProgress
 import app.aaps.core.interfaces.rx.events.EventRefreshOverview
 import app.aaps.core.interfaces.rx.events.EventScale
 import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph
+import app.aaps.core.interfaces.stats.TirCalculator
 import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
 import app.aaps.core.interfaces.workflow.CalculationWorkflow
@@ -31,6 +32,7 @@ import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
 import app.aaps.core.ui.extensions.toVisibility
 import app.aaps.core.ui.extensions.toVisibilityKeepSpace
 import app.aaps.databinding.ActivityHistorybrowseBinding
+import app.aaps.plugins.main.general.overview.TirHelper
 import app.aaps.plugins.main.general.overview.graphData.GraphData
 import com.google.android.material.datepicker.MaterialDatePicker
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -56,6 +58,8 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
     @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var graphDataProvider: Provider<GraphData>
+    @Inject lateinit var tirCalculator: TirCalculator
+    @Inject lateinit var tirHelper: TirHelper
 
     private val disposable = CompositeDisposable()
 
@@ -400,6 +404,38 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
                 ).toVisibility()
             secondaryGraphsData[g].performUpdate()
         }
+
+        updateTirChart(menuChartSettings)
+    }
+
+    private fun updateTirChart(menuChartSettings: List<Array<Boolean>>) {
+        val tirEnabled = menuChartSettings.isNotEmpty() &&
+                         menuChartSettings[0][OverviewMenus.CharType.TIR.ordinal]
+
+        aapsLogger.debug(LTag.UI, "TIR Chart (History) - enabled: $tirEnabled, fromTime: ${historyBrowserData.overviewData.fromTime}, toTime: ${historyBrowserData.overviewData.toTime}")
+
+        if (tirEnabled) {
+            try {
+                val tirData = tirHelper.calculateTirForRange(
+                    historyBrowserData.overviewData.fromTime,
+                    historyBrowserData.overviewData.toTime
+                )
+
+                // Only show chart if there's data
+                if (tirData.count > 0) {
+                    val titleText = rh.gs(app.aaps.plugins.main.R.string.tir_shown_time)
+                    binding.tirChart.tirChartLayout.visibility = android.view.View.VISIBLE
+                    binding.tirChart.tirChartView.setData(tirData, titleText)
+                } else {
+                    binding.tirChart.tirChartLayout.visibility = android.view.View.GONE
+                }
+            } catch (e: Exception) {
+                aapsLogger.error(LTag.UI, "Error calculating TIR for history", e)
+                binding.tirChart.tirChartLayout.visibility = android.view.View.GONE
+            }
+        } else {
+            binding.tirChart.tirChartLayout.visibility = android.view.View.GONE
+        }
     }
 
     private fun updateCalcProgress(percent: Int) {

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

@@ -109,6 +109,10 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
 
+            <include
+                android:id="@+id/tir_chart"
+                layout="@layout/overview_tir_chart" />
+
         </LinearLayout>
 
     </LinearLayout>

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt

@@ -16,6 +16,7 @@ interface OverviewMenus {
         SEN,
         VAR_SEN,
         ACT,
+        TIR,
         DEVSLOPE,
         HR,
         STEPS

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/stats/TirCalculator.kt

@@ -7,5 +7,7 @@ import androidx.collection.LongSparseArray
 interface TirCalculator {
 
     fun calculate(days: Long, lowMgdl: Double, highMgdl: Double): LongSparseArray<TIR>
+    fun calculateToday(lowMgdl: Double, highMgdl: Double): TIR
+    fun calculateRange(start: Long, end: Long, lowMgdl: Double, highMgdl: Double): TIR
     fun stats(context: Context): TableLayout
 }

implementation/src/main/kotlin/app/aaps/implementation/stats/TirCalculatorImpl.kt

@@ -50,6 +50,29 @@ class TirCalculatorImpl @Inject constructor(
         return result
     }
 
+    override fun calculateToday(lowMgdl: Double, highMgdl: Double): TIR {
+        val midnight = MidnightTime.calc(dateUtil.now())
+        val now = dateUtil.now()
+        return calculateRange(midnight, now, lowMgdl, highMgdl)
+    }
+
+    override fun calculateRange(start: Long, end: Long, lowMgdl: Double, highMgdl: Double): TIR {
+        if (lowMgdl < 39) throw RuntimeException("Low below 39")
+        if (lowMgdl > highMgdl) throw RuntimeException("Low > High")
+
+        val bgReadings = persistenceLayer.getBgReadingsDataFromTimeToTime(start, end, true)
+        val tir = TirImpl(start, lowMgdl, highMgdl)
+
+        for (bg in bgReadings) {
+            if (bg.value < 39) tir.error()
+            if (bg.value >= 39 && bg.value < lowMgdl) tir.below()
+            if (bg.value in lowMgdl..highMgdl) tir.inRange()
+            if (bg.value > highMgdl) tir.above()
+        }
+
+        return tir
+    }
+
     private fun averageTIR(tirs: LongSparseArray<TIR>): TIR {
         val totalTir = if (tirs.size() > 0) {
             TirImpl(tirs.valueAt(0).date, tirs.valueAt(0).lowThreshold, tirs.valueAt(0).highThreshold)