diff --git a/app/src/main/java/org/tasks/time/DateTimeUtils.java b/app/src/main/java/org/tasks/time/DateTimeUtils.java deleted file mode 100644 index 10a66de2a..000000000 --- a/app/src/main/java/org/tasks/time/DateTimeUtils.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.tasks.time; - -import android.annotation.SuppressLint; -import java.util.Date; -import org.tasks.BuildConfig; - -public class DateTimeUtils { - - private static final SystemMillisProvider SYSTEM_MILLIS_PROVIDER = new SystemMillisProvider(); - private static volatile MillisProvider MILLIS_PROVIDER = SYSTEM_MILLIS_PROVIDER; - - public static long currentTimeMillis() { - return MILLIS_PROVIDER.getMillis(); - } - - public static void setCurrentMillisFixed(long millis) { - MILLIS_PROVIDER = new FixedMillisProvider(millis); - } - - public static void setCurrentMillisSystem() { - MILLIS_PROVIDER = SYSTEM_MILLIS_PROVIDER; - } - - public static String printTimestamp(long timestamp) { - return BuildConfig.DEBUG ? new Date(timestamp).toString() : Long.toString(timestamp); - } - - @SuppressLint("DefaultLocale") - public static String printDuration(long millis) { - if (BuildConfig.DEBUG) { - long seconds = millis / 1000; - return String.format( - "%dh %dm %ds", seconds / 3600L, (int) (seconds % 3600L / 60L), (int) (seconds % 60L)); - } else { - return Long.toString(millis); - } - } -} diff --git a/app/src/main/java/org/tasks/time/DateTimeUtils.kt b/app/src/main/java/org/tasks/time/DateTimeUtils.kt new file mode 100644 index 000000000..8fc560a15 --- /dev/null +++ b/app/src/main/java/org/tasks/time/DateTimeUtils.kt @@ -0,0 +1,40 @@ +package org.tasks.time + +import android.annotation.SuppressLint +import org.tasks.BuildConfig +import java.util.* + +object DateTimeUtils { + private val SYSTEM_MILLIS_PROVIDER = SystemMillisProvider() + + @Volatile + private var MILLIS_PROVIDER: MillisProvider = SYSTEM_MILLIS_PROVIDER + + @JvmStatic + fun currentTimeMillis(): Long { + return MILLIS_PROVIDER.millis + } + + fun setCurrentMillisFixed(millis: Long) { + MILLIS_PROVIDER = FixedMillisProvider(millis) + } + + fun setCurrentMillisSystem() { + MILLIS_PROVIDER = SYSTEM_MILLIS_PROVIDER + } + + fun printTimestamp(timestamp: Long): String { + return if (BuildConfig.DEBUG) Date(timestamp).toString() else timestamp.toString() + } + + @SuppressLint("DefaultLocale") + fun printDuration(millis: Long): String { + return if (BuildConfig.DEBUG) { + val seconds = millis / 1000 + String.format( + "%dh %dm %ds", seconds / 3600L, (seconds % 3600L / 60L).toInt(), (seconds % 60L).toInt()) + } else { + millis.toString() + } + } +} \ No newline at end of file