Skip to content

Commit

Permalink
[chore] #74 ktlint
Browse files Browse the repository at this point in the history
  • Loading branch information
kamja0510 committed Jan 24, 2025
1 parent af812c2 commit a8ad70a
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ fun MainNavHost(
navigateToBack = { navigator.popBackStackIfNotSubject() },
navigateToModifyMotivation = { id, name -> navigator.navigateToModifyMotivationMessage(id, name) },
navigateToModifySubjectName = { id, name -> navigator.navigateToModifySubjectName(id, name) },
navigateToAddStudy = {splitStudyData -> navigator.navigateToAddStudy(splitStudyData)}
navigateToAddStudy = { splitStudyData -> navigator.navigateToAddStudy(splitStudyData) },
)

todoNavGraph(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class AddStudyViewModel
updateState(AddStudyReduce.UpdateAddStudyViewType)
updateState(AddStudyReduce.UpdatePieceNumber(pieceNumber = event.pieceNumber))
updateState(AddStudyReduce.UpdatePiecePickerBottomSheetState)
Timber.tag("김재민").d("addstudy에서 보내는 값${currentUiState}")
Timber.tag("김재민").d("addstudy에서 보내는 값$currentUiState")
setSideEffect(
AddStudyContract.AddStudySideEffect.NavigateSplitStudy(
addStudyData =
Expand All @@ -105,9 +105,9 @@ class AddStudyViewModel
studyContent = currentUiState.studyContent ?: "",
startPage = currentUiState.startPage ?: "",
endPage = currentUiState.endPage ?: "",
startPageList = if(currentUiState.addStudyViewType == AddStudyViewType.AGAIN) currentUiState.startPageList else divideRangeIntoInts(currentUiState.startPage!!.filter { it.isDigit() }.toInt(), currentUiState.endPage!!.filter { it.isDigit() }.toInt(), event.pieceNumber).map { it.toString() }.subList(0, event.pieceNumber),
endPageList = if(currentUiState.addStudyViewType == AddStudyViewType.AGAIN) currentUiState.endPageList else divideRangeIntoInts(currentUiState.startPage!!.filter { it.isDigit() }.toInt(), currentUiState.endPage!!.filter { it.isDigit() }.toInt(), event.pieceNumber).map { it.toString() }.subList(1, event.pieceNumber + 1),
examName = currentUiState.examName
startPageList = if (currentUiState.addStudyViewType == AddStudyViewType.AGAIN) currentUiState.startPageList else divideRangeIntoInts(currentUiState.startPage!!.filter { it.isDigit() }.toInt(), currentUiState.endPage!!.filter { it.isDigit() }.toInt(), event.pieceNumber).map { it.toString() }.subList(0, event.pieceNumber),
endPageList = if (currentUiState.addStudyViewType == AddStudyViewType.AGAIN) currentUiState.endPageList else divideRangeIntoInts(currentUiState.startPage!!.filter { it.isDigit() }.toInt(), currentUiState.endPage!!.filter { it.isDigit() }.toInt(), event.pieceNumber).map { it.toString() }.subList(1, event.pieceNumber + 1),
examName = currentUiState.examName,
),
),
)
Expand All @@ -133,7 +133,7 @@ class AddStudyViewModel
endPage = currentUiState.endPage ?: "",
startPageList = currentUiState.startPageList,
endPageList = currentUiState.endPageList,
examName = currentUiState.examName
examName = currentUiState.examName,
),
),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ class SplitStudyViewModel
startPage = event.splitStudyData.startPage,
endPage = event.splitStudyData.endPage,
addStudyViewType = event.splitStudyData.addStudyViewType,
examName = event.splitStudyData.examName
examName = event.splitStudyData.examName,
),
),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fun NavGraphBuilder.subjectDetailNavGraph(
navigateToBack = navigateToBack,
navigateToModifyMotivation = navigateToModifyMotivation,
navigateToModifySubjectName = navigateToModifySubjectName,
navigateToAddStudy = navigateToAddStudy
navigateToAddStudy = navigateToAddStudy,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ fun SubjectDetailRoute(
onRevertCompleteBottomSheetDismissRequest = { viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnRevertCompleteBottomSheetDissmissRequest) },
onRevertCompleteBottomSheetApproveButtonClicked = { pieceId -> viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnRevertCompleteBottomSheetApproveButtonClicked(pieceId = pieceId)) },
onRevertCompleteBottomSheetDismissButtonClicked = { viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnRevertCompleteBottomSheetDismissButtonClicked) },

)
false ->
Box(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,20 @@ fun SubjectDetailScreen(

val tabs = listOf("중간고사", "기말고사")
var selectedIndex by remember { mutableIntStateOf(0) }
val splitStudyData = SplitStudyData(
subjectName = subjectName,
pieceNumber = 0,
examDate = "시험 일자 입력",
examName = examName,
studyContent = "",
startPage = "",
endPage = "",
startPageList = emptyList(),
endPageList = emptyList(),
deadLineList = emptyList(),
addStudyViewType = AddStudyViewType.DEFAULT
)
val splitStudyData =
SplitStudyData(
subjectName = subjectName,
pieceNumber = 0,
examDate = "시험 일자 입력",
examName = examName,
studyContent = "",
startPage = "",
endPage = "",
startPageList = emptyList(),
endPageList = emptyList(),
deadLineList = emptyList(),
addStudyViewType = AddStudyViewType.DEFAULT,
)

Timber.d("${deletedSet.size}")
Box(
Expand Down Expand Up @@ -194,7 +195,7 @@ fun SubjectDetailScreen(
onClick = {
onClickTab(index)
selectedIndex = index
},
},
)
}
}
Expand All @@ -216,7 +217,7 @@ fun SubjectDetailScreen(
dDay = examDDay.toString(),
examDay = examDate,
splitStudyData = splitStudyData,
onClickAddStudy = onClickAddStudy
onClickAddStudy = onClickAddStudy,
)
}
PieceViewType.DELETE -> {
Expand Down Expand Up @@ -438,7 +439,7 @@ private fun DefaultPieceView(
.applyFilterOnClick(
radius = 24.dp,
isDisabled = false,
) {onClickAddStudy(splitStudyData) },
) { onClickAddStudy(splitStudyData) },
) {
Row(
modifier =
Expand Down Expand Up @@ -751,6 +752,6 @@ private fun SubjectDetailScreenPreview() {
motivationMessage = "사장님의 각오 한마디를 작성해보세요",
examDate = "2025년 1월 1일",
examDDay = 14,
examName = "중간고사"
examName = "중간고사",
)
}

0 comments on commit a8ad70a

Please sign in to comment.