#5 [REFACTOR] 코드리뷰 반영

Author: gaeulzzang

core/src/main/java/com/sopt/core/designsystem/component/button/NoostakFloatingActionButton.kt

@@ -10,6 +10,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import com.sopt.core.R
@@ -24,7 +25,7 @@ fun NoostakFloatingActionButton(
 ) {
     ExtendedFloatingActionButton(
         modifier = modifier,
-        shape = RoundedCornerShape(30.dp),
+        shape = RoundedCornerShape(dimensionResource(id = R.dimen.fab_radius)),
         containerColor = NoostakTheme.colors.black,
         contentColor = NoostakTheme.colors.white,
         elevation = FloatingActionButtonDefaults.elevation(4.dp),

core/src/main/java/com/sopt/core/designsystem/component/chip/NoostakCategoryChip.kt

@@ -2,7 +2,9 @@ package com.sopt.core.designsystem.component.chip
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
+import com.sopt.core.R
 import com.sopt.core.designsystem.theme.NoostakTheme
 
 @Composable
@@ -16,7 +18,7 @@ fun NoostakCategoryChip(
         textColor = NoostakTheme.colors.white,
         backgroundColor = backgroundColor,
         borderColor = Color.Transparent,
-        horizontalPaddingValues = 15.dp,
-        verticalPaddingValues = 6.dp
+        horizontalPaddingValues = dimensionResource(id = R.dimen.category_chip_horizontal_padding),
+        verticalPaddingValues = dimensionResource(id = R.dimen.category_chip_vertical_padding)
     )
 }

core/src/main/java/com/sopt/core/designsystem/component/chip/NoostakChip.kt

@@ -12,12 +12,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.sopt.core.R
 import com.sopt.core.designsystem.theme.NoostakAndroidTheme
 import com.sopt.core.designsystem.theme.NoostakTheme
 
@@ -35,12 +37,12 @@ fun NoostakChip(
         modifier = Modifier
             .background(
                 color = backgroundColor,
-                shape = RoundedCornerShape(16.dp)
+                shape = RoundedCornerShape(dimensionResource(id = R.dimen.chip_radius))
             )
             .border(
                 width = 1.dp,
                 color = borderColor,
-                shape = RoundedCornerShape(16.dp)
+                shape = RoundedCornerShape(dimensionResource(id = R.dimen.chip_radius))
             )
             .defaultMinSize(minWidth = 39.dp)
             .padding(horizontal = horizontalPaddingValues, vertical = verticalPaddingValues)

core/src/main/java/com/sopt/core/designsystem/component/chip/NoostakUserChip.kt

@@ -2,7 +2,9 @@ package com.sopt.core.designsystem.component.chip
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
+import com.sopt.core.R
 import com.sopt.core.designsystem.theme.NoostakTheme
 
 @Composable
@@ -18,7 +20,7 @@ fun NoostakUserChip(
         textColor = textColor,
         backgroundColor = backgroundColor,
         borderColor = borderColor,
-        horizontalPaddingValues = 8.dp,
-        verticalPaddingValues = 6.dp
+        horizontalPaddingValues = dimensionResource(id = R.dimen.user_chip_horizontal_padding),
+        verticalPaddingValues = dimensionResource(id = R.dimen.user_chip_vertical_padding)
     )
 }

core/src/main/java/com/sopt/core/designsystem/component/topappbar/NoostakTopAppBar.kt

@@ -6,12 +6,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Color.Companion.White
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -21,7 +19,8 @@ import androidx.compose.ui.unit.dp
 import com.sopt.core.R
 import com.sopt.core.designsystem.theme.NoostakAndroidTheme
 import com.sopt.core.designsystem.theme.NoostakTheme
-import com.sopt.core.util.NoRippleInteractionSource
+import com.sopt.core.extension.noRippleClickable
+import com.sopt.core.extension.showIf
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -42,19 +41,15 @@ fun NoostakTopAppBar(
             )
         },
         navigationIcon = {
-            IconButton(
-                onClick = { onBackButtonClick() },
-                enabled = isIconVisible,
-                interactionSource = NoRippleInteractionSource
-            ) {
-                Icon(
-                    painter = painterResource(id = R.drawable.ic_back),
-                    contentDescription = stringResource(id = R.string.ic_back),
-                    modifier = Modifier
-                        .padding(start = 8.dp),
-                    tint = if (isIconVisible) NoostakTheme.colors.black else Color.Transparent
-                )
-            }
+            Icon(
+                painter = painterResource(id = R.drawable.ic_back),
+                contentDescription = stringResource(id = R.string.ic_back),
+                modifier = Modifier
+                    .padding(start = 8.dp)
+                    .noRippleClickable { onBackButtonClick() }
+                    .showIf(isIconVisible),
+                tint = NoostakTheme.colors.black
+            )
         },
         colors = TopAppBarDefaults.topAppBarColors(White),
         windowInsets = WindowInsets(0)
@@ -67,7 +62,7 @@ fun NoostakTopAppBarPreview() {
     NoostakAndroidTheme {
         NoostakTopAppBar(
             modifier = Modifier.fillMaxWidth(),
-            isIconVisible = false,
+            isIconVisible = true,
             title = "그룹"
         )
     }

core/src/main/java/com/sopt/core/util/BaseViewModel.kt

@@ -0,0 +1,19 @@
+package com.sopt.core.util
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+
+abstract class BaseViewModel<T> : ViewModel() {
+    private val _sideEffects = MutableSharedFlow<T>()
+    val sideEffects: SharedFlow<T> get() = _sideEffects.asSharedFlow()
+
+    protected fun emitSideEffect(sideEffect: T) {
+        viewModelScope.launch {
+            _sideEffects.emit(sideEffect)
+        }
+    }
+}

core/src/main/res/values/dimens.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="chip_radius">16dp</dimen>
+    <dimen name="user_chip_horizontal_padding">8dp</dimen>
+    <dimen name="user_chip_vertical_padding">6dp</dimen>
+    <dimen name="category_chip_horizontal_padding">15dp</dimen>
+    <dimen name="category_chip_vertical_padding">6dp</dimen>
+    <dimen name="fab_radius">30dp</dimen>
+</resources>

presentation/src/main/java/com/sopt/presentation/groupDetail/ConfirmedDetailViewModel.kt

@@ -1,24 +1,14 @@
 package com.sopt.presentation.groupDetail
 
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import com.sopt.core.util.BaseViewModel
 import com.sopt.domain.entity.ConfirmedDetailEntity
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class ConfirmedDetailViewModel @Inject constructor() : ViewModel() {
-    private val _sideEffects: MutableSharedFlow<ConfirmedDetailSideEffect> = MutableSharedFlow()
-    val sideEffects: SharedFlow<ConfirmedDetailSideEffect> get() = _sideEffects.asSharedFlow()
-
+class ConfirmedDetailViewModel @Inject constructor() : BaseViewModel<ConfirmedDetailSideEffect>() {
     fun navigateUp() {
-        viewModelScope.launch {
-            _sideEffects.emit(ConfirmedDetailSideEffect.NavigateUp)
-        }
+        emitSideEffect(ConfirmedDetailSideEffect.NavigateUp)
     }
 
     val mockConfirmedDetail = ConfirmedDetailEntity(
@@ -32,7 +22,7 @@ class ConfirmedDetailViewModel @Inject constructor() : ViewModel() {
         availableMembersCount = 5,
         availableMembers = listOf(
             "나", "선우정아", "대한민국만세", "최영희", "정영수",
-            "이가을", "김언지", "박유진", "임하늘", "변우석", "김혜윤", "카리나", "닝닝",
+            "이가을", "김언지", "박유진", "임하늘", "변우석", "김혜윤", "정해인", "카리나", "닝닝",
             "지젤", "장원영", "이채연", "김민주", "김채원", "김민주", "김채원", "김민주"
         ),
         unavailableMembersCount = 5,

presentation/src/main/java/com/sopt/presentation/groupDetail/GroupDetailViewModel.kt

@@ -1,42 +1,28 @@
 package com.sopt.presentation.groupDetail
 
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import com.sopt.core.util.BaseViewModel
 import com.sopt.domain.entity.ConfirmedEntity
 import com.sopt.domain.entity.GroupDetailEntity
 import com.sopt.domain.entity.ProgressEntity
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
 import okhttp3.internal.immutableListOf
 import javax.inject.Inject
 
 @HiltViewModel
-class GroupDetailViewModel @Inject constructor() : ViewModel() {
-    private val _sideEffects: MutableSharedFlow<GroupDetailSideEffect> = MutableSharedFlow()
-    val sideEffects: SharedFlow<GroupDetailSideEffect> get() = _sideEffects.asSharedFlow()
-
+class GroupDetailViewModel @Inject constructor() : BaseViewModel<GroupDetailSideEffect>() {
     fun navigateUp() {
-        viewModelScope.launch {
-            _sideEffects.emit(GroupDetailSideEffect.NavigateUp)
-        }
+        emitSideEffect(GroupDetailSideEffect.NavigateUp)
     }
 
     fun navigateToConfirmedDetail(groupId: Long, confirmedId: Long) {
-        viewModelScope.launch {
-            _sideEffects.emit(GroupDetailSideEffect.NavigateToConfirmedDetail(groupId, confirmedId))
-        }
+        emitSideEffect(GroupDetailSideEffect.NavigateToConfirmedDetail(groupId, confirmedId))
     }
 
     fun navigateToGroupMember(groupId: Long) {
-        viewModelScope.launch {
-            _sideEffects.emit(GroupDetailSideEffect.NavigateToGroupMember(groupId))
-        }
+        emitSideEffect(GroupDetailSideEffect.NavigateToGroupMember(groupId))
     }
 
-    val tabs = immutableListOf("진행중", "완료")
+    val tabs = immutableListOf("진행중", "확정")
     val mockGroupDetail = GroupDetailEntity(
         groupName = "누스탁",
         groupMembersCount = 10,

presentation/src/main/java/com/sopt/presentation/groupDetail/GroupMemberViewModel.kt

@@ -1,26 +1,16 @@
 package com.sopt.presentation.groupDetail
 
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import com.sopt.core.util.BaseViewModel
 import com.sopt.domain.entity.GroupLeaderEntity
 import com.sopt.domain.entity.GroupMemberEntity
 import com.sopt.domain.entity.GroupMembersEntity
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class GroupMemberViewModel @Inject constructor() : ViewModel() {
-    private val _sideEffects: MutableSharedFlow<GroupMemberSideEffect> = MutableSharedFlow()
-    val sideEffects: SharedFlow<GroupMemberSideEffect> get() = _sideEffects.asSharedFlow()
-
+class GroupMemberViewModel @Inject constructor() : BaseViewModel<GroupMemberSideEffect>() {
     fun navigateUp() {
-        viewModelScope.launch {
-            _sideEffects.emit(GroupMemberSideEffect.NavigateUp)
-        }
+        emitSideEffect(GroupMemberSideEffect.NavigateUp)
     }
 
     val mockGroupMembers = GroupMembersEntity(