🔀 :: (#294) - Use UiState To Certification Module

.github/workflows/android.yml

@@ -49,12 +49,12 @@ jobs:
       with:
         title: ✅ Bitgouel-Android-CI 성공! ✅
         webhook: ${{ secrets.BITGOUEL_DISCORD_WEBHOOK }}
-        color: 00FF00
+        color: 65280
 
     - name: Bitgouel Android CI Discord Notification
       uses: sarisia/actions-status-discord@v1
       if: ${{ failure() }}
       with:
         title: ❗️ Bitgouel-Android-CI 실패! ❗️
         webhook: ${{ secrets.BITGOUEL_DISCORD_WEBHOOK }}
-        color: FF0000
+        color: 16711680

app/build.gradle.kts

@@ -15,7 +15,9 @@ android {
 }
 
 dependencies {
+    implementation(project(":core:common"))
     implementation(project(":core:design-system"))
+    implementation(project(":core:ui"))
     implementation(project(":feature:login"))
     implementation(project(":feature:sign-up"))
     implementation(project(":feature:student-activity"))

app/src/main/java/com/msg/bitgoeul_android/navigation/BitgoeulNavHost.kt

@@ -2,6 +2,7 @@ package com.msg.bitgoeul_android.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.compose.NavHost
 import com.bitgoeul.email.navigation.emailSendInformScreen
 import com.bitgoeul.email.navigation.inputEmailScreen
@@ -18,6 +19,7 @@ import com.example.my_page.navigation.changePasswordScreen
 import com.example.my_page.navigation.myPageScreen
 import com.example.my_page.navigation.navigateToMyPage
 import com.example.my_page.navigation.navigateToPasswordChange
+import com.msg.design_system.R
 import com.msg.bitgoeul_android.ui.BitgoeulAppState
 import com.msg.bitgoeul_android.ui.navigateWithPopUpToLogin
 import com.msg.certification.navigation.addCertificationScreen
@@ -26,6 +28,12 @@ import com.msg.certification.navigation.navigateToAddCertificationPage
 import com.msg.club.navigation.clubDetailScreen
 import com.msg.club.navigation.clubScreen
 import com.msg.club.navigation.navigateToClubDetailPage
+import com.msg.common.exception.ForBiddenException
+import com.msg.common.exception.NetworkException
+import com.msg.common.exception.OtherException
+import com.msg.common.exception.ServerException
+import com.msg.common.exception.TimeOutException
+import com.msg.common.exception.UnknownException
 import com.msg.lecture.navigation.lectureDetailScreen
 import com.msg.lecture.navigation.lectureListScreen
 import com.msg.lecture.navigation.lectureTakingStudentListScreen
@@ -46,14 +54,32 @@ import com.msg.student_activity.navigation.studentActivityScreen
 import com.msg.student_activity.navigation.studentAddActivityScreen
 import com.msg.student_activity.navigation.studentDetailActivityScreen
 import com.msg.student_activity.navigation.studentDetailSettingActivityScreen
+import com.msg.ui.makeToast
 
 @Composable
 fun BitgoeulNavHost(
     appState: BitgoeulAppState,
     modifier: Modifier = Modifier,
     startDestination: String = loginRoute,
 ) {
+    val context = LocalContext.current
     val navController = appState.navController
+
+    val createErrorToast: (throwable: Throwable?, message: Int?) -> Unit = { throwable, message ->
+        val errorMessage = throwable?.let {
+            when(it) {
+                is ForBiddenException -> R.string.error_for_bidden
+                is TimeOutException -> R.string.error_time_out
+                is ServerException -> R.string.error_server
+                is NetworkException -> R.string.error_no_internet
+                is OtherException -> R.string.error_other_http
+                is UnknownException -> R.string.error_un_known
+                else -> message
+            }
+        } ?: message ?: R.string.error_default
+        makeToast(context, context.getString(errorMessage))
+    }
+
     NavHost(
         navController = navController,
         startDestination = startDestination,
@@ -139,10 +165,12 @@ fun BitgoeulNavHost(
         )
         certificationScreen(
             onHumanClicked = navController::navigateToMyPage,
-            onEditClicked = navController::navigateToAddCertificationPage
+            onEditClicked = navController::navigateToAddCertificationPage,
+            createErrorToast = createErrorToast
         )
         addCertificationScreen(
-            onBackClicked = navController::navigateUp
+            onBackClicked = navController::navigateUp,
+            createErrorToast = createErrorToast
         )
     }
 }

core/common/src/main/java/com/msg/common/result/Result.kt

@@ -0,0 +1,13 @@
+package com.msg.common.result
+
+import kotlinx.coroutines.flow.*
+
+sealed interface Result<out T> {
+    data class Success<T>(val data: T): Result<T>
+    data class Error(val exception: Throwable): Result<Nothing>
+    data object Loading: Result<Nothing>
+}
+
+fun <T> Flow<T>.asResult(): Flow<Result<T>> = map<T, Result<T>> { Result.Success(it) }
+    .onStart { emit(Result.Loading) }
+    .catch { emit(Result.Error(it)) }

core/design-system/src/main/java/com/msg/design_system/component/bottomsheet/BitgoeulBottomSheet.kt

@@ -84,126 +84,6 @@ fun SelectorBottomSheet(
     }
 }
 
-@Composable
-@OptIn(ExperimentalMaterial3Api::class)
-fun LectureFilterBottomSheet(
-    onQuit: () -> Unit,
-    isVisible: Boolean,
-) {
-    val isChecked = remember { mutableStateListOf(false, false) }
-
-    val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
-
-    if (isVisible) {
-        BitgoeulAndroidTheme { colors, type ->
-            ModalBottomSheet(
-                onDismissRequest = {
-                    onQuit()
-                },
-                sheetState = bottomSheetState
-            ) {
-                Column(
-                    modifier = Modifier
-                        .padding(horizontal = 28.dp)
-                ) {
-                    Text(
-                        text = stringResource(id = R.string.filter),
-                        modifier = Modifier
-                            .width(35.dp)
-                            .height(26.dp),
-                        color = colors.BLACK,
-                        style = type.bodySmall,
-                        fontSize = 20.sp
-                    )
-
-                    Spacer(modifier = Modifier.height(18.dp))
-
-                    Text(
-                        text = stringResource(id = R.string.lecture_category),
-                        modifier = Modifier
-                            .width(67.dp)
-                            .height(26.dp),
-                        color = colors.BLACK,
-                        style = type.bodyLarge,
-                        fontSize = 18.sp
-                    )
-
-                    Spacer(modifier = Modifier.height(8.dp))
-
-                    Row(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(vertical = 8.dp, horizontal = 13.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        BitGoeulCheckBox(
-                            isChecked = isChecked[0],
-                            onCheckedChange = { isChecked[0] = it },
-                            modifier = Modifier
-                                .width(24.dp)
-                                .height(24.dp),
-                        )
-
-                        Spacer(modifier = Modifier.width(8.dp))
-
-                        Text(
-                            text = stringResource(id = R.string.mutual_credit_recognition_curriculum),
-                            modifier = Modifier
-                                .width(139.dp),
-                            color = colors.BLACK,
-                            style = type.bodySmall,
-                            fontSize = 16.sp
-                        )
-                    }
-                    Row(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .padding(vertical = 8.dp, horizontal = 13.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        BitGoeulCheckBox(
-                            isChecked = isChecked[1],
-                            onCheckedChange = { isChecked[1] = it },
-                            modifier = Modifier
-                                .width(24.dp)
-                                .height(24.dp),
-                        )
-
-                        Spacer(modifier = Modifier.width(8.dp))
-
-                        Text(
-                            text = stringResource(id = R.string.university_visit_program),
-                            modifier = Modifier
-                                .width(111.dp),
-                            color = colors.BLACK,
-                            style = type.bodySmall,
-                            fontSize = 16.sp
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(16.dp))
-
-                    BitgoeulButton(
-                        text = stringResource(id = R.string.apply),
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(52.dp),
-                        state = ButtonState.Enable
-                    ) {
-                        // 클릭시 필터 적용 시키기
-                    }
-
-                    Box(
-                        modifier = Modifier
-                            .height(38.dp)
-                            .fillMaxWidth()
-                    )
-                }
-            }
-        }
-    }
-}
-
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
 fun TimePickerBottomSheet(

core/design-system/src/main/java/com/msg/design_system/component/button/BitgoeulButton.kt

@@ -18,6 +18,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.msg.design_system.component.icon.G2ColorFilterIcon
 import com.msg.design_system.component.icon.MainColorSettingIcon
 import com.msg.design_system.theme.BitgoeulAndroidTheme
 
@@ -98,7 +99,7 @@ fun BitgoeulButton(
 fun DetailSettingButton(
     modifier: Modifier = Modifier,
     type: String,
-    onClicked: () -> Unit
+    onClicked: () -> Unit,
 ) {
     BitgoeulAndroidTheme { colors, typography ->
         OutlinedButton(
@@ -130,7 +131,7 @@ fun NegativeBitgoeulButton(
     modifier: Modifier = Modifier,
     text: String,
     state: ButtonState = ButtonState.Enable,
-    onClicked: () -> Unit
+    onClicked: () -> Unit,
 ) {
     BitgoeulAndroidTheme { colors, typography ->
 
@@ -182,7 +183,6 @@ fun ApplicationDoneButton(
             ),
             shape = RoundedCornerShape(8.dp),
         ) {
-
             Text(
                 text = text,
                 color = colors.E5,
@@ -192,6 +192,27 @@ fun ApplicationDoneButton(
     }
 }
 
+@Composable
+fun G2FilterIconButton(
+    modifier: Modifier = Modifier,
+    onClicked: () -> Unit,
+) {
+    BitgoeulAndroidTheme { colors, _ ->
+        OutlinedButton(
+            modifier = modifier,
+            onClick = onClicked,
+            border = BorderStroke(1.dp, color = colors.G2),
+            colors = ButtonDefaults.outlinedButtonColors(
+                containerColor = colors.WHITE,
+                contentColor = colors.G2,
+            ),
+            shape = RoundedCornerShape(8.dp),
+        ) {
+            G2ColorFilterIcon()
+        }
+    }
+}
+
 @Preview
 @Composable
 fun BitgoeulButtonPre() {
@@ -233,5 +254,12 @@ fun BitgoeulButtonPre() {
             onClicked = {},
             text = "수강 신청 취소"
         )
+
+        G2FilterIconButton(
+            modifier = Modifier
+                .width(319.dp)
+                .height(52.dp),
+            onClicked = {},
+        )
     }
 }

core/design-system/src/main/java/com/msg/design_system/component/checkbox/BitgoeulCheckBox.kt

@@ -6,6 +6,8 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -15,8 +17,8 @@ import com.msg.design_system.R
 @Composable
 fun BitGoeulCheckBox(
     modifier: Modifier,
-    isChecked: Boolean,
     onCheckedChange: (Boolean) -> Unit,
+    isChecked: Boolean,
 ) {
     Box(
         modifier = modifier.background(color = Color.White, shape = RoundedCornerShape(8.dp))
@@ -28,7 +30,9 @@ fun BitGoeulCheckBox(
                 painterResource(id = R.drawable.ic_unchecked_box)
             },
             contentDescription = null,
-            modifier = modifier.clickable { onCheckedChange(!isChecked) }
+            modifier = modifier.clickable {
+                onCheckedChange(!isChecked)
+            }
         )
     }
 }