Merge pull request #89 from Kevinlinpr/zhong_1

优化网络错误缺省图

app/src/main/java/com/aiosman/ravenow/ui/comment/notice/CommentNotice.kt

@@ -48,7 +48,7 @@ import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.navigateToPost
 import kotlinx.coroutines.launch
 import com.aiosman.ravenow.utils.NetworkUtils
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContent
 @Composable
 fun CommentNoticeScreen(includeStatusBarPadding: Boolean = true){
     val viewModel = viewModel<CommentNoticeListViewModel>(
@@ -75,43 +75,11 @@ fun CommentNoticeScreen(includeStatusBarPadding: Boolean = true){
         val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
         if (!isNetworkAvailable) {
-            Box(
+            NetworkErrorContent(
-                modifier = Modifier
+                onReload = {
-                    .fillMaxSize()
+                    viewModel.initData(context, force = true)
-                    .padding(top = 149.dp),
-                contentAlignment = Alignment.TopCenter
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    androidx.compose.foundation.Image(
-                        painter = painterResource(id = R.mipmap.invalid_name_10),
-                        contentDescription = "network error",
-                        modifier = Modifier.size(181.dp)
-                    )
-                    Spacer(modifier = Modifier.size(24.dp))
-                    Text(
-                        text = stringResource(R.string.friend_chat_no_network_title),
-                        color = AppColors.text,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
-                    )
-                    Spacer(modifier = Modifier.size(8.dp))
-                    Text(
-                        text = stringResource(R.string.friend_chat_no_network_subtitle),
-                        color = AppColors.text,
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.W400
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-                    ReloadButton(
-                        onClick = {
-                            viewModel.initData(context, force = true)
-                        }
-                    )
                 }
-            }
+            )
         } else if (comments.itemCount == 0 && comments.loadState.refresh is LoadState.NotLoading) {
             Box(
                 modifier = Modifier

app/src/main/java/com/aiosman/ravenow/ui/favourite/FavouriteListPage.kt

@@ -42,7 +42,7 @@ import com.aiosman.ravenow.ui.composables.StatusBarSpacer
 import com.aiosman.ravenow.ui.favourite.FavouriteListViewModel.refreshPager
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.navigateToPost
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContent
 import com.aiosman.ravenow.utils.NetworkUtils
 
 @OptIn(ExperimentalMaterialApi::class)
@@ -84,43 +84,11 @@ fun FavouriteListPage() {
                 var moments = dataFlow.collectAsLazyPagingItems()
 
                 if (!isNetworkAvailable) {
-                    Box(
+                    NetworkErrorContent(
-                        modifier = Modifier
+                        onReload = {
-                            .fillMaxSize()
+                            model.refreshPager(force = true)
-                            .padding(top=149.dp),
-                        contentAlignment = Alignment.TopCenter
-                    ) {
-                        Column(
-                            horizontalAlignment = Alignment.CenterHorizontally,
-                            modifier = Modifier.fillMaxWidth()
-                        ) {
-                            Image(
-                                painter = painterResource(id = R.mipmap.invalid_name_10),
-                                contentDescription = "network error",
-                                modifier = Modifier.size(181.dp)
-                            )
-                            Spacer(modifier = Modifier.size(24.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_title),
-                                color = AppColors.text,
-                                fontSize = 16.sp,
-                                fontWeight = FontWeight.W600
-                            )
-                            Spacer(modifier = Modifier.size(8.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_subtitle),
-                                color = AppColors.secondaryText,
-                                fontSize = 14.sp,
-                                fontWeight = FontWeight.W400
-                            )
-                            Spacer(modifier = Modifier.height(16.dp))
-                            ReloadButton(
-                                onClick = {
-                                    model.refreshPager(force = true)
-                                }
-                            )
                         }
-                    }
+                    )
                 } else if(moments.itemCount == 0) {
                     Box(
                         modifier = Modifier

app/src/main/java/com/aiosman/ravenow/ui/follower/FollowerList.kt

@@ -42,7 +42,7 @@ import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
 import kotlinx.coroutines.launch
 import com.aiosman.ravenow.utils.NetworkUtils
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContent
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -76,43 +76,11 @@ fun FollowerListScreen(userId: Int) {
         val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
         if (!isNetworkAvailable) {
-            Box(
+            NetworkErrorContent(
-                modifier = Modifier
+                onReload = {
-                    .fillMaxSize()
+                    model.loadData(userId, true)
-                    .padding(top = 149.dp),
-                contentAlignment = Alignment.TopCenter
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.invalid_name_10),
-                        contentDescription = "network error",
-                        modifier = Modifier.size(181.dp)
-                    )
-                    Spacer(modifier = Modifier.size(24.dp))
-                    androidx.compose.material.Text(
-                        text = stringResource(R.string.friend_chat_no_network_title),
-                        color = appColors.text,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
-                    )
-                    Spacer(modifier = Modifier.size(8.dp))
-                    androidx.compose.material.Text(
-                        text = stringResource(R.string.friend_chat_no_network_subtitle),
-                        color = appColors.text,
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.W400
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-                    ReloadButton(
-                        onClick = {
-                            model.loadData(userId, true)
-                        }
-                    )
                 }
-            }
+            )
         } else if (users.itemCount == 0) {
             Box(
                 modifier = Modifier

app/src/main/java/com/aiosman/ravenow/ui/follower/FollowerNotice.kt

@@ -41,7 +41,7 @@ import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.FollowButton
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContent
 import kotlinx.coroutines.launch
 import com.aiosman.ravenow.utils.NetworkUtils
 
@@ -68,43 +68,11 @@ fun FollowerNoticeScreen(includeStatusBarPadding: Boolean = true) {
         val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
         if (!isNetworkAvailable) {
-            Box(
+            NetworkErrorContent(
-                modifier = Modifier
+                onReload = {
-                    .fillMaxSize()
+                    model.reload(force = true)
-                    .padding(top=149.dp),
-                contentAlignment = Alignment.TopCenter
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.invalid_name_10),
-                        contentDescription = "network error",
-                        modifier = Modifier.size(181.dp)
-                    )
-                    Spacer(modifier = Modifier.size(24.dp))
-                    androidx.compose.material.Text(
-                        text = stringResource(R.string.friend_chat_no_network_title),
-                        color = AppColors.text,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
-                    )
-                    Spacer(modifier = Modifier.size(8.dp))
-                    androidx.compose.material.Text(
-                        text = stringResource(R.string.friend_chat_no_network_subtitle),
-                        color = AppColors.text,
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.W400
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-                    ReloadButton(
-                        onClick = {
-                            model.reload(force = true)
-                        }
-                    )
                 }
-            }
+            )
         } else if (followers.itemCount == 0) {
             Box(
                 modifier = Modifier

app/src/main/java/com/aiosman/ravenow/ui/follower/FollowingList.kt

@@ -40,7 +40,7 @@ import com.aiosman.ravenow.exp.viewModelFactory
 import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContent
 import kotlinx.coroutines.launch
 import com.aiosman.ravenow.utils.NetworkUtils
 
@@ -78,43 +78,11 @@ fun FollowingListScreen(userId: Int) {
         val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
         if (!isNetworkAvailable) {
-            Box(
+            NetworkErrorContent(
-                modifier = Modifier
+                onReload = {
-                    .fillMaxSize()
+                    model.loadData(userId, true)
-                    .padding(top=149.dp),
-                contentAlignment = Alignment.TopCenter
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Image(
-                        painter = painterResource(id = R.mipmap.invalid_name_10),
-                        contentDescription = "network error",
-                        modifier = Modifier.size(181.dp)
-                    )
-                    Spacer(modifier = Modifier.size(24.dp))
-                    androidx.compose.material.Text(
-                        text = stringResource(R.string.friend_chat_no_network_title),
-                        color = appColors.text,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
-                    )
-                    Spacer(modifier = Modifier.size(8.dp))
-                    androidx.compose.material.Text(
-                        text = stringResource(R.string.friend_chat_no_network_subtitle),
-                        color = appColors.secondaryText,
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.W400
-                    )
-                    Spacer(modifier = Modifier.height(16.dp))
-                    ReloadButton(
-                        onClick = {
-                            model.loadData(userId, true)
-                        }
-                    )
                 }
-            }
+            )
         } else if(users.itemCount == 0) {
             Box(
                 modifier = Modifier

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/AgentChatListScreen.kt

@@ -49,7 +49,7 @@ import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.utils.NetworkUtils
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContentCompact
 import com.airbnb.lottie.compose.LottieAnimation
 import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.LottieConstants
@@ -121,35 +121,8 @@ fun AgentChatListScreen() {
                                 overflow = TextOverflow.Ellipsis
                             )
                         } else {
-                            Image(
+                            NetworkErrorContentCompact(
-                                painter = painterResource(id = R.mipmap.invalid_name_10),
+                                onReload = {
-                                contentDescription = "network error",
-                                modifier = Modifier.size(120.dp)
-                            )
-                            Spacer(modifier = Modifier.height(24.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_title),
-                                color = AppColors.text,
-                                fontSize = 16.sp,
-                                fontWeight = FontWeight.W600,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(horizontal = 24.dp),
-                                maxLines = 2,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_subtitle),
-                                color = AppColors.secondaryText,
-                                fontSize = 14.sp,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(horizontal = 24.dp),
-                                maxLines = 3,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                            Spacer(modifier = Modifier.height(16.dp))
-                            ReloadButton(
-                                onClick = {
                                     AgentChatListViewModel.refreshPager(context = context)
                                 }
                             )

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/AllChatListScreen.kt

@@ -42,7 +42,7 @@ import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.utils.NetworkUtils
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContentCompact
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.ui.text.font.FontFamily
@@ -247,35 +247,8 @@ fun AllChatListScreen() {
                                 overflow = TextOverflow.Ellipsis
                             )
                         } else {
-                            Image(
+                            NetworkErrorContentCompact(
-                                painter = painterResource(id = R.mipmap.invalid_name_10),
+                                onReload = {
-                                contentDescription = "network error",
-                                modifier = Modifier.size(120.dp)
-                            )
-                            Spacer(modifier = Modifier.height(24.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_title),
-                                color = AppColors.text,
-                                fontSize = 16.sp,
-                                fontWeight = FontWeight.W600,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(horizontal = 24.dp),
-                                maxLines = 2,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_subtitle),
-                                color = AppColors.secondaryText,
-                                fontSize = 14.sp,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(horizontal = 24.dp),
-                                maxLines = 3,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                            Spacer(modifier = Modifier.height(16.dp))
-                            ReloadButton(
-                                onClick = {
                                     isLoading = true
                                     // 重新加载所有类型的数据
                                     AgentChatListViewModel.refreshPager(context = context)

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/FriendChatListScreen.kt

@@ -33,7 +33,7 @@ import com.aiosman.ravenow.LocalNavController
 import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
-import com.aiosman.ravenow.ui.index.tabs.search.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContentCompact
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.utils.NetworkUtils
 import androidx.compose.ui.text.style.TextAlign
@@ -102,35 +102,8 @@ fun FriendChatListScreen() {
                                 overflow = TextOverflow.Ellipsis
                             )
                         } else {
-                            Image(
+                            NetworkErrorContentCompact(
-                                painter = painterResource(id = R.mipmap.invalid_name_10),
+                                onReload = {
-                                contentDescription = "network error",
-                                modifier = Modifier.size(120.dp)
-                            )
-                            Spacer(modifier = Modifier.height(24.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_title),
-                                color = AppColors.text,
-                                fontSize = 16.sp,
-                                fontWeight = FontWeight.W600,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(horizontal = 24.dp),
-                                maxLines = 2,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_subtitle),
-                                color = AppColors.secondaryText,
-                                fontSize = 14.sp,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(horizontal = 24.dp),
-                                maxLines = 3,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                            Spacer(modifier = Modifier.height(16.dp))
-                            ReloadButton(
-                                onClick = {
                                     FriendChatListViewModel.refreshPager(pullRefresh = true, context = context)
                                 }
                             )

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListScreen.kt

@@ -35,7 +35,7 @@ import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.utils.NetworkUtils
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContentCompact
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -97,35 +97,8 @@ fun GroupChatListScreen() {
                                 overflow = TextOverflow.Ellipsis
                             )
                         } else {
-                            Image(
+                            NetworkErrorContentCompact(
-                                painter = painterResource(id = R.mipmap.invalid_name_10),
+                                onReload = {
-                                contentDescription = "network error",
-                                modifier = Modifier.size(120.dp)
-                            )
-                            Spacer(modifier = Modifier.height(24.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_title),
-                                color = AppColors.text,
-                                fontSize = 16.sp,
-                                fontWeight = FontWeight.W600,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(horizontal = 24.dp),
-                                maxLines = 2,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                            Spacer(modifier = Modifier.height(8.dp))
-                            Text(
-                                text = stringResource(R.string.friend_chat_no_network_subtitle),
-                                color = AppColors.secondaryText,
-                                fontSize = 14.sp,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(horizontal = 24.dp),
-                                maxLines = 3,
-                                overflow = TextOverflow.Ellipsis
-                            )
-                            Spacer(modifier = Modifier.height(16.dp))
-                            ReloadButton(
-                                onClick = {
                                     GroupChatListViewModel.refreshPager(context = context)
                                 }
                             )

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/Moment.kt

@@ -47,6 +47,7 @@ import com.aiosman.ravenow.ui.composables.rememberDebouncer
 import kotlinx.coroutines.launch
 import com.aiosman.ravenow.utils.NetworkUtils
 import androidx.compose.ui.platform.LocalContext
+import com.aiosman.ravenow.ui.network.NetworkErrorContentInline
 
 /**
  * 动态列表
@@ -90,38 +91,11 @@ fun TimelineMomentsList() {
                 .padding(top = 188.dp),
             contentAlignment = Alignment.TopCenter
         ) {
-            Column(
+            NetworkErrorContentInline(
-                horizontalAlignment = Alignment.CenterHorizontally,
+                onReload = {
-                modifier = Modifier.fillMaxWidth()
+                    model.refreshPager(pullRefresh = true)
-            ) {
+                }
-                val exploreDebouncer = rememberDebouncer()
+            )
-                Image(
-                    painter = painterResource(id = R.mipmap.invalid_name_10),
-                    contentDescription = "network error",
-                    modifier = Modifier.size(140.dp)
-                )
-                Spacer(modifier = Modifier.size(24.dp))
-                Text(
-                    text = stringResource(R.string.friend_chat_no_network_title),
-                    color = AppColors.text,
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.W600
-                )
-                Spacer(modifier = Modifier.size(8.dp))
-                Text(
-                    text = stringResource(R.string.friend_chat_no_network_subtitle),
-                    color = AppColors.text,
-                    fontSize = 16.sp,
-                    fontWeight = FontWeight.W400
-                )
-                Spacer(modifier = Modifier.size(16.dp))
-                ExploreButton(
-                    onClick = {
-                        exploreDebouncer {
-                            /* TODO: 添加点击事件处理 */
-                        } }
-                )
-            }
         }
     } else if (moments.isEmpty()) {
         Box(

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/SearchScreen.kt

@@ -84,6 +84,7 @@ import com.aiosman.ravenow.ui.NavigationRoute
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.launch
 import com.aiosman.ravenow.utils.NetworkUtils
+import com.aiosman.ravenow.ui.network.NetworkErrorContentInline
 
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -780,26 +781,7 @@ fun SearchPlaceholderContent(
                 fontWeight = FontWeight.W600
             )
         } else {
-            androidx.compose.foundation.Image(
+            NetworkErrorContentInline(onReload = onReload)
-                painter = painterResource(id = R.mipmap.invalid_name_10),
-                contentDescription = "network error",
-                modifier = Modifier.size(140.dp)
-            )
-            Text(
-                text = stringResource(R.string.friend_chat_no_network_title),
-                color = appColors.text,
-                fontSize = 16.sp,
-                fontWeight = FontWeight.W600
-            )
-            Spacer(modifier = Modifier.height(8.dp))
-            Text(
-                text = stringResource(R.string.friend_chat_no_network_subtitle),
-                color = appColors.secondaryText,
-                fontSize = 14.sp,
-                fontWeight = FontWeight.W400
-            )
-            Spacer(modifier = Modifier.size(16.dp))
-            ReloadButton(onClick = onReload)
         }
     }
 }

app/src/main/java/com/aiosman/ravenow/ui/like/LikePage.kt

@@ -47,7 +47,7 @@ import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.navigateToPost
 import java.util.Date
 import com.aiosman.ravenow.utils.NetworkUtils
-import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.ui.network.NetworkErrorContent
 @Preview
 @Composable
 fun LikeNoticeScreen(includeStatusBarPadding: Boolean = true) {
@@ -77,42 +77,11 @@ fun LikeNoticeScreen(includeStatusBarPadding: Boolean = true) {
             val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
             if (!isNetworkAvailable) {
-                Box(
+                NetworkErrorContent(
-                    modifier = Modifier.fillMaxSize()
+                    onReload = {
-                        .padding(top=149.dp),
+                        LikeNoticeViewModel.reload(force = true)
-                    contentAlignment = Alignment.TopCenter
-                ) {
-                    Column(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalAlignment = Alignment.CenterHorizontally
-                    ) {
-                        Image(
-                            painter = painterResource(id = R.mipmap.invalid_name_10),
-                            contentDescription = "network error",
-                            modifier = Modifier.size(181.dp)
-                        )
-                        Spacer(modifier = Modifier.height(24.dp))
-                        Text(
-                            text = stringResource(R.string.friend_chat_no_network_title),
-                            color = AppColors.text,
-                            fontSize = 16.sp,
-                            fontWeight = FontWeight.W600,
-                        )
-                        Spacer(modifier = Modifier.size(8.dp))
-                        Text(
-                            text = stringResource(R.string.friend_chat_no_network_subtitle),
-                            color = AppColors.text,
-                            fontSize = 14.sp,
-                            fontWeight = FontWeight.W400
-                        )
-                        Spacer(modifier = Modifier.height(16.dp))
-                        ReloadButton(
-                            onClick = {
-                                LikeNoticeViewModel.reload(force = true)
-                            }
-                        )
                     }
-                }
+                )
             } else if (likes.itemCount == 0) {
                 Box(
                     modifier = Modifier.fillMaxSize()

app/src/main/java/com/aiosman/ravenow/ui/network/Networkerror.kt

@@ -0,0 +1,153 @@
+package com.aiosman.ravenow.ui.network
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.R
+
+
+//关注、粉丝、通知、like界面网络缺省图
+@Composable
+fun NetworkErrorContent(
+    onReload: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val AppColors = LocalAppTheme.current
+    
+    Box(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(top = 149.dp),
+        contentAlignment = Alignment.TopCenter
+    ) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Image(
+                painter = painterResource(id = R.mipmap.invalid_name_10),
+                contentDescription = "network error",
+                modifier = Modifier.size(181.dp)
+            )
+            Spacer(modifier = Modifier.size(24.dp))
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_title),
+                color = AppColors.text,
+                fontSize = 16.sp,
+                fontWeight = FontWeight.W600
+            )
+            Spacer(modifier = Modifier.size(8.dp))
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_subtitle),
+                color = AppColors.text,
+                fontSize = 14.sp,
+                fontWeight = FontWeight.W400
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            ReloadButton(
+                onClick = onReload
+            )
+        }
+    }
+}
+
+@Composable
+fun NetworkErrorContentInline(
+    onReload: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val AppColors = LocalAppTheme.current
+    
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier.fillMaxWidth()
+    ) {
+        Image(
+            painter = painterResource(id = R.mipmap.invalid_name_10),
+            contentDescription = "network error",
+            modifier = Modifier.size(140.dp)
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        Text(
+            text = stringResource(R.string.friend_chat_no_network_title),
+            color = AppColors.text,
+            fontSize = 16.sp,
+            fontWeight = FontWeight.W600
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        Text(
+            text = stringResource(R.string.friend_chat_no_network_subtitle),
+            color = AppColors.secondaryText,
+            fontSize = 14.sp,
+            fontWeight = FontWeight.W400
+        )
+        Spacer(modifier = Modifier.size(16.dp))
+        ReloadButton(
+            onClick = onReload
+        )
+    }
+}
+
+//消息界面网络缺省图
+@Composable
+fun NetworkErrorContentCompact(
+    onReload: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val AppColors = LocalAppTheme.current
+    
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
+    ) {
+        Image(
+            painter = painterResource(id = R.mipmap.invalid_name_10),
+            contentDescription = "network error",
+            modifier = Modifier.size(120.dp)
+        )
+        Spacer(modifier = Modifier.height(24.dp))
+        Text(
+            text = stringResource(R.string.friend_chat_no_network_title),
+            color = AppColors.text,
+            fontSize = 16.sp,
+            fontWeight = FontWeight.W600,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(horizontal = 24.dp),
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis
+        )
+        Spacer(modifier = Modifier.height(8.dp))
+        Text(
+            text = stringResource(R.string.friend_chat_no_network_subtitle),
+            color = AppColors.secondaryText,
+            fontSize = 14.sp,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(horizontal = 24.dp),
+            maxLines = 3,
+            overflow = TextOverflow.Ellipsis
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        ReloadButton(
+            onClick = onReload
+        )
+    }
+}
+