Merge pull request #127 from pknu-wap/refactor/tgyuu/#125

Refactor/tgyuu/#125
pknu-wap · Feb 18, 2024 · a1bf5fe · a1bf5fe
2 parents 28a2281 + 50f9aed
commit a1bf5fe
Show file tree

Hide file tree

Showing 61 changed files with 975 additions and 766 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/dictionaries/jaino.xml b/.idea/dictionaries/jaino.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/wap/wapp/MainActivity.kt b/app/src/main/java/com/wap/wapp/MainActivity.kt
@@ -28,6 +28,7 @@ import com.wap.wapp.core.domain.usecase.auth.SignInUseCase
 import com.wap.wapp.feature.attendance.management.navigation.attendanceManagementNavigationRoute
 import com.wap.wapp.feature.auth.signin.navigation.signInNavigationRoute
 import com.wap.wapp.feature.auth.signup.navigation.signUpNavigationRoute
+import com.wap.wapp.feature.management.event.navigation.eventEditNavigationRoute
 import com.wap.wapp.feature.management.event.navigation.eventRegistrationNavigationRoute
 import com.wap.wapp.feature.management.survey.navigation.ManagementSurveyRoute
 import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavigationRoute
@@ -114,6 +115,7 @@ private fun handleBottomBarState(
     ManagementSurveyRoute.surveyFormRegistrationRoute -> setBottomBarState(false)
     ManagementSurveyRoute.surveyFormEditRoute("{id}") -> setBottomBarState(false)
     eventRegistrationNavigationRoute -> setBottomBarState(false)
+    eventEditNavigationRoute -> setBottomBarState(false)
     SurveyRoute.answerRoute("{id}") -> setBottomBarState(false)
     surveyCheckRoute -> setBottomBarState(false)
     SurveyCheckRoute.surveyDetailRoute("{id}") -> setBottomBarState(false)

diff --git a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt
@@ -93,6 +93,11 @@ fun WappNavHost(
                 )
             },
             navigateToSurveyDetail = navController::navigateToSurveyDetail,
+            navigateToSurvey = {
+                navController.navigateToSurvey(
+                    navOptions { popUpTo(surveyCheckRoute) { inclusive = true } },
+                )
+            },
         )
         managementSurveyNavGraph(
             navigateToManagement = navController::navigateToManagement,
@@ -109,7 +114,13 @@ fun WappNavHost(
         )
         attendanceScreen(
             navigateToSignIn = {
-                navController.navigateToSignIn(navOptions { popUpTo(attendanceNavigationRoute) })
+                navController.navigateToSignIn(
+                    navOptions {
+                        popUpTo(
+                            attendanceNavigationRoute,
+                        )
+                    },
+                )
             },
             navigateToAttendanceManagement = navController::navigateToAttendanceManagement,
         )

diff --git a/core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ThrowableExtensions.kt b/core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ThrowableExtensions.kt
@@ -6,42 +6,32 @@ import java.net.UnknownHostException
 
 fun Throwable.toSupportingText(): String {
     return when (this) {
-        is UnknownHostException -> {
-            "네트워크 연결이 원활하지 않습니다."
-        }
-        is FirebaseAuthException -> {
-            this.toSupportingText()
-        }
-        is FirebaseFirestoreException -> {
-            this.toSupportingText()
-        }
-        else -> {
-            "알 수 없는 오류가 발생하였습니다."
-        }
+        is UnknownHostException -> "네트워크 연결이 원활하지 않습니다."
+
+        is FirebaseAuthException -> this.toSupportingText()
+
+        is FirebaseFirestoreException -> this.toSupportingText()
+
+        is IllegalStateException -> this.message.toString()
+
+        else -> "알 수 없는 오류가 발생하였습니다."
     }
 }
 
 fun FirebaseAuthException.toSupportingText(): String {
     return when (this.errorCode) {
-        "ERROR_WEB_CONTEXT_CANCELED", "ERROR_USER_CANCELLED" -> {
-            "다시 시도해 주세요."
-        }
-        else -> {
-            "알 수 없는 오류가 발생하였습니다."
-        }
+        "ERROR_WEB_CONTEXT_CANCELED", "ERROR_USER_CANCELLED" -> "다시 시도해 주세요."
+
+        else -> "알 수 없는 오류가 발생하였습니다."
     }
 }
 
 fun FirebaseFirestoreException.toSupportingText(): String {
     return when (this.code.value()) {
-        7 -> {
-            "접근 권한이 없습니다."
-        }
-        16 -> {
-            "회원이 만료되었습니다. 다시 로그인 해주세요."
-        }
-        else -> {
-            "알 수 없는 오류가 발생하였습니다."
-        }
+        7 -> "접근 권한이 없습니다."
+
+        16 -> "회원이 만료되었습니다. 다시 로그인 해주세요."
+
+        else -> "알 수 없는 오류가 발생하였습니다."
     }
 }
diff --git a/core/designsystem/src/main/java/com/wap/designsystem/component/MainTopBar.kt b/core/designsystem/src/main/java/com/wap/designsystem/component/MainTopBar.kt
@@ -35,7 +35,7 @@ fun WappLeftMainTopBar(
         verticalArrangement = Arrangement.spacedBy(16.dp),
         horizontalAlignment = Alignment.Start,
         modifier = modifier
-            .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 20.dp)
+            .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 40.dp)
             .fillMaxWidth()
             .wrapContentHeight(),
     ) {
@@ -79,7 +79,7 @@ fun WappRightMainTopBar(
         verticalArrangement = Arrangement.spacedBy(16.dp),
         horizontalAlignment = Alignment.End,
         modifier = modifier
-            .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 20.dp)
+            .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 40.dp)
             .fillMaxWidth()
             .wrapContentHeight(),
     ) {