android/ReadYou
1
0
Fork 0
mirror of https://github.com/Ashinch/ReadYou.git synced 2026-03-13 09:53:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: open article list when click on the list widget title

Browse Source
This commit is contained in:
junkfood
2025-08-16 17:19:48 +08:00
parent fed187fcef
commit 7c18d188f9
4 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/me/ash/reader/infrastructure/android/MainActivity.kt
View File

@@ -40,6 +40,7 @@ import me.ash.reader.ui.page.common.ExtraName
import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeViewModel
import me.ash.reader.ui.page.nav3.AppEntry
import me.ash.reader.ui.page.nav3.key.Route
import me.ash.reader.ui.page.nav3.key.Route.*
import me.ash.reader.ui.theme.AppTheme
/** The Single-Activity Architecture. */
@@ -157,7 +158,22 @@ class MainActivity : AppCompatActivity() {
if (readingIndex != -1) {
backStack.removeRange(readingIndex, backStack.size)
}
backStack.add(Route.Reading(articleId = articleId))
backStack.add(Reading(articleId = articleId))
}
is LaunchAction.OpenArticleList -> {
val (accountId, feedId, groupId) = action
if (
accountId != null &&
accountId != accountService.getCurrentAccountId()
)
return@Consumer
filterUseCase.init(feedId, groupId)
val readingIndex = backStack.indexOfFirst { it is Reading }
if (readingIndex != -1) {
backStack.removeRange(readingIndex, backStack.size)
}
backStack.add(Reading(articleId = null))
}
is LaunchAction.Subscribe -> {
@@ -190,6 +206,9 @@ sealed interface LaunchAction {
data class OpenArticle(val articleId: String, val feedId: String?, val groupId: String?) :
LaunchAction
data class OpenArticleList(val accountId: Int?, val feedId: String?, val groupId: String?) :
LaunchAction
}
private fun Intent.getLaunchAction(): LaunchAction? {
@@ -210,8 +229,23 @@ private fun Intent.getLaunchAction(): LaunchAction? {
val feedId = getStringExtra(ExtraName.FEED_ID)?.also { removeExtra(ExtraName.FEED_ID) }
val groupId =
getStringExtra(ExtraName.GROUP_ID)?.also { removeExtra(ExtraName.GROUP_ID) }
val accountId = getIntExtra(ExtraName.ACCOUNT_ID, -1)
articleId?.let { LaunchAction.OpenArticle(it, feedId, groupId) }
if (accountId != -1) {
removeExtra(ExtraName.ACCOUNT_ID)
}
if (articleId != null) {
LaunchAction.OpenArticle(articleId, feedId, groupId)
} else if (feedId != null || groupId != null || accountId != -1) {
LaunchAction.OpenArticleList(
accountId = if (accountId != -1) accountId else null,
feedId = feedId,
groupId = groupId,
)
} else {
null
}
}
}
}

2
app/src/main/java/me/ash/reader/ui/page/common/ExtraName.kt
View File

@@ -5,4 +5,6 @@ object ExtraName {
const val ARTICLE_ID: String = "article.id"
const val FEED_ID: String = "feed.id"
const val GROUP_ID: String = "group.id"
const val ACCOUNT_ID:String = "account.id"
}

2
app/src/main/java/me/ash/reader/ui/widget/ActionParameters.kt
View File

@@ -10,7 +10,7 @@ internal fun makeActionParameters(item: Article?, dataSource: DataSource) =
set(ActionParameters.Key<String>(ExtraName.ARTICLE_ID), item.id)
}
when (dataSource) {
is DataSource.Account -> {}
is DataSource.Account -> set(ActionParameters.Key<Int>(ExtraName.ACCOUNT_ID), dataSource.accountId)
is DataSource.Feed ->
set(ActionParameters.Key<String>(ExtraName.FEED_ID), dataSource.feedId)
is DataSource.Group ->

7
app/src/main/java/me/ash/reader/ui/widget/ArticleListWidget.kt
View File

@@ -223,7 +223,12 @@ fun ArticleList(
)
}
} else {
Column(modifier = modifier) {
Column(
modifier =
modifier.clickable(
actionStartActivity<MainActivity>(makeActionParameters(null, dataSource))
)
) {
Header(title, theme)
LazyColumn() {