Merge pull request #113 from Stack-Knowledge/feature/111_empty_selete_goods_exception_handling

🔀 :: (#111) Empty Goods Select Disabled

Author: yeongun130

core/design-system/src/main/java/com/stackknowledge/design_system/component/bottomsheet/StackKnowledgeBottomSheet.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.stackknowledge.design_system.R
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -85,10 +86,10 @@ fun StackKnowledgeBottomSheet(
                 Spacer(modifier = modifier.height(8.dp))
                 StackKnowledgeButton(
                     text = stringResource(id = R.string.purchase),
+                    enable = ButtonState.ACTIVATE,
                     modifier = modifier
                         .height(60.dp),
-                    onClick = {},
-                )
+                ) {}
 
                 Spacer(modifier = modifier.height(24.dp))
             }

core/design-system/src/main/java/com/stackknowledge/design_system/component/button/StackKnowledgeButton.kt

@@ -11,23 +11,36 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 
 @Composable
 fun StackKnowledgeButton(
     modifier: Modifier = Modifier,
     text: String,
+    enable: ButtonState,
     onClick: () -> Unit,
 ) {
     StackKnowledgeAndroidTheme { colors, typography ->
+        val color = when (enable) {
+            ButtonState.ACTIVATE -> {
+                colors.P1
+            }
+
+            ButtonState.DISABLED -> {
+                colors.G1
+            }
+        }
         Button(
-            onClick = { onClick() },
+            onClick = {
+                if (enable.buttonState) onClick()
+            },
             modifier = modifier
                 .fillMaxWidth()
                 .clip(shape = RoundedCornerShape(10.dp))
-                .background(color = colors.P1),
+                .background(color = color),
             colors = ButtonDefaults.buttonColors(
-                containerColor = colors.P1
+                containerColor = color
             )
         ) {
             Text(
@@ -44,6 +57,6 @@ fun StackKnowledgeButton(
 fun StackKnowledgeButtonPre() {
     StackKnowledgeButton(
         text = "제출하기",
-        onClick = {}
-    )
+        enable = ButtonState.ACTIVATE
+    ) {}
 }

core/design-system/src/main/java/com/stackknowledge/design_system/component/button/enumclass/ButtonState.kt

@@ -0,0 +1,6 @@
+package com.stackknowledge.design_system.component.button.enumclass
+
+enum class ButtonState(val buttonState: Boolean) {
+    ACTIVATE(true),
+    DISABLED(false)
+}

feature/login/src/main/java/com/stackknowledge/login/RoleCheckScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackknowledge.login.background.LoginBackground
 
@@ -64,6 +65,7 @@ private fun RoleCheckScreen(
                 ) {
                     StackKnowledgeButton(
                         text = stringResource(id = R.string.student),
+                        enable = ButtonState.ACTIVATE,
                         modifier = modifier
                             .height(60.dp)
                             .weight(1f),
@@ -74,6 +76,7 @@ private fun RoleCheckScreen(
 
                     StackKnowledgeButton(
                         text = stringResource(id = R.string.teacher),
+                        enable = ButtonState.ACTIVATE,
                         modifier = modifier
                             .height(60.dp)
                             .weight(1f),

feature/mission/src/main/java/com/stackkowledge/mission/component/InputAnswer.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.unit.dp
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackknowledge.design_system.R
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.component.textfield.StackKnowledgeTextField
 
 @Composable
@@ -52,6 +53,7 @@ fun InputAnswer(
 
                 StackKnowledgeButton(
                     text = stringResource(id = R.string.submit),
+                    enable = ButtonState.ACTIVATE,
                     modifier = modifier
                         .height(60.dp),
                     onClick = openDialog

feature/mission/src/main/java/com/stackkowledge/mission/component/InputMission.kt

@@ -8,21 +8,14 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackknowledge.design_system.R
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.component.textfield.StackKnowledgeTextField
-import com.stackkowledge.mission.viewmodel.MissionViewModel
-import remote.request.mission.CreateMissionRequestModel
 
 @Composable
 fun InputMission(
@@ -57,10 +50,10 @@ fun InputMission(
 
                 StackKnowledgeButton(
                     text = stringResource(id = R.string.submit),
+                    enable = ButtonState.ACTIVATE,
                     modifier = modifier
-                        .height(60.dp),
-                    onClick = { onClick() }
-                )
+                        .height(60.dp)
+                ) { onClick() }
 
                 Spacer(modifier.height(28.dp))
             }

feature/score-mission/src/main/java/com/stackknowledge/score_mission/component/GradingRadioButton.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -20,14 +19,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackknowledge.design_system.R
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 
 @Composable
 fun GradingRadioButton(
@@ -113,6 +111,7 @@ fun GradingRadioButton(
 
             StackKnowledgeButton(
                 text = stringResource(id = R.string.submit),
+                enable = ButtonState.ACTIVATE,
                 modifier = modifier
                     .height(60.dp),
                 onClick = openDialog

feature/shop/src/main/java/com/stackknowledge/shop/component/GoodsList.kt

@@ -1,5 +1,6 @@
 package com.stackknowledge.shop.component
 
+import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -13,15 +14,18 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.stackknowledge.design_system.R
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackknowledge.shop.data.SelectedItemData
 import com.stackknowledge.shop.viewmodel.uistate.GetItemUiState
@@ -37,6 +41,7 @@ fun GoodsList(
 ) {
     val selectedDisplayItemList = remember { mutableListOf<GetItemResponseModel>() }
     val isBottomSheetVisible = remember { mutableStateOf(false) }
+    val isButtonState = remember { mutableStateOf(ButtonState.DISABLED) }
 
     StackKnowledgeAndroidTheme { colors, typography ->
         Column(
@@ -71,11 +76,21 @@ fun GoodsList(
                                     itemData = item,
                                     onItemCheckButtonClick = { selectedItem ->
                                         selectedDisplayItemList.add(selectedItem)
+                                        isButtonState.value = if (selectedDisplayItemList.isEmpty()) {
+                                            ButtonState.DISABLED
+                                        } else {
+                                            ButtonState.ACTIVATE
+                                        }
                                     },
                                     onItemUnCheckButtonClick = { unselectedItem ->
                                         selectedDisplayItemList.removeIf { selectedItemListElement ->
                                             selectedItemListElement.id == unselectedItem.id
                                         }
+                                        isButtonState.value = if (selectedDisplayItemList.isEmpty()) {
+                                            ButtonState.DISABLED
+                                        } else {
+                                            ButtonState.ACTIVATE
+                                        }
                                     }
                                 )
                             }
@@ -106,24 +121,24 @@ fun GoodsList(
                 }
             }
 
-            Spacer(modifier = modifier.height(32.dp))
+            Spacer(modifier = modifier.height(80.dp))
 
             Box(
                 modifier = modifier
                     .padding(horizontal = 16.dp),
             ) {
                 StackKnowledgeButton(
-                    text = stringResource(id = R.string.select),
+                    text = stringResource(id = R.string.purchase),
                     modifier = modifier
                         .height(60.dp),
-                    onClick = {
-                        onSelectButtonClick(selectedDisplayItemList)
-                        isBottomSheetVisible.value = true
-                    }
-                )
+                    enable = isButtonState.value
+                ) {
+                    onSelectButtonClick(selectedDisplayItemList)
+                    isBottomSheetVisible.value = true
+                }
             }
 
-            Spacer(modifier = modifier.height(100.dp))
+            Spacer(modifier = modifier.height(28.dp))
         }
 
         if (isBottomSheetVisible.value) {

feature/shop/src/main/java/com/stackknowledge/shop/component/OrderBottomSheet.kt

@@ -25,6 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.stackknowledge.design_system.R
 import com.stackknowledge.design_system.component.button.StackKnowledgeButton
+import com.stackknowledge.design_system.component.button.enumclass.ButtonState
 import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 import com.stackknowledge.shop.data.SelectedItemData
 
@@ -109,12 +110,12 @@ fun OrderBottomSheet(
 
                 StackKnowledgeButton(
                     text = stringResource(id = R.string.purchase),
+                    enable = ButtonState.ACTIVATE,
                     modifier = modifier
-                        .height(60.dp),
-                    onClick = {
-                        onOrderButtonClick()
-                    }
-                )
+                        .height(60.dp)
+                ) {
+                    onOrderButtonClick()
+                }
 
                 Spacer(modifier = modifier.height(24.dp))
             }