From 87352f94c6064d51d10c8430e74c8b96da7d533d Mon Sep 17 00:00:00 2001 From: Bnyro Date: Wed, 12 Mar 2025 21:21:32 +0100 Subject: [PATCH] fix: sort channels alphabetically on client side --- .../github/libretube/api/SubscriptionHelper.kt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt b/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt index c0436bf52..a49890426 100644 --- a/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt +++ b/app/src/main/java/com/github/libretube/api/SubscriptionHelper.kt @@ -24,10 +24,11 @@ object SubscriptionHelper { */ const val GET_SUBSCRIPTIONS_LIMIT = 100 - private val localFeedExtraction get() = PreferenceHelper.getBoolean( - PreferenceKeys.LOCAL_FEED_EXTRACTION, - false - ) + private val localFeedExtraction + get() = PreferenceHelper.getBoolean( + PreferenceKeys.LOCAL_FEED_EXTRACTION, + false + ) private val token get() = PreferenceHelper.getToken() private val subscriptionsRepository: SubscriptionsRepository get() = when { @@ -48,11 +49,15 @@ object SubscriptionHelper { suspend fun importSubscriptions(newChannels: List) = subscriptionsRepository.importSubscriptions(newChannels) - suspend fun getSubscriptions() = subscriptionsRepository.getSubscriptions() + suspend fun getSubscriptions() = + subscriptionsRepository.getSubscriptions().sortedBy { it.name.lowercase() } + suspend fun getSubscriptionChannelIds() = subscriptionsRepository.getSubscriptionChannelIds() suspend fun getFeed(forceRefresh: Boolean, onProgressUpdate: (FeedProgress) -> Unit = {}) = feedRepository.getFeed(forceRefresh, onProgressUpdate) - suspend fun submitFeedItemChange(feedItem: SubscriptionsFeedItem) = feedRepository.submitFeedItemChange(feedItem) + + suspend fun submitFeedItemChange(feedItem: SubscriptionsFeedItem) = + feedRepository.submitFeedItemChange(feedItem) fun handleUnsubscribe( context: Context,