ReVanced-Mirror/VancedMicroG
1
0
Fork 0
mirror of https://github.com/TeamVanced/VancedMicroG synced 2025-02-19 06:06:48 +01:00
Code Issues Projects Releases Wiki Activity

DotChartView: Format date without year

Browse Source
This commit is contained in:
Marvin W 2021-12-08 12:04:10 +01:00
parent 05d18bb8d2
commit fba6fbdfd0
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
play-services-nearby-core-ui/src/main/kotlin/org/microg/gms/nearby/core/ui/DotChartView.kt
View File

@ -11,7 +11,9 @@ import android.content.Context
import android.graphics.* import android.graphics.*
import android.os.Build import android.os.Build
import android.text.format.DateFormat import android.text.format.DateFormat
import android.text.format.DateUtils
import android.util.AttributeSet import android.util.AttributeSet
import android.util.Log
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
@ -40,12 +42,13 @@ class DotChartView : View {
val dateFormat = DateFormat.getMediumDateFormat(context) val dateFormat = DateFormat.getMediumDateFormat(context)
val hourFormat = SimpleDateFormat("H") val hourFormat = SimpleDateFormat("H")
val lowest = dateFormat.parse(dateFormat.format(date))?.time ?: date.time val lowest = dateFormat.parse(dateFormat.format(date))?.time ?: date.time
fun formatDateForView(date: Date) = DateUtils.formatDateTime(context, date.time, DateUtils.FORMAT_ABBREV_MONTH or DateUtils.FORMAT_NO_YEAR)
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
displayData[day] = dateFormat.format(date) to hashMapOf() displayData[day] = formatDateForView(date) to hashMapOf()
} }
fun dayByDate(date: Date) : Int? { fun dayByDate(date: Date) : Int? {
val dateString = dateFormat.format(date) val dateString = formatDateForView(date)
return displayData.entries.firstOrNull { it.value.first == dateString }?.key return displayData.entries.firstOrNull { it.value.first == dateString }?.key
} }
if (value != null) { if (value != null) {
@ -113,8 +116,8 @@ class DotChartView : View {
maxTextHeight = max(maxTextHeight, fontTempRect.height()) maxTextHeight = max(maxTextHeight, fontTempRect.height())
} }
val legendLeft = maxTextWidth + 4 * d val legendLeft = max(56 * d, maxTextWidth + 8 * d)
val legendBottom = maxTextHeight + 4 * d val legendBottom = maxTextHeight + 8 * d
val subHeight = maxTextHeight + 4 * d + paddingBottom val subHeight = maxTextHeight + 4 * d + paddingBottom
val distHeight = (height - innerPadding * 14 - paddingTop - paddingBottom - legendBottom - subHeight).toDouble() val distHeight = (height - innerPadding * 14 - paddingTop - paddingBottom - legendBottom - subHeight).toDouble()
@ -134,7 +137,7 @@ class DotChartView : View {
val (dateString, hours) = displayData[day] ?: "" to emptyMap() val (dateString, hours) = displayData[day] ?: "" to emptyMap()
val top = day * (perHeight + innerPadding) + paddingTop val top = day * (perHeight + innerPadding) + paddingTop
if (day % 2 == 0) { if (day % 2 == 0) {
canvas.drawText(dateString, (paddingLeft + legendLeft - 4 * d), (top + perHeight / 2.0 + maxTextHeight / 2.0).toFloat(), fontPaint) canvas.drawText(dateString, (paddingLeft + legendLeft - 8 * d), (top + perHeight / 2.0 + maxTextHeight / 2.0).toFloat(), fontPaint)
} }
focusPoint?.let { if (it.y > top && it.y < top + perHeight) focusDay = day } focusPoint?.let { if (it.y > top && it.y < top + perHeight) focusDay = day }
for (hour in 0 until 24) { for (hour in 0 until 24) {
@ -162,7 +165,7 @@ class DotChartView : View {
} }
} }
} }
val legendTop = 15 * (perHeight + innerPadding) + paddingTop + maxTextHeight + 4 * d val legendTop = 15 * (perHeight + innerPadding) + paddingTop + maxTextHeight + 8 * d
fontPaint.textAlign = Paint.Align.CENTER fontPaint.textAlign = Paint.Align.CENTER
for (hour in 0 until 24) { for (hour in 0 until 24) {
if (hour % 3 == 0) { if (hour % 3 == 0) {