kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1504 from Bnyro/master

Browse Source 
Option to sort playlists
This commit is contained in:
Bnyro 2022-10-06 15:14:39 +02:00 committed by GitHub
commit e523c901bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 94 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt
View File

@ -29,13 +29,13 @@ object PreferenceKeys {
const val PURE_THEME = "pure_theme"
const val ACCENT_COLOR = "accent_color"
const val GRID_COLUMNS = "grid"
const val DEFAULT_TAB = "default_tab"
const val LABEL_VISIBILITY = "label_visibility"
const val APP_ICON = "icon_change"
const val LEGACY_SUBSCRIPTIONS = "legacy_subscriptions"
const val LEGACY_SUBSCRIPTIONS_COLUMNS = "legacy_subscriptions_columns"
const val ALTERNATIVE_TRENDING_LAYOUT = "trending_layout"
const val NEW_VIDEOS_BADGE = "new_videos_badge"
const val PLAYLISTS_ORDER = "playlists_order"
/**
* Instance

1
app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
View File

@ -7,7 +7,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import android.widget.Toast.makeText
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager

19
app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
View File

@ -97,7 +97,7 @@ class LibraryFragment : BaseFragment() {
fun fetchPlaylists() {
binding.playlistRefresh.isRefreshing = true
lifecycleScope.launchWhenCreated {
val response = try {
var playlists = try {
RetrofitInstance.authApi.playlists(token)
} catch (e: IOException) {
println(e)
@ -111,11 +111,24 @@ class LibraryFragment : BaseFragment() {
} finally {
binding.playlistRefresh.isRefreshing = false
}
if (response.isNotEmpty()) {
if (playlists.isNotEmpty()) {
binding.loginOrRegister.visibility = View.GONE
playlists = when (
PreferenceHelper.getString(
PreferenceKeys.PLAYLISTS_ORDER,
"recent"
)
) {
"recent" -> playlists
"recent_reversed" -> playlists.reversed()
"name" -> playlists.sortedBy { it.name }
"name_reversed" -> playlists.sortedBy { it.name }.reversed()
else -> playlists
}
val playlistsAdapter = PlaylistsAdapter(
response.toMutableList(),
playlists.toMutableList(),
childFragmentManager,
requireActivity()
)

17
app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
View File

@ -25,7 +25,7 @@ class SubscriptionsFragment : BaseFragment() {
private val viewModel: SubscriptionsViewModel by activityViewModels()
private var subscriptionAdapter: TrendingAdapter? = null
private var sortOrder = "most_recent"
private var sortOrder = 0
override fun onCreateView(
inflater: LayoutInflater,
@ -120,12 +120,11 @@ class SubscriptionsFragment : BaseFragment() {
private fun showSortDialog() {
val sortOptions = resources.getStringArray(R.array.sortOptions)
val sortOptionValues = resources.getStringArray(R.array.sortOptionsValues)
val bottomSheet = BottomSheet().apply {
setSimpleItems(sortOptions.toList()) { index ->
binding.sortTV.text = sortOptions[index]
sortOrder = sortOptionValues[index]
sortOrder = index
showFeed()
}
}
@ -140,12 +139,12 @@ class SubscriptionsFragment : BaseFragment() {
val feed = viewModel.videoFeed.value!!
// sort the feed
val sortedFeed = when (sortOrder) {
"most_recent" -> feed
"least_recent" -> feed.reversed()
"most_views" -> feed.sortedBy { it.views }.reversed()
"least_views" -> feed.sortedBy { it.views }
"channel_name_az" -> feed.sortedBy { it.uploaderName }
"channel_name_za" -> feed.sortedBy { it.uploaderName }.reversed()
0 -> feed
1 -> feed.reversed()
2 -> feed.sortedBy { it.views }.reversed()
3 -> feed.sortedBy { it.views }
4 -> feed.sortedBy { it.uploaderName }
5 -> feed.sortedBy { it.uploaderName }.reversed()
else -> feed
}

1
app/src/main/java/com/github/libretube/ui/preferences/PlayerSettings.kt
View File

@ -10,7 +10,6 @@ import com.github.libretube.ui.activities.SettingsActivity
import com.github.libretube.ui.base.BasePreferenceFragment
import com.github.libretube.util.LocaleHelper
import com.github.libretube.util.PreferenceHelper
import java.util.*
class PlayerSettings : BasePreferenceFragment() {

10
app/src/main/res/drawable/ic_filter.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
</vector>

6
app/src/main/res/layout/dialog_delete_account.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<TextView
@ -16,8 +16,8 @@
<com.google.android.material.textfield.TextInputLayout
style="@style/CustomDialogTextInputLayout"
app:passwordToggleEnabled="true"
android:hint="@string/password">
android:hint="@string/password"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/delete_password"

2
app/src/main/res/layout/dialog_download.xml
View File

@ -15,8 +15,8 @@
android:textSize="20sp" />
<com.google.android.material.textfield.TextInputLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="10dp"
android:hint="@string/filename">

6
app/src/main/res/layout/dialog_login.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<TextView
@ -27,8 +27,8 @@
<com.google.android.material.textfield.TextInputLayout
style="@style/CustomDialogTextInputLayout"
app:passwordToggleEnabled="true"
android:hint="@string/password">
android:hint="@string/password"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"

8
app/src/main/res/menu/bottom_menu.xml
View File

@ -18,14 +18,14 @@
<item
android:id="@+id/downloadsFragment"
android:enabled="false"
android:icon="@drawable/ic_download_filled"
android:title="@string/downloads"
android:enabled="false" />
android:title="@string/downloads" />
<item
android:id="@+id/watchHistoryFragment"
android:enabled="false"
android:icon="@drawable/ic_history_filled"
android:title="@string/history"
android:enabled="false" />
android:title="@string/history" />
</menu>

9
app/src/main/res/values-night/themes.xml
View File

@ -93,7 +93,8 @@
<item name="colorSecondary">@color/yellow_md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/yellow_md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/yellow_md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/yellow_md_theme_dark_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/yellow_md_theme_dark_onSecondaryContainer
</item>
<item name="colorTertiary">@color/yellow_md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/yellow_md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/yellow_md_theme_dark_tertiaryContainer</item>
@ -124,7 +125,8 @@
<item name="colorSecondary">@color/green_md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/green_md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/green_md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/green_md_theme_dark_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/green_md_theme_dark_onSecondaryContainer
</item>
<item name="colorTertiary">@color/green_md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/green_md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/green_md_theme_dark_tertiaryContainer</item>
@ -155,7 +157,8 @@
<item name="colorSecondary">@color/purple_md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/purple_md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/purple_md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/purple_md_theme_dark_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/purple_md_theme_dark_onSecondaryContainer
</item>
<item name="colorTertiary">@color/purple_md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/purple_md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/purple_md_theme_dark_tertiaryContainer</item>

23
app/src/main/res/values/array.xml
View File

@ -343,15 +343,6 @@
<item>@string/channel_name_za</item>
</string-array>
<string-array name="sortOptionsValues">
<item>most_recent</item>
<item>least_recent</item>
<item>most_views</item>
<item>least_views</item>
<item>channel_name_az</item>
<item>channel_name_za</item>
</string-array>
<string-array name="requiredNetwork">
<item>@string/network_all</item>
<item>@string/network_wifi</item>
@ -430,4 +421,18 @@
<item>default</item>
</string-array>
<string-array name="playlistSortingOptions">
<item>@string/recentlyUpdated</item>
<item>@string/recentlyUpdatedReversed</item>
<item>@string/playlistName</item>
<item>@string/playlistNameReversed</item>
</string-array>
<string-array name="playlistSortingOptionsValues">
<item>recent</item>
<item>recent_reversed</item>
<item>name</item>
<item>name_reversed</item>
</string-array>
</resources>

4
app/src/main/res/values/strings.xml
View File

@ -341,6 +341,10 @@
<string name="playback_pitch">Pitch</string>
<string name="filename">Filename</string>
<string name="invalid_filename">Invalid filename!</string>
<string name="playlists_order">Playlists order</string>
<string name="playlistNameReversed">Playlist name (reversed)</string>
<string name="recentlyUpdated">Recently updated</string>
<string name="recentlyUpdatedReversed">Recently updated (reversed)</string>
<!-- Notification channel strings -->
<string name="download_channel_name">Download Service</string>

18
app/src/main/res/values/themes.xml
View File

@ -62,7 +62,8 @@
<item name="colorSecondary">@color/blue_md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/blue_md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/blue_md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/blue_md_theme_light_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/blue_md_theme_light_onSecondaryContainer
</item>
<item name="colorTertiary">@color/blue_md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/blue_md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/blue_md_theme_light_tertiaryContainer</item>
@ -93,11 +94,13 @@
<item name="colorSecondary">@color/yellow_md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/yellow_md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/yellow_md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/yellow_md_theme_light_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/yellow_md_theme_light_onSecondaryContainer
</item>
<item name="colorTertiary">@color/yellow_md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/yellow_md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/yellow_md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/yellow_md_theme_light_onTertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/yellow_md_theme_light_onTertiaryContainer
</item>
<item name="colorError">@color/yellow_md_theme_light_error</item>
<item name="colorErrorContainer">@color/yellow_md_theme_light_errorContainer</item>
<item name="colorOnError">@color/yellow_md_theme_light_onError</item>
@ -124,7 +127,8 @@
<item name="colorSecondary">@color/green_md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/green_md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/green_md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/green_md_theme_light_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/green_md_theme_light_onSecondaryContainer
</item>
<item name="colorTertiary">@color/green_md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/green_md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/green_md_theme_light_tertiaryContainer</item>
@ -155,11 +159,13 @@
<item name="colorSecondary">@color/purple_md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/purple_md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/purple_md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/purple_md_theme_light_onSecondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/purple_md_theme_light_onSecondaryContainer
</item>
<item name="colorTertiary">@color/purple_md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/purple_md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/purple_md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/purple_md_theme_light_onTertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/purple_md_theme_light_onTertiaryContainer
</item>
<item name="colorError">@color/purple_md_theme_light_error</item>
<item name="colorErrorContainer">@color/purple_md_theme_light_errorContainer</item>
<item name="colorOnError">@color/purple_md_theme_light_onError</item>

12
app/src/main/res/xml/instance_settings.xml
View File

@ -71,4 +71,16 @@
</PreferenceCategory>
<PreferenceCategory app:title="@string/misc">
<ListPreference
android:defaultValue="recent"
android:entries="@array/playlistSortingOptions"
android:entryValues="@array/playlistSortingOptionsValues"
android:icon="@drawable/ic_filter"
app:key="playlists_order"
app:title="@string/playlists_order" />
</PreferenceCategory>
</PreferenceScreen>