From c21f553fa4fe279236f855cc0c53be39298735b6 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sun, 6 Nov 2022 16:35:36 +0100 Subject: [PATCH] layout fixes --- .../main/java/com/github/libretube/constants/Constants.kt | 1 - .../com/github/libretube/ui/activities/MainActivity.kt | 6 +++--- .../com/github/libretube/ui/adapters/CommentsAdapter.kt | 3 ++- .../com/github/libretube/ui/adapters/DownloadsAdapter.kt | 3 ++- .../com/github/libretube/ui/adapters/SearchAdapter.kt | 7 ++++--- .../com/github/libretube/ui/adapters/VideosAdapter.kt | 7 ++++--- .../github/libretube/ui/dialogs/AddToPlaylistDialog.kt | 2 +- .../com/github/libretube/ui/fragments/LibraryFragment.kt | 2 +- .../com/github/libretube/ui/fragments/PlayerFragment.kt | 7 ++++--- .../com/github/libretube/ui/fragments/PlaylistFragment.kt | 5 +++-- .../com/github/libretube/ui/fragments/SearchFragment.kt | 2 +- .../libretube/ui/fragments/SubscriptionsFragment.kt | 2 +- .../{models => ui}/interfaces/DoubleTapInterface.kt | 2 +- .../{util => ui/interfaces}/DoubleTapListener.kt | 2 +- .../{models => ui}/interfaces/OnlinePlayerOptions.kt | 2 +- .../libretube/{models => ui}/interfaces/PlayerOptions.kt | 2 +- .../github/libretube/{ => ui}/models/PlayerViewModel.kt | 2 +- .../github/libretube/{ => ui}/models/PlaylistViewModel.kt | 2 +- .../github/libretube/{ => ui}/models/SearchViewModel.kt | 2 +- .../libretube/{ => ui}/models/SubscriptionsViewModel.kt | 2 +- .../com/github/libretube/ui/views/CustomExoPlayerView.kt | 8 ++++---- app/src/main/java/com/github/libretube/util/TextUtils.kt | 8 ++++++++ app/src/main/res/layout/playlists_row.xml | 3 +++ 23 files changed, 49 insertions(+), 33 deletions(-) rename app/src/main/java/com/github/libretube/{models => ui}/interfaces/DoubleTapInterface.kt (56%) rename app/src/main/java/com/github/libretube/{util => ui/interfaces}/DoubleTapListener.kt (96%) rename app/src/main/java/com/github/libretube/{models => ui}/interfaces/OnlinePlayerOptions.kt (65%) rename app/src/main/java/com/github/libretube/{models => ui}/interfaces/PlayerOptions.kt (76%) rename app/src/main/java/com/github/libretube/{ => ui}/models/PlayerViewModel.kt (88%) rename app/src/main/java/com/github/libretube/{ => ui}/models/PlaylistViewModel.kt (76%) rename app/src/main/java/com/github/libretube/{ => ui}/models/SearchViewModel.kt (86%) rename app/src/main/java/com/github/libretube/{ => ui}/models/SubscriptionsViewModel.kt (98%) create mode 100644 app/src/main/java/com/github/libretube/util/TextUtils.kt diff --git a/app/src/main/java/com/github/libretube/constants/Constants.kt b/app/src/main/java/com/github/libretube/constants/Constants.kt index b3a959e13..85dcc1731 100644 --- a/app/src/main/java/com/github/libretube/constants/Constants.kt +++ b/app/src/main/java/com/github/libretube/constants/Constants.kt @@ -9,7 +9,6 @@ const val GITHUB_API_URL = "https://api.github.com/repos/libre-tube/LibreTube/re * Links for the about fragment */ const val WEBSITE_URL = "https://libre-tube.github.io/" -const val DONATE_URL = "https://github.com/libre-tube/LibreTube#donate" const val GITHUB_URL = "https://github.com/libre-tube/LibreTube" const val PIPED_GITHUB_URL = "https://github.com/TeamPiped/Piped" const val WEBLATE_URL = "https://hosted.weblate.org/projects/libretube/libretube/" diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt index 6c4258d16..6d772594f 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt @@ -27,13 +27,13 @@ import com.github.libretube.constants.IntentData import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.ActivityMainBinding import com.github.libretube.extensions.toID -import com.github.libretube.models.PlayerViewModel -import com.github.libretube.models.SearchViewModel -import com.github.libretube.models.SubscriptionsViewModel import com.github.libretube.services.ClosingService import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.dialogs.ErrorDialog import com.github.libretube.ui.fragments.PlayerFragment +import com.github.libretube.ui.models.PlayerViewModel +import com.github.libretube.ui.models.SearchViewModel +import com.github.libretube.ui.models.SubscriptionsViewModel import com.github.libretube.ui.sheets.PlayingQueueSheet import com.github.libretube.util.NavBarHelper import com.github.libretube.util.NetworkHelper diff --git a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt index 1c612dd39..330f6e543 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/CommentsAdapter.kt @@ -20,6 +20,7 @@ import com.github.libretube.ui.viewholders.CommentsViewHolder import com.github.libretube.util.ClipboardHelper import com.github.libretube.util.ImageHelper import com.github.libretube.util.NavigationHelper +import com.github.libretube.util.TextUtils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -61,7 +62,7 @@ class CommentsAdapter( root.scaleY = 0.9f } - commentInfos.text = comment.author.toString() + " • " + comment.commentedTime.toString() + commentInfos.text = comment.author.toString() + TextUtils.SEPARATOR + comment.commentedTime.toString() commentText.text = comment.commentText.toString() ImageHelper.loadImage(comment.thumbnail, commentorImage) diff --git a/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt index b1f35725b..70140dce7 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt @@ -13,6 +13,7 @@ import com.github.libretube.obj.DownloadedFile import com.github.libretube.ui.activities.OfflinePlayerActivity import com.github.libretube.ui.viewholders.DownloadsViewHolder import com.github.libretube.util.DownloadHelper +import com.github.libretube.util.TextUtils import com.google.android.material.dialog.MaterialAlertDialogBuilder import java.io.File @@ -39,7 +40,7 @@ class DownloadsAdapter( uploaderName.text = it.uploader videoInfo.text = it.views.formatShort() + " " + root.context.getString(R.string.views_placeholder) + - " • " + it.uploadDate + TextUtils.SEPARATOR + it.uploadDate } thumbnailImage.setImageBitmap(file.thumbnail) diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt index 2d5636d9e..46ebe2f32 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt @@ -21,6 +21,7 @@ import com.github.libretube.ui.sheets.VideoOptionsBottomSheet import com.github.libretube.ui.viewholders.SearchViewHolder import com.github.libretube.util.ImageHelper import com.github.libretube.util.NavigationHelper +import com.github.libretube.util.TextUtils class SearchAdapter( private val searchItems: MutableList, @@ -121,7 +122,7 @@ class SearchAdapter( searchViews.text = root.context.getString( R.string.subscribers, item.subscribers.formatShort() - ) + " • " + root.context.getString(R.string.videoCount, item.videos.toString()) + ) + TextUtils.SEPARATOR + root.context.getString(R.string.videoCount, item.videos.toString()) root.setOnClickListener { NavigationHelper.navigateChannel(root.context, item.url) } @@ -137,8 +138,8 @@ class SearchAdapter( binding.apply { ImageHelper.loadImage(item.thumbnail, playlistThumbnail) if (item.videos?.toInt() != -1) videoCount.text = item.videos.toString() - playlistDescription.text = item.name - playlistTitle.text = item.uploaderName + playlistTitle.text = item.name + playlistDescription.text = item.uploaderName root.setOnClickListener { NavigationHelper.navigatePlaylist(root.context, item.url, false) } diff --git a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt index 51924e55e..d2d02eb1d 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt @@ -21,6 +21,7 @@ import com.github.libretube.ui.viewholders.VideosViewHolder import com.github.libretube.util.ImageHelper import com.github.libretube.util.NavigationHelper import com.github.libretube.util.PreferenceHelper +import com.github.libretube.util.TextUtils class VideosAdapter( private val streamItems: MutableList, @@ -79,10 +80,10 @@ class VideosAdapter( holder.trendingRowBinding?.apply { textViewTitle.text = video.title textViewChannel.text = - video.uploaderName + " • " + + video.uploaderName + TextUtils.SEPARATOR + video.views.formatShort() + " " + root.context.getString(R.string.views_placeholder) + - " • " + video.uploaded?.let { DateUtils.getRelativeTimeSpanString(it) } + TextUtils.SEPARATOR + video.uploaded?.let { DateUtils.getRelativeTimeSpanString(it) } video.duration?.let { thumbnailDuration.setFormattedDuration(it) } channelImage.setOnClickListener { NavigationHelper.navigateChannel(root.context, video.uploaderUrl) @@ -114,7 +115,7 @@ class VideosAdapter( videoInfo.text = video.views.formatShort() + " " + root.context.getString(R.string.views_placeholder) + - " • " + video.uploaded?.let { DateUtils.getRelativeTimeSpanString(it) } + TextUtils.SEPARATOR + video.uploaded?.let { DateUtils.getRelativeTimeSpanString(it) } thumbnailDuration.text = video.duration?.let { DateUtils.formatElapsedTime(it) } diff --git a/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt index d5dbb27ae..4c008e81d 100644 --- a/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt +++ b/app/src/main/java/com/github/libretube/ui/dialogs/AddToPlaylistDialog.kt @@ -16,7 +16,7 @@ import com.github.libretube.constants.IntentData import com.github.libretube.databinding.DialogAddtoplaylistBinding import com.github.libretube.extensions.TAG import com.github.libretube.extensions.toastFromMainThread -import com.github.libretube.models.PlaylistViewModel +import com.github.libretube.ui.models.PlaylistViewModel import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.ThemeHelper import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt index fafe5e6fe..8b593feee 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt @@ -17,10 +17,10 @@ import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.FragmentLibraryBinding import com.github.libretube.extensions.TAG import com.github.libretube.extensions.toDp -import com.github.libretube.models.PlayerViewModel import com.github.libretube.ui.adapters.PlaylistsAdapter import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.dialogs.CreatePlaylistDialog +import com.github.libretube.ui.models.PlayerViewModel import com.github.libretube.util.PreferenceHelper import retrofit2.HttpException import java.io.IOException diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt index 770f6f012..e3834d73b 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt @@ -55,8 +55,6 @@ import com.github.libretube.extensions.query import com.github.libretube.extensions.setupSubscriptionButton import com.github.libretube.extensions.toID import com.github.libretube.extensions.toStreamItem -import com.github.libretube.models.PlayerViewModel -import com.github.libretube.models.interfaces.OnlinePlayerOptions import com.github.libretube.obj.ShareData import com.github.libretube.services.BackgroundMode import com.github.libretube.services.DownloadService @@ -68,6 +66,8 @@ import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.dialogs.AddToPlaylistDialog import com.github.libretube.ui.dialogs.DownloadDialog import com.github.libretube.ui.dialogs.ShareDialog +import com.github.libretube.ui.interfaces.OnlinePlayerOptions +import com.github.libretube.ui.models.PlayerViewModel import com.github.libretube.ui.sheets.BaseBottomSheet import com.github.libretube.ui.sheets.PlayingQueueSheet import com.github.libretube.util.BackgroundHelper @@ -76,6 +76,7 @@ import com.github.libretube.util.NowPlayingNotification import com.github.libretube.util.PlayerHelper import com.github.libretube.util.PlayingQueue import com.github.libretube.util.PreferenceHelper +import com.github.libretube.util.TextUtils import com.google.android.exoplayer2.C import com.google.android.exoplayer2.DefaultLoadControl import com.google.android.exoplayer2.ExoPlayer @@ -765,7 +766,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions { binding.apply { playerViewsInfo.text = context?.getString(R.string.views, response.views.formatShort()) + - if (!isLive) " • " + response.uploadDate else "" + if (!isLive) TextUtils.SEPARATOR + response.uploadDate else "" textLike.text = response.likes.formatShort() textDislike.text = response.dislikes.formatShort() diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt index b4544288a..3fe8e7029 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt @@ -24,6 +24,7 @@ import com.github.libretube.ui.dialogs.ShareDialog import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet import com.github.libretube.util.ImageHelper import com.github.libretube.util.NavigationHelper +import com.github.libretube.util.TextUtils import retrofit2.HttpException import java.io.IOException @@ -89,7 +90,7 @@ class PlaylistFragment : BaseFragment() { ImageHelper.loadImage(response.thumbnailUrl, binding.thumbnail) binding.playlistProgress.visibility = View.GONE binding.playlistName.text = response.name - binding.playlistInfo.text = response.uploader + " • " + getString(R.string.videoCount, response.videos.toString()) + binding.playlistInfo.text = response.uploader + TextUtils.SEPARATOR + getString(R.string.videoCount, response.videos.toString()) // show playlist options binding.optionsMenu.setOnClickListener { @@ -127,7 +128,7 @@ class PlaylistFragment : BaseFragment() { RecyclerView.AdapterDataObserver() { override fun onChanged() { binding.playlistInfo.text = - binding.playlistInfo.text.split(" • ").first() + " • " + getString( + binding.playlistInfo.text.split(TextUtils.SEPARATOR).first() + TextUtils.SEPARATOR + getString( R.string.videoCount, playlistAdapter!!.itemCount.toString() ) diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt index b690af088..3a706dca0 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/SearchFragment.kt @@ -15,11 +15,11 @@ import com.github.libretube.databinding.FragmentSearchBinding import com.github.libretube.db.DatabaseHolder.Companion.Database import com.github.libretube.extensions.TAG import com.github.libretube.extensions.awaitQuery -import com.github.libretube.models.SearchViewModel import com.github.libretube.ui.activities.MainActivity import com.github.libretube.ui.adapters.SearchHistoryAdapter import com.github.libretube.ui.adapters.SearchSuggestionsAdapter import com.github.libretube.ui.base.BaseFragment +import com.github.libretube.ui.models.SearchViewModel import retrofit2.HttpException import java.io.IOException diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt index 5af8d30bc..3745164e3 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt @@ -12,11 +12,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.github.libretube.R import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.FragmentSubscriptionsBinding -import com.github.libretube.models.SubscriptionsViewModel import com.github.libretube.ui.adapters.LegacySubscriptionAdapter import com.github.libretube.ui.adapters.SubscriptionChannelAdapter import com.github.libretube.ui.adapters.VideosAdapter import com.github.libretube.ui.base.BaseFragment +import com.github.libretube.ui.models.SubscriptionsViewModel import com.github.libretube.ui.sheets.BaseBottomSheet import com.github.libretube.util.LayoutHelper import com.github.libretube.util.PreferenceHelper diff --git a/app/src/main/java/com/github/libretube/models/interfaces/DoubleTapInterface.kt b/app/src/main/java/com/github/libretube/ui/interfaces/DoubleTapInterface.kt similarity index 56% rename from app/src/main/java/com/github/libretube/models/interfaces/DoubleTapInterface.kt rename to app/src/main/java/com/github/libretube/ui/interfaces/DoubleTapInterface.kt index b26a13b4f..774681b14 100644 --- a/app/src/main/java/com/github/libretube/models/interfaces/DoubleTapInterface.kt +++ b/app/src/main/java/com/github/libretube/ui/interfaces/DoubleTapInterface.kt @@ -1,4 +1,4 @@ -package com.github.libretube.models.interfaces +package com.github.libretube.ui.interfaces interface DoubleTapInterface { fun onEvent(x: Float) diff --git a/app/src/main/java/com/github/libretube/util/DoubleTapListener.kt b/app/src/main/java/com/github/libretube/ui/interfaces/DoubleTapListener.kt similarity index 96% rename from app/src/main/java/com/github/libretube/util/DoubleTapListener.kt rename to app/src/main/java/com/github/libretube/ui/interfaces/DoubleTapListener.kt index 28645bfbc..3bfd2803c 100644 --- a/app/src/main/java/com/github/libretube/util/DoubleTapListener.kt +++ b/app/src/main/java/com/github/libretube/ui/interfaces/DoubleTapListener.kt @@ -1,4 +1,4 @@ -package com.github.libretube.util +package com.github.libretube.ui.interfaces import android.os.Handler import android.os.Looper diff --git a/app/src/main/java/com/github/libretube/models/interfaces/OnlinePlayerOptions.kt b/app/src/main/java/com/github/libretube/ui/interfaces/OnlinePlayerOptions.kt similarity index 65% rename from app/src/main/java/com/github/libretube/models/interfaces/OnlinePlayerOptions.kt rename to app/src/main/java/com/github/libretube/ui/interfaces/OnlinePlayerOptions.kt index 10a354921..b8ec19a7e 100644 --- a/app/src/main/java/com/github/libretube/models/interfaces/OnlinePlayerOptions.kt +++ b/app/src/main/java/com/github/libretube/ui/interfaces/OnlinePlayerOptions.kt @@ -1,4 +1,4 @@ -package com.github.libretube.models.interfaces +package com.github.libretube.ui.interfaces interface OnlinePlayerOptions { fun onCaptionsClicked() diff --git a/app/src/main/java/com/github/libretube/models/interfaces/PlayerOptions.kt b/app/src/main/java/com/github/libretube/ui/interfaces/PlayerOptions.kt similarity index 76% rename from app/src/main/java/com/github/libretube/models/interfaces/PlayerOptions.kt rename to app/src/main/java/com/github/libretube/ui/interfaces/PlayerOptions.kt index fe2a5db67..6b60b4785 100644 --- a/app/src/main/java/com/github/libretube/models/interfaces/PlayerOptions.kt +++ b/app/src/main/java/com/github/libretube/ui/interfaces/PlayerOptions.kt @@ -1,4 +1,4 @@ -package com.github.libretube.models.interfaces +package com.github.libretube.ui.interfaces interface PlayerOptions { fun onAutoplayClicked() diff --git a/app/src/main/java/com/github/libretube/models/PlayerViewModel.kt b/app/src/main/java/com/github/libretube/ui/models/PlayerViewModel.kt similarity index 88% rename from app/src/main/java/com/github/libretube/models/PlayerViewModel.kt rename to app/src/main/java/com/github/libretube/ui/models/PlayerViewModel.kt index 14e707513..a42d566a9 100644 --- a/app/src/main/java/com/github/libretube/models/PlayerViewModel.kt +++ b/app/src/main/java/com/github/libretube/ui/models/PlayerViewModel.kt @@ -1,4 +1,4 @@ -package com.github.libretube.models +package com.github.libretube.ui.models import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/github/libretube/models/PlaylistViewModel.kt b/app/src/main/java/com/github/libretube/ui/models/PlaylistViewModel.kt similarity index 76% rename from app/src/main/java/com/github/libretube/models/PlaylistViewModel.kt rename to app/src/main/java/com/github/libretube/ui/models/PlaylistViewModel.kt index 633286d42..700fc9670 100644 --- a/app/src/main/java/com/github/libretube/models/PlaylistViewModel.kt +++ b/app/src/main/java/com/github/libretube/ui/models/PlaylistViewModel.kt @@ -1,4 +1,4 @@ -package com.github.libretube.models +package com.github.libretube.ui.models import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/github/libretube/models/SearchViewModel.kt b/app/src/main/java/com/github/libretube/ui/models/SearchViewModel.kt similarity index 86% rename from app/src/main/java/com/github/libretube/models/SearchViewModel.kt rename to app/src/main/java/com/github/libretube/ui/models/SearchViewModel.kt index c8c46b0ff..86d429fd0 100644 --- a/app/src/main/java/com/github/libretube/models/SearchViewModel.kt +++ b/app/src/main/java/com/github/libretube/ui/models/SearchViewModel.kt @@ -1,4 +1,4 @@ -package com.github.libretube.models +package com.github.libretube.ui.models import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/github/libretube/models/SubscriptionsViewModel.kt b/app/src/main/java/com/github/libretube/ui/models/SubscriptionsViewModel.kt similarity index 98% rename from app/src/main/java/com/github/libretube/models/SubscriptionsViewModel.kt rename to app/src/main/java/com/github/libretube/ui/models/SubscriptionsViewModel.kt index 0a9518fc4..76e08ec26 100644 --- a/app/src/main/java/com/github/libretube/models/SubscriptionsViewModel.kt +++ b/app/src/main/java/com/github/libretube/ui/models/SubscriptionsViewModel.kt @@ -1,4 +1,4 @@ -package com.github.libretube.models +package com.github.libretube.ui.models import android.util.Log import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt index 67bf0f4d3..d5fa8978c 100644 --- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt +++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt @@ -13,14 +13,14 @@ import com.github.libretube.R import com.github.libretube.databinding.DoubleTapOverlayBinding import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding import com.github.libretube.extensions.toDp -import com.github.libretube.models.interfaces.DoubleTapInterface -import com.github.libretube.models.interfaces.OnlinePlayerOptions -import com.github.libretube.models.interfaces.PlayerOptions import com.github.libretube.obj.BottomSheetItem import com.github.libretube.ui.activities.MainActivity +import com.github.libretube.ui.interfaces.DoubleTapInterface +import com.github.libretube.ui.interfaces.DoubleTapListener +import com.github.libretube.ui.interfaces.OnlinePlayerOptions +import com.github.libretube.ui.interfaces.PlayerOptions import com.github.libretube.ui.sheets.BaseBottomSheet import com.github.libretube.ui.sheets.PlaybackSpeedSheet -import com.github.libretube.util.DoubleTapListener import com.github.libretube.util.PlayerHelper import com.google.android.exoplayer2.PlaybackParameters import com.google.android.exoplayer2.trackselection.TrackSelector diff --git a/app/src/main/java/com/github/libretube/util/TextUtils.kt b/app/src/main/java/com/github/libretube/util/TextUtils.kt new file mode 100644 index 000000000..63b8966f1 --- /dev/null +++ b/app/src/main/java/com/github/libretube/util/TextUtils.kt @@ -0,0 +1,8 @@ +package com.github.libretube.util + +object TextUtils { + /** + * Separator used for descriptions + */ + const val SEPARATOR = " • " +} diff --git a/app/src/main/res/layout/playlists_row.xml b/app/src/main/res/layout/playlists_row.xml index cfb2fc75c..4a83a16ae 100644 --- a/app/src/main/res/layout/playlists_row.xml +++ b/app/src/main/res/layout/playlists_row.xml @@ -75,6 +75,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" + android:ellipsize="end" + android:maxLines="2" + android:textSize="14sp" app:layout_constraintEnd_toStartOf="@id/delete_playlist" app:layout_constraintStart_toEndOf="@+id/card_playlist_thumbnail" app:layout_constraintTop_toBottomOf="@+id/playlist_title" />