diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ViewsAndVisitorsMapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ViewsAndVisitorsMapper.kt index ec2442b5e905..04ab8cda6ce0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ViewsAndVisitorsMapper.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ViewsAndVisitorsMapper.kt @@ -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() ) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/LineChartLabelFormatter.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/LineChartLabelFormatter.kt index c59476298925..59d531c21c81 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/LineChartLabelFormatter.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/LineChartLabelFormatter.kt @@ -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( @@ -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() - } }