Unverified Commit 8dceaad8 authored by Fynn Godau's avatar Fynn Godau Committed by GitHub
Browse files

Fix date format being used incorrectly (#1443)

fixes #1441
parent a173d268
...@@ -10,14 +10,12 @@ import android.annotation.TargetApi ...@@ -10,14 +10,12 @@ import android.annotation.TargetApi
import android.content.Context import android.content.Context
import android.graphics.* import android.graphics.*
import android.os.Build import android.os.Build
import android.provider.Settings import android.text.format.DateFormat
import android.text.TextUtils
import android.util.AttributeSet import android.util.AttributeSet
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View
import org.microg.gms.nearby.exposurenotification.ExposureScanSummary import org.microg.gms.nearby.exposurenotification.ExposureScanSummary
import org.microg.gms.ui.resolveColor import org.microg.gms.ui.resolveColor
import java.text.SimpleDateFormat
import java.util.* import java.util.*
import kotlin.math.max import kotlin.math.max
import kotlin.math.min import kotlin.math.min
...@@ -38,12 +36,7 @@ class DotChartView : View { ...@@ -38,12 +36,7 @@ class DotChartView : View {
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
val min = now - 14 * 24 * 60 * 60 * 1000L val min = now - 14 * 24 * 60 * 60 * 1000L
val date = Date(min) val date = Date(min)
val format = Settings.System.getString(context.contentResolver, Settings.System.DATE_FORMAT); val dateFormat = DateFormat.getMediumDateFormat(context)
val dateFormat = if (TextUtils.isEmpty(format)) {
android.text.format.DateFormat.getMediumDateFormat(context)
} else {
SimpleDateFormat(format)
}
val lowest = dateFormat.parse(dateFormat.format(date))?.time ?: date.time val lowest = dateFormat.parse(dateFormat.format(date))?.time ?: date.time
for (day in 0 until 15) { for (day in 0 until 15) {
date.time = now - (14 - day) * 24 * 60 * 60 * 1000L date.time = now - (14 - day) * 24 * 60 * 60 * 1000L
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment