penguin86/luna-tracker
2
1
Fork 2
Code Issues 9 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

improvements #10

Open
mwarning wants to merge 17 commits from mwarning/luna-tracker:improvements into master
pull from: mwarning/luna-tracker:improvements
merge into: penguin86:master
Conversation 0 Commits 17 Files Changed 17 +367 -153
17 changed files with 367 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0dfd9646f3 - Show all commits

6
app/src/main/java/utils/DateUtils.kt
View File

@@ -81,10 +81,10 @@ class DateUtils {
return DateFormat.getDateFormat(context).format(Date(unixTime*1000)) + "\n" + return DateFormat.getDateFormat(context).format(Date(unixTime*1000)) + "\n" +
DateFormat.getTimeFormat(context).format(Date(unixTime*1000)) DateFormat.getTimeFormat(context).format(Date(unixTime*1000))
var formattedTime = StringBuilder() val formattedTime = StringBuilder()
if (hoursAgo > 0) { if (hoursAgo > 0) {
formattedTime.append(hoursAgo).append(" ") formattedTime.append(hoursAgo).append(" ")
if (hoursAgo.toInt() == 1) if (hoursAgo == 1)
formattedTime.append(context.getString(R.string.hour_ago)) formattedTime.append(context.getString(R.string.hour_ago))
else else
formattedTime.append(context.getString(R.string.hours_ago)) formattedTime.append(context.getString(R.string.hours_ago))
@@ -93,7 +93,7 @@ class DateUtils {
if (formattedTime.isNotEmpty()) if (formattedTime.isNotEmpty())
formattedTime.append(", ") formattedTime.append(", ")
formattedTime.append(minutesAgo).append(" ") formattedTime.append(minutesAgo).append(" ")
if (minutesAgo.toInt() == 1) if (minutesAgo == 1)
formattedTime.append(context.getString(R.string.minute_ago)) formattedTime.append(context.getString(R.string.minute_ago))
else else
formattedTime.append(context.getString(R.string.minutes_ago)) formattedTime.append(context.getString(R.string.minutes_ago))