Skip to content

Stats Revamp v2: Fix date problem on line chart #16754

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

Merged
ravishanker merged 1 commit into from
Jun 16, 2022
Merged

Stats Revamp v2: Fix date problem on line chart #16754

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
3 changes: 2 additions & 1 deletion ...press/android/ui/stats/refresh/lists/sections/insights/usecases/ViewsAndVisitorsMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ class ViewsAndVisitorsMapper
Visitors -> it.visitors
else -> 0L
}
val date = statsDateFormatter.parseStatsDate(statsGranularity, it.period)
Line(
statsDateFormatter.printGranularDate(it.period, statsGranularity),
statsDateFormatter.printDayWithoutYear(date),
it.period,
value.toInt()
)
Expand Down
24 changes: 1 addition & 23 deletions ...ess/src/main/java/org/wordpress/android/ui/stats/refresh/utils/LineChartLabelFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ package org.wordpress.android.ui.stats.refresh.utils
import com.github.mikephil.charting.components.AxisBase
import com.github.mikephil.charting.formatter.ValueFormatter
import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LineChartItem.Line
import java.text.ParseException
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import javax.inject.Inject

class LineChartLabelFormatter @Inject constructor(
Expand All @@ -15,27 +11,9 @@ class LineChartLabelFormatter @Inject constructor(
override fun getAxisLabel(value: Float, axis: AxisBase?): String {
val index = value.toInt()
return if (index < entries.size) {
formatLabelDate(parseLabelDate(entries[index].label))
entries[index].label
} else {
""
}
}

// 12 Apr 2022
private fun parseLabelDate(label: String): Date? {
var labelDate: Date? = null
val labelParser = SimpleDateFormat("dd MMM yyyy", Locale.getDefault())
try {
labelDate = labelParser.parse(label)
} catch (e: ParseException) {
e.printStackTrace()
}
return labelDate
}

// Apr 12
private fun formatLabelDate(date: Date?): String {
val labelFormatter = SimpleDateFormat("MMM d", Locale.getDefault())
return date?.let { labelFormatter.format(it) }.toString()
}
}