From 06e8e00d37b728d941ae4ec9af7259a9e6787bdb Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 24 Sep 2023 20:41:58 +0200 Subject: [PATCH] TimeAsXAxisLabelFormatter -> kt --- ...tter.java => TimeAsXAxisLabelFormatter.kt} | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) rename core/main/src/main/java/info/nightscout/core/graph/data/{TimeAsXAxisLabelFormatter.java => TimeAsXAxisLabelFormatter.kt} (56%) diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.java b/core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.kt similarity index 56% rename from core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.java rename to core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.kt index a5367c142b..277366ee3f 100644 --- a/core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.java +++ b/core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.kt @@ -1,28 +1,20 @@ -package info.nightscout.core.graph.data; +package info.nightscout.core.graph.data -import com.jjoe64.graphview.DefaultLabelFormatter; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Locale; +import com.jjoe64.graphview.DefaultLabelFormatter +import java.text.DateFormat +import java.text.SimpleDateFormat +import java.util.Locale /** * Created by mike on 09.06.2016. */ -public class TimeAsXAxisLabelFormatter extends DefaultLabelFormatter { +class TimeAsXAxisLabelFormatter(private val format: String) : DefaultLabelFormatter() { - protected final String mFormat; - - public TimeAsXAxisLabelFormatter(String format) { - mFormat = format; - } - - @Override - public String formatLabel(double value, boolean isValueX) { + override fun formatLabel(value: Double, isValueX: Boolean): String = if (isValueX) { // format as date - DateFormat dateFormat = new SimpleDateFormat(mFormat, Locale.getDefault()); - return dateFormat.format((long) value); + val dateFormat: DateFormat = SimpleDateFormat(format, Locale.getDefault()) + dateFormat.format(value.toLong()) } else { try { // unknown reason for crashing on this @@ -33,11 +25,9 @@ public class TimeAsXAxisLabelFormatter extends DefaultLabelFormatter { // com.jjoe64.graphview.GridLabelRenderer.drawVerticalSteps (GridLabelRenderer.java:1057) // com.jjoe64.graphview.GridLabelRenderer.draw (GridLabelRenderer.java:866) // com.jjoe64.graphview.GraphView.onDraw (GraphView.java:296) - //noinspection ConstantConditions - return super.formatLabel(value, isValueX); - } catch (Exception ignored) { - return ""; + super.formatLabel(value, false) + } catch (ignored: Exception) { + "" } } - } }