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

UI: Graph Scale Buttons instead of Dropdown #3311

Closed
wants to merge 1 commit into from
Closed

UI: Graph Scale Buttons instead of Dropdown #3311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 66 additions & 0 deletions 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 @@ -16,12 +16,15 @@ import android.os.HandlerThread
import android.util.DisplayMetrics
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.Menu
import android.view.View
import android.view.View.OnLongClickListener
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.graphics.Typeface
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
Expand Down Expand Up @@ -220,6 +223,54 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
sp.putBoolean(app.aaps.core.utils.R.string.key_objectiveusescale, true)
false
}

val selectedScale = sp.getInt(app.aaps.core.utils.R.string.key_rangetodisplay, 6)
when (selectedScale) {
6 -> binding.graphsLayout.graphScale6h.isChecked = true
12 -> binding.graphsLayout.graphScale12h.isChecked = true
18 -> binding.graphsLayout.graphScale18h.isChecked = true
24 -> binding.graphsLayout.graphScale24h.isChecked = true
}

binding.graphsLayout.chartMenuButton.setOnLongClickListener { v: View ->
val popup = PopupMenu(v.context, v)
popup.menu.add(Menu.NONE, 6, Menu.NONE, rh.gq(app.aaps.core.ui.R.plurals.hours, 6, 6))
popup.menu.add(Menu.NONE, 12, Menu.NONE, rh.gq(app.aaps.core.ui.R.plurals.hours, 12, 12))
popup.menu.add(Menu.NONE, 18, Menu.NONE, rh.gq(app.aaps.core.ui.R.plurals.hours, 18, 18))
popup.menu.add(Menu.NONE, 24, Menu.NONE, rh.gq(app.aaps.core.ui.R.plurals.hours, 24, 24))
popup.setOnMenuItemClickListener {
// id == Range to display ...
sp.putInt(app.aaps.core.utils.R.string.key_rangetodisplay, it.itemId)
rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.utils.R.string.key_rangetodisplay)))
return@setOnMenuItemClickListener true
}
binding.graphsLayout.chartMenuButton.setImageResource(R.drawable.ic_arrow_drop_up_white_24dp)
popup.setOnDismissListener { binding.graphsLayout.chartMenuButton.setImageResource(R.drawable.ic_arrow_drop_down_white_24dp) }
popup.show()
false
}

binding.graphsLayout.graphScale6h.setOnClickListener {
sp.putInt(app.aaps.core.utils.R.string.key_rangetodisplay, 6)
resetScaleText()
rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.utils.R.string.key_rangetodisplay)))
}
binding.graphsLayout.graphScale12h.setOnClickListener {
sp.putInt(app.aaps.core.utils.R.string.key_rangetodisplay, 12)
resetScaleText()
rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.utils.R.string.key_rangetodisplay)))
}
binding.graphsLayout.graphScale18h.setOnClickListener {
sp.putInt(app.aaps.core.utils.R.string.key_rangetodisplay, 18)
resetScaleText()
rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.utils.R.string.key_rangetodisplay)))
}
binding.graphsLayout.graphScale24h.setOnClickListener {
sp.putInt(app.aaps.core.utils.R.string.key_rangetodisplay, 24)
resetScaleText()
rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.utils.R.string.key_rangetodisplay)))
}

prepareGraphsIfNeeded(overviewMenus.setting.size)
context?.let { overviewMenus.setupChartMenu(it, binding.graphsLayout.chartMenuButton) }
binding.graphsLayout.chartMenuButton.visibility = preferences.simpleMode.not().toVisibility()
Expand All @@ -241,6 +292,20 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
binding.infoLayout.apsMode.setOnLongClickListener(this)
}

fun resetScaleText() {
binding.graphsLayout.graphScale6h.setTypeface(null, Typeface.NORMAL)
binding.graphsLayout.graphScale12h.setTypeface(null, Typeface.NORMAL)
binding.graphsLayout.graphScale18h.setTypeface(null, Typeface.NORMAL)
binding.graphsLayout.graphScale24h.setTypeface(null, Typeface.NORMAL)

when (sp.getInt(app.aaps.core.utils.R.string.key_rangetodisplay,6)) {
6 -> binding.graphsLayout.graphScale6h.setTypeface(null, Typeface.BOLD)
12 -> binding.graphsLayout.graphScale12h.setTypeface(null, Typeface.BOLD)
18 -> binding.graphsLayout.graphScale18h.setTypeface(null, Typeface.BOLD)
24 -> binding.graphsLayout.graphScale24h.setTypeface(null, Typeface.BOLD)
}
}

@Synchronized
override fun onPause() {
super.onPause()
Expand Down Expand Up @@ -351,6 +416,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
if (!config.appInitialized) return
runOnUiThread {
_binding ?: return@runOnUiThread
resetScaleText()
updateTime()
updateSensitivity()
updateGraph()
Expand Down
6 changes: 6 additions & 0 deletions plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ class OverviewMenusImpl @Inject constructor(
}

popup.setOnMenuItemClickListener {
var keepMenu = false
synchronized(this) {
try {
// id < 100 graph header - divider 1, 2, 3 .....
Expand All @@ -191,17 +192,20 @@ class OverviewMenusImpl @Inject constructor(
it.itemId == numOfGraphs -> {
// add new empty
_setting.add(Array(CharTypeData.entries.size) { false })
keepMenu = true
}

it.itemId < 100 -> {
// remove graph
_setting.removeAt(it.itemId)
keepMenu = true
}

else -> {
val graphNumber = it.itemId / 100 - 1
val item = it.itemId % 100
_setting[graphNumber][item] = !it.isChecked
keepMenu = true
}
}
} catch (exception: Exception) {
Expand All @@ -210,6 +214,8 @@ class OverviewMenusImpl @Inject constructor(
}
storeGraphConfig()
setupChartMenu(context, chartButton)
if (keepMenu)
chartButton.performClick()
rxBus.send(EventRefreshOverview("OnMenuItemClickListener", now = true))
return@setOnMenuItemClickListener true
}
Expand Down
68 changes: 57 additions & 11 deletions plugins/main/src/main/res/layout/overview_graphs_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,63 @@
android:layout_height="match_parent"
android:orientation="vertical">

<LinearLayout
android:id="@+id/graph_scale"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<com.google.android.material.chip.ChipGroup
android:layout_width="0dp"
android:layout_height="35dp"
android:layout_weight="1"
app:singleSelection="true"
app:chipSpacing="10dp">

<com.google.android.material.chip.Chip
android:id="@+id/graph_scale_6h"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/graph_scale_6h"
android:contentDescription="@string/a11y_graph_scale_6h"
style="@style/Widget.MaterialComponents.Chip.Choice" />

<com.google.android.material.chip.Chip
android:id="@+id/graph_scale_12h"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/graph_scale_12h"
android:contentDescription="@string/a11y_graph_scale_12h"
style="@style/Widget.MaterialComponents.Chip.Choice" />

<com.google.android.material.chip.Chip
android:id="@+id/graph_scale_18h"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/graph_scale_18h"
android:contentDescription="@string/a11y_graph_scale_18h"
style="@style/Widget.MaterialComponents.Chip.Choice" />

<com.google.android.material.chip.Chip
android:id="@+id/graph_scale_24h"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/graph_scale_24h"
android:contentDescription="@string/a11y_graph_scale_24h"
style="@style/Widget.MaterialComponents.Chip.Choice" />

</com.google.android.material.chip.ChipGroup>

<ImageButton
android:id="@+id/chart_menu_button"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_gravity="end"
android:contentDescription="@string/chart_menu"
app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />

</LinearLayout>

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
Expand All @@ -17,17 +74,6 @@
android:layout_height="200dp"
android:contentDescription="@string/a11y_graph" />

<ImageButton
android:id="@+id/chart_menu_button"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginEnd="3dp"
android:contentDescription="@string/chart_menu"
android:paddingTop="5dp"
app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />

</RelativeLayout>

<LinearLayout
Expand Down
8 changes: 8 additions & 0 deletions plugins/main/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,15 @@
<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="a11y_graph">graph</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>
Expand Down