Merge branch 'develop' of https://github.com/Noostak/Noostak_Android into feature/#38-appointment-dialog-add

# Conflicts:
#	presentation/src/main/java/com/sopt/presentation/mypage/MyPageRoute.kt
#	presentation/src/main/java/com/sopt/presentation/mypage/navigation/MyPageNavigation.kt
#	presentation/src/main/res/values/strings.xml

Author: gaeulzzang

core/src/main/java/com/sopt/core/designsystem/component/image/ProfileImagePicker.kt

@@ -28,7 +28,7 @@ fun ProfileImagePicker(
 ) {
     Box(modifier = modifier) {
         GlideImage(
-            imageModel = { selectedImageUri ?: R.drawable.ic_profile },
+            imageModel = { selectedImageUri?.takeIf { it.isNotBlank() } ?: R.drawable.ic_profile },
             imageOptions = ImageOptions(
                 contentScale = ContentScale.Crop,
                 alignment = Alignment.Center

core/src/main/java/com/sopt/core/designsystem/component/textfield/NoostakTextField.kt

@@ -51,6 +51,7 @@ fun NoostakTextField(
     focusedBorderColor: Color = NoostakTheme.colors.blue600,
     unfocusedWithInputBorderColor: Color = NoostakTheme.colors.gray700,
     unfocusedBorderColor: Color = NoostakTheme.colors.gray500,
+    errorBorderColor: Color = NoostakTheme.colors.red02,
     maxLength: Int = 30,
     modifier: Modifier = Modifier,
     visualTransformation: VisualTransformation = VisualTransformation.None,
@@ -61,6 +62,7 @@ fun NoostakTextField(
     var hasInvalidInput by remember { mutableStateOf(false) }
 
     val validInputRegex = "^[a-zA-Z0-9가-힣]*$".toRegex()
+    val isEmptyError = textFieldType == TextFieldType.EDITPROFILE && value.isBlank()
 
     Column {
         Box(
@@ -69,7 +71,8 @@ fun NoostakTextField(
                 .border(
                     width = 1.dp,
                     color = when {
-                        hasInvalidInput -> NoostakTheme.colors.red02
+                        isEmptyError -> errorBorderColor
+                        hasInvalidInput -> errorBorderColor
                         isFocused -> focusedBorderColor // 포커스된 경우
                         value.isNotEmpty() -> unfocusedWithInputBorderColor // 텍스트가 입력되고 포커스 안된 경우
                         else -> unfocusedBorderColor // 포커스되지 않은 경우
@@ -84,7 +87,7 @@ fun NoostakTextField(
                     value = value,
                     textStyle = textStyle,
                     onValueChange = { newValue ->
-                        if (textFieldType != TextFieldType.SIGNUP) {
+                        if (textFieldType != TextFieldType.SIGNUP && textFieldType != TextFieldType.EDITPROFILE) {
                             if (newValue.replace(" ", "").length <= maxLength) {
                                 onValueChange(newValue)
                             }
@@ -148,14 +151,36 @@ fun NoostakTextField(
         ) {
             if (textFieldType == TextFieldType.SIGNUP && hasInvalidInput) {
                 Text(
-                    text = stringResource(R.string.text_noostak_text_field_sign_up_condition),
+                    text = stringResource(R.string.text_noostak_text_field_condition),
                     color = NoostakTheme.colors.red02,
                     style = NoostakTheme.typography.c3SemiBold,
                     modifier = modifier.padding(top = 6.dp),
                     maxLines = 1
                 )
             }
 
+            if (textFieldType == TextFieldType.EDITPROFILE) {
+                when {
+                    value.isBlank() ->
+                        Text(
+                            text = stringResource(R.string.text_noostak_text_field_edit_profile_empty),
+                            color = NoostakTheme.colors.red02,
+                            style = NoostakTheme.typography.c3SemiBold,
+                            modifier = modifier.padding(top = 6.dp),
+                            maxLines = 1
+                        )
+
+                    hasInvalidInput ->
+                        Text(
+                            text = stringResource(R.string.text_noostak_text_field_condition),
+                            color = NoostakTheme.colors.red02,
+                            style = NoostakTheme.typography.c3SemiBold,
+                            modifier = modifier.padding(top = 6.dp),
+                            maxLines = 1
+                        )
+                }
+            }
+
             Spacer(modifier = Modifier.weight(1f))
             Text(
                 text = stringResource(

core/src/main/java/com/sopt/core/type/TextFieldType.kt

@@ -14,5 +14,8 @@ enum class TextFieldType(
     ),
     CALENDAR(
         placeholder = R.string.tf_calendar_info_placeholder
+    ),
+    EDITPROFILE(
+        placeholder = R.string.tf_edit_profile_placeholder
     )
 }

core/src/main/java/com/sopt/core/util/permission/GalleryPermissionHandler.kt

@@ -0,0 +1,31 @@
+package com.sopt.core.util.permission
+
+import android.Manifest
+import android.os.Build
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import timber.log.Timber
+
+@Composable
+fun RequestGalleryPermission(onPermissionResult: (Boolean) -> Unit) {
+    val permissionLauncher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.RequestPermission()
+    ) { isGranted ->
+        try {
+            onPermissionResult(isGranted)
+        } catch (e: Exception) {
+            Timber.e(e)
+        }
+    }
+
+    LaunchedEffect(Unit) {
+        val permission = when {
+            Build.VERSION.SDK_INT == Build.VERSION_CODES.TIRAMISU -> Manifest.permission.READ_MEDIA_IMAGES
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU -> Manifest.permission.READ_EXTERNAL_STORAGE
+            else -> return@LaunchedEffect
+        }
+        permissionLauncher.launch(permission)
+    }
+}

core/src/main/res/values/strings.xml

@@ -18,10 +18,14 @@
     <!-- Calendar Info -->
     <string name="tf_calendar_info_placeholder">이름을 입력해주세요</string>
 
+    <!-- Edit Profile -->
+    <string name="tf_edit_profile_placeholder">이름을 입력해주세요</string>
+
     <!-- Noostak Text Field -->
-    <string name="text_noostak_text_field_sign_up_condition">띄어쓰기 없이 한글, 영문, 숫자만 가능해요.</string>
+    <string name="text_noostak_text_field_condition">띄어쓰기 없이 한글, 영문, 숫자만 가능해요.</string>
     <string name="text_noostak_text_field_count">%1$s/%2$s</string>
     <string name="icon_noostak_text_field_descrition">Delete Profile Name</string>
+    <string name="text_noostak_text_field_edit_profile_empty">이름을 입력해주세요!</string>
 
     <!-- Profile Image Picker -->
     <string name="image_profile_image_picker_description">Add Profile Image By Camera Button</string>

data/src/main/java/com/sopt/data/datasource/UserDataSource.kt

@@ -7,7 +7,7 @@ interface UserDataSource {
     val refreshToken: Flow<String>
     val userId: Flow<Int>
     val isAutoLogin: Flow<Boolean>
-    val nickName: Flow<String>
+    val nickname: Flow<String>
     val profileImage: Flow<String>
 
     suspend fun updateAccessToken(accessToken: String)
@@ -18,7 +18,7 @@ interface UserDataSource {
 
     suspend fun updateIsAutoLogin(isAutoLogin: Boolean)
 
-    suspend fun updateNickName(nickName: String)
+    suspend fun updateNickname(nickname: String)
 
     suspend fun updateProfileImage(profileImage: String)
 

data/src/main/java/com/sopt/data/datasourceimpl/UserDataSourceImpl.kt

@@ -23,7 +23,7 @@ class UserDataSourceImpl @Inject constructor(
         val refreshToken = stringPreferencesKey("refreshToken")
         val userId = intPreferencesKey("userId")
         val isAutoLogin = booleanPreferencesKey("isAutoLogin")
-        val nickName = stringPreferencesKey("nickName")
+        val nickname = stringPreferencesKey("nickname")
         val profileImage = stringPreferencesKey("profileImage")
     }
 
@@ -51,10 +51,10 @@ class UserDataSourceImpl @Inject constructor(
             preferences[PreferencesKeys.isAutoLogin] ?: false
         }
 
-    override val nickName: Flow<String> = dataStore.data
+    override val nickname: Flow<String> = dataStore.data
         .catch { handleError(it) }
         .map { preferences ->
-            preferences[PreferencesKeys.nickName].orEmpty()
+            preferences[PreferencesKeys.nickname].orEmpty()
         }
 
     override var profileImage: Flow<String> = dataStore.data
@@ -87,9 +87,9 @@ class UserDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun updateNickName(nickName: String) {
+    override suspend fun updateNickname(nickname: String) {
         dataStore.edit { preferences ->
-            preferences[PreferencesKeys.nickName] = nickName
+            preferences[PreferencesKeys.nickname] = nickname
         }
     }
 

data/src/main/java/com/sopt/data/repositoryimpl/UserInfoRepositoryImpl.kt

@@ -16,7 +16,7 @@ class UserInfoRepositoryImpl @Inject constructor(
 
     override fun getIsAutoLogin(): Flow<Boolean> = authDataSource.isAutoLogin
 
-    override fun getNickName(): Flow<String> = authDataSource.nickName
+    override fun getNickname(): Flow<String> = authDataSource.nickname
 
     override fun getProfileImage(): Flow<String> = authDataSource.profileImage
 
@@ -36,8 +36,8 @@ class UserInfoRepositoryImpl @Inject constructor(
         authDataSource.updateIsAutoLogin(isAutoLogin)
     }
 
-    override suspend fun saveNickName(nickName: String) {
-        authDataSource.updateNickName(nickName)
+    override suspend fun saveNickname(nickname: String) {
+        authDataSource.updateNickname(nickname)
     }
 
     override suspend fun saveProfileImage(profileImage: String) {

domain/src/main/java/com/sopt/domain/entity/UserEntity.kt

@@ -1,10 +1,10 @@
 package com.sopt.domain.entity
 
 data class UserEntity(
-    val accessToken: String?,
-    val refreshToken: String?,
-    val userId: Int?,
-    val isAutoLogin: Boolean,
-    val nickName: String,
-    val profileImage: String?
+    val accessToken: String? = null,
+    val refreshToken: String? = null,
+    val userId: Int? = null,
+    val isAutoLogin: Boolean = false,
+    val nickname: String = "",
+    val profileImage: String? = null
 )

domain/src/main/java/com/sopt/domain/repository/UserInfoRepository.kt

@@ -7,14 +7,14 @@ interface UserInfoRepository {
     fun getRefreshToken(): Flow<String>
     fun getUserId(): Flow<Int>
     fun getIsAutoLogin(): Flow<Boolean>
-    fun getNickName(): Flow<String>
+    fun getNickname(): Flow<String>
     fun getProfileImage(): Flow<String>
 
     suspend fun saveAccessToken(accessToken: String)
     suspend fun saveRefreshToken(refreshToken: String)
     suspend fun saveUserId(userId: Int)
     suspend fun saveIsAutoLogin(isAutoLogin: Boolean)
-    suspend fun saveNickName(nickName: String)
+    suspend fun saveNickname(nickname: String)
     suspend fun saveProfileImage(profileImage: String)
 
     suspend fun clearAll()

presentation/src/main/java/com/sopt/presentation/auth/signup/SignUpRoute.kt

@@ -98,7 +98,7 @@ fun SignUpRoute(
         onProfileSettingBtnClick = {
             handleProfileBtnClick(viewModel, permissionLauncher)
         },
-        onNameChange = { viewModel.onUserNameChanged(it) },
+        onNameChange = { viewModel.onNicknameChanged(it) },
         onSignUpClick = { viewModel.navigateToCheckInvite() }
     )
 }
@@ -148,14 +148,14 @@ fun SignUpScreen(
         Spacer(modifier = Modifier.height(27.dp))
         NoostakTextField(
             textFieldType = TextFieldType.SIGNUP,
-            value = signUpState.userName,
+            value = signUpState.nickname,
             maxLength = 10,
             onValueChange = onNameChange
         )
         Spacer(modifier = Modifier.weight(1f))
         NoostakBottomButton(
             text = stringResource(R.string.btn_next),
-            isEnabled = signUpState.userName.isNotEmpty(),
+            isEnabled = signUpState.nickname.isNotEmpty(),
             onButtonClick = onSignUpClick
         )
     }
@@ -167,7 +167,7 @@ fun SignUpScreenPreview() {
     NoostakAndroidTheme {
         SignUpScreen(
             signUpState = SignUpState(
-                userName = stringResource(R.string.app_name),
+                nickname = stringResource(R.string.app_name),
                 profileImageUri = null
             ),
             onProfileSettingBtnClick = {},

presentation/src/main/java/com/sopt/presentation/auth/signup/SignUpState.kt

@@ -1,7 +1,7 @@
 package com.sopt.presentation.auth.signup
 
 data class SignUpState(
-    val userName: String = "",
+    val nickname: String = "",
     val profileImageUri: String? = null,
     val authId: String = "",
     val isPermissionGranted: Boolean = false,

presentation/src/main/java/com/sopt/presentation/auth/signup/SignUpViewModel.kt

@@ -19,13 +19,13 @@ class SignUpViewModel @Inject constructor(
     private val _signUpState: MutableStateFlow<SignUpState> = MutableStateFlow(SignUpState())
     val signUpState: StateFlow<SignUpState> get() = _signUpState.asStateFlow()
 
-    fun onUserNameChanged(userName: String) {
-        _signUpState.update { it.copy(userName = userName) }
-        validateUserName(userName)
+    fun onNicknameChanged(nickname: String) {
+        _signUpState.update { it.copy(nickname = nickname) }
+        validateNickname(nickname)
     }
 
-    private fun validateUserName(userName: String) {
-        _signUpState.update { it.copy(isNameCheck = userName.length in 1..10) }
+    private fun validateNickname(nickname: String) {
+        _signUpState.update { it.copy(isNameCheck = nickname.length in 1..10) }
     }
 
     fun updateGalleryPermissionState(isGranted: Boolean) {
@@ -52,16 +52,16 @@ class SignUpViewModel @Inject constructor(
     }
 
     fun navigateToCheckInvite() {
-        val name = _signUpState.value.userName
-        if (name.isNotEmpty()) {
-            saveUserNickName(name)
-            emitSideEffect(SignUpSideEffect.NavigateToCheckInvite(name))
+        val nickname = _signUpState.value.nickname
+        if (nickname.isNotEmpty()) {
+            saveUserNickname(nickname)
+            emitSideEffect(SignUpSideEffect.NavigateToCheckInvite(nickname))
         }
     }
 
-    private fun saveUserNickName(nickName: String) {
+    private fun saveUserNickname(nickname: String) {
         executeInScope {
-            userInfoRepository.saveNickName(nickName)
+            userInfoRepository.saveNickname(nickname)
         }
     }
 

presentation/src/main/java/com/sopt/presentation/group/navigation/GroupNavigation.kt

@@ -5,9 +5,9 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import com.sopt.core.navigation.MainTabRoute
+import com.sopt.presentation.auth.signup.inputGroupCode.navigation.navigateInputGroupCode
 import com.sopt.presentation.group.GroupRoute
 import com.sopt.presentation.groupCreate.navigation.navigateToGroupCreate
-import com.sopt.presentation.groupCreate.navigation.navigateToGroupEnter
 import com.sopt.presentation.groupDetail.navigation.navigateGroupDetail
 import kotlinx.serialization.Serializable
 
@@ -27,7 +27,7 @@ fun NavGraphBuilder.groupNavGraph(
                 navHostController.navigateGroupDetail(groupId = groupId)
             },
             navigateToGroupCreate = { navHostController.navigateToGroupCreate() },
-            navigateToGroupEnter = { navHostController.navigateToGroupEnter() }
+            navigateToGroupEnter = { navHostController.navigateInputGroupCode() }
         )
     }
 }

presentation/src/main/java/com/sopt/presentation/groupCreate/navigation/GroupCreateNavigation.kt

@@ -17,13 +17,6 @@ fun NavController.navigateToGroupCreate(navOptions: NavOptions? = null) {
     )
 }
 
-fun NavController.navigateToGroupEnter(navOptions: NavOptions? = null) {
-    navigate(
-        route = GroupEnter,
-        navOptions = navOptions
-    )
-}
-
 fun NavGraphBuilder.groupCreateNavGraph(
     paddingValues: PaddingValues,
     navHostController: NavController
@@ -36,14 +29,7 @@ fun NavGraphBuilder.groupCreateNavGraph(
             }
         )
     }
-
-    composable<GroupEnter> {
-        // 이동 코드 추가하기
-    }
 }
 
 @Serializable
 data object GroupCreate : Route
-
-@Serializable
-data object GroupEnter : Route