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 5b8f70bc8..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.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 7740c7e58..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.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 de06907ae..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.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 d1fa29523..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.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 3e37fd814..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.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 376171c9e..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.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 bf33cecf6..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.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 a8c6a2f67..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.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 = - response.views.formatShort() + " views • " + 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) diff --git a/app/src/main/java/com/github/libretube/util/VideoViews.kt b/app/src/main/java/com/github/libretube/util/VideoViews.kt index 41c7c4cbe..5de54163d 100644 --- a/app/src/main/java/com/github/libretube/util/VideoViews.kt +++ b/app/src/main/java/com/github/libretube/util/VideoViews.kt @@ -1,4 +1,4 @@ -package com.github.libretube +package com.github.libretube.util import java.math.BigDecimal import java.math.RoundingMode diff --git a/app/src/main/res/menu/action_bar.xml b/app/src/main/res/menu/action_bar.xml index 88b77a9ac..6aa29f4da 100644 --- a/app/src/main/res/menu/action_bar.xml +++ b/app/src/main/res/menu/action_bar.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index 1edd99554..31f7d2b94 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -580,14 +580,14 @@ - Default - Legacy - Gradient - Fire - Torch - Shaped - Flame - Bird + @string/defaultIcon + @string/legacyIcon + @string/gradientIcon + @string/fireIcon + @string/torchIcon + @string/shapedIcon + @string/flameIcon + @string/birdIcon MainActivity @@ -604,7 +604,6 @@ MP4 MKV - .mp4 .mkv @@ -619,7 +618,6 @@ 1.5x 2x - 0.25F 0.5F @@ -636,7 +634,6 @@ @string/movies_directory @string/sdcard - downloads music diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8215b8a32..363b5bb98 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -152,4 +152,13 @@ Music directory Movies directory Share Url To: + %1$s views + Default + Legacy + Gradient + Fire + Torch + Shaped + Flame + Bird \ No newline at end of file