pref: 新版贴页面跳转
This commit is contained in:
parent
1a97fe4f57
commit
2f1ab3b038
|
|
@ -335,7 +335,12 @@ fun ForumThreadListPage(
|
||||||
goodClassifyId = goodClassifyId,
|
goodClassifyId = goodClassifyId,
|
||||||
goodClassifyHoldersProvider = { goodClassifies },
|
goodClassifyHoldersProvider = { goodClassifies },
|
||||||
onItemClicked = {
|
onItemClicked = {
|
||||||
navigator.navigate(ThreadPageDestination(it.threadId))
|
navigator.navigate(
|
||||||
|
ThreadPageDestination(
|
||||||
|
it.threadId,
|
||||||
|
threadInfo = it
|
||||||
|
)
|
||||||
|
)
|
||||||
},
|
},
|
||||||
onAgree = {
|
onAgree = {
|
||||||
viewModel.send(
|
viewModel.send(
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,8 @@ import com.huanchengfly.tieba.post.models.database.History
|
||||||
import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme
|
import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme
|
||||||
import com.huanchengfly.tieba.post.ui.page.LocalNavigator
|
import com.huanchengfly.tieba.post.ui.page.LocalNavigator
|
||||||
import com.huanchengfly.tieba.post.ui.page.destinations.ForumPageDestination
|
import com.huanchengfly.tieba.post.ui.page.destinations.ForumPageDestination
|
||||||
|
import com.huanchengfly.tieba.post.ui.page.destinations.ThreadPageDestination
|
||||||
|
import com.huanchengfly.tieba.post.ui.page.thread.ThreadPageFrom
|
||||||
import com.huanchengfly.tieba.post.ui.widgets.Chip
|
import com.huanchengfly.tieba.post.ui.widgets.Chip
|
||||||
import com.huanchengfly.tieba.post.ui.widgets.compose.Avatar
|
import com.huanchengfly.tieba.post.ui.widgets.compose.Avatar
|
||||||
import com.huanchengfly.tieba.post.ui.widgets.compose.LazyLoad
|
import com.huanchengfly.tieba.post.ui.widgets.compose.LazyLoad
|
||||||
|
|
@ -144,12 +146,13 @@ fun HistoryListPage(
|
||||||
HistoryUtil.TYPE_THREAD -> {
|
HistoryUtil.TYPE_THREAD -> {
|
||||||
val extra =
|
val extra =
|
||||||
if (it.extras != null) it.extras.fromJson<ThreadHistoryInfoBean>() else null
|
if (it.extras != null) it.extras.fromJson<ThreadHistoryInfoBean>() else null
|
||||||
ThreadActivity.launch(
|
navigator.navigate(
|
||||||
context,
|
ThreadPageDestination(
|
||||||
it.data,
|
it.data.toLong(),
|
||||||
extra?.pid,
|
postId = extra?.pid?.toLongOrNull() ?: 0L,
|
||||||
extra?.isSeeLz,
|
seeLz = extra?.isSeeLz ?: false,
|
||||||
ThreadActivity.FROM_HISTORY
|
from = ThreadPageFrom.FROM_HISTORY
|
||||||
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -183,14 +183,6 @@ fun ThreadStorePage(
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onClick = {
|
onClick = {
|
||||||
// ThreadActivity.launch(
|
|
||||||
// context,
|
|
||||||
// info.threadId,
|
|
||||||
// info.markPid,
|
|
||||||
// context.appPreferences.collectThreadSeeLz,
|
|
||||||
// "collect",
|
|
||||||
// info.maxPid
|
|
||||||
// )
|
|
||||||
navigator.navigate(
|
navigator.navigate(
|
||||||
ThreadPageDestination(
|
ThreadPageDestination(
|
||||||
threadId = info.threadId.toLong(),
|
threadId = info.threadId.toLong(),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue