refactor: GroupListScreen 개선(#196)

boostcampwm-2024 · Jan 16, 2025 · 9e7fe96 · 9e7fe96
1 parent 02dbd23
commit 9e7fe96
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/feature/study/src/main/java/kr/boostcamp_2024/course/study/component/StudyGroupMemberItem.kt b/feature/study/src/main/java/kr/boostcamp_2024/course/study/component/StudyGroupMemberItem.kt
@@ -26,6 +26,7 @@ internal fun StudyGroupMemberItem(
     ownerId: String?,
     groupId: String?,
     user: User,
+    isOwner: Boolean,
     removeButtonClick: (String, String) -> Unit,
 ) {
     Row(
@@ -46,7 +47,7 @@ internal fun StudyGroupMemberItem(
             text = user.name,
             style = MaterialTheme.typography.bodyLarge,
         )
-        if (ownerId != user.id) {
+        if (isOwner && ownerId != user.id) {
             Button(
                 onClick = {
                     if (groupId != null) {
@@ -76,6 +77,7 @@ private fun StudyGroupMemberItemPreview() {
             ownerId = "user1",
             groupId = "study1",
             removeButtonClick = { _, _ -> },
+            isOwner = true,
             user = User(
                 id = "user1",
                 name = "user1",

diff --git a/feature/study/src/main/java/kr/boostcamp_2024/course/study/presentation/GroupListScreen.kt b/feature/study/src/main/java/kr/boostcamp_2024/course/study/presentation/GroupListScreen.kt
@@ -26,7 +26,7 @@ import kr.boostcamp_2024.course.study.component.CustomPropertyTab
 import kr.boostcamp_2024.course.study.component.StudyGroupMemberItem
 
 @Composable
-fun GroupListScreen(
+internal fun GroupListScreen(
     currentGroup: StudyGroup,
     owner: User,
     curUserId: String?,
@@ -35,6 +35,7 @@ fun GroupListScreen(
     removeClick: (String, String) -> Unit,
 ) {
     var showDialog by remember { mutableStateOf(false) }
+    val isOwner: Boolean = owner?.id == curUserId
 
     Column(
         modifier = Modifier
@@ -62,15 +63,17 @@ fun GroupListScreen(
             groupId = currentGroup.id,
             users = users,
             removeClick = removeClick,
+            isOwner = isOwner,
         )
     }
 }
 
 @Composable
-fun StudyGroupMemberLazyColumn(
+private fun StudyGroupMemberLazyColumn(
     owner: User,
     groupId: String?,
     users: List<User>,
+    isOwner: Boolean,
     removeClick: (String, String) -> Unit,
 ) {
     LazyColumn(
@@ -84,6 +87,7 @@ fun StudyGroupMemberLazyColumn(
                 groupId = groupId,
                 user = user,
                 removeButtonClick = removeClick,
+                isOwner = isOwner,
             )
             if (index < 9) {
                 HorizontalDivider()
@@ -94,7 +98,7 @@ fun StudyGroupMemberLazyColumn(
 
 @Preview(showBackground = true, locale = "ko")
 @Composable
-fun GroupListScreenPreview() {
+private fun GroupListScreenPreview() {
     WeQuizTheme {
         GroupListScreen(
             currentGroup = StudyGroup(