From c6cbfab0fa66e00d13a58667400abfc301af1ef8 Mon Sep 17 00:00:00 2001 From: HapeLee <63206378+HapeLee@users.noreply.github.com> Date: Fri, 15 May 2026 01:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=BA=90=E5=9C=A8=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=A2=84=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=B8=BB=E5=8A=A8=E5=8A=A0=E8=BD=BD=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/rss/article/RssArticlesCompose.kt | 10 ++---- .../ui/rss/article/RssArticlesViewModel.kt | 1 - .../app/ui/rss/article/RssSortRouteScreen.kt | 25 +++++++------- .../app/ui/rss/article/RssSortViewModel.kt | 33 ++++++------------- .../ui/rss/favorites/RssFavoritesScreen.kt | 6 +++- 5 files changed, 31 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesCompose.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesCompose.kt index 0b97e0144..e134f9b41 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesCompose.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesCompose.kt @@ -120,11 +120,7 @@ fun RssArticlesPage( val articles by articleFlow.collectAsStateWithLifecycle(initialValue = emptyList()) LaunchedEffect(rssSource?.sourceUrl, sortName, sortUrl) { - rssSource?.let { source -> - if (isPreload) { - viewModel.loadArticles(source) - } - } + rssSource?.let(viewModel::loadArticles) } LaunchedEffect(loadState.errorMessage) { @@ -308,7 +304,7 @@ private fun LoadMoreFooter( onRetry: () -> Unit ) { val text = when { - state.isLoadingMore -> "加载中..." + state.isRefreshing || state.isLoadingMore -> "加载中..." !state.hasMore -> "没有更多了" state.errorMessage != null -> "加载失败，点击重试" else -> "上拉加载更多" @@ -326,7 +322,7 @@ private fun LoadMoreFooter( ) { EmptyMessage( message = text, - isLoading = state.isLoadingMore, + isLoading = state.isRefreshing || state.isLoadingMore, modifier = contentModifier ) } diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt index edb1d02a8..07d4a9287 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt @@ -90,7 +90,6 @@ class RssArticlesViewModel(application: Application) : BaseViewModel(application val pageUrl = nextPageUrl if (pageUrl.isNullOrEmpty()) { - _loadState.value = currentState.copy(hasMore = false) return } diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssSortRouteScreen.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortRouteScreen.kt index 595ef3e77..32f2e5362 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssSortRouteScreen.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortRouteScreen.kt @@ -6,6 +6,7 @@ import android.app.Activity import androidx.activity.compose.LocalActivity import androidx.activity.compose.rememberLauncherForActivityResult import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf @@ -52,26 +53,25 @@ fun RssSortRouteScreen( var showReadRecordSheet by remember { mutableStateOf(false) } var readRecords by remember { mutableStateOf>(emptyList()) } - fun reloadSourceState() { - viewModel.initData(sourceUrl) { - scope.launch { - sortList = viewModel.loadSorts() - articleStyle = viewModel.currentArticleStyle() - screenTitle = viewModel.rssSource?.sourceName.orEmpty() - redirectPolicy = RedirectPolicy.fromString(viewModel.rssSource?.redirectPolicy) - } + suspend fun reloadSourceState() { + withContext(Dispatchers.IO) { + viewModel.initDataSource(sourceUrl) } + sortList = viewModel.loadSorts() + articleStyle = viewModel.currentArticleStyle() + screenTitle = viewModel.rssSource?.sourceName.orEmpty() + redirectPolicy = RedirectPolicy.fromString(viewModel.rssSource?.redirectPolicy) } val editSourceResult = rememberLauncherForActivityResult( StartActivityContract(RssSourceEditActivity::class.java) ) { if (it.resultCode == Activity.RESULT_OK) { - reloadSourceState() + scope.launch { reloadSourceState() } } } - androidx.compose.runtime.LaunchedEffect(sourceUrl) { + LaunchedEffect(sourceUrl) { reloadSourceState() } @@ -91,8 +91,9 @@ fun RssSortRouteScreen( } }, onRefreshSort = { - viewModel.clearSortCache { - scope.launch { sortList = viewModel.loadSorts() } + scope.launch { + viewModel.clearSortCache() + sortList = viewModel.loadSorts() } }, onSetSourceVariable = { diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt index be7006cee..c8cc464d6 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt @@ -1,7 +1,6 @@ package io.legado.app.ui.rss.article import android.app.Application -import android.content.Intent import androidx.lifecycle.MutableLiveData import io.legado.app.base.BaseViewModel import io.legado.app.data.appDb @@ -21,23 +20,15 @@ class RssSortViewModel(application: Application) : BaseViewModel(application) { val isGridLayout get() = rssSource?.articleStyle == 2 val isWaterLayout get() = rssSource?.articleStyle == 3 - fun initData(intent: Intent, finally: () -> Unit) { - initData(intent.getStringExtra("url") ?: intent.getStringExtra("sourceUrl"), finally) - } - - fun initData(sourceUrl: String?, finally: () -> Unit) { - execute { - url = sourceUrl - url?.let { sourceUrl -> - rssSource = appDb.rssSourceDao.getByKey(sourceUrl) - rssSource?.let { - titleLiveData.postValue(it.sourceName) - } ?: let { - rssSource = RssSource(sourceUrl = sourceUrl) - } + fun initDataSource(sourceUrl: String?) { + url = sourceUrl + url?.let { src -> + rssSource = appDb.rssSourceDao.getByKey(src) + rssSource?.let { + titleLiveData.postValue(it.sourceName) + } ?: run { + rssSource = RssSource(sourceUrl = src) } - }.onFinally { - finally() } } @@ -80,12 +71,8 @@ class RssSortViewModel(application: Application) : BaseViewModel(application) { } } - fun clearSortCache(onFinally: () -> Unit) { - execute { - rssSource?.removeSortCache() - }.onFinally { - onFinally.invoke() - } + suspend fun clearSortCache() { + rssSource?.removeSortCache() } fun getRecords(): List { diff --git a/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesScreen.kt b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesScreen.kt index 2076dd053..8396d9a0c 100644 --- a/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesScreen.kt +++ b/app/src/main/java/io/legado/app/ui/rss/favorites/RssFavoritesScreen.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import io.legado.app.R import io.legado.app.data.entities.RssStar +import io.legado.app.ui.theme.adaptiveContentPadding import io.legado.app.ui.widget.components.ActionItem import io.legado.app.ui.widget.components.EmptyMessage import io.legado.app.ui.widget.components.SourceIcon @@ -191,7 +192,10 @@ fun RssFavoritesScreen( } else { LazyColumn( modifier = Modifier.fillMaxSize(), - contentPadding = paddingValues, + contentPadding = adaptiveContentPadding( + top = paddingValues.calculateTopPadding(), + bottom = paddingValues.calculateBottomPadding() + 120.dp + ), verticalArrangement = Arrangement.spacedBy(8.dp) ) { items(state.items, key = { "${it.origin}|${it.link}" }) { rssStar ->