From f7f16c9c17aed99cc77ec439998a30b901d6721c Mon Sep 17 00:00:00 2001 From: Bnyro Date: Wed, 8 Jun 2022 07:43:37 +0200 Subject: [PATCH 1/2] live video indication --- .../com/github/libretube/adapters/SearchAdapter.kt | 11 ++++++++++- .../github/libretube/adapters/SubscriptionAdapter.kt | 10 ++++++++-- .../com/github/libretube/adapters/TrendingAdapter.kt | 10 ++++++++-- app/src/main/res/values/strings.xml | 1 + 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt index f37c09928..452f0583f 100644 --- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt @@ -1,7 +1,10 @@ package com.github.libretube.adapters +import android.graphics.Color +import android.graphics.Color.rgb import android.os.Bundle import android.text.format.DateUtils +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -70,7 +73,13 @@ class SearchViewHolder( val thumbnailImage = v.findViewById(R.id.search_thumbnail) Picasso.get().load(item.thumbnail).fit().centerCrop().into(thumbnailImage) val thumbnailDuration = v.findViewById(R.id.search_thumbnail_duration) - thumbnailDuration.text = DateUtils.formatElapsedTime(item.duration!!) + val itemDuration = DateUtils.formatElapsedTime(item.duration!!) + if (itemDuration != "00:-1") { + thumbnailDuration.text = itemDuration + } else { + thumbnailDuration.text = v.context.getString(R.string.live) + thumbnailDuration.setBackgroundColor(R.attr.colorPrimaryDark) + } val channelImage = v.findViewById(R.id.search_channel_image) Picasso.get().load(item.uploaderAvatar).fit().centerCrop().into(channelImage) val title = v.findViewById(R.id.search_description) diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt index 2d9e3b264..c54de5961 100644 --- a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt @@ -53,8 +53,14 @@ class SubscriptionAdapter( trending.views.formatShort() + " • " + DateUtils.getRelativeTimeSpanString(trending.uploaded!!) val thumbnailImage = holder.v.findViewById(R.id.thumbnail) - holder.v.findViewById(R.id.thumbnail_duration).text = - DateUtils.formatElapsedTime(trending.duration!!) + val thumbnailDuration = holder.v.findViewById(R.id.thumbnail_duration) + val itemDuration = DateUtils.formatElapsedTime(trending.duration!!) + if (itemDuration != "00:-1") { + thumbnailDuration.text = itemDuration + } else { + thumbnailDuration.text = holder.v.context.getString(R.string.live) + thumbnailDuration.setBackgroundColor(R.attr.colorPrimaryDark) + } val channelImage = holder.v.findViewById(R.id.channel_image) channelImage.setOnClickListener { val activity = holder.v.context as MainActivity diff --git a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt index 7d317ba48..fca2ef549 100644 --- a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt @@ -42,8 +42,14 @@ class TrendingAdapter( trending.views.formatShort() + " • " + DateUtils.getRelativeTimeSpanString(trending.uploaded!!) val thumbnailImage = holder.v.findViewById(R.id.thumbnail) - holder.v.findViewById(R.id.thumbnail_duration).text = - DateUtils.formatElapsedTime(trending.duration!!) + val thumbnailDuration = holder.v.findViewById(R.id.thumbnail_duration) + val itemDuration = DateUtils.formatElapsedTime(trending.duration!!) + if (itemDuration != "00:-1") { + thumbnailDuration.text = itemDuration + } else { + thumbnailDuration.text = holder.v.context.getString(R.string.live) + thumbnailDuration.setBackgroundColor(R.attr.colorPrimaryDark) + } val channelImage = holder.v.findViewById(R.id.channel_image) channelImage.setOnClickListener { val activity = holder.v.context as MainActivity diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c30bf7fa6..d4b240d65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -140,4 +140,5 @@ Player Make the app look how you want to. Player, Downloads, History + Live \ No newline at end of file From 9ad8409fe1f9aca3dbf3476facac255e6819bfc7 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Wed, 8 Jun 2022 07:58:44 +0200 Subject: [PATCH 2/2] ktlint --- .../main/java/com/github/libretube/adapters/SearchAdapter.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt index 452f0583f..37d07bbcf 100644 --- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt @@ -1,10 +1,7 @@ package com.github.libretube.adapters -import android.graphics.Color -import android.graphics.Color.rgb import android.os.Bundle import android.text.format.DateUtils -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup