Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref: 贴子无回复时提示

This commit is contained in:
HuanCheng65 2023-09-26 18:09:10 +08:00
parent 2ff94cae57
commit 6442ad8e40
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
2 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadPage.kt
View File

@ -67,6 +67,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
@ -85,6 +86,10 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.compose.ui.util.fastForEach import androidx.compose.ui.util.fastForEach
import com.airbnb.lottie.compose.LottieAnimation
import com.airbnb.lottie.compose.LottieCompositionSpec
import com.airbnb.lottie.compose.LottieConstants
import com.airbnb.lottie.compose.rememberLottieComposition
import com.huanchengfly.tieba.post.App import com.huanchengfly.tieba.post.App
import com.huanchengfly.tieba.post.R import com.huanchengfly.tieba.post.R
import com.huanchengfly.tieba.post.activities.UserActivity import com.huanchengfly.tieba.post.activities.UserActivity
@ -140,6 +145,7 @@ import com.huanchengfly.tieba.post.ui.widgets.compose.MyScaffold
import com.huanchengfly.tieba.post.ui.widgets.compose.PromptDialog import com.huanchengfly.tieba.post.ui.widgets.compose.PromptDialog
import com.huanchengfly.tieba.post.ui.widgets.compose.Sizes import com.huanchengfly.tieba.post.ui.widgets.compose.Sizes
import com.huanchengfly.tieba.post.ui.widgets.compose.TextWithMinWidth import com.huanchengfly.tieba.post.ui.widgets.compose.TextWithMinWidth
import com.huanchengfly.tieba.post.ui.widgets.compose.TipScreen
import com.huanchengfly.tieba.post.ui.widgets.compose.TitleCentredToolbar import com.huanchengfly.tieba.post.ui.widgets.compose.TitleCentredToolbar
import com.huanchengfly.tieba.post.ui.widgets.compose.UserHeader import com.huanchengfly.tieba.post.ui.widgets.compose.UserHeader
import com.huanchengfly.tieba.post.ui.widgets.compose.VerticalDivider import com.huanchengfly.tieba.post.ui.widgets.compose.VerticalDivider
@ -623,7 +629,7 @@ fun ThreadPage(
val updateCollectMarkDialogState = rememberDialogState() val updateCollectMarkDialogState = rememberDialogState()
var readFloorBeforeBack by remember { var readFloorBeforeBack by remember {
mutableStateOf(1) mutableIntStateOf(1)
} }
ConfirmDialog( ConfirmDialog(
dialogState = updateCollectMarkDialogState, dialogState = updateCollectMarkDialogState,
@ -1193,7 +1199,7 @@ fun ThreadPage(
Text( Text(
text = stringResource( text = stringResource(
R.string.title_thread_header, R.string.title_thread_header,
"${thread?.get { replyNum } ?: 0}"), "${thread?.get { replyNum - 1 } ?: 0}"),
fontSize = 13.sp, fontSize = 13.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = ExtendedTheme.colors.text, color = ExtendedTheme.colors.text,
@ -1293,16 +1299,45 @@ fun ThreadPage(
} }
} }
} }
items( if (!isRefreshing && data.isEmpty()) {
items = data, item(key = "EmptyTip") {
key = { (item) -> "Post_${item.get { id }}" } TipScreen(
) { (item, blocked, renders, subPosts) -> title = { Text(text = stringResource(id = R.string.title_empty)) },
PostCard( image = {
item, val composition by rememberLottieComposition(
renders, LottieCompositionSpec.RawRes(R.raw.lottie_empty_box)
subPosts, )
blocked LottieAnimation(
) composition = composition,
iterations = LottieConstants.IterateForever,
modifier = Modifier
.fillMaxWidth()
.aspectRatio(2f)
)
},
actions = {
if (canReload) {
Button(onClick = { reload() }) {
Text(text = stringResource(id = R.string.btn_refresh))
}
}
},
modifier = Modifier.fillMaxSize(),
scrollable = false
)
}
} else {
items(
items = data,
key = { (item) -> "Post_${item.get { id }}" }
) { (item, blocked, renders, subPosts) ->
PostCard(
item,
renders,
subPosts,
blocked
)
}
} }
if (curSortType != ThreadSortType.SORT_TYPE_DESC) { if (curSortType != ThreadSortType.SORT_TYPE_DESC) {
latestPosts(false) latestPosts(false)

14
app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Errors.kt
View File

@ -40,18 +40,22 @@ fun TipScreen(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
image: @Composable (ColumnScope.() -> Unit) = {}, image: @Composable (ColumnScope.() -> Unit) = {},
message: @Composable (ColumnScope.() -> Unit) = {}, message: @Composable (ColumnScope.() -> Unit) = {},
actions: @Composable (ColumnScope.() -> Unit) = {} actions: @Composable (ColumnScope.() -> Unit) = {},
scrollable: Boolean = true,
) { ) {
val scrollableModifier =
if (scrollable) Modifier.verticalScroll(rememberScrollState()) else Modifier
val widthFraction = val widthFraction =
if (LocalWindowSizeClass.current.widthSizeClass == WindowWidthSizeClass.Compact) 0.9f else 0.5f if (LocalWindowSizeClass.current.widthSizeClass == WindowWidthSizeClass.Compact) 0.9f else 0.5f
Column(modifier = modifier) { Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = modifier
) {
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth(fraction = widthFraction) .fillMaxWidth(fraction = widthFraction)
.padding(16.dp) .padding(16.dp)
.verticalScroll( .then(scrollableModifier),
rememberScrollState()
),
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(8.dp, alignment = Alignment.CenterVertically) verticalArrangement = Arrangement.spacedBy(8.dp, alignment = Alignment.CenterVertically)
) { ) {