From a88d35ea425fb5f48cbd7e8961b29215c7ed114a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C3=87erri?= <64997243+deniscerri@users.noreply.github.com> Date: Tue, 7 Mar 2023 13:22:43 +0100 Subject: [PATCH] Added relative time to download history card --- .../ytdlnis/adapter/HistoryAdapter.kt | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt index 41e57f1b..60c8c133 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt @@ -7,7 +7,7 @@ import android.graphics.ColorMatrix import android.graphics.ColorMatrixColorFilter import android.os.Handler import android.os.Looper -import android.util.Log +import android.text.format.DateUtils import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -26,10 +26,9 @@ import com.google.android.material.button.MaterialButton import com.google.android.material.card.MaterialCardView import com.squareup.picasso.Picasso import java.io.File -import java.text.DateFormat -import java.text.SimpleDateFormat import java.util.* + class HistoryAdapter(onItemClickListener: OnItemClickListener, activity: Activity) : ListAdapter(AsyncDifferConfig.Builder(DIFF_CALLBACK).build()) { private val checkedItems: ArrayList private val onItemClickListener: OnItemClickListener @@ -88,22 +87,29 @@ class HistoryAdapter(onItemClickListener: OnItemClickListener, activity: Activit // TIME DOWNLOADED ---------------------------------- val datetime = card.findViewById(R.id.downloads_info_time) - val time = item.time - val downloadedTime: String - if (time == 0L) { - downloadedTime = activity.getString(R.string.currently_downloading) + " " + item.type - } else { - val cal = Calendar.getInstance() - val date = Date(time * 1000L) - cal.time = date - val day = cal[Calendar.DAY_OF_MONTH] - val month = cal.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault()) - val year = cal[Calendar.YEAR] - val formatter: DateFormat = SimpleDateFormat("HH:mm", Locale.getDefault()) - val timeString = formatter.format(date) - downloadedTime = "$day $month $year - $timeString" - } - datetime.text = downloadedTime + + val relativeTime = DateUtils.getRelativeTimeSpanString( + item.time * 1000L, + System.currentTimeMillis(), + DateUtils.MINUTE_IN_MILLIS + ) +// +// val time = item.time +// val downloadedTime: String +// if (time == 0L) { +// downloadedTime = activity.getString(R.string.currently_downloading) + " " + item.type +// } else { +// val cal = Calendar.getInstance() +// val date = Date(time * 1000L) +// cal.time = date +// val day = cal[Calendar.DAY_OF_MONTH] +// val month = cal.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault()) +// val year = cal[Calendar.YEAR] +// val formatter: DateFormat = SimpleDateFormat("HH:mm", Locale.getDefault()) +// val timeString = formatter.format(date) +// downloadedTime = "$day $month $year - $timeString" +// } + datetime.text = relativeTime // BUTTON ---------------------------------- val buttonLayout = card.findViewById(R.id.downloads_download_button_layout)