더보기 탭 닉네임 기능

app/src/main/java/com/wafflestudio/snutt2/components/compose/Icon.kt

@@ -747,3 +747,16 @@ fun QuestionCircleIcon(
         colorFilter = colorFilter,
     )
 }
+
+@Composable
+fun CloseCircleIcon(
+    modifier: Modifier = Modifier,
+    colorFilter: ColorFilter? = null,
+) {
+    Image(
+        modifier = modifier,
+        painter = painterResource(id = R.drawable.ic_close_circle),
+        contentDescription = "",
+        colorFilter = colorFilter,
+    )
+}

app/src/main/java/com/wafflestudio/snutt2/data/user/UserRepository.kt

@@ -29,7 +29,7 @@ interface UserRepository {
 
     suspend fun fetchUserInfo()
 
-    suspend fun putUserInfo(email: String)
+    suspend fun patchUserInfo(nickname: String)
 
     suspend fun deleteUserAccount()
 

app/src/main/java/com/wafflestudio/snutt2/data/user/UserRepositoryImpl.kt

@@ -63,13 +63,9 @@ class UserRepositoryImpl @Inject constructor(
         storage.user.update(response.toOptional())
     }
 
-    override suspend fun putUserInfo(email: String) {
-        api._putUserInfo(PutUserInfoParams(email))
-        storage.user.update(
-            storage.user.get().value?.copy(
-                email = email,
-            ).toOptional(),
-        )
+    override suspend fun patchUserInfo(nickname: String) {
+        val response = api._patchUserInfo(PatchUserInfoParams(nickname))
+        storage.user.update(response.toOptional())
     }
 
     override suspend fun deleteUserAccount() {

app/src/main/java/com/wafflestudio/snutt2/lib/DimensionUtil.kt

@@ -0,0 +1,10 @@
+package com.wafflestudio.snutt2.lib
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.TextUnit
+
+@Composable
+fun TextUnit.toDp() = with(LocalDensity.current) {
+    this@toDp.toDp()
+}

app/src/main/java/com/wafflestudio/snutt2/lib/network/ApiOnError.kt

@@ -299,6 +299,11 @@ class ApiOnError @Inject constructor(
                             context.getString(R.string.error_vacancy_duplicate),
                             Toast.LENGTH_SHORT,
                         ).show()
+                        ErrorCode.INVALID_NICKNAME -> Toast.makeText(
+                            context,
+                            context.getString(R.string.error_invalid_nickname),
+                            Toast.LENGTH_SHORT,
+                        ).show()
                         else -> Toast.makeText(
                             context,
                             error.errorDTO?.message ?: context.getString(R.string.error_unknown),
@@ -326,6 +331,7 @@ object ErrorCode {
     const val INVALID_EMAIL = 0x300F
     const val VACANCY_PREV_SEMESTER = 0x9C45
     const val VACANCY_DUPLICATE = 0x9FC4
+    const val INVALID_NICKNAME = 0x9C48
 
     /* 401 - Request was invalid */
     const val NO_FB_ID_OR_TOKEN = 0x1001

app/src/main/java/com/wafflestudio/snutt2/lib/network/SNUTTRestApi.kt

@@ -166,13 +166,13 @@ interface SNUTTRestApi {
         @Body body: PostVerifyEmailCodeParams,
     )
 
-    @GET("/v1/user/info")
+    @GET("/v1/users/me")
     suspend fun _getUserInfo(): GetUserInfoResults
 
-    @PUT("/v1/user/info")
-    suspend fun _putUserInfo(
-        @Body body: PutUserInfoParams,
-    ): PutUserInfoResults
+    @PATCH("/v1/users/me")
+    suspend fun _patchUserInfo(
+        @Body body: PatchUserInfoParams,
+    ): PatchUserInfoResults
 
     @PUT("/v1/user/password")
     suspend fun _putUserPassword(

app/src/main/java/com/wafflestudio/snutt2/lib/network/dto/PutUserInfoParams.kt → app/src/main/java/com/wafflestudio/snutt2/lib/network/dto/PatchUserInfoParams.kt

@@ -4,6 +4,6 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class PutUserInfoParams(
-    @Json(name = "email") val email: String,
+data class PatchUserInfoParams(
+    @Json(name = "nickname") val nickname: String,
 )

app/src/main/java/com/wafflestudio/snutt2/lib/network/dto/PatchUserInfoResults.kt

@@ -0,0 +1,5 @@
+package com.wafflestudio.snutt2.lib.network.dto
+
+import com.wafflestudio.snutt2.lib.network.dto.core.UserDto
+
+typealias PatchUserInfoResults = UserDto

app/src/main/java/com/wafflestudio/snutt2/lib/network/dto/core/NicknameDto.kt

@@ -0,0 +1,14 @@
+package com.wafflestudio.snutt2.lib.network.dto.core
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class NicknameDto(
+    @Json(name = "nickname") val nickname: String = "",
+    @Json(name = "tag") val tag: String = "",
+) {
+    override fun toString(): String {
+        return "$nickname#$tag"
+    }
+}

app/src/main/java/com/wafflestudio/snutt2/lib/network/dto/core/UserDto.kt

@@ -9,6 +9,7 @@ data class UserDto(
     @Json(name = "regDate") val regDate: String? = null,
     @Json(name = "notificationCheckedAt") val notificationCheckedAt: String? = null,
     @Json(name = "email") val email: String? = null,
-    @Json(name = "local_id") val localId: String? = null,
-    @Json(name = "fb_name") val fbName: String? = null,
+    @Json(name = "localId") val localId: String? = null,
+    @Json(name = "fbName") val fbName: String? = null,
+    @Json(name = "nickname") val nickname: NicknameDto? = null,
 )

app/src/main/java/com/wafflestudio/snutt2/views/NavigationDestination.kt

@@ -18,6 +18,7 @@ object NavigationDestination {
     const val TeamInfo = "team_info"
     const val TimeTableConfig = "timetable_config"
     const val UserConfig = "user_config"
+    const val ChangeNickname = "change_nickname"
     const val PersonalInformationPolicy = "personal_information_policy"
     const val ThemeModeSelect = "theme_mode_select"
     const val Bookmark = "bookmark"

app/src/main/java/com/wafflestudio/snutt2/views/RootActivity.kt

@@ -306,6 +306,7 @@ class RootActivity : AppCompatActivity() {
         composable2(NavigationDestination.TeamInfo) { TeamInfoPage() }
         composable2(NavigationDestination.TimeTableConfig) { TimetableConfigPage() }
         composable2(NavigationDestination.UserConfig) { UserConfigPage() }
+        composable2(NavigationDestination.ChangeNickname) { ChangeNicknamePage() }
         composable2(NavigationDestination.PersonalInformationPolicy) { PersonalInformationPolicyPage() }
         composable2(NavigationDestination.ThemeModeSelect) { ColorModeSelectPage() }
         composable2(NavigationDestination.VacancyNotification) {

app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/settings/ChangeNicknamePage.kt

@@ -0,0 +1,217 @@
+package com.wafflestudio.snutt2.views.logged_in.home.settings
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.KeyboardActionScope
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.*
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.style.TextIndent
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.wafflestudio.snutt2.R
+import com.wafflestudio.snutt2.components.compose.*
+import com.wafflestudio.snutt2.lib.toDp
+import com.wafflestudio.snutt2.ui.SNUTTColors
+import com.wafflestudio.snutt2.ui.SNUTTTypography
+import com.wafflestudio.snutt2.views.*
+import com.wafflestudio.snutt2.views.logged_in.lecture_detail.Margin
+import kotlinx.coroutines.launch
+
+@Composable
+fun ChangeNicknamePage() {
+    val navController = LocalNavController.current
+    val apiOnProgress = LocalApiOnProgress.current
+    val apiOnError = LocalApiOnError.current
+    val scope = rememberCoroutineScope()
+    val userViewModel = hiltViewModel<UserViewModel>()
+
+    val user by userViewModel.userInfo.collectAsState()
+    val initialNickname = user?.nickname?.nickname ?: ""
+    var nicknameField by remember { mutableStateOf(user?.nickname?.nickname ?: "") }
+    val nicknameRequirementTexts = listOf(
+        stringResource(R.string.settings_change_nickname_requirement_0),
+        stringResource(R.string.settings_change_nickname_requirement_1),
+        stringResource(R.string.settings_change_nickname_requirement_2),
+    )
+
+    val onBackPressed = {
+        if (navController.currentDestination?.route == NavigationDestination.ChangeNickname) {
+            navController.popBackStack()
+        }
+    }
+
+    val handleChangeNickname = {
+        scope.launch {
+            launchSuspendApi(apiOnProgress, apiOnError) {
+                userViewModel.changeNickname(nicknameField)
+                onBackPressed()
+            }
+        }
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(SNUTTColors.Gray100),
+    ) {
+        TopBar(
+            title = {
+                Text(
+                    text = stringResource(R.string.settings_change_nickname_app_bar_title),
+                    style = SNUTTTypography.h2,
+                )
+            },
+            navigationIcon = {
+                ArrowBackIcon(
+                    modifier = Modifier
+                        .size(30.dp)
+                        .clicks { onBackPressed() },
+                    colorFilter = ColorFilter.tint(SNUTTColors.Black900),
+                )
+            },
+            actions = {
+                Text(
+                    text = stringResource(R.string.settings_change_nickname_app_bar_save),
+                    style = SNUTTTypography.body1,
+                    color = if (nicknameField.isEmpty() || nicknameField == initialNickname) SNUTTColors.Black500 else SNUTTColors.Black900,
+                    modifier = Modifier
+                        .clicks {
+                            if (nicknameField.isNotEmpty() && nicknameField != initialNickname) {
+                                handleChangeNickname()
+                            }
+                        },
+                )
+            },
+        )
+        Margin(10.dp)
+        SettingColumn(
+            title = stringResource(R.string.settings_change_nickname_title),
+        ) {
+            NicknameEditText(
+                value = nicknameField,
+                onValueChange = { nicknameField = it },
+                onDone = {
+                    if (nicknameField.isNotEmpty() && nicknameField != initialNickname) {
+                        handleChangeNickname()
+                    }
+                },
+                hint = initialNickname,
+            )
+        }
+        Margin(12.dp)
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 30.dp),
+        ) {
+            Text(
+                text = stringResource(R.string.settings_change_nickname_guide),
+                style = SNUTTTypography.body2.copy(
+                    color = SNUTTColors.Black500,
+                ),
+            )
+            Margin(30.dp)
+            Column(
+                verticalArrangement = Arrangement.spacedBy(2.sp.toDp()),
+            ) {
+                Text(
+                    text = stringResource(R.string.settings_change_nickname_requirement_title),
+                    style = SNUTTTypography.h5.copy(
+                        color = SNUTTColors.Black500,
+                    ),
+                )
+                nicknameRequirementTexts.forEach {
+                    BulletedParagraph(
+                        text = it,
+                        style = SNUTTTypography.body2.copy(
+                            color = SNUTTColors.Black500,
+                        ),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun NicknameEditText(
+    value: String,
+    onValueChange: (String) -> Unit,
+    onDone: (KeyboardActionScope.() -> Unit),
+    hint: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(45.dp)
+            .background(SNUTTColors.White900)
+            .padding(horizontal = 35.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        val keyboardController = LocalSoftwareKeyboardController.current
+        var isFocused by remember { mutableStateOf(false) }
+        EditText(
+            modifier = Modifier
+                .weight(1f)
+                .onFocusChanged { isFocused = it.isFocused }
+                .clearFocusOnKeyboardDismiss(),
+            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+            keyboardActions = KeyboardActions(onDone = onDone),
+            value = value,
+            onValueChange = onValueChange,
+            hint = hint,
+            underlineEnabled = false,
+            textStyle = SNUTTTypography.body1.copy(
+                fontSize = 16.sp,
+            ),
+        )
+        if (isFocused) {
+            CloseCircleIcon(
+                modifier = Modifier
+                    .size(30.dp)
+                    .clicks {
+                        onValueChange("")
+                        keyboardController?.hide()
+                    },
+            )
+        }
+        Text(
+            text = "#NNNN",
+            style = SNUTTTypography.body1.copy(
+                color = SNUTTColors.Black300,
+                fontSize = 16.sp,
+            ),
+        )
+    }
+}
+
+@Composable
+fun BulletedParagraph(
+    text: String,
+    style: TextStyle,
+) {
+    Text(
+        text = buildAnnotatedString {
+            withStyle(ParagraphStyle(textIndent = TextIndent(restLine = style.fontSize))) {
+                append("\u2022")
+                append("\t\t")
+                append(text)
+            }
+        },
+        style = style,
+    )
+}

app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/settings/SettingsPage.kt

@@ -238,7 +238,7 @@ fun SettingColumn(
         if (title.isNotEmpty()) {
             Text(
                 text = title,
-                modifier = Modifier.padding(start = 35.dp),
+                modifier = Modifier.padding(start = 30.dp),
                 style = SNUTTTypography.body2.copy(
                     color = SNUTTColors.SettingColumnTitle,
                 ),