-
-
Notifications
You must be signed in to change notification settings - Fork 220
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: add custom formatting to
LocalStats fields
- Loading branch information
Showing
4 changed files
with
90 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
app/src/main/java/com/geeksville/mesh/util/DateTimeUtils.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Copyright (c) 2024 Meshtastic LLC | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.geeksville.mesh.util | ||
|
|
||
| import java.text.DateFormat | ||
| import java.util.Date | ||
| import java.util.concurrent.TimeUnit | ||
|
|
||
| // return time if within 24 hours, otherwise date | ||
| fun getShortDate(time: Long): String? { | ||
| val date = if (time != 0L) Date(time) else return null | ||
| val isWithin24Hours = System.currentTimeMillis() - date.time <= TimeUnit.DAYS.toMillis(1) | ||
|
|
||
| return if (isWithin24Hours) { | ||
| DateFormat.getTimeInstance(DateFormat.SHORT).format(date) | ||
| } else { | ||
| DateFormat.getDateInstance(DateFormat.SHORT).format(date) | ||
| } | ||
| } | ||
|
|
||
| // return time if within 24 hours, otherwise date/time | ||
| fun getShortDateTime(time: Long): String { | ||
| val date = Date(time) | ||
| val isWithin24Hours = System.currentTimeMillis() - date.time <= TimeUnit.DAYS.toMillis(1) | ||
|
|
||
| return if (isWithin24Hours) { | ||
| DateFormat.getTimeInstance(DateFormat.SHORT).format(date) | ||
| } else { | ||
| DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(date) | ||
| } | ||
| } | ||
|
|
||
| fun formatUptime(seconds: Int): String = formatUptime(seconds.toLong()) | ||
|
|
||
| private fun formatUptime(seconds: Long): String { | ||
| val days = TimeUnit.SECONDS.toDays(seconds) | ||
| val hours = TimeUnit.SECONDS.toHours(seconds) % TimeUnit.DAYS.toHours(1) | ||
| val minutes = TimeUnit.SECONDS.toMinutes(seconds) % TimeUnit.HOURS.toMinutes(1) | ||
| val secs = seconds % TimeUnit.MINUTES.toSeconds(1) | ||
|
|
||
| return listOfNotNull( | ||
| "${days}d".takeIf { days > 0 }, | ||
| "${hours}h".takeIf { hours > 0 }, | ||
| "${minutes}m".takeIf { minutes > 0 }, | ||
| "${secs}s".takeIf { secs > 0 }, | ||
| ).joinToString(" ") | ||
| } |