From f2cad9073c57142efe9618202d85c19d72b58e0a Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 24 May 2024 15:18:00 +0200
Subject: [PATCH 1/3] New Graph menu and rescale menu

---
 .../aaps/activities/HistoryBrowseActivity.kt  |  34 ++-
 .../res/layout/activity_historybrowse.xml     |  19 +-
 .../core/interfaces/overview/OverviewMenus.kt |   3 +-
 .../main/general/overview/OverviewFragment.kt |  35 ++-
 .../general/overview/OverviewMenusImpl.kt     | 224 +++++++++++-------
 .../res/layout/overview_graphs_layout.xml     |  20 +-
 plugins/main/src/main/res/values/strings.xml  |  13 +
 7 files changed, 248 insertions(+), 100 deletions(-)

diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
index 77aa449fae9..5752abea919 100644
--- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
@@ -4,10 +4,13 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import android.util.DisplayMetrics
+import android.view.Menu
+import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
+import androidx.appcompat.widget.PopupMenu
 import app.aaps.core.data.time.T
 import app.aaps.core.interfaces.configuration.Config
 import app.aaps.core.interfaces.logging.AAPSLogger
@@ -33,6 +36,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.R
 import app.aaps.plugins.main.general.overview.graphData.GraphData
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.jjoe64.graphview.GraphView
@@ -140,7 +144,23 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
         binding.bgGraph.gridLabelRenderer?.reloadStyles()
         binding.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth
 
-        overviewMenus.setupChartMenu(context, binding.chartMenuButton)
+        overviewMenus.setupChartMenu(binding.chartMenuButton)
+        binding.scaleButton.setOnClickListener { v: View ->
+            val popup = PopupMenu(v.context, v)
+            popup.menu.add(Menu.NONE, 6, Menu.NONE, rh.gs(R.string.graph_long_scale_6h))
+            popup.menu.add(Menu.NONE, 12, Menu.NONE, rh.gs(R.string.graph_long_scale_12h))
+            popup.menu.add(Menu.NONE, 18, Menu.NONE, rh.gs(R.string.graph_long_scale_18h))
+            popup.menu.add(Menu.NONE, 24, Menu.NONE, rh.gs(R.string.graph_long_scale_24h))
+            popup.setOnMenuItemClickListener {
+                // id == Range to display ...
+                rxBus.send(EventScale(it.itemId))
+                return@setOnMenuItemClickListener true
+            }
+            binding.scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_up_white_24dp), null)
+            popup.setOnDismissListener { binding.scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_down_white_24dp), null) }
+            popup.show()
+            false
+        }
         prepareGraphsIfNeeded(overviewMenus.setting.size)
         savedInstanceState?.let { bundle ->
             rangeToDisplay = bundle.getInt("rangeToDisplay", 0)
@@ -184,6 +204,7 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
             .observeOn(aapsSchedulers.main)
             .subscribe({
                            rangeToDisplay = it.hours
+                           updateScaletext()
                            setTime(historyBrowserData.overviewData.fromTime)
                            loadAll("rangeChange")
                        }, fabricPrivacy::logException)
@@ -291,12 +312,21 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
         binding.zoom.text = rangeToDisplay.toString()
     }
 
+    private fun updateScaletext() {
+        binding.scaleButton.text = when (rangeToDisplay) {
+            6   -> rh.gs(R.string.graph_scale_6h)
+            12  -> rh.gs(R.string.graph_scale_12h)
+            18  -> rh.gs(R.string.graph_scale_18h)
+            24  -> rh.gs(R.string.graph_scale_24h)
+            else -> ""
+        }
+    }
     @SuppressLint("SetTextI18n")
     fun updateGUI(from: String) {
         aapsLogger.debug(LTag.UI, "updateGui $from")
 
         updateDate()
-
+        updateScaletext()
         val pump = activePlugin.activePump
         val graphData = GraphData(injector, binding.bgGraph, historyBrowserData.overviewData)
         val menuChartSettings = overviewMenus.setting
diff --git a/app/src/main/res/layout/activity_historybrowse.xml b/app/src/main/res/layout/activity_historybrowse.xml
index 5e309f77e09..0d6275f6769 100644
--- a/app/src/main/res/layout/activity_historybrowse.xml
+++ b/app/src/main/res/layout/activity_historybrowse.xml
@@ -78,14 +78,27 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent" />
 
+                <Button
+                    android:id="@+id/scale_button"
+                    android:layout_width="65dp"
+                    android:layout_height="35dp"
+                    android:layout_marginStart="35dp"
+                    android:textAllCaps="false"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentStart="true"
+                    android:padding = "0dp"
+                    android:drawableRight="@drawable/ic_arrow_drop_down_white_24dp"
+                    android:contentDescription="@string/a11y_graph_scale" />
+
                 <ImageButton
                     android:id="@+id/chart_menu_button"
-                    android:layout_width="30dp"
-                    android:layout_height="wrap_content"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
                     android:layout_alignParentTop="true"
                     android:layout_alignParentEnd="true"
-                    android:contentDescription="@string/chart_menu"
+                    android:layout_marginEnd="5dp"
                     android:paddingTop="5dp"
+                    android:contentDescription="@string/chart_menu"
                     app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
 
             </RelativeLayout>
diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt
index 48436e1c87b..1e75059f96c 100644
--- a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt
+++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt
@@ -1,6 +1,5 @@
 package app.aaps.core.interfaces.overview
 
-import android.content.Context
 import android.widget.ImageButton
 
 interface OverviewMenus {
@@ -23,7 +22,7 @@ interface OverviewMenus {
 
     val setting: List<Array<Boolean>>
     fun loadGraphConfig()
-    fun setupChartMenu(context: Context, chartButton: ImageButton)
+    fun setupChartMenu(chartButton: ImageButton)
     fun enabledTypes(graph: Int): String
     fun isEnabledIn(type: CharType): Int
 }
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
index cadb99aa0b7..6dde1156702 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
+++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
@@ -21,7 +21,9 @@ import android.view.View.OnLongClickListener
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
+import android.view.Menu
 import android.widget.TextView
+import androidx.appcompat.widget.PopupMenu
 import androidx.core.text.toSpanned
 import androidx.recyclerview.widget.LinearLayoutManager
 import app.aaps.core.data.configuration.Constants
@@ -221,7 +223,26 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             false
         }
         prepareGraphsIfNeeded(overviewMenus.setting.size)
-        context?.let { overviewMenus.setupChartMenu(it, binding.graphsLayout.chartMenuButton) }
+        overviewMenus.setupChartMenu(binding.graphsLayout.chartMenuButton)
+        updateScaletext()
+
+        binding.graphsLayout.scaleButton.setOnClickListener { v: View ->
+            val popup = PopupMenu(v.context, v)
+            popup.menu.add(Menu.NONE, 6, Menu.NONE, rh.gs(R.string.graph_long_scale_6h))
+            popup.menu.add(Menu.NONE, 12, Menu.NONE, rh.gs(R.string.graph_long_scale_12h))
+            popup.menu.add(Menu.NONE, 18, Menu.NONE, rh.gs(R.string.graph_long_scale_18h))
+            popup.menu.add(Menu.NONE, 24, Menu.NONE, rh.gs(R.string.graph_long_scale_24h))
+            popup.setOnMenuItemClickListener {
+                // id == Range to display ...
+                rxBus.send(EventScale(it.itemId))
+                return@setOnMenuItemClickListener true
+            }
+            binding.graphsLayout.scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_up_white_24dp), null)
+            popup.setOnDismissListener { binding.graphsLayout.scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_down_white_24dp), null) }
+            popup.show()
+            false
+        }
+
         binding.graphsLayout.chartMenuButton.visibility = preferences.simpleMode.not().toVisibility()
 
         binding.activeProfile.setOnClickListener(this)
@@ -241,6 +262,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         binding.infoLayout.apsMode.setOnLongClickListener(this)
     }
 
+    private fun updateScaletext() {
+        val selectedScale = sp.getInt(app.aaps.core.utils.R.string.key_rangetodisplay, 6)
+        binding.graphsLayout.scaleButton.text = when (selectedScale) {
+            6   -> rh.gs(R.string.graph_scale_6h)
+            12  -> rh.gs(R.string.graph_scale_12h)
+            18  -> rh.gs(R.string.graph_scale_18h)
+            24  -> rh.gs(R.string.graph_scale_24h)
+            else -> ""
+        }
+    }
     @Synchronized
     override fun onPause() {
         super.onPause()
@@ -280,6 +311,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             .subscribe({
                            overviewData.rangeToDisplay = it.hours
                            sp.putInt(app.aaps.core.utils.R.string.key_rangetodisplay, it.hours)
+                           updateScaletext()
                            rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.utils.R.string.key_rangetodisplay)))
                            sp.putBoolean(app.aaps.core.utils.R.string.key_objectiveusescale, true)
                        }, fabricPrivacy::logException)
@@ -351,6 +383,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (!config.appInitialized) return
         runOnUiThread {
             _binding ?: return@runOnUiThread
+            updateScaletext()
             updateTime()
             updateSensitivity()
             updateGraph()
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
index f1d8682a2d2..4d58fa90329 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
+++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
@@ -4,12 +4,19 @@ import android.content.Context
 import android.text.SpannableString
 import android.text.style.BackgroundColorSpan
 import android.text.style.ForegroundColorSpan
-import android.view.Menu
+import android.view.Gravity
 import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.CompoundButton
+import android.widget.HorizontalScrollView
 import android.widget.ImageButton
+import android.widget.PopupWindow
+import android.widget.ScrollView
+import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
-import androidx.appcompat.widget.PopupMenu
+import androidx.gridlayout.widget.GridLayout
 import app.aaps.core.interfaces.aps.Loop
 import app.aaps.core.interfaces.configuration.Config
 import app.aaps.core.interfaces.logging.AAPSLogger
@@ -17,7 +24,6 @@ import app.aaps.core.interfaces.overview.OverviewMenus
 import app.aaps.core.interfaces.resources.ResourceHelper
 import app.aaps.core.interfaces.rx.bus.RxBus
 import app.aaps.core.interfaces.rx.events.EventRefreshOverview
-import app.aaps.core.interfaces.rx.events.EventScale
 import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
 import app.aaps.core.keys.Preferences
@@ -67,7 +73,6 @@ class OverviewMenusImpl @Inject constructor(
     companion object {
 
         const val MAX_GRAPHS = 5 // including main
-        const val SCALE_ID = 1001
     }
 
     override fun enabledTypes(graph: Int): String {
@@ -81,11 +86,20 @@ class OverviewMenusImpl @Inject constructor(
     }
 
     private var _setting: MutableList<Array<Boolean>> = ArrayList()
+        get() = field.also {
+            while (it.size < MAX_GRAPHS)
+                it.add(Array(CharTypeData.entries.size) { false })
+        }
 
     override val setting: List<Array<Boolean>>
         @Synchronized get() =
-            if (!preferences.simpleMode)
-                _setting.toMutableList() // implicitly does a list copy
+            if (!preferences.simpleMode) // implicitly does a list copy and update according to number of graphs
+                _setting.toMutableList().also {
+                    for (i in it.size - 1 downTo 1) {
+                        if (!it[i].any { it })
+                            it.removeAt(i)
+                    }
+                }
             else
                 listOf(
                     arrayOf(true, true, true, false, false, false, false, false, false, false, false, false, false, false),
@@ -109,113 +123,147 @@ class OverviewMenusImpl @Inject constructor(
             // reset when new CharType added
             for (s in _setting)
                 if (s.size != OverviewMenus.CharType.entries.size) {
-                    _setting = ArrayList()
-                    _setting.add(Array(OverviewMenus.CharType.entries.size) { CharTypeData.entries[it].enabledByDefault })
+                    _setting = ArrayList<Array<Boolean>>().also { it.add(Array(OverviewMenus.CharType.entries.size) { CharTypeData.entries[it].enabledByDefault }) }
                 }
         } else {
-            _setting = ArrayList()
-            _setting.add(Array(OverviewMenus.CharType.entries.size) { CharTypeData.entries[it].enabledByDefault })
+            _setting = ArrayList<Array<Boolean>>().also { it.add(Array(OverviewMenus.CharType.entries.size) { CharTypeData.entries[it].enabledByDefault }) }
         }
     }
 
-    override fun setupChartMenu(context: Context, chartButton: ImageButton) {
-        val settingsCopy = setting
-        val numOfGraphs = settingsCopy.size // 1 main + x secondary
+    override fun setupChartMenu(chartButton: ImageButton) {
 
         chartButton.setOnClickListener { v: View ->
+            var itemRow = 0
             val predictionsAvailable: Boolean = when {
                 config.APS      -> loop.lastRun?.request?.hasPredictions ?: false
                 config.NSCLIENT -> true
                 else            -> false
             }
-            val popup = PopupMenu(v.context, v)
+            val popup = PopupWindow(v.context)
+            val scrollView = ScrollView(v.context)                        // required to be able to scroll menu on low res screen
+            val horizontalScrollView = HorizontalScrollView(v.context)    // Workaround because I was not able to manage first column width for long labels
+            horizontalScrollView.addView(scrollView)
 
-            popup.menu.addSubMenu(Menu.NONE, SCALE_ID, Menu.NONE, rh.gs(R.string.graph_scale)).also {
-                it.add(Menu.NONE, SCALE_ID + 6, Menu.NONE, "6")
-                it.add(Menu.NONE, SCALE_ID + 12, Menu.NONE, "12")
-                it.add(Menu.NONE, SCALE_ID + 18, Menu.NONE, "18")
-                it.add(Menu.NONE, SCALE_ID + 24, Menu.NONE, "24")
-            }
+            val layout = GridLayout(v.context)
+            layout.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)  // not sure it works
 
-            val used = arrayListOf<Int>()
+            scrollView.addView(layout)
+            layout.columnCount = MAX_GRAPHS
 
-            for (g in 0 until numOfGraphs) {
-                if (g != 0) {
-                    val dividerItem = popup.menu.add(Menu.NONE, g, Menu.NONE, "------- ${rh.gs(R.string.graph_menu_divider_header)} $g -------")
-                    dividerItem.isCheckable = true
-                    dividerItem.isChecked = true
-                }
-                CharTypeData.entries.forEach { m ->
-                    if (g == 0 && !m.primary) return@forEach
-                    if (g > 0 && !m.secondary) return@forEach
-                    var insert = true
-                    if (m == CharTypeData.PRE) insert = predictionsAvailable
-                    if (m == CharTypeData.DEVSLOPE) insert = config.isDev()
-                    if (used.contains(m.ordinal)) insert = false
-                    for (g2 in g + 1 until numOfGraphs) {
-                        if (settingsCopy[g2][m.ordinal]) insert = false
-                    }
-                    if (insert) {
-                        val item = popup.menu.add(Menu.NONE, m.ordinal + 100 * (g + 1), Menu.NONE, rh.gs(m.nameId))
-                        val title = item.title
-                        val s = SpannableString(" $title ")
-                        s.setSpan(ForegroundColorSpan(rh.gac(m.attrTextId)), 0, s.length, 0)
-                        s.setSpan(BackgroundColorSpan(rh.gac(m.attrId)), 0, s.length, 0)
-                        item.title = s
-                        item.isCheckable = true
-                        item.isChecked = settingsCopy[g][m.ordinal]
-                        if (settingsCopy[g][m.ordinal]) used.add(m.ordinal)
-                    }
+            // instert primary items
+            CharTypeData.entries.forEach { m ->
+                var insert = true
+                if (m == CharTypeData.PRE) insert = predictionsAvailable
+                if (insert && m.primary) {
+                    createCustomMenuItemView(v.context, m, itemRow, layout, true)
+                    itemRow++
                 }
             }
-            if (numOfGraphs < MAX_GRAPHS) {
-                val dividerItem = popup.menu.add(Menu.NONE, numOfGraphs, Menu.NONE, "------- ${rh.gs(R.string.graph_menu_divider_header)} $numOfGraphs -------")
-                dividerItem.isCheckable = true
-                dividerItem.isChecked = false
+
+            // insert hearder row
+            var layoutParamsLabel = GridLayout.LayoutParams(GridLayout.spec(itemRow, 1), GridLayout.spec(0, 1))
+            val textView = TextView(v.context).also {
+                it.text = " ${rh.gs(R.string.graph_menu_divider_header)}"
+                it.maxLines = 3                                                     // don't works currently
             }
+            layout.addView(textView, layoutParamsLabel)
+            for (i in 1..(MAX_GRAPHS - 1)) {
+                val item = TextView(v.context).also {
+                    it.gravity = Gravity.CENTER
+                    it.text = "$i"
+                }
+                layoutParamsLabel = GridLayout.LayoutParams(GridLayout.spec(itemRow, 1), GridLayout.spec(i, 1)).apply {
+                    setGravity(Gravity.CENTER)
+                }
+                layout.addView(item, layoutParamsLabel)
+            }
+            itemRow++
 
-            popup.setOnMenuItemClickListener {
-                synchronized(this) {
-                    try {
-                        // id < 100 graph header - divider 1, 2, 3 .....
-                        when {
-                            it.itemId == SCALE_ID                              -> {
-                                // do nothing, submenu
-                            }
-
-                            it.itemId > SCALE_ID && it.itemId < SCALE_ID + 100 -> {
-                                val hours = it.itemId - SCALE_ID // 6,12,....
-                                rxBus.send(EventScale(hours))
-                            }
-
-                            it.itemId == numOfGraphs                           -> {
-                                // add new empty
-                                _setting.add(Array(CharTypeData.entries.size) { false })
-                            }
-
-                            it.itemId < 100                                    -> {
-                                // remove graph
-                                _setting.removeAt(it.itemId)
-                            }
-
-                            else                                               -> {
-                                val graphNumber = it.itemId / 100 - 1
-                                val item = it.itemId % 100
-                                _setting[graphNumber][item] = !it.isChecked
-                            }
-                        }
-                    } catch (exception: Exception) {
-                        fabricPrivacy.logException(exception)
+            // instert secondary items
+            CharTypeData.entries.forEach { m ->
+                var insert = true
+                if (m == CharTypeData.DEVSLOPE) insert = config.isDev()
+                if (insert && m.secondary) {
+                    createCustomMenuItemView(v.context, m, itemRow, layout, false)
+                    itemRow++
+                }
+            }
+            popup.contentView = horizontalScrollView
+            // Permettre la fermeture de la PopupWindow en touchant en dehors
+            popup.isOutsideTouchable = true
+            popup.isFocusable = true
+            popup.setOnDismissListener {    // remove empty graphs
+                chartButton.setImageResource(R.drawable.ic_arrow_drop_down_white_24dp)
+                _setting.let {
+                    for (i in it.size - 1 downTo 1) {
+                        if (!isSecondary(it[i]))
+                            it.removeAt(i)
                     }
                 }
                 storeGraphConfig()
-                setupChartMenu(context, chartButton)
                 rxBus.send(EventRefreshOverview("OnMenuItemClickListener", now = true))
-                return@setOnMenuItemClickListener true
             }
             chartButton.setImageResource(R.drawable.ic_arrow_drop_up_white_24dp)
-            popup.setOnDismissListener { chartButton.setImageResource(R.drawable.ic_arrow_drop_down_white_24dp) }
-            popup.show()
+            popup.showAsDropDown(v)
+        }
+    }
+
+    fun isSecondary(graphArray: Array<Boolean>): Boolean = graphArray.filterIndexed { index, _ -> CharTypeData.entries[index].secondary }.reduce { acc, b -> acc || b }
+
+    private fun createCustomMenuItemView(context: Context, m: CharTypeData, rowIndex: Int, layout: GridLayout, primary: Boolean) {
+        var layoutParamsLabel = GridLayout.LayoutParams(GridLayout.spec(rowIndex, 1), GridLayout.spec(0, 1))
+        val textView = TextView(context).also {
+            it.text = formatedText(m)
+            it.maxLines = 3                                                     // don't works currently
+        }
+        layout.addView(textView, layoutParamsLabel)
+
+        val checkBoxes = mutableListOf<CheckBox>()
+
+        // Create one or 4 checkbox
+        for (i in 1..(MAX_GRAPHS - 1)) {
+            val item = if (!primary || i == (MAX_GRAPHS - 1)) CheckBox(context) else TextView(context)
+            item.id = i
+            if (item is CheckBox) {
+                if (primary)
+                    item.isChecked = _setting[0][m.ordinal]
+                else
+                    item.isChecked = _setting[i][m.ordinal]
+                checkBoxes.add(item)
+            }
+            layoutParamsLabel = GridLayout.LayoutParams(GridLayout.spec(rowIndex, 1), GridLayout.spec(i, 1))
+            layout.addView(item, layoutParamsLabel)
+        }
+
+        val checkBoxListener = CompoundButton.OnCheckedChangeListener { buttonView, isChecked ->
+            // Update other Checkboxes on same row to allow a curve to only one subgraph
+            if (isChecked) {
+                checkBoxes.forEach { checkBox ->
+                    if (checkBox != buttonView) {
+                        checkBox.isChecked = false
+                    }
+                }
+            }
+            if (m.primary)
+                _setting[0][m.ordinal] = checkBoxes[0].isChecked
+            else {
+                checkBoxes.forEach { checkBox ->
+                    _setting[checkBox.id][m.ordinal] = checkBox.isChecked
+                }
+            }
+            storeGraphConfig()
+            rxBus.send(EventRefreshOverview("OnMenuItemClickListener", now = true))
+        }
+
+        checkBoxes.forEach { checkBox ->
+            checkBox.setOnCheckedChangeListener(checkBoxListener)
+        }
+    }
+
+    private fun formatedText(m: CharTypeData): SpannableString {
+        return SpannableString(" ${rh.gs(m.nameId)} ").also {
+            it.setSpan(ForegroundColorSpan(rh.gac(m.attrTextId)), 0, it.length, 0)
+            it.setSpan(BackgroundColorSpan(rh.gac(m.attrId)), 0, it.length, 0)
         }
     }
 
diff --git a/plugins/main/src/main/res/layout/overview_graphs_layout.xml b/plugins/main/src/main/res/layout/overview_graphs_layout.xml
index 1bca74a8093..9585f013617 100644
--- a/plugins/main/src/main/res/layout/overview_graphs_layout.xml
+++ b/plugins/main/src/main/res/layout/overview_graphs_layout.xml
@@ -17,15 +17,27 @@
             android:layout_height="200dp"
             android:contentDescription="@string/a11y_graph" />
 
+        <Button
+            android:id="@+id/scale_button"
+            android:layout_width="65dp"
+            android:layout_height="35dp"
+            android:layout_marginStart="35dp"
+            android:textAllCaps="false"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentStart="true"
+            android:padding = "0dp"
+            android:drawableRight="@drawable/ic_arrow_drop_down_white_24dp"
+            android:contentDescription="@string/a11y_graph_scale" />
+
         <ImageButton
             android:id="@+id/chart_menu_button"
-            android:layout_width="30dp"
-            android:layout_height="wrap_content"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
             android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginEnd="3dp"
-            android:contentDescription="@string/chart_menu"
+            android:layout_marginEnd="5dp"
             android:paddingTop="5dp"
+            android:contentDescription="@string/chart_menu"
             app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
 
     </RelativeLayout>
diff --git a/plugins/main/src/main/res/values/strings.xml b/plugins/main/src/main/res/values/strings.xml
index 7bbb87e7e8d..fbe96678e06 100644
--- a/plugins/main/src/main/res/values/strings.xml
+++ b/plugins/main/src/main/res/values/strings.xml
@@ -203,7 +203,20 @@
     <string name="statuslights_bat_warning">Threshold warning pump battery level [%]</string>
     <string name="statuslights_bat_critical">Threshold critical pump battery level [%]</string>
     <string name="statuslights_copy_ns">Copy settings from NS</string>
+    <string name="graph_scale_6h">6h</string>
+    <string name="graph_scale_12h">12h</string>
+    <string name="graph_scale_18h">18h</string>
+    <string name="graph_scale_24h">24h</string>
+    <string name="graph_long_scale_6h">6 hours</string>
+    <string name="graph_long_scale_12h">12 hours</string>
+    <string name="graph_long_scale_18h">18 hours</string>
+    <string name="graph_long_scale_24h">24 hours</string>
     <string name="a11y_graph">graph</string>
+    <string name="a11y_graph_scale">selet graph scale</string>
+    <string name="a11y_graph_scale_6h">graph scale 6 hours</string>
+    <string name="a11y_graph_scale_12h">graph scale 12 hours</string>
+    <string name="a11y_graph_scale_18h">graph scale 18 hours</string>
+    <string name="a11y_graph_scale_24h">graph scale 24 hours</string>
     <string name="a11y_insulin_label">insulin</string>
     <string name="chart_menu">Chart menu</string>
     <string name="a11y_bg_quality">blood glucose quality</string>

From eb6c40875d0d6df205971d1192b600c198fb8fa3 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 24 May 2024 16:07:32 +0200
Subject: [PATCH 2/3] Move Scale menu to OverViewMenusImpl

---
 .../aaps/activities/HistoryBrowseActivity.kt  | 33 ++---------------
 .../core/interfaces/overview/OverviewMenus.kt |  4 ++-
 .../main/general/overview/OverviewFragment.kt | 36 ++-----------------
 .../general/overview/OverviewMenusImpl.kt     | 30 +++++++++++++++-
 4 files changed, 37 insertions(+), 66 deletions(-)

diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
index 5752abea919..0f72a072129 100644
--- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
@@ -4,13 +4,10 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import android.util.DisplayMetrics
-import android.view.Menu
-import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
-import androidx.appcompat.widget.PopupMenu
 import app.aaps.core.data.time.T
 import app.aaps.core.interfaces.configuration.Config
 import app.aaps.core.interfaces.logging.AAPSLogger
@@ -144,23 +141,7 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
         binding.bgGraph.gridLabelRenderer?.reloadStyles()
         binding.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth
 
-        overviewMenus.setupChartMenu(binding.chartMenuButton)
-        binding.scaleButton.setOnClickListener { v: View ->
-            val popup = PopupMenu(v.context, v)
-            popup.menu.add(Menu.NONE, 6, Menu.NONE, rh.gs(R.string.graph_long_scale_6h))
-            popup.menu.add(Menu.NONE, 12, Menu.NONE, rh.gs(R.string.graph_long_scale_12h))
-            popup.menu.add(Menu.NONE, 18, Menu.NONE, rh.gs(R.string.graph_long_scale_18h))
-            popup.menu.add(Menu.NONE, 24, Menu.NONE, rh.gs(R.string.graph_long_scale_24h))
-            popup.setOnMenuItemClickListener {
-                // id == Range to display ...
-                rxBus.send(EventScale(it.itemId))
-                return@setOnMenuItemClickListener true
-            }
-            binding.scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_up_white_24dp), null)
-            popup.setOnDismissListener { binding.scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_down_white_24dp), null) }
-            popup.show()
-            false
-        }
+        overviewMenus.setupChartMenu(binding.chartMenuButton, binding.scaleButton)
         prepareGraphsIfNeeded(overviewMenus.setting.size)
         savedInstanceState?.let { bundle ->
             rangeToDisplay = bundle.getInt("rangeToDisplay", 0)
@@ -204,7 +185,6 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
             .observeOn(aapsSchedulers.main)
             .subscribe({
                            rangeToDisplay = it.hours
-                           updateScaletext()
                            setTime(historyBrowserData.overviewData.fromTime)
                            loadAll("rangeChange")
                        }, fabricPrivacy::logException)
@@ -312,21 +292,12 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
         binding.zoom.text = rangeToDisplay.toString()
     }
 
-    private fun updateScaletext() {
-        binding.scaleButton.text = when (rangeToDisplay) {
-            6   -> rh.gs(R.string.graph_scale_6h)
-            12  -> rh.gs(R.string.graph_scale_12h)
-            18  -> rh.gs(R.string.graph_scale_18h)
-            24  -> rh.gs(R.string.graph_scale_24h)
-            else -> ""
-        }
-    }
     @SuppressLint("SetTextI18n")
     fun updateGUI(from: String) {
         aapsLogger.debug(LTag.UI, "updateGui $from")
 
         updateDate()
-        updateScaletext()
+        binding.scaleButton.text = overviewMenus.scaleString(rangeToDisplay)
         val pump = activePlugin.activePump
         val graphData = GraphData(injector, binding.bgGraph, historyBrowserData.overviewData)
         val menuChartSettings = overviewMenus.setting
diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt
index 1e75059f96c..9fe3862b54b 100644
--- a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt
+++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt
@@ -1,5 +1,6 @@
 package app.aaps.core.interfaces.overview
 
+import android.widget.Button
 import android.widget.ImageButton
 
 interface OverviewMenus {
@@ -22,7 +23,8 @@ interface OverviewMenus {
 
     val setting: List<Array<Boolean>>
     fun loadGraphConfig()
-    fun setupChartMenu(chartButton: ImageButton)
+    fun setupChartMenu(chartButton: ImageButton, scaleButton: Button)
     fun enabledTypes(graph: Int): String
     fun isEnabledIn(type: CharType): Int
+    fun scaleString(rangeToDisplay: Int): String
 }
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
index 6dde1156702..dd593a3aef4 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
+++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
@@ -21,9 +21,7 @@ import android.view.View.OnLongClickListener
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
-import android.view.Menu
 import android.widget.TextView
-import androidx.appcompat.widget.PopupMenu
 import androidx.core.text.toSpanned
 import androidx.recyclerview.widget.LinearLayoutManager
 import app.aaps.core.data.configuration.Constants
@@ -223,25 +221,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             false
         }
         prepareGraphsIfNeeded(overviewMenus.setting.size)
-        overviewMenus.setupChartMenu(binding.graphsLayout.chartMenuButton)
-        updateScaletext()
-
-        binding.graphsLayout.scaleButton.setOnClickListener { v: View ->
-            val popup = PopupMenu(v.context, v)
-            popup.menu.add(Menu.NONE, 6, Menu.NONE, rh.gs(R.string.graph_long_scale_6h))
-            popup.menu.add(Menu.NONE, 12, Menu.NONE, rh.gs(R.string.graph_long_scale_12h))
-            popup.menu.add(Menu.NONE, 18, Menu.NONE, rh.gs(R.string.graph_long_scale_18h))
-            popup.menu.add(Menu.NONE, 24, Menu.NONE, rh.gs(R.string.graph_long_scale_24h))
-            popup.setOnMenuItemClickListener {
-                // id == Range to display ...
-                rxBus.send(EventScale(it.itemId))
-                return@setOnMenuItemClickListener true
-            }
-            binding.graphsLayout.scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_up_white_24dp), null)
-            popup.setOnDismissListener { binding.graphsLayout.scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_down_white_24dp), null) }
-            popup.show()
-            false
-        }
+        overviewMenus.setupChartMenu(binding.graphsLayout.chartMenuButton, binding.graphsLayout.scaleButton)
+        binding.graphsLayout.scaleButton.text = overviewMenus.scaleString(overviewData.rangeToDisplay)
 
         binding.graphsLayout.chartMenuButton.visibility = preferences.simpleMode.not().toVisibility()
 
@@ -262,16 +243,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         binding.infoLayout.apsMode.setOnLongClickListener(this)
     }
 
-    private fun updateScaletext() {
-        val selectedScale = sp.getInt(app.aaps.core.utils.R.string.key_rangetodisplay, 6)
-        binding.graphsLayout.scaleButton.text = when (selectedScale) {
-            6   -> rh.gs(R.string.graph_scale_6h)
-            12  -> rh.gs(R.string.graph_scale_12h)
-            18  -> rh.gs(R.string.graph_scale_18h)
-            24  -> rh.gs(R.string.graph_scale_24h)
-            else -> ""
-        }
-    }
     @Synchronized
     override fun onPause() {
         super.onPause()
@@ -311,7 +282,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             .subscribe({
                            overviewData.rangeToDisplay = it.hours
                            sp.putInt(app.aaps.core.utils.R.string.key_rangetodisplay, it.hours)
-                           updateScaletext()
                            rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.utils.R.string.key_rangetodisplay)))
                            sp.putBoolean(app.aaps.core.utils.R.string.key_objectiveusescale, true)
                        }, fabricPrivacy::logException)
@@ -383,7 +353,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (!config.appInitialized) return
         runOnUiThread {
             _binding ?: return@runOnUiThread
-            updateScaletext()
             updateTime()
             updateSensitivity()
             updateGraph()
@@ -947,6 +916,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
     private fun updateTime() {
         _binding ?: return
+        binding.graphsLayout.scaleButton.text = overviewMenus.scaleString(overviewData.rangeToDisplay)
         binding.infoLayout.time.text = dateUtil.timeString(dateUtil.now())
         // Status lights
         val pump = activePlugin.activePump
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
index 4d58fa90329..69b68bb433c 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
+++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
@@ -5,8 +5,10 @@ import android.text.SpannableString
 import android.text.style.BackgroundColorSpan
 import android.text.style.ForegroundColorSpan
 import android.view.Gravity
+import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.CheckBox
 import android.widget.CompoundButton
 import android.widget.HorizontalScrollView
@@ -16,6 +18,7 @@ import android.widget.ScrollView
 import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
+import androidx.appcompat.widget.PopupMenu
 import androidx.gridlayout.widget.GridLayout
 import app.aaps.core.interfaces.aps.Loop
 import app.aaps.core.interfaces.configuration.Config
@@ -24,6 +27,7 @@ import app.aaps.core.interfaces.overview.OverviewMenus
 import app.aaps.core.interfaces.resources.ResourceHelper
 import app.aaps.core.interfaces.rx.bus.RxBus
 import app.aaps.core.interfaces.rx.events.EventRefreshOverview
+import app.aaps.core.interfaces.rx.events.EventScale
 import app.aaps.core.interfaces.sharedPreferences.SP
 import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
 import app.aaps.core.keys.Preferences
@@ -130,7 +134,7 @@ class OverviewMenusImpl @Inject constructor(
         }
     }
 
-    override fun setupChartMenu(chartButton: ImageButton) {
+    override fun setupChartMenu(chartButton: ImageButton, scaleButton: Button) {
 
         chartButton.setOnClickListener { v: View ->
             var itemRow = 0
@@ -206,6 +210,23 @@ class OverviewMenusImpl @Inject constructor(
             chartButton.setImageResource(R.drawable.ic_arrow_drop_up_white_24dp)
             popup.showAsDropDown(v)
         }
+
+        scaleButton.setOnClickListener { v: View ->
+            val popup = PopupMenu(v.context, v)
+            popup.menu.add(Menu.NONE, 6, Menu.NONE, rh.gs(R.string.graph_long_scale_6h))
+            popup.menu.add(Menu.NONE, 12, Menu.NONE, rh.gs(R.string.graph_long_scale_12h))
+            popup.menu.add(Menu.NONE, 18, Menu.NONE, rh.gs(R.string.graph_long_scale_18h))
+            popup.menu.add(Menu.NONE, 24, Menu.NONE, rh.gs(R.string.graph_long_scale_24h))
+            popup.setOnMenuItemClickListener {
+                // id == Range to display ...
+                rxBus.send(EventScale(it.itemId))
+                return@setOnMenuItemClickListener true
+            }
+            scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_up_white_24dp), null)
+            popup.setOnDismissListener { scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_down_white_24dp), null) }
+            popup.show()
+            false
+        }
     }
 
     fun isSecondary(graphArray: Array<Boolean>): Boolean = graphArray.filterIndexed { index, _ -> CharTypeData.entries[index].secondary }.reduce { acc, b -> acc || b }
@@ -273,5 +294,12 @@ class OverviewMenusImpl @Inject constructor(
         for (g in 0 until numOfGraphs) if (settingsCopy[g][type.ordinal]) return g
         return -1
     }
+    override fun scaleString(rangeToDisplay: Int): String = when (rangeToDisplay) {
+        6   -> rh.gs(R.string.graph_scale_6h)
+        12  -> rh.gs(R.string.graph_scale_12h)
+        18  -> rh.gs(R.string.graph_scale_18h)
+        24  -> rh.gs(R.string.graph_scale_24h)
+        else -> ""
+    }
 
 }

From 53b968c94e3398099cb2de896f9bf8afbbbf5598 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 31 May 2024 17:21:06 +0200
Subject: [PATCH 3/3] GraphMenu Fix Background menu and icon color in Light
 Theme

---
 core/ui/src/main/res/values-night/styles.xml  |  1 +
 core/ui/src/main/res/values/attrs.xml         |  1 +
 core/ui/src/main/res/values/styles.xml        |  1 +
 .../general/overview/OverviewMenusImpl.kt     | 26 ++++++++++++++++---
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/core/ui/src/main/res/values-night/styles.xml b/core/ui/src/main/res/values-night/styles.xml
index a5c788e5871..4611069e3b2 100644
--- a/core/ui/src/main/res/values-night/styles.xml
+++ b/core/ui/src/main/res/values-night/styles.xml
@@ -91,6 +91,7 @@
         <item name="ribbonTextWarningColor">@color/ribbonTextWarning</item>
         <!---Background  -->
         <item name="defaultBackground">@color/defaultBackground</item>
+        <item name="popupWindowBackground">@color/ribbonTextWarning</item>
         <!---Toast  -->
         <item name="toastBaseTextColor">@color/toastBase</item>
         <item name="toastBackgroundColor">@color/buttonBackground</item>
diff --git a/core/ui/src/main/res/values/attrs.xml b/core/ui/src/main/res/values/attrs.xml
index a59a442dfcc..2c199155225 100644
--- a/core/ui/src/main/res/values/attrs.xml
+++ b/core/ui/src/main/res/values/attrs.xml
@@ -63,6 +63,7 @@
     <attr name="ribbonTextWarningColor" format="reference|color" />
     <!---Background  -->
     <attr name="defaultBackground" format="reference|color" />
+    <attr name="popupWindowBackground" format="reference|color" />
     <!---Toast  -->
     <attr name="toastBaseTextColor" format="reference|color" />
     <attr name="toastBackgroundColor" format="reference|color" />
diff --git a/core/ui/src/main/res/values/styles.xml b/core/ui/src/main/res/values/styles.xml
index 3e5bda9b1ff..975f56850cf 100644
--- a/core/ui/src/main/res/values/styles.xml
+++ b/core/ui/src/main/res/values/styles.xml
@@ -96,6 +96,7 @@
         <item name="ribbonTextWarningColor">@color/ribbonTextWarning</item>
         <!---Background  -->
         <item name="defaultBackground">@color/white</item>
+        <item name="popupWindowBackground">@color/white</item>
         <!---Toast  -->
         <item name="toastBaseTextColor">@color/toastBase</item>
         <item name="toastBackgroundColor">@color/colorLightGray</item>
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
index 69b68bb433c..594842d27d5 100644
--- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
+++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
@@ -1,6 +1,7 @@
 package app.aaps.plugins.main.general.overview
 
 import android.content.Context
+import android.graphics.drawable.ColorDrawable
 import android.text.SpannableString
 import android.text.style.BackgroundColorSpan
 import android.text.style.ForegroundColorSpan
@@ -135,7 +136,13 @@ class OverviewMenusImpl @Inject constructor(
     }
 
     override fun setupChartMenu(chartButton: ImageButton, scaleButton: Button) {
-
+        chartButton.setColorFilter(rh.gac(chartButton.context, app.aaps.core.ui.R.attr.defaultTextColor))
+        scaleButton.setCompoundDrawablesWithIntrinsicBounds(
+            null,
+            null,
+            rh.gd(R.drawable.ic_arrow_drop_down_white_24dp)?.also { it.setTint(rh.gac(scaleButton.context, app.aaps.core.ui.R.attr.defaultTextColor))},
+            null
+        )
         chartButton.setOnClickListener { v: View ->
             var itemRow = 0
             val predictionsAvailable: Boolean = when {
@@ -144,6 +151,7 @@ class OverviewMenusImpl @Inject constructor(
                 else            -> false
             }
             val popup = PopupWindow(v.context)
+            popup.setBackgroundDrawable(ColorDrawable(rh.gac(chartButton.context, app.aaps.core.ui.R.attr.popupWindowBackground)))
             val scrollView = ScrollView(v.context)                        // required to be able to scroll menu on low res screen
             val horizontalScrollView = HorizontalScrollView(v.context)    // Workaround because I was not able to manage first column width for long labels
             horizontalScrollView.addView(scrollView)
@@ -222,8 +230,20 @@ class OverviewMenusImpl @Inject constructor(
                 rxBus.send(EventScale(it.itemId))
                 return@setOnMenuItemClickListener true
             }
-            scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_up_white_24dp), null)
-            popup.setOnDismissListener { scaleButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rh.gd(R.drawable.ic_arrow_drop_down_white_24dp), null) }
+            scaleButton.setCompoundDrawablesWithIntrinsicBounds(
+                null,
+                null,
+                rh.gd(R.drawable.ic_arrow_drop_up_white_24dp)?.also { it.setTint(rh.gac(v.context, app.aaps.core.ui.R.attr.defaultTextColor))},
+                null
+            )
+            popup.setOnDismissListener {
+                scaleButton.setCompoundDrawablesWithIntrinsicBounds(
+                    null,
+                    null,
+                    rh.gd(R.drawable.ic_arrow_drop_down_white_24dp)?.also { it.setTint(rh.gac(v.context, app.aaps.core.ui.R.attr.defaultTextColor))},
+                    null
+                )
+            }
             popup.show()
             false
         }