From 633e9a39458a7528cf1f834826bb7de750a213c7 Mon Sep 17 00:00:00 2001 From: AllenTom Date: Fri, 6 Sep 2024 08:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将消息页面重命名为通知页面，并将相关 ViewModel 和 Composable 函数也进行了重命名。 --- .../main/java/com/aiosman/riderpro/ui/Navi.kt | 12 +++++----- ...riteScreen.kt => FavouriteNoticeScreen.kt} | 22 ++----------------- ...ewModel.kt => FavouriteNoticeViewModel.kt} | 2 +- .../{FollowerPage.kt => FollowerNotice.kt} | 2 +- .../riderpro/ui/index/tabs/profile/Profile.kt | 2 +- ...ageViewModel.kt => LikeNoticeViewModel.kt} | 2 +- .../com/aiosman/riderpro/ui/like/LikePage.kt | 11 ++++++---- 7 files changed, 19 insertions(+), 34 deletions(-) rename app/src/main/java/com/aiosman/riderpro/ui/favourite/{FavouriteScreen.kt => FavouriteNoticeScreen.kt} (75%) rename app/src/main/java/com/aiosman/riderpro/ui/favourite/{FavouritePageViewModel.kt => FavouriteNoticeViewModel.kt} (97%) rename app/src/main/java/com/aiosman/riderpro/ui/follower/{FollowerPage.kt => FollowerNotice.kt} (99%) rename app/src/main/java/com/aiosman/riderpro/ui/like/{LikePageViewModel.kt => LikeNoticeViewModel.kt} (97%) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/Navi.kt b/app/src/main/java/com/aiosman/riderpro/ui/Navi.kt index d810085..fc06c6c 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/Navi.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/Navi.kt @@ -29,9 +29,9 @@ import com.aiosman.riderpro.LocalNavController import com.aiosman.riderpro.LocalSharedTransitionScope import com.aiosman.riderpro.ui.account.AccountEditScreen2 import com.aiosman.riderpro.ui.comment.CommentsScreen -import com.aiosman.riderpro.ui.favourite.FavouriteScreen +import com.aiosman.riderpro.ui.favourite.FavouriteNoticeScreen import com.aiosman.riderpro.ui.follower.FollowerListScreen -import com.aiosman.riderpro.ui.follower.FollowerNotificationScreen +import com.aiosman.riderpro.ui.follower.FollowerNoticeScreen import com.aiosman.riderpro.ui.follower.FollowingListScreen import com.aiosman.riderpro.ui.gallery.OfficialGalleryScreen import com.aiosman.riderpro.ui.gallery.OfficialPhotographerScreen @@ -39,7 +39,7 @@ import com.aiosman.riderpro.ui.gallery.ProfileTimelineScreen import com.aiosman.riderpro.ui.index.IndexScreen import com.aiosman.riderpro.ui.index.tabs.message.NotificationsScreen import com.aiosman.riderpro.ui.index.tabs.search.SearchScreen -import com.aiosman.riderpro.ui.like.LikeScreen +import com.aiosman.riderpro.ui.like.LikeNoticeScreen import com.aiosman.riderpro.ui.location.LocationDetailScreen import com.aiosman.riderpro.ui.login.EmailSignupScreen import com.aiosman.riderpro.ui.login.LoginPage @@ -158,10 +158,10 @@ fun NavigationController( CommentsScreen() } composable(route = NavigationRoute.Likes.route) { - LikeScreen() + LikeNoticeScreen() } composable(route = NavigationRoute.Followers.route) { - FollowerNotificationScreen() + FollowerNoticeScreen() } composable( route = NavigationRoute.NewPost.route, @@ -219,7 +219,7 @@ fun NavigationController( ChangePasswordScreen() } composable(route = NavigationRoute.FavouritesScreen.route) { - FavouriteScreen() + FavouriteNoticeScreen() } composable(route = NavigationRoute.NewPostImageGrid.route) { NewPostImageGridScreen() diff --git a/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt b/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteNoticeScreen.kt similarity index 75% rename from app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt rename to app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteNoticeScreen.kt index 195a221..720c366 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteNoticeScreen.kt @@ -1,49 +1,31 @@ package com.aiosman.riderpro.ui.favourite -import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer 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.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.LocalNavController import com.aiosman.riderpro.R import com.aiosman.riderpro.ui.comment.NoticeScreenHeader import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder import com.aiosman.riderpro.ui.like.ActionNoticeItem -import com.aiosman.riderpro.ui.like.LikePageViewModel /** * 收藏消息界面 */ @Composable -fun FavouriteScreen() { - val model = FavouritePageViewModel +fun FavouriteNoticeScreen() { + val model = FavouriteNoticeViewModel val listState = rememberLazyListState() var dataFlow = model.favouriteItemsFlow var favourites = dataFlow.collectAsLazyPagingItems() diff --git a/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouritePageViewModel.kt b/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteNoticeViewModel.kt similarity index 97% rename from app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouritePageViewModel.kt rename to app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteNoticeViewModel.kt index 1915ccb..436e3df 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouritePageViewModel.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteNoticeViewModel.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.launch /** * 收藏消息列表的 ViewModel */ -object FavouritePageViewModel : ViewModel() { +object FavouriteNoticeViewModel : ViewModel() { private val accountService: AccountService = AccountServiceImpl() private val _favouriteItemsFlow = MutableStateFlow>(PagingData.empty()) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerPage.kt b/app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerNotice.kt similarity index 99% rename from app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerPage.kt rename to app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerNotice.kt index f226af5..988f1a5 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerPage.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerNotice.kt @@ -38,7 +38,7 @@ import kotlinx.coroutines.launch * 关注消息列表 */ @Composable -fun FollowerNotificationScreen() { +fun FollowerNoticeScreen() { val scope = rememberCoroutineScope() StatusBarMaskLayout( modifier = Modifier.padding(horizontal = 16.dp) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt index 16c097a..ee133d1 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt @@ -726,7 +726,7 @@ fun TimeGroup(time: String = "2024.06.08 12:23") { text = time, fontSize = 16.sp, color = Color.Black, - style = TextStyle(fontWeight = FontWeight.Bold) + style = TextStyle(fontWeight = FontWeight.W600) ) } } diff --git a/app/src/main/java/com/aiosman/riderpro/ui/like/LikePageViewModel.kt b/app/src/main/java/com/aiosman/riderpro/ui/like/LikeNoticeViewModel.kt similarity index 97% rename from app/src/main/java/com/aiosman/riderpro/ui/like/LikePageViewModel.kt rename to app/src/main/java/com/aiosman/riderpro/ui/like/LikeNoticeViewModel.kt index 8d3206e..6a76b56 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/like/LikePageViewModel.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/like/LikeNoticeViewModel.kt @@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch -object LikePageViewModel : ViewModel() { +object LikeNoticeViewModel : ViewModel() { private val accountService: AccountService = AccountServiceImpl() private val _likeItemsFlow = MutableStateFlow>(PagingData.empty()) val likeItemsFlow = _likeItemsFlow.asStateFlow() diff --git a/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt b/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt index db75d85..80b1673 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt @@ -12,11 +12,13 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource @@ -38,8 +40,8 @@ import java.util.Date @Preview @Composable -fun LikeScreen() { - val model = LikePageViewModel +fun LikeNoticeScreen() { + val model = LikeNoticeViewModel val listState = rememberLazyListState() var dataFlow = model.likeItemsFlow var likes = dataFlow.collectAsLazyPagingItems() @@ -118,7 +120,8 @@ fun ActionNoticeItem( context, imageUrl = avatar, modifier = Modifier - .size(40.dp) + .size(48.dp) + .clip(CircleShape) .noRippleClickable { navController.navigate( NavigationRoute.AccountProfile.route.replace( @@ -151,7 +154,7 @@ fun ActionNoticeItem( CustomAsyncImage( context, imageUrl = thumbnail, - modifier = Modifier.size(64.dp), + modifier = Modifier.size(48.dp), contentDescription = action, ) }