Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Graph menu + Scale menu #3347

Merged
merged 3 commits into from
Aug 2, 2024
Merged

New Graph menu + Scale menu #3347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2cad90
New Graph menu and rescale menu
Philoul May 24, 2024
eb6c408
Move Scale menu to OverViewMenusImpl
Philoul May 24, 2024
53b968c
GraphMenu Fix Background menu and icon color in Light Theme
Philoul May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -140,7 +141,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)
Expand Down Expand Up @@ -296,7 +297,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
Expand Down
19 changes: 16 additions & 3 deletions app/src/main/res/layout/activity_historybrowse.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions core/interfaces/src/main/kotlin/app/aaps/core/interfaces/overview/OverviewMenus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package app.aaps.core.interfaces.overview

import android.content.Context
import android.widget.Button
import android.widget.ImageButton

interface OverviewMenus {
Expand All @@ -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
}
1 change: 1 addition & 0 deletions core/ui/src/main/res/values-night/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions core/ui/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions core/ui/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
Loading