Merge pull request #379 from 6QuizOnTheBlock/and/design#377-student_a…

…pp_detail

And/design#377 student app detail

android/feature/navigator/src/main/java/com/sixkids/feature/navigator/MainScreen.kt

@@ -164,7 +164,7 @@ fun MainScreen(
                 navigateToStudentAnnounceDetail = navigator::navigateStudentAnnounceDetail,
                 navigateToTagHello = { },
                 navigateToRank = navigator::navigateRank,
-                navigateToChatting = navigator::navigateChatting,
+                navigateToChatting = navigator::navigateStudentChatting,
                 navigateBack = navigator::popBackStack,
                 navigateToGreetingSender = navigator::navigateGreetingSender,
                 navigateToGreetingReceiver = navigator::navigateGreetingReceiver,

android/feature/student/board/src/main/java/com/sixkids/student/board/component/CommentCount.kt

@@ -4,20 +4,23 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.sixkids.designsystem.theme.BlueDark
 import com.sixkids.designsystem.theme.UlbanTypography
 import com.sixkids.designsystem.R as UlbanRes
 
 @Composable
 fun CommentCount(
     count: Int
 ) {
-    Row {
+    Row(verticalAlignment = Alignment.CenterVertically) {
         Icon(
             imageVector = ImageVector.vectorResource(id = UlbanRes.drawable.ic_chat_bubble),
-            contentDescription = null
+            contentDescription = null,
+            tint = BlueDark
         )
         Text(
             text = count.toString(),

android/feature/student/board/src/main/java/com/sixkids/student/board/component/PostItem.kt

@@ -37,12 +37,12 @@ fun PostItem(
             text = title,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            style = UlbanTypography.titleLarge
+            style = UlbanTypography.titleMedium
         )
         Spacer(modifier = Modifier.height(10.dp))
         Row(
             modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.Top
+            verticalAlignment = Alignment.CenterVertically
         ) {
             if (commentCount > 0){
                 CommentCount(count = commentCount)

android/feature/student/board/src/main/java/com/sixkids/student/board/main/StudentBoardMainScreen.kt

@@ -24,6 +24,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
+import com.sixkids.designsystem.component.appbar.UlbanDefaultAppBar
 import com.sixkids.designsystem.R as UlbanRes
 import com.sixkids.designsystem.component.appbar.UlbanDetailAppBar
 import com.sixkids.designsystem.component.button.EditFAB
@@ -98,12 +99,11 @@ fun StudentBoardMainScreen(
         Column(
 
         ) {
-            UlbanDetailAppBar(
+            UlbanDefaultAppBar(
                 leftIcon = UlbanRes.drawable.board,
                 title = stringResource(id = R.string.student_board_main_post),
                 content = stringResource(id = R.string.student_board_main_post),
-                topDescription = "",
-                bottomDescription = "",
+                body = postState.classString.replace("\n", " "),
                 color = Blue
             )
 

android/feature/student/home/src/main/java/com/sixkids/student/home/announce/announcelist/StudentAnnounceListScreen.kt

@@ -22,6 +22,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
+import com.sixkids.designsystem.component.appbar.UlbanDefaultAppBar
 import com.sixkids.designsystem.component.appbar.UlbanDetailAppBar
 import com.sixkids.designsystem.component.screen.LoadingScreen
 import com.sixkids.designsystem.theme.Orange
@@ -84,15 +85,12 @@ fun StudentAnnounceListScreen(
         modifier = modifier
             .fillMaxSize()
     ) {
-        Column(
-
-        ) {
-            UlbanDetailAppBar(
+        Column {
+            UlbanDefaultAppBar(
                 leftIcon = UlbanRes.drawable.announce,
                 title = stringResource(id = R.string.student_home_main_announce),
                 content = stringResource(id = R.string.student_home_main_announce),
-                topDescription = "",
-                bottomDescription = studentAnnounceListState.classString,
+                body = studentAnnounceListState.classString.replace("\n", " "),
                 color = Orange
             )
 

android/feature/student/home/src/main/java/com/sixkids/student/home/announce/announcelist/StudentAnnounceListViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.sixkids.domain.usecase.organization.GetSelectedOrganizationIdUseCase
+import com.sixkids.domain.usecase.organization.LoadSelectedOrganizationNameUseCase
 import com.sixkids.domain.usecase.post.GetPostListUseCase
 import com.sixkids.model.Post
 import com.sixkids.model.PostCategory
@@ -16,7 +17,8 @@ import javax.inject.Inject
 @HiltViewModel
 class StudentAnnounceListViewModel @Inject constructor(
     private val getPostListUseCase: GetPostListUseCase,
-    private val getSelectedOrganizationIdUseCase: GetSelectedOrganizationIdUseCase
+    private val getSelectedOrganizationIdUseCase: GetSelectedOrganizationIdUseCase,
+    private val loadSelectedOrganizationNameUseCase: LoadSelectedOrganizationNameUseCase
 ): BaseViewModel<StudentAnnounceListState, StudentAnnounceListEffect>(StudentAnnounceListState()){
     private var organizationId: Int? = null
 
@@ -26,6 +28,12 @@ class StudentAnnounceListViewModel @Inject constructor(
         viewModelScope.launch {
             intent { copy(isLoding = true) }
 
+            loadSelectedOrganizationNameUseCase().onSuccess {
+                intent { copy(classString = it) }
+            }.onFailure {
+                intent { copy(classString = "") }
+            }
+
             if (organizationId == null){
                 organizationId = getSelectedOrganizationIdUseCase().getOrNull()
             }

android/feature/student/home/src/main/java/com/sixkids/student/home/announce/component/CommentCount.kt

@@ -4,20 +4,23 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.sixkids.designsystem.theme.OrangeText
 import com.sixkids.designsystem.theme.UlbanTypography
 import com.sixkids.designsystem.R as UlbanRes
 
 @Composable
 fun CommentCount(
     count: Int
 ) {
-    Row {
+    Row(verticalAlignment = Alignment.CenterVertically) {
         Icon(
             imageVector = ImageVector.vectorResource(id = UlbanRes.drawable.ic_chat_bubble),
-            contentDescription = null
+            contentDescription = null,
+            tint = OrangeText
         )
         Text(
             text = count.toString(),

android/feature/student/home/src/main/java/com/sixkids/student/home/announce/component/PostItem.kt

@@ -31,18 +31,18 @@ fun PostItem(
     onClick: () -> Unit = {}
 ) {
     Column(
-        modifier = modifier.clickable { onClick() }
+        modifier = modifier.padding(bottom = 8.dp).clickable { onClick() }
     ) {
         Text(
             text = title,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            style = UlbanTypography.titleLarge
+            style = UlbanTypography.titleMedium
         )
         Spacer(modifier = Modifier.height(10.dp))
         Row(
             modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.Top
+            verticalAlignment = Alignment.CenterVertically
         ) {
             if (commentCount > 0){
                 CommentCount(count = commentCount)

android/feature/student/home/src/main/java/com/sixkids/student/home/chatting/StudentChattingScreen.kt

@@ -26,6 +26,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -62,7 +63,7 @@ fun StudentChattingRoute(
     onBackClick: () -> Unit,
     onShowSnackBar: (SnackbarToken) -> Unit
 ) {
-    val uiState = viewModel.uiState.collectAsStateWithLifecycle().value
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
     viewModel.sideEffect.collectWithLifecycle { sideEffect ->
         when (sideEffect) {
@@ -106,7 +107,7 @@ fun StudentChattingScreen(
         Column {
             TopSection(
                 uiState.organizationName,
-                uiState.memberCount, onBackClick
+                onBackClick
             )
 
             ChatSection(
@@ -132,7 +133,6 @@ fun StudentChattingScreen(
 @Composable
 fun TopSection(
     organizationName: String = "",
-    memberCount: Int = 0,
     onBackClick: () -> Unit = {}
 ) {
     Row(
@@ -148,15 +148,11 @@ fun TopSection(
         )
 
         Text(
-            text = "구미 초등학교 3학년 1반",
+            text = organizationName.replace("\n", " "),
             style = UlbanTypography.titleSmall,
             modifier = Modifier.padding(10.dp, 0.dp)
         )
 
-        Text(
-            text = "21",
-            style = UlbanTypography.titleSmall.copy(color = Gray),
-        )
     }
 }
 
@@ -323,11 +319,6 @@ fun InputSection(
             .padding(6.dp),
         verticalAlignment = Alignment.Bottom
     ) {
-        Icon(
-            painter = painterResource(id = R.drawable.ic_camera),
-            contentDescription = "photo",
-            modifier = Modifier.size(30.dp)
-        )
 
         UlbanBasicTextField(
             text = msg,

android/feature/student/home/src/main/java/com/sixkids/student/home/chatting/StudentChattingViewModel.kt

@@ -7,6 +7,7 @@ import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.sixkids.domain.usecase.chatting.GetChattingHistoryUseCase
 import com.sixkids.domain.usecase.organization.GetSelectedOrganizationIdUseCase
+import com.sixkids.domain.usecase.organization.LoadSelectedOrganizationNameUseCase
 import com.sixkids.domain.usecase.user.GetATKUseCase
 import com.sixkids.domain.usecase.user.LoadUserInfoUseCase
 import com.sixkids.model.Chat
@@ -38,6 +39,7 @@ private const val TAG = "D107"
 class StudentChattingViewModel @Inject constructor(
     private val getATKUseCase: GetATKUseCase,
     private val getSelectedOrganizationIdUseCase: GetSelectedOrganizationIdUseCase,
+    private val loadSelectedOrganizationNameUseCase: LoadSelectedOrganizationNameUseCase,
     private val loadUserInfoUseCase: LoadUserInfoUseCase,
     private val getChattingHistoryUseCase: GetChattingHistoryUseCase
 ) : BaseViewModel<StudentChattingState, StudentChattingSideEffect>(
@@ -58,6 +60,16 @@ class StudentChattingViewModel @Inject constructor(
 
     var originalChatList: Flow<PagingData<Chat>>? = null
 
+    init {
+        viewModelScope.launch {
+            loadSelectedOrganizationNameUseCase().onSuccess {
+                Log.d(TAG, "initStomp1: $it")
+                intent { copy(organizationName = it) }
+            }.onFailure {
+                Log.d(TAG, "initStomp1: $it")
+            }
+        }
+    }
     @SuppressLint("CheckResult")
     fun initStomp() {
         viewModelScope.launch {
@@ -67,8 +79,6 @@ class StudentChattingViewModel @Inject constructor(
                 originalChatList =
                     getChattingHistoryUseCase(roomId).cachedIn(viewModelScope)
 
-
-
             } catch (e: Exception) {
                 Log.d(TAG, "initStomp: ${e.message}")
             }

android/feature/student/home/src/main/java/com/sixkids/student/home/main/StudentHomeMainScreen.kt

@@ -27,10 +27,14 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sixkids.designsystem.component.item.StudentSimpleCardItem
 import com.sixkids.designsystem.theme.Blue
+import com.sixkids.designsystem.theme.BlueText
 import com.sixkids.designsystem.theme.Orange
+import com.sixkids.designsystem.theme.OrangeText
 import com.sixkids.designsystem.theme.Purple
+import com.sixkids.designsystem.theme.PurpleText
 import com.sixkids.designsystem.theme.UlbanTypography
 import com.sixkids.designsystem.theme.Yellow
+import com.sixkids.designsystem.theme.YellowText
 import com.sixkids.designsystem.theme.component.card.ContentVerticalCard
 import com.sixkids.model.MemberSimple
 import com.sixkids.model.MemberSimpleWithScore
@@ -112,20 +116,23 @@ fun StudentHomeMainScreen(
             .fillMaxSize()
             .padding(20.dp)
     ) {
+        Spacer(modifier = Modifier.height(10.dp))
+
         StudentMainInfo(
             name = studentHomeMainState.studentName,
             imageUrlString = studentHomeMainState.studentImageUrl,
             classString = studentHomeMainState.studentClass,
             exp = studentHomeMainState.studentExp
         )
-        Spacer(modifier = Modifier.height(20.dp))
+        Spacer(modifier = Modifier.weight(1f))
         Row {
             ContentVerticalCard(
                 cardModifier = Modifier
                     .weight(1f)
                     .aspectRatio(1f)
                     .padding(end = 10.dp),
                 cardColor = Orange,
+                textColor = OrangeText,
                 imageDrawable = UlbanRes.drawable.announce,
                 text = stringResource(id = R.string.student_home_main_announce),
                 onClick = announceCardOnClick
@@ -136,6 +143,7 @@ fun StudentHomeMainScreen(
                     .aspectRatio(1f)
                     .padding(start = 10.dp),
                 cardColor = Blue,
+                textColor = BlueText,
                 imageDrawable = UlbanRes.drawable.tag_hello,
                 text = stringResource(id = R.string.student_home_main_hi),
                 onClick = showGreetingDialog
@@ -144,7 +152,8 @@ fun StudentHomeMainScreen(
         Spacer(modifier = Modifier.height(20.dp))
         Text(
             text = stringResource(id = R.string.student_home_main_best_friends),
-            style = UlbanTypography.bodyMedium
+            style = UlbanTypography.titleSmall,
+            modifier = Modifier.padding(start = 15.dp)
         )
         Spacer(modifier = Modifier.height(10.dp))
         Row(
@@ -174,6 +183,7 @@ fun StudentHomeMainScreen(
                     .aspectRatio(1f)
                     .padding(end = 10.dp),
                 cardColor = Purple,
+                textColor = PurpleText,
                 imageDrawable = UlbanRes.drawable.chat,
                 text = stringResource(id = R.string.student_home_main_chatting),
                 onClick = chattingCardOnClick
@@ -184,11 +194,13 @@ fun StudentHomeMainScreen(
                     .aspectRatio(1f)
                     .padding(start = 10.dp),
                 cardColor = Yellow,
+                textColor = YellowText,
                 imageDrawable = UlbanRes.drawable.rank,
                 text = stringResource(id = R.string.student_home_main_rank),
                 onClick = rankCardOnClick
             )
         }
+        Spacer(modifier = Modifier.weight(1f))
     }
 }