penguin86/luna-tracker
1
2
Fork 3
Code Issues 13 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

base: penguin86:be5463bf18f2d46991c58bcc6df919c4b98b9d32
Branches Tags
penguin86:master penguin86:develop penguin86:multiple-children
penguin86:v0.8 penguin86:v0.7 penguin86:v0.6 penguin86:v0.5 penguin86:v0.4 penguin86:v0.3 penguin86:v0.2 penguin86:v0.1
..
compare: penguin86:43f0519487cd76324903dabd455a455b2946beca
Branches Tags
penguin86:master penguin86:develop penguin86:multiple-children
penguin86:v0.8 penguin86:v0.7 penguin86:v0.6 penguin86:v0.5 penguin86:v0.4 penguin86:v0.3 penguin86:v0.2 penguin86:v0.1

5 Commits
be5463bf18 ... 43f0519487

Author SHA1 Message Date
Moritz Warning
43f0519487 LunaEvent: rework sleep event 
Remove adjustment buttons and
simplify design.
 2026-02-12 23:01:01 +01:00
Moritz Warning
1bcfc18a71 MainActivity: rename datepicker 2026-02-12 23:01:01 +01:00
Moritz Warning
e345e98668 layout: replace menu icon with utf8 character 
The three dot menu icosn looks odd when stretched
due to the dynamic menu feature. Thus replace it
with the hamburger menu character that looks better
when scaled.
 2026-02-12 23:01:01 +01:00
Moritz Warning
09f5a4e27b MainActivity: sort events before saving 
Also replace notifyItemInserted since it does not
call the adapter to redraw the row striping when
a new event is added.
 2026-02-12 23:01:01 +01:00
Moritz Warning
b3b432525e StatisticsActivity: rework all statistics 
Improve the overall code.
 2026-02-12 23:00:58 +01:00
1 changed files with 27 additions and 6 deletions
Expand all files Collapse all files

33
app/src/main/java/it/danieleverducci/lunatracker/StatisticsActivity.kt
View File

@@ -1,5 +1,6 @@
package it.danieleverducci.lunatracker
import android.graphics.Canvas
import android.graphics.Color
import android.os.Bundle
import android.util.Log
@@ -11,6 +12,7 @@ import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.graphics.toColorInt
import com.github.mikephil.charting.animation.ChartAnimator
import com.github.mikephil.charting.charts.BarChart
import com.github.mikephil.charting.data.BarData
import com.github.mikephil.charting.data.BarDataSet
@@ -18,7 +20,10 @@ import com.github.mikephil.charting.data.BarEntry
import com.github.mikephil.charting.data.Entry
import com.github.mikephil.charting.formatter.ValueFormatter
import com.github.mikephil.charting.highlight.Highlight
import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider
import com.github.mikephil.charting.listener.OnChartValueSelectedListener
import com.github.mikephil.charting.renderer.HorizontalBarChartRenderer
import com.github.mikephil.charting.utils.ViewPortHandler
import it.danieleverducci.lunatracker.entities.LunaEvent
import utils.DateUtils
import utils.NumericUtils
@@ -316,10 +321,7 @@ class StatisticsActivity : AppCompatActivity() {
format.format((dayStartUnix + startSeconds) * 1000).toString()
val endTimeString =
format.format((dayStartUnix + endSeconds) * 1000).toString()
val durationString = NumericUtils(applicationContext).formatEventQuantity(
LunaEvent.Type.SLEEP,
durationSeconds
)
val durationString = DateUtils.formatTimeDuration(applicationContext, durationSeconds.toLong())
val daysWithData =
stack[e.x.toInt()][startSeconds / SLEEP_PATTERN_GRANULARITY]
@@ -461,7 +463,7 @@ class StatisticsActivity : AppCompatActivity() {
}
val duration = value.yVals[h.stackIndex].toInt()
val durationString = NumericUtils(applicationContext).formatEventQuantity(LunaEvent.Type.SLEEP, duration)
val durationString = DateUtils.formatTimeDuration(applicationContext, duration.toLong())
val offsetUnix = spanToUnix(state.startSpan + e.x.toInt()) // start of the time span (day/week/month)
val startUnix = offsetUnix + value.yVals.sliceArray(0..<h.stackIndex).fold(0) { acc, y -> acc + y.toInt() }
@@ -492,6 +494,21 @@ class StatisticsActivity : AppCompatActivity() {
barChart.invalidate()
}
// Make sure the value on the bar is not out of screen.
class CustomHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, viewPortHandler: ViewPortHandler): HorizontalBarChartRenderer(chart, animator, viewPortHandler) {
override fun drawValue(
c: Canvas,
valueText: String,
x: Float,
y: Float,
color: Int
) {
mValuePaint.setColor(color)
c.drawText(valueText, x.coerceAtLeast(60F), y, mValuePaint)
}
}
fun showSleepBarGraph(state: GraphState) {
val ranges = toSleepRanges(state.events)
val values = ArrayList(List(state.endSpan - state.startSpan + 1) { BarEntry(it.toFloat(), 0F) })
@@ -556,7 +573,7 @@ class StatisticsActivity : AppCompatActivity() {
prefix + value.toInt().toString()
}
GraphType.SLEEP_SUM -> {
prefix + NumericUtils(applicationContext).formatEventQuantity(LunaEvent.Type.SLEEP, value.toInt())
prefix + DateUtils.formatTimeDuration(applicationContext, value.toLong())
}
else -> {
Log.e(TAG, "unhandled graphTypeSelection $graphTypeSelection")
@@ -571,6 +588,8 @@ class StatisticsActivity : AppCompatActivity() {
data.setValueTextSize(12f)
barChart.setData(data)
barChart.setRenderer(CustomHorizontalBarChartRenderer(barChart, barChart.getAnimator(), barChart.getViewPortHandler()))
barChart.legend.isEnabled = false
val valueCount = min(values.size, 24)
barChart.setVisibleXRangeMaximum(valueCount.toFloat())
@@ -635,6 +654,8 @@ class StatisticsActivity : AppCompatActivity() {
data.setValueTextSize(12f)
barChart.setData(data)
barChart.setRenderer(CustomHorizontalBarChartRenderer(barChart, barChart.getAnimator(), barChart.getViewPortHandler()))
val valueCount = min(values.size, 24)
barChart.setVisibleXRangeMaximum(valueCount.toFloat())
barChart.xAxis.setLabelCount(valueCount)