整理代码

app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt

@@ -9,16 +9,27 @@ import com.aiosman.riderpro.data.AccountService
 import com.aiosman.riderpro.data.AccountServiceImpl
 import kotlinx.coroutines.launch
 
+/**
+ * 修改密码页面的 ViewModel
+ */
 class ChangePasswordViewModel {
-    val accountService :AccountService = AccountServiceImpl()
+    val accountService: AccountService = AccountServiceImpl()
+
+    /**
+     * 修改密码
+     * @param currentPassword 当前密码
+     * @param newPassword 新密码
+     */
     suspend fun changePassword(currentPassword: String, newPassword: String) {
         accountService.changeAccountPassword(currentPassword, newPassword)
     }
 }
-@Composable
-fun ChangePasswordScreen(
 
-) {
+/**
+ * 修改密码页面
+ */
+@Composable
+fun ChangePasswordScreen() {
     val viewModel = remember { ChangePasswordViewModel() }
     var currentPassword by remember { mutableStateOf("") }
     var newPassword by remember { mutableStateOf("") }

app/src/main/java/com/aiosman/riderpro/ui/account/edit.kt

@@ -33,10 +33,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import com.aiosman.riderpro.data.AccountProfileEntity
+import com.aiosman.riderpro.entity.AccountProfileEntity
 import com.aiosman.riderpro.data.AccountService
 import com.aiosman.riderpro.data.AccountServiceImpl
-import com.aiosman.riderpro.data.TestUserServiceImpl
+import com.aiosman.riderpro.data.UserServiceImpl
 import com.aiosman.riderpro.data.UploadImage
 import com.aiosman.riderpro.data.UserService
 import com.aiosman.riderpro.ui.composables.CustomAsyncImage
@@ -44,10 +44,12 @@ import com.aiosman.riderpro.ui.modifiers.noRippleClickable
 import com.aiosman.riderpro.ui.post.NewPostViewModel.uriToFile
 import kotlinx.coroutines.launch
 
+/**
+ * 编辑用户资料界面
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AccountEditScreen() {
-    val userService: UserService = TestUserServiceImpl()
     val accountService: AccountService = AccountServiceImpl()
     var name by remember { mutableStateOf("") }
     var bio by remember { mutableStateOf("") }
@@ -59,8 +61,11 @@ fun AccountEditScreen() {
     }
     val scope = rememberCoroutineScope()
     val context = LocalContext.current
-    suspend fun reloadProfile() {
 
+    /**
+     * 加载用户资料
+     */
+    suspend fun reloadProfile() {
         accountService.getMyAccountProfile().let {
             profile = it
             name = it.nickName
@@ -70,19 +75,12 @@ fun AccountEditScreen() {
 
     }
 
-    fun updateUserAvatar(uri: String) {
-        scope.launch {
-            accountService.updateAvatar(uri)
-            reloadProfile()
-        }
-
-    }
     fun updateUserProfile() {
         scope.launch {
             val newAvatar = imageUrl?.let {
                 val cursor = context.contentResolver.query(it, null, null, null, null)
                 var newAvatar: UploadImage? = null
-                cursor?.use {cur ->
+                cursor?.use { cur ->
                     if (cur.moveToFirst()) {
                         val displayName = cur.getString(cur.getColumnIndex("_display_name"))
                         val extension = displayName.substringAfterLast(".")
@@ -135,13 +133,13 @@ fun AccountEditScreen() {
                 )
             }
         }
-    ) {
-        padding ->
+    ) { padding ->
         profile?.let {
             Column(
                 modifier = Modifier
                     .fillMaxSize()
-                    .padding(padding).padding(horizontal = 24.dp),
+                    .padding(padding)
+                    .padding(horizontal = 24.dp),
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 CustomAsyncImage(

app/src/main/java/com/aiosman/riderpro/ui/comment/CommentModal.kt

@@ -49,19 +49,22 @@ import androidx.paging.cachedIn
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.aiosman.riderpro.ui.post.CommentsSection
 import com.aiosman.riderpro.R
-import com.aiosman.riderpro.data.CommentEntity
-import com.aiosman.riderpro.data.CommentPagingSource
+import com.aiosman.riderpro.entity.CommentEntity
+import com.aiosman.riderpro.entity.CommentPagingSource
 import com.aiosman.riderpro.data.CommentRemoteDataSource
 import com.aiosman.riderpro.data.CommentService
-import com.aiosman.riderpro.data.TestCommentServiceImpl
+import com.aiosman.riderpro.data.CommentServiceImpl
 import com.aiosman.riderpro.ui.modifiers.noRippleClickable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 
+/**
+ * 评论弹窗的 ViewModel
+ */
 class CommentModalViewModel(
     val postId: Int?
 ) : ViewModel() {
-    val commentService: CommentService = TestCommentServiceImpl()
+    val commentService: CommentService = CommentServiceImpl()
     val commentsFlow: Flow<PagingData<CommentEntity>> = Pager(
         config = PagingConfig(pageSize = 20, enablePlaceholders = false),
         pagingSourceFactory = {
@@ -72,6 +75,9 @@ class CommentModalViewModel(
         }
     ).flow.cachedIn(viewModelScope)
 
+    /**
+     * 创建评论
+     */
     suspend fun createComment(content: String) {
         postId?.let {
             commentService.createComment(postId, content)
@@ -79,7 +85,13 @@ class CommentModalViewModel(
     }
 }
 
-@Preview
+
+/**
+ * 评论弹窗
+ * @param postId 帖子ID
+ * @param onCommentAdded 评论添加回调
+ * @param onDismiss 关闭回调
+ */
 @Composable
 fun CommentModalContent(
     postId: Int? = null,

app/src/main/java/com/aiosman/riderpro/ui/composables/RelPostCard.kt

@@ -10,7 +10,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
-import com.aiosman.riderpro.model.MomentEntity
+import com.aiosman.riderpro.entity.MomentEntity
 import com.aiosman.riderpro.ui.index.tabs.moment.MomentTopRowGroup
 
 @Composable

app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouritePageViewModel.kt

@@ -7,9 +7,9 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
-import com.aiosman.riderpro.data.AccountFavouriteEntity
+import com.aiosman.riderpro.entity.AccountFavouriteEntity
 import com.aiosman.riderpro.data.AccountService
-import com.aiosman.riderpro.data.FavoriteItemPagingSource
+import com.aiosman.riderpro.entity.FavoriteItemPagingSource
 import com.aiosman.riderpro.data.AccountServiceImpl
 import com.aiosman.riderpro.data.api.ApiClient
 import com.aiosman.riderpro.data.api.UpdateNoticeRequestBody
@@ -18,6 +18,9 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
+/**
+ * 收藏消息列表的 ViewModel
+ */
 object FavouritePageViewModel : ViewModel() {
     private val accountService: AccountService = AccountServiceImpl()
     private val _favouriteItemsFlow =
@@ -38,6 +41,7 @@ object FavouritePageViewModel : ViewModel() {
             }
         }
     }
+    // 更新收藏消息的查看时间
     suspend fun updateNotice() {
         var now = Calendar.getInstance().time
         accountService.updateNotice(

app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt

@@ -37,11 +37,12 @@ import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder
 import com.aiosman.riderpro.ui.like.ActionNoticeItem
 import com.aiosman.riderpro.ui.like.LikePageViewModel
 
-@Preview
+/**
+ * 收藏消息界面
+ */
 @Composable
 fun FavouriteScreen() {
     val model = FavouritePageViewModel
-    val coroutineScope = rememberCoroutineScope()
     val listState = rememberLazyListState()
     var dataFlow = model.favouriteItemsFlow
     var favourites = dataFlow.collectAsLazyPagingItems()
@@ -59,7 +60,9 @@ fun FavouriteScreen() {
                 .padding(horizontal = 16.dp)
         ) {
             Box(
-                modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp)
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 16.dp)
             ) {
                 NoticeScreenHeader(
                     "FAVOURITE",

app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerPage.kt

@@ -35,7 +35,9 @@ import com.aiosman.riderpro.ui.composables.CustomAsyncImage
 import com.aiosman.riderpro.ui.modifiers.noRippleClickable
 import kotlinx.coroutines.launch
 
-@Preview
+/**
+ * 关注消息列表
+ */
 @Composable
 fun FollowerScreen() {
     val scope = rememberCoroutineScope()

app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerViewModel.kt

@@ -10,9 +10,9 @@ import androidx.paging.cachedIn
 import androidx.paging.map
 import com.aiosman.riderpro.data.AccountFollow
 import com.aiosman.riderpro.data.AccountService
-import com.aiosman.riderpro.data.FollowItemPagingSource
+import com.aiosman.riderpro.entity.FollowItemPagingSource
 import com.aiosman.riderpro.data.AccountServiceImpl
-import com.aiosman.riderpro.data.TestUserServiceImpl
+import com.aiosman.riderpro.data.UserServiceImpl
 import com.aiosman.riderpro.data.UserService
 import com.aiosman.riderpro.data.api.ApiClient
 import com.aiosman.riderpro.data.api.UpdateNoticeRequestBody
@@ -21,9 +21,12 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
+/**
+ * 关注消息列表的 ViewModel
+ */
 object FollowerViewModel : ViewModel() {
     private val accountService: AccountService = AccountServiceImpl()
-    private val userService: UserService = TestUserServiceImpl()
+    private val userService: UserService = UserServiceImpl()
     private val _followerItemsFlow =
         MutableStateFlow<PagingData<AccountFollow>>(PagingData.empty())
     val followerItemsFlow = _followerItemsFlow.asStateFlow()

app/src/main/java/com/aiosman/riderpro/ui/imageviewer/ImageViewerViewModel.kt

@@ -1,6 +1,6 @@
 package com.aiosman.riderpro.ui.imageviewer
 
-import com.aiosman.riderpro.model.MomentImageEntity
+import com.aiosman.riderpro.entity.MomentImageEntity
 
 object ImageViewerViewModel {
     var imageList = mutableListOf<MomentImageEntity>()

app/src/main/java/com/aiosman/riderpro/ui/index/Index.kt

@@ -60,7 +60,7 @@ fun IndexScreen() {
     val systemUiController = rememberSystemUiController()
 
     LaunchedEffect(Unit) {
-//        systemUiController.setNavigationBarColor(Color.Transparent)
+        systemUiController.setNavigationBarColor(Color.Transparent)
     }
     Scaffold(
         bottomBar = {

app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt

@@ -32,17 +32,18 @@ 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.data.CommentEntity
+import com.aiosman.riderpro.entity.CommentEntity
 import com.aiosman.riderpro.exp.timeAgo
 import com.aiosman.riderpro.ui.NavigationRoute
-import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout
 import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder
 import com.aiosman.riderpro.ui.composables.CustomAsyncImage
 import com.aiosman.riderpro.ui.modifiers.noRippleClickable
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 
 
-@Preview(showBackground = true)
+/**
+ * 消息列表界面
+ */
 @Composable
 fun NotificationsScreen() {
     val model = MessageListViewModel

app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageListViewModel.kt

@@ -12,12 +12,12 @@ import androidx.paging.cachedIn
 import androidx.paging.map
 import com.aiosman.riderpro.data.AccountNotice
 import com.aiosman.riderpro.data.AccountService
-import com.aiosman.riderpro.data.CommentEntity
-import com.aiosman.riderpro.data.CommentPagingSource
+import com.aiosman.riderpro.entity.CommentEntity
+import com.aiosman.riderpro.entity.CommentPagingSource
 import com.aiosman.riderpro.data.CommentRemoteDataSource
 import com.aiosman.riderpro.data.CommentService
 import com.aiosman.riderpro.data.AccountServiceImpl
-import com.aiosman.riderpro.data.TestCommentServiceImpl
+import com.aiosman.riderpro.data.CommentServiceImpl
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
@@ -27,7 +27,7 @@ object MessageListViewModel : ViewModel() {
     val accountService: AccountService = AccountServiceImpl()
     var noticeInfo by mutableStateOf<AccountNotice?>(null)
 
-    private val commentService: CommentService = TestCommentServiceImpl()
+    private val commentService: CommentService = CommentServiceImpl()
     private val _commentItemsFlow = MutableStateFlow<PagingData<CommentEntity>>(PagingData.empty())
     val commentItemsFlow = _commentItemsFlow.asStateFlow()
 

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

@@ -42,7 +42,6 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -65,9 +64,9 @@ import com.aiosman.riderpro.LocalAnimatedContentScope
 import com.aiosman.riderpro.LocalNavController
 import com.aiosman.riderpro.LocalSharedTransitionScope
 import com.aiosman.riderpro.R
+import com.aiosman.riderpro.entity.MomentEntity
+import com.aiosman.riderpro.entity.MomentImageEntity
 import com.aiosman.riderpro.exp.timeAgo
-import com.aiosman.riderpro.model.MomentEntity
-import com.aiosman.riderpro.model.MomentImageEntity
 import com.aiosman.riderpro.ui.NavigationRoute
 import com.aiosman.riderpro.ui.comment.CommentModalContent
 import com.aiosman.riderpro.ui.composables.AnimatedCounter
@@ -78,9 +77,11 @@ import com.aiosman.riderpro.ui.composables.RelPostCard
 import com.aiosman.riderpro.ui.modifiers.noRippleClickable
 import com.aiosman.riderpro.ui.post.NewPostViewModel
 import com.aiosman.riderpro.ui.post.PostViewModel
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.launch
 
+/**
+ * 动态列表
+ */
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun MomentsList() {
@@ -370,21 +371,21 @@ fun PostImageView(
 //                        )
 //                        .fillMaxSize()
 //                )
-                CustomAsyncImage(
-                    context,
-                    image.thumbnail,
-                    contentDescription = "Image",
-                    blurHash = image.blurHash,
-                    contentScale = ContentScale.Crop,
-                    modifier = Modifier
-                        .fillMaxSize()
+            CustomAsyncImage(
+                context,
+                image.thumbnail,
+                contentDescription = "Image",
+                blurHash = image.blurHash,
+                contentScale = ContentScale.Crop,
+                modifier = Modifier
+                    .fillMaxSize()
 //                        .noRippleClickable {
 //                            ImageViewerViewModel.asNew(images, page)
 //                            navController.navigate(
 //                                NavigationRoute.ImageViewer.route
 //                            )
 //                        }
-                )
+            )
 
         }
 

app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/MomentViewModel.kt

@@ -8,12 +8,12 @@ import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.map
 import com.aiosman.riderpro.data.AccountService
-import com.aiosman.riderpro.data.MomentPagingSource
-import com.aiosman.riderpro.data.MomentRemoteDataSource
+import com.aiosman.riderpro.entity.MomentPagingSource
+import com.aiosman.riderpro.entity.MomentRemoteDataSource
 import com.aiosman.riderpro.data.MomentService
 import com.aiosman.riderpro.data.AccountServiceImpl
-import com.aiosman.riderpro.data.TestMomentServiceImpl
-import com.aiosman.riderpro.model.MomentEntity
+import com.aiosman.riderpro.entity.MomentServiceImpl
+import com.aiosman.riderpro.entity.MomentEntity
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
@@ -21,7 +21,7 @@ import kotlinx.coroutines.launch
 
 
 object MomentViewModel : ViewModel() {
-    private val momentService: MomentService = TestMomentServiceImpl()
+    private val momentService: MomentService = MomentServiceImpl()
     private val _momentsFlow = MutableStateFlow<PagingData<MomentEntity>>(PagingData.empty())
     val momentsFlow = _momentsFlow.asStateFlow()
     val accountService: AccountService = AccountServiceImpl()

app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/MyProfileViewModel.kt

@@ -7,19 +7,19 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.aiosman.riderpro.AppStore
-import com.aiosman.riderpro.data.AccountProfileEntity
+import com.aiosman.riderpro.entity.AccountProfileEntity
 import com.aiosman.riderpro.data.AccountService
 import com.aiosman.riderpro.data.AccountServiceImpl
-import com.aiosman.riderpro.data.MomentPagingSource
-import com.aiosman.riderpro.data.MomentRemoteDataSource
-import com.aiosman.riderpro.data.TestMomentServiceImpl
-import com.aiosman.riderpro.data.TestUserServiceImpl
-import com.aiosman.riderpro.model.MomentEntity
+import com.aiosman.riderpro.entity.MomentPagingSource
+import com.aiosman.riderpro.entity.MomentRemoteDataSource
+import com.aiosman.riderpro.entity.MomentServiceImpl
+import com.aiosman.riderpro.data.UserServiceImpl
+import com.aiosman.riderpro.entity.MomentEntity
 import kotlinx.coroutines.flow.Flow
 
 object MyProfileViewModel {
     val service: AccountService = AccountServiceImpl()
-    val userService = TestUserServiceImpl()
+    val userService = UserServiceImpl()
     var profile by mutableStateOf<AccountProfileEntity?>(null)
     var momentsFlow by mutableStateOf<Flow<PagingData<MomentEntity>>?>(null)
     suspend fun loadProfile() {
@@ -28,7 +28,7 @@ object MyProfileViewModel {
             config = PagingConfig(pageSize = 5, enablePlaceholders = false),
             pagingSourceFactory = {
                 MomentPagingSource(
-                    MomentRemoteDataSource(TestMomentServiceImpl()),
+                    MomentRemoteDataSource(MomentServiceImpl()),
                     author = profile?.id ?: 0,
 
                 )

app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt

@@ -4,7 +4,6 @@ import androidx.annotation.DrawableRes
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -47,14 +46,13 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import androidx.paging.compose.collectAsLazyPagingItems
-import coil.compose.AsyncImage
 import com.aiosman.riderpro.LocalAnimatedContentScope
 import com.aiosman.riderpro.LocalNavController
 import com.aiosman.riderpro.LocalSharedTransitionScope
 import com.aiosman.riderpro.R
-import com.aiosman.riderpro.data.AccountProfileEntity
+import com.aiosman.riderpro.entity.AccountProfileEntity
 import com.aiosman.riderpro.exp.formatPostTime
-import com.aiosman.riderpro.model.MomentEntity
+import com.aiosman.riderpro.entity.MomentEntity
 import com.aiosman.riderpro.ui.NavigationRoute
 import com.aiosman.riderpro.ui.composables.CustomAsyncImage
 import com.aiosman.riderpro.ui.modifiers.noRippleClickable

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

@@ -44,7 +44,7 @@ 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.data.AccountProfileEntity
+import com.aiosman.riderpro.entity.AccountProfileEntity
 import com.aiosman.riderpro.ui.composables.CustomAsyncImage
 import com.aiosman.riderpro.ui.index.tabs.moment.MomentCard
 import com.aiosman.riderpro.ui.modifiers.noRippleClickable

app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchViewModel.kt

@@ -9,16 +9,14 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
-import com.aiosman.riderpro.data.AccountPagingSource
-import com.aiosman.riderpro.data.AccountProfileEntity
-import com.aiosman.riderpro.data.MomentPagingSource
-import com.aiosman.riderpro.data.MomentRemoteDataSource
+import com.aiosman.riderpro.entity.AccountPagingSource
+import com.aiosman.riderpro.entity.AccountProfileEntity
+import com.aiosman.riderpro.entity.MomentPagingSource
+import com.aiosman.riderpro.entity.MomentRemoteDataSource
 import com.aiosman.riderpro.data.MomentService
-import com.aiosman.riderpro.data.TestMomentServiceImpl
-import com.aiosman.riderpro.data.TestUserServiceImpl
-import com.aiosman.riderpro.model.MomentEntity
-import com.aiosman.riderpro.ui.index.tabs.moment.MomentViewModel
-import com.aiosman.riderpro.ui.index.tabs.moment.MomentViewModel.accountService
+import com.aiosman.riderpro.entity.MomentServiceImpl
+import com.aiosman.riderpro.data.UserServiceImpl
+import com.aiosman.riderpro.entity.MomentEntity
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
@@ -26,11 +24,11 @@ import kotlinx.coroutines.launch
 
 object SearchViewModel : ViewModel() {
     var searchText by mutableStateOf("")
-    private val momentService: MomentService = TestMomentServiceImpl()
+    private val momentService: MomentService = MomentServiceImpl()
     private val _momentsFlow = MutableStateFlow<PagingData<MomentEntity>>(PagingData.empty())
     val momentsFlow = _momentsFlow.asStateFlow()
 
-    private val userService = TestUserServiceImpl()
+    private val userService = UserServiceImpl()
     private val _usersFlow = MutableStateFlow<PagingData<AccountProfileEntity>>(PagingData.empty())
     val usersFlow = _usersFlow.asStateFlow()
     var showResult by mutableStateOf(false)

app/src/main/java/com/aiosman/riderpro/ui/like/LikePageViewModel.kt

@@ -7,9 +7,9 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
-import com.aiosman.riderpro.data.AccountLikeEntity
+import com.aiosman.riderpro.entity.AccountLikeEntity
 import com.aiosman.riderpro.data.AccountService
-import com.aiosman.riderpro.data.LikeItemPagingSource
+import com.aiosman.riderpro.entity.LikeItemPagingSource
 import com.aiosman.riderpro.data.AccountServiceImpl
 import com.aiosman.riderpro.data.api.ApiClient
 import com.aiosman.riderpro.data.api.UpdateNoticeRequestBody

app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt

@@ -8,9 +8,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import com.aiosman.riderpro.data.MomentService
-import com.aiosman.riderpro.data.TestMomentServiceImpl
+import com.aiosman.riderpro.entity.MomentServiceImpl
 import com.aiosman.riderpro.data.UploadImage
-import com.aiosman.riderpro.model.MomentEntity
+import com.aiosman.riderpro.entity.MomentEntity
 import com.aiosman.riderpro.ui.modification.Modification
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -20,7 +20,7 @@ import java.io.InputStream
 
 
 object NewPostViewModel : ViewModel() {
-    var momentService: MomentService = TestMomentServiceImpl()
+    var momentService: MomentService = MomentServiceImpl()
     var textContent by mutableStateOf("")
     var searchPlaceAddressResult by mutableStateOf<SearchPlaceAddressResult?>(null)
     var modificationList by mutableStateOf<List<Modification>>(listOf())

app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt

@@ -61,9 +61,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
@@ -75,22 +73,22 @@ import com.aiosman.riderpro.LocalAnimatedContentScope
 import com.aiosman.riderpro.LocalNavController
 import com.aiosman.riderpro.LocalSharedTransitionScope
 import com.aiosman.riderpro.R
-import com.aiosman.riderpro.data.AccountProfileEntity
+import com.aiosman.riderpro.entity.AccountProfileEntity
 import com.aiosman.riderpro.data.AccountService
-import com.aiosman.riderpro.data.CommentEntity
-import com.aiosman.riderpro.data.CommentPagingSource
+import com.aiosman.riderpro.entity.CommentEntity
+import com.aiosman.riderpro.entity.CommentPagingSource
 import com.aiosman.riderpro.data.CommentRemoteDataSource
 import com.aiosman.riderpro.data.CommentService
-import com.aiosman.riderpro.data.TestCommentServiceImpl
+import com.aiosman.riderpro.data.CommentServiceImpl
 import com.aiosman.riderpro.data.MomentService
 import com.aiosman.riderpro.data.AccountServiceImpl
-import com.aiosman.riderpro.data.TestMomentServiceImpl
-import com.aiosman.riderpro.data.TestUserServiceImpl
+import com.aiosman.riderpro.entity.MomentServiceImpl
+import com.aiosman.riderpro.data.UserServiceImpl
 import com.aiosman.riderpro.data.UserService
 import com.aiosman.riderpro.exp.formatPostTime
 import com.aiosman.riderpro.exp.timeAgo
-import com.aiosman.riderpro.model.MomentEntity
-import com.aiosman.riderpro.model.MomentImageEntity
+import com.aiosman.riderpro.entity.MomentEntity
+import com.aiosman.riderpro.entity.MomentImageEntity
 import com.aiosman.riderpro.ui.NavigationRoute
 import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout
 import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder
@@ -106,9 +104,9 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
 object PostViewModel : ViewModel() {
-    var service: MomentService = TestMomentServiceImpl()
-    var commentService: CommentService = TestCommentServiceImpl()
-    var userService: UserService = TestUserServiceImpl()
+    var service: MomentService = MomentServiceImpl()
+    var commentService: CommentService = CommentServiceImpl()
+    var userService: UserService = UserServiceImpl()
     private var _commentsFlow = MutableStateFlow<PagingData<CommentEntity>>(PagingData.empty())
     val commentsFlow = _commentsFlow.asStateFlow()
     var postId: String = ""
@@ -146,7 +144,7 @@ object PostViewModel : ViewModel() {
     suspend fun initData() {
         moment = service.getMomentById(postId.toInt())
         moment?.let {
-            accountProfileEntity = accountService.getAccountProfileById(it.authorId)
+            accountProfileEntity = userService.getUserProfile(it.authorId.toString())
         }
     }
 

app/src/main/java/com/aiosman/riderpro/ui/profile/AccountProfile.kt

@@ -18,13 +18,13 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.compose.collectAsLazyPagingItems
-import com.aiosman.riderpro.data.AccountProfileEntity
-import com.aiosman.riderpro.data.MomentPagingSource
-import com.aiosman.riderpro.data.MomentRemoteDataSource
-import com.aiosman.riderpro.data.TestMomentServiceImpl
-import com.aiosman.riderpro.data.TestUserServiceImpl
+import com.aiosman.riderpro.entity.AccountProfileEntity
+import com.aiosman.riderpro.entity.MomentPagingSource
+import com.aiosman.riderpro.entity.MomentRemoteDataSource
+import com.aiosman.riderpro.entity.MomentServiceImpl
+import com.aiosman.riderpro.data.UserServiceImpl
 import com.aiosman.riderpro.data.UserService
-import com.aiosman.riderpro.model.MomentEntity
+import com.aiosman.riderpro.entity.MomentEntity
 import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout
 import com.aiosman.riderpro.ui.index.tabs.profile.CarGroup
 import com.aiosman.riderpro.ui.index.tabs.profile.MomentPostUnit
@@ -36,9 +36,9 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun AccountProfile(id:String) {
-    val userService: UserService = TestUserServiceImpl()
+    val userService: UserService = UserServiceImpl()
     var userProfile by remember { mutableStateOf<AccountProfileEntity?>(null) }
-    val momentService = TestMomentServiceImpl()
+    val momentService = MomentServiceImpl()
     var momentsFlow by remember { mutableStateOf<Flow<PagingData<MomentEntity>>?>(null) }
     val scope = rememberCoroutineScope()
     LaunchedEffect(Unit) {