Merge pull request #3347 from Philoul/New/GraphMenuNewUI

New Graph menu + Scale menu
nightscout · Aug 2, 2024 · 39752d7 · 39752d7 · vanelsberg · Aug 3, 2024
2 parents 841ffe0 + 53b968c
commit 39752d7
Show file tree

Hide file tree

Showing 10 changed files with 239 additions and 97 deletions.
diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
@@ -33,6 +33,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
@@ -141,7 +142,7 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
         binding.bgGraph.gridLabelRenderer?.reloadStyles()
         binding.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth
 
-        overviewMenus.setupChartMenu(context, binding.chartMenuButton)
+        overviewMenus.setupChartMenu(binding.chartMenuButton, binding.scaleButton)
         prepareGraphsIfNeeded(overviewMenus.setting.size)
         savedInstanceState?.let { bundle ->
             rangeToDisplay = bundle.getInt("rangeToDisplay", 0)
@@ -301,7 +302,7 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() {
         aapsLogger.debug(LTag.UI, "updateGui $from")
 
         updateDate()
-
+        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/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
@@ -1,6 +1,6 @@
 package app.aaps.core.interfaces.overview
 
-import android.content.Context
+import android.widget.Button
 import android.widget.ImageButton
 
 interface OverviewMenus {
@@ -23,7 +23,8 @@ interface OverviewMenus {
 
     val setting: List<Array<Boolean>>
     fun loadGraphConfig()
-    fun setupChartMenu(context: Context, 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/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
@@ -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
@@ -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/OverviewFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
@@ -221,7 +221,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             false
         }
         prepareGraphsIfNeeded(overviewMenus.setting.size)
-        context?.let { overviewMenus.setupChartMenu(it, binding.graphsLayout.chartMenuButton) }
+        overviewMenus.setupChartMenu(binding.graphsLayout.chartMenuButton, binding.graphsLayout.scaleButton)
+        binding.graphsLayout.scaleButton.text = overviewMenus.scaleString(overviewData.rangeToDisplay)
+
         binding.graphsLayout.chartMenuButton.visibility = preferences.simpleMode.not().toVisibility()
 
         binding.activeProfile.setOnClickListener(this)
@@ -914,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