🚀 :: (#421) 웹뷰 설정

core/common/src/main/java/team/retum/common/enums/Department.kt

@@ -5,4 +5,5 @@ enum class Department(val value: String) {
     EMBEDDED_SOFTWARE("임베디드소프트웨어과"),
     INFORMATION_SECURITY("정보보안과"),
     AI_SOFTWARE("인공지능소프트웨어과"),
+    COMMON("공통교육과정"),
 }

core/design-system/src/main/java/team/retum/jobisdesignsystemv2/foundation/JobisIcon.kt

@@ -36,4 +36,5 @@ object JobisIcon {
     val SnowMan = R.drawable.ic_snow_man
     val Notification = R.drawable.ic_notification
     val Empty = R.drawable.ic_empty
+    val Person = R.drawable.ic_person
 }

core/domain/src/main/java/team/retum/usecase/usecase/student/PostSignUpUseCase.kt

@@ -17,7 +17,7 @@ class PostSignUpUseCase @Inject constructor(
         gender: Gender,
         classRoom: Long,
         number: Long,
-        profileImageUrl: String,
+        profileImageUrl: String?,
         deviceToken: String,
     ) = runCatching {
         studentRepository.postSignUp(

core/network/src/main/java/team/retum/network/model/request/student/PostSignUpRequest.kt

@@ -14,7 +14,7 @@ data class PostSignUpRequest(
     @Json(name = "gender") val gender: Gender,
     @Json(name = "class_room") val classRoom: Long,
     @Json(name = "number") val number: Long,
-    @Json(name = "profile_image_url") val profileImageUrl: String,
+    @Json(name = "profile_image_url") val profileImageUrl: String?,
     @Json(name = "platform_type") val platformType: PlatformType,
     @Json(name = "device_token") val deviceToken: String,
 )

feature/mypage/src/main/java/team/retum/jobis/ui/MyPageScreen.kt

@@ -186,7 +186,7 @@ private fun MyPageScreen(
             with(state.studentInformation) {
                 StudentInfo(
                     modifier = Modifier.padding(vertical = 12.dp),
-                    profileImageUrl = state.studentInformation.profileImageUrl,
+                    profileImageUrl = profileImageUrl,
                     number = studentGcn,
                     name = studentName,
                     department = department.value,

feature/mypage/src/main/java/team/retum/jobis/viewmodel/MyPageViewModel.kt

@@ -87,10 +87,11 @@ internal class MyPageViewModel @Inject constructor(
 
     private fun fetchStudentInformation() {
         viewModelScope.launch(Dispatchers.IO) {
-            fetchStudentInformationUseCase().onSuccess {
-                val profileImageUrl = ResourceKeys.IMAGE_URL + it.profileImageUrl
-                setState { state.value.copy(studentInformation = it.copy(profileImageUrl = profileImageUrl)) }
-            }
+            fetchStudentInformationUseCase()
+                .onSuccess {
+                    val profileImageUrl = ResourceKeys.IMAGE_URL + it.profileImageUrl
+                    setState { state.value.copy(studentInformation = it.copy(profileImageUrl = profileImageUrl)) }
+                }
         }
     }
 

feature/signup/src/main/java/team/retum/signup/model/SignUpData.kt

@@ -14,7 +14,7 @@ data class SignUpData(
     val gender: Gender? = null,
     val classRoom: String = "",
     val number: String = "",
-    val profileImageUrl: String = "",
+    val profileImageUrl: String? = null,
 )
 
 internal fun SignUpData.toJsonString() = Json.encodeToString(this)

feature/signup/src/main/java/team/retum/signup/ui/SetProfileScreen.kt

@@ -41,6 +41,7 @@ import coil.compose.AsyncImage
 import team.retum.jobisdesignsystemv2.appbar.JobisLargeTopAppBar
 import team.retum.jobisdesignsystemv2.button.ButtonColor
 import team.retum.jobisdesignsystemv2.button.JobisButton
+import team.retum.jobisdesignsystemv2.foundation.JobisIcon
 import team.retum.jobisdesignsystemv2.foundation.JobisTheme
 import team.retum.jobisdesignsystemv2.foundation.JobisTypography
 import team.retum.jobisdesignsystemv2.text.JobisText
@@ -82,6 +83,7 @@ internal fun SetProfile(
     SetProfileScreen(
         onBackPressed = onBackPressed,
         onNextClick = setProfileViewModel::onNextClick,
+        onImgChangeClick = setProfileViewModel::onImgChangeClick,
         activityResultLauncher = activityResultLauncher,
         state = state,
     )
@@ -91,6 +93,7 @@ internal fun SetProfile(
 private fun SetProfileScreen(
     onBackPressed: () -> Unit,
     onNextClick: () -> Unit,
+    onImgChangeClick: () -> Unit,
     activityResultLauncher: ManagedActivityResultLauncher<PickVisualMediaRequest, Uri?>,
     state: SetProfileState,
 ) {
@@ -104,26 +107,26 @@ private fun SetProfileScreen(
             onBackPressed = onBackPressed,
         )
         SetImage(
-            uri = state.uri.toString(),
+            uri = state.uri,
             onClick = {
                 val mediaType = ActivityResultContracts.PickVisualMedia.ImageOnly
                 val request = PickVisualMediaRequest(mediaType)
                 activityResultLauncher.launch(request)
+                onImgChangeClick()
             },
         )
         Spacer(modifier = Modifier.weight(1f))
         JobisButton(
-            text = stringResource(id = R.string.next),
+            text = stringResource(id = if (state.uri == null) R.string.skip else R.string.next),
             onClick = onNextClick,
             color = ButtonColor.Primary,
-            enabled = state.buttonEnabled,
         )
     }
 }
 
 @Composable
 private fun SetImage(
-    uri: String?,
+    uri: Uri?,
     onClick: () -> Unit,
 ) {
     Column(
@@ -137,7 +140,7 @@ private fun SetImage(
             modifier = Modifier
                 .size(80.dp)
                 .clip(CircleShape),
-            model = uri ?: team.retum.common.R.drawable.ic_person,
+            model = uri ?: JobisIcon.Person,
             contentDescription = "user profile",
             contentScale = ContentScale.Crop,
         )

feature/signup/src/main/java/team/retum/signup/viewmodel/SetProfileViewModel.kt

@@ -40,6 +40,11 @@ internal class SetProfileViewModel @Inject constructor(
     }
 
     internal fun onNextClick() {
+        val profileImageUrl = state.value.profileImageUrl
+        postSideEffect(SetProfileSideEffect.MoveToNext(profileImageUrl = profileImageUrl))
+    }
+
+    internal fun onImgChangeClick() {
         viewModelScope.launch(Dispatchers.IO) {
             createPresignedUrlUseCase(files = listOf(state.value.image?.name ?: "")).onSuccess {
                 val response = it.urls.first()
@@ -60,7 +65,7 @@ internal class SetProfileViewModel @Inject constructor(
             file = state.value.image!!,
         ).onSuccess {
             val encodedImageUrl = URLEncoder.encode(fileUrl, "UTF8")
-            postSideEffect(SetProfileSideEffect.MoveToNext(profileImageUrl = encodedImageUrl))
+            setState { state.value.copy(profileImageUrl = encodedImageUrl) }
         }
     }
 }
@@ -70,18 +75,20 @@ internal data class SetProfileState(
     val image: File?,
     val imageUrl: String,
     val uri: Uri?,
+    val profileImageUrl: String?,
     val buttonEnabled: Boolean,
 ) {
     companion object {
         fun getInitialState() = SetProfileState(
             image = null,
             imageUrl = "",
             uri = null,
+            profileImageUrl = null,
             buttonEnabled = false,
         )
     }
 }
 
 internal sealed interface SetProfileSideEffect {
-    data class MoveToNext(val profileImageUrl: String) : SetProfileSideEffect
+    data class MoveToNext(val profileImageUrl: String?) : SetProfileSideEffect
 }

feature/signup/src/main/java/team/retum/signup/viewmodel/TermsViewModel.kt

@@ -40,7 +40,14 @@ internal class TermsViewModel @Inject constructor(
     internal fun onCompleteClick(signUpData: SignUpData) {
         with(signUpData) {
             val decodedPassword = URLDecoder.decode(password, "UTF8")
-            val decodedImageUrl = URLDecoder.decode(profileImageUrl, "UTF8")
+            val decodedImageUrl = if (profileImageUrl.isNullOrEmpty()) {
+                null
+            } else {
+                URLDecoder.decode(
+                    profileImageUrl,
+                    "UTF8",
+                )
+            }
             viewModelScope.launch(Dispatchers.IO) {
                 postSignUpUseCase(
                     email = email,

feature/signup/src/main/res/values/strings.xml

@@ -48,6 +48,7 @@
     <string name="name">이름</string>
     <string name="student_number">학번</string>
     <string name="next">다음</string>
+    <string name="skip">건너뛰기</string>
 
 
     <string name="select_gender">성별을 선택해주세요</string>