From 0db214469a901ed63e72a7b86f7b73764d03b80f Mon Sep 17 00:00:00 2001 From: Bnyro Date: Fri, 10 Jun 2022 15:03:48 +0200 Subject: [PATCH] ktlint --- .../java/com/github/libretube/adapters/ChannelAdapter.kt | 2 +- .../java/com/github/libretube/adapters/CommentsAdapter.kt | 2 +- .../java/com/github/libretube/adapters/RepliesAdapter.kt | 2 +- .../main/java/com/github/libretube/adapters/SearchAdapter.kt | 2 +- .../com/github/libretube/adapters/SubscriptionAdapter.kt | 2 +- .../java/com/github/libretube/adapters/TrendingAdapter.kt | 2 +- .../java/com/github/libretube/fragments/ChannelFragment.kt | 2 +- .../java/com/github/libretube/fragments/PlayerFragment.kt | 5 +++-- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt b/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt index 20bea6628..28f716ac1 100644 --- a/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/ChannelAdapter.kt @@ -10,9 +10,9 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView import com.github.libretube.R -import com.github.libretube.util.formatShort import com.github.libretube.fragments.PlayerFragment import com.github.libretube.obj.StreamItem +import com.github.libretube.util.formatShort import com.squareup.picasso.Picasso class ChannelAdapter(private val videoFeed: MutableList) : diff --git a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt index 18bb2d5cf..efce52157 100644 --- a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt @@ -14,10 +14,10 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.github.libretube.MainActivity import com.github.libretube.R -import com.github.libretube.util.formatShort import com.github.libretube.obj.Comment import com.github.libretube.obj.CommentsPage import com.github.libretube.util.RetrofitInstance +import com.github.libretube.util.formatShort import com.squareup.picasso.Picasso import java.io.IOException import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt index a282d3a0b..7cd46cfc8 100644 --- a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt @@ -10,8 +10,8 @@ import androidx.core.os.bundleOf import androidx.recyclerview.widget.RecyclerView import com.github.libretube.MainActivity import com.github.libretube.R -import com.github.libretube.util.formatShort import com.github.libretube.obj.Comment +import com.github.libretube.util.formatShort import com.squareup.picasso.Picasso class RepliesAdapter( 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 cebe3ee6e..75fedea49 100644 --- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt @@ -14,9 +14,9 @@ import androidx.recyclerview.widget.RecyclerView import com.github.libretube.MainActivity import com.github.libretube.R import com.github.libretube.dialogs.VideoOptionsDialog -import com.github.libretube.util.formatShort import com.github.libretube.fragments.PlayerFragment import com.github.libretube.obj.SearchItem +import com.github.libretube.util.formatShort import com.squareup.picasso.Picasso class SearchAdapter( 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 e14bb89de..0db923b83 100644 --- a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt @@ -15,9 +15,9 @@ import androidx.recyclerview.widget.RecyclerView import com.github.libretube.MainActivity import com.github.libretube.R import com.github.libretube.dialogs.VideoOptionsDialog -import com.github.libretube.util.formatShort import com.github.libretube.fragments.PlayerFragment import com.github.libretube.obj.StreamItem +import com.github.libretube.util.formatShort import com.squareup.picasso.Picasso class SubscriptionAdapter( 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 34e76b25d..0d223e54d 100644 --- a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt @@ -15,9 +15,9 @@ import androidx.recyclerview.widget.RecyclerView import com.github.libretube.MainActivity import com.github.libretube.R import com.github.libretube.dialogs.VideoOptionsDialog -import com.github.libretube.util.formatShort import com.github.libretube.fragments.PlayerFragment import com.github.libretube.obj.StreamItem +import com.github.libretube.util.formatShort import com.squareup.picasso.Picasso class TrendingAdapter( diff --git a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt index e2bc2acc5..d7c3fd030 100644 --- a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt @@ -17,9 +17,9 @@ import androidx.recyclerview.widget.RecyclerView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.github.libretube.R import com.github.libretube.adapters.ChannelAdapter -import com.github.libretube.util.formatShort import com.github.libretube.obj.Subscribe import com.github.libretube.util.RetrofitInstance +import com.github.libretube.util.formatShort import com.google.android.material.button.MaterialButton import com.squareup.picasso.Picasso import java.io.IOException diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt index fc13387fe..e3002e85d 100644 --- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt @@ -48,7 +48,6 @@ import com.github.libretube.adapters.TrendingAdapter import com.github.libretube.dialogs.AddtoPlaylistDialog import com.github.libretube.dialogs.DownloadDialog import com.github.libretube.dialogs.ShareDialog -import com.github.libretube.util.formatShort import com.github.libretube.hideKeyboard import com.github.libretube.obj.PipedStream import com.github.libretube.obj.Segment @@ -58,6 +57,7 @@ import com.github.libretube.obj.Subscribe import com.github.libretube.preferences.SponsorBlockSettings import com.github.libretube.util.CronetHelper import com.github.libretube.util.RetrofitInstance +import com.github.libretube.util.formatShort import com.google.android.exoplayer2.C import com.google.android.exoplayer2.DefaultLoadControl import com.google.android.exoplayer2.ExoPlayer @@ -445,7 +445,8 @@ class PlayerFragment : Fragment() { private fun initializePlayerView(view: View, response: Streams) { view.findViewById(R.id.player_views_info).text = - context?.getString(R.string.views, response.views.formatShort()) + " • " + response.uploadDate + context?.getString(R.string.views, response.views.formatShort()) + + " • " + response.uploadDate view.findViewById(R.id.textLike).text = response.likes.formatShort() val channelImage = view.findViewById(R.id.player_channelImage) Picasso.get().load(response.uploaderAvatar).into(channelImage)