Skip to content

[Feat/#299] 영어 버전 기능 분기 처리를 진행합니다. #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SYAAINN merged 8 commits into from
Jul 16, 2025
Merged

[Feat/#299] 영어 버전 기능 분기 처리를 진행합니다. #302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1a17aa
[FEAT/#299] 한국어 typo, 영어 typo를 정의합니다.
SYAAINN Jul 15, 2025
dbe356d
[FEAT/#299] LanguageProvider 클래스 구현
SYAAINN Jul 15, 2025
b21319f
[FEAT/#299] 영어 버전일 경우, 구글 로그인 버튼을 노출합니다.
SYAAINN Jul 15, 2025
bc017da
[FEAT/#299] 웹뷰 링크를 분기처리 합니다.
SYAAINN Jul 15, 2025
c65fc30
[FEAT/#299] 닉네임 최대 길이를 영어 버전 15자, 한국어 버전 10자로 설정합니다.
SYAAINN Jul 15, 2025
8fc9d6f
[FEAT/#299] 일기 하나의 최대 길이를 영어 버전 100자, 한국어 버전 50자로 설정합니다.
SYAAINN Jul 15, 2025
ac6664c
[CHORE/#299] 코드래빗 리뷰사항을 반영합니다.
SYAAINN Jul 16, 2025
c28221c
[CHORE/#299] 코드리뷰 사항을 반영합니다.
SYAAINN Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...java/com/sopt/clody/presentation/ui/writediary/component/textfield/WriteDiaryTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ fun WriteDiaryTextField(
if (it.length <= maxLength) {
onTextChange(it)
val textWithoutSpaces = it.replace("\\s".toRegex(), "")
isTextValid = textWithoutSpaces.matches(Regex("^[a-zA-Z가-힣0-9ㄱ-ㅎㅏ-ㅣ가-힣]{2,50}$"))
isTextValid = textWithoutSpaces.matches(Regex("^[a-zA-Z가-힣0-9ㄱ-ㅎㅏ-ㅣ가-힣]{2,$maxLength}$"))
isTextTooLong = false
} else {
isTextTooLong = true
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ fun WriteDiaryRoute(
val entryToDelete by viewModel::entryToDelete
val showDialog by viewModel::showDialog
val showExitDialog by viewModel::showExitDialog
val diaryMaxLength by viewModel.diaryMaxLength.collectAsState()

LaunchedEffectWhenStarted {
viewModel.fetchDraftDiary(year, month, date)
Expand Down Expand Up @@ -113,6 +114,7 @@ fun WriteDiaryRoute(
showFailureDialog = showFailureDialog,
failureMessage = failureMessage,
showExitDialog = showExitDialog,
diaryMaxLength = diaryMaxLength,
onClickBack = {
AmplitudeUtils.trackEvent(AmplitudeConstraints.WRITING_DIARY_BACK)
if (!viewModel.hasChangedFromInitial()) {
Expand Down Expand Up @@ -183,6 +185,7 @@ fun WriteDiaryScreen(
showEmptyFieldsMessage: Boolean,
showDeleteBottomSheet: Boolean,
showDialog: Boolean,
diaryMaxLength: Int,
onClickBack: () -> Unit,
onClickAdd: () -> Unit,
onClickRemove: (Int) -> Unit,
Expand Down Expand Up @@ -265,7 +268,7 @@ fun WriteDiaryScreen(
onTextChange = { newText -> onTextChange(index, newText) },
onRemove = { onClickRemove(index) },
isRemovable = entries.size > 1,
maxLength = 50,
maxLength = diaryMaxLength,
showWarning = showWarnings[index],
)
}
Expand Down Expand Up @@ -390,6 +393,7 @@ private fun WriteDiaryScreenPreview() {
showEmptyFieldsMessage = false,
showDeleteBottomSheet = false,
showDialog = false,
diaryMaxLength = 100,
onClickBack = {},
onClickAdd = {},
onClickRemove = {},
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.sopt.clody.domain.repository.DiaryRepository
import com.sopt.clody.domain.repository.DraftRepository
import com.sopt.clody.domain.usecase.FetchDraftDiaryUseCase
import com.sopt.clody.domain.usecase.SaveDraftDiaryUseCase
import com.sopt.clody.presentation.utils.language.LanguageProvider
import com.sopt.clody.presentation.utils.network.ErrorMessages
import com.sopt.clody.presentation.utils.network.ErrorMessages.FAILURE_NETWORK_MESSAGE
import com.sopt.clody.presentation.utils.network.ErrorMessages.FAILURE_TEMPORARY_MESSAGE
Expand All @@ -30,6 +31,7 @@ class WriteDiaryViewModel @Inject constructor(
private val saveDraftDiaryUseCase: SaveDraftDiaryUseCase,
private val networkUtil: NetworkUtil,
private val draftRepository: DraftRepository,
private val languageProvider: LanguageProvider,
) : ViewModel() {

private val _writeDiaryState = MutableStateFlow<WriteDiaryState>(WriteDiaryState.Idle)
Expand Down Expand Up @@ -67,6 +69,9 @@ class WriteDiaryViewModel @Inject constructor(

private var initialEntries: List<String> = emptyList()

private val _diaryMaxLength = MutableStateFlow(languageProvider.getDiaryMaxLength())
val diaryMaxLength: StateFlow<Int> = _diaryMaxLength

fun writeDiary(year: Int, month: Int, day: Int, contents: List<String>) {
viewModelScope.launch {
if (!networkUtil.isNetworkAvailable()) {
Expand Down Expand Up @@ -154,7 +159,7 @@ class WriteDiaryViewModel @Inject constructor(

private fun isValidEntry(text: String): Boolean {
val textWithoutSpaces = text.replace("\\s".toRegex(), "")
return textWithoutSpaces.matches(Regex(ENTRY_REGEX))
return textWithoutSpaces.matches(Regex("^[a-zA-Z가-힣0-9ㄱ-ㅎㅏ-ㅣ가-힣\\W]{2,${_diaryMaxLength.value}$"))
Copy link
Copy Markdown
Contributor

@MoonsuKang MoonsuKang Jul 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P5
어라 이 친구 object에서 뺀 이유가 있을까여?

Copy link
Copy Markdown
Contributor Author

@SYAAINN SYAAINN Jul 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

object에 들어가있어서 _diaryMaxLength.value 부분을 정규식에 집어넣지를 못해서 빼게 됐습니다!
일기 작성 최대 글자수 변경하는 작업하느냐고 뷰모델부터 Screen들을 대충 쭉 봤는데 정규식이 여기도 있고 스크린에도 있고 한 상태라 한번 뒤엎는 작업이 필요하지 않을까.. 싶습니다.

}

private fun checkLimitMessage() {
Expand Down Expand Up @@ -250,6 +255,5 @@ class WriteDiaryViewModel @Inject constructor(

companion object {
const val MAX_ENTRIES = 5
const val ENTRY_REGEX = "^[a-zA-Z가-힣0-9ㄱ-ㅎㅏ-ㅣ가-힣\\W]{2,50}$"
}
}