Skip to content

Commit 867e001

Browse files
angryPodoangryPodo
committed
[FIX/#739] Mark delete functionality as deprecated (#740)
1 parent c5f1a10 commit 867e001

File tree

8 files changed

+103
-94
lines changed

8 files changed

+103
-94
lines changed

‎data/diary/src/main/java/com/hilingual/data/diary/repository/DiaryRepository.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ interface DiaryRepository {
5050
diaryId: Long
5151
): Result<Unit>
5252

53+
@Deprecated("수정 기능이 도입되기 까지 지원 중단입니다.")
5354
suspend fun deleteDiary(
5455
diaryId: Long
5556
): Result<Unit>

‎presentation/diaryfeedback/src/main/java/com/hilingual/presentation/diaryfeedback/DiaryFeedbackScreen.kt‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import com.hilingual.core.designsystem.component.button.HilingualButton
5858
import com.hilingual.core.designsystem.component.button.HilingualFloatingButton
5959
import com.hilingual.core.designsystem.component.indicator.HilingualLoadingIndicator
6060
import com.hilingual.core.designsystem.theme.HilingualTheme
61-
import com.hilingual.core.ui.component.dialog.diary.DiaryDeleteDialog
6261
import com.hilingual.core.ui.component.dialog.diary.DiaryPublishDialog
6362
import com.hilingual.core.ui.component.dialog.diary.DiaryUnpublishDialog
6463
import com.hilingual.core.ui.component.item.diary.image.ModalImage
@@ -77,7 +76,7 @@ internal fun DiaryFeedbackRoute(
7776
navigateToHome: () -> Unit,
7877
navigateToFeed: () -> Unit,
7978
navigateToVoca: () -> Unit,
80-
viewModel: DiaryFeedbackViewModel = hiltViewModel()
79+
viewModel: DiaryFeedbackViewModel = hiltViewModel(),
8180
) {
8281
val context = LocalContext.current
8382

@@ -114,12 +113,12 @@ internal fun DiaryFeedbackRoute(
114113
"toast_id" to "diary_post_success",
115114
"toast_action" to "cta_click",
116115
"entry_id" to viewModel.diaryId,
117-
"page" to FEEDBACK.pageName
118-
)
116+
"page" to FEEDBACK.pageName,
117+
),
119118
)
120119
navigateToFeed()
121-
}
122-
)
120+
},
121+
),
123122
)
124123
}
125124

@@ -128,8 +127,8 @@ internal fun DiaryFeedbackRoute(
128127
HilingualMessage.Snackbar(
129128
message = it.message,
130129
actionLabelText = it.actionLabel,
131-
onAction = navigateToVoca
132-
)
130+
onAction = navigateToVoca,
131+
),
133132
)
134133
}
135134

@@ -154,8 +153,8 @@ internal fun DiaryFeedbackRoute(
154153
event = "back_feedback",
155154
properties = mapOf(
156155
"entry_id" to viewModel.diaryId,
157-
"back_source" to "ui_button"
158-
)
156+
"back_source" to "ui_button",
157+
),
159158
)
160159
navigateUp()
161160
},
@@ -168,14 +167,14 @@ internal fun DiaryFeedbackRoute(
168167
trigger = TriggerType.CLICK,
169168
page = FEEDBACK,
170169
event = "submitted_post_diary",
171-
properties = mapOf("entry_id" to viewModel.diaryId)
170+
properties = mapOf("entry_id" to viewModel.diaryId),
172171
)
173172
}
174173
viewModel.toggleIsPublished(isPublished)
175174
},
176175
onToggleBookmark = viewModel::toggleBookmark,
177-
onDeleteDiary = viewModel::deleteDiary,
178-
tracker = tracker
176+
onDeleteDiary = { /* viewModel::deleteDiary 수정기능 도입까지 삭제 기능 지원중단 */ },
177+
tracker = tracker,
179178
)
180179
}
181180

@@ -192,7 +191,7 @@ private fun DiaryFeedbackScreen(
192191
onToggleBookmark: (Long, Boolean) -> Unit,
193192
onDeleteDiary: () -> Unit,
194193
tracker: Tracker,
195-
modifier: Modifier = Modifier
194+
modifier: Modifier = Modifier,
196195
) {
197196
var isPublishDialogVisible by remember { mutableStateOf(false) }
198197
var isDeleteDialogVisible by remember { mutableStateOf(false) }
@@ -233,12 +232,12 @@ private fun DiaryFeedbackScreen(
233232
.fillMaxSize()
234233
.statusBarColor(HilingualTheme.colors.white)
235234
.background(HilingualTheme.colors.white)
236-
.padding(paddingValues)
235+
.padding(paddingValues),
237236
) {
238237
BackAndMoreTopAppBar(
239238
title = "일기장",
240239
onBackClicked = onBackClick,
241-
onMoreClicked = { isReportBottomSheetVisible = true }
240+
onMoreClicked = { isReportBottomSheetVisible = true },
242241
)
243242

244243
DiaryTabRow(
@@ -247,7 +246,7 @@ private fun DiaryFeedbackScreen(
247246
coroutineScope.launch {
248247
pagerState.animateScrollToPage(it)
249248
}
250-
}
249+
},
251250
)
252251

253252
when (uiState) {
@@ -259,11 +258,11 @@ private fun DiaryFeedbackScreen(
259258
Box(
260259
modifier = Modifier
261260
.background(HilingualTheme.colors.gray100)
262-
.weight(1f)
261+
.weight(1f),
263262
) {
264263
HorizontalPager(
265264
state = pagerState,
266-
modifier = Modifier.fillMaxSize()
265+
modifier = Modifier.fillMaxSize(),
267266
) { page ->
268267
when (page) {
269268
0 -> GrammarSpellingTab(
@@ -283,10 +282,10 @@ private fun DiaryFeedbackScreen(
283282
properties = mapOf(
284283
"entry_id" to diaryId,
285284
"toggle_state" to it,
286-
"toggle_click_count" to toggleClickCount
287-
)
285+
"toggle_click_count" to toggleClickCount,
286+
),
288287
)
289-
}
288+
},
290289
)
291290

292291
1 -> RecommendExpressionTab(
@@ -302,11 +301,11 @@ private fun DiaryFeedbackScreen(
302301
"entry_id" to diaryId,
303302
"bookmark_action" to if (isMarked) "add" else "remove",
304303
"page" to FEEDBACK.pageName,
305-
"tab_name" to "recommend_expression"
306-
)
304+
"tab_name" to "recommend_expression",
305+
),
307306
)
308307
onToggleBookmark(phraseId, isMarked)
309-
}
308+
},
310309
)
311310
}
312311
}
@@ -323,7 +322,7 @@ private fun DiaryFeedbackScreen(
323322
},
324323
modifier = Modifier
325324
.align(Alignment.BottomEnd)
326-
.padding(bottom = 24.dp, end = 16.dp)
325+
.padding(bottom = 24.dp, end = 16.dp),
327326
)
328327
}
329328

@@ -333,7 +332,7 @@ private fun DiaryFeedbackScreen(
333332
modifier = Modifier
334333
.background(HilingualTheme.colors.gray100)
335334
.padding(horizontal = 16.dp)
336-
.padding(top = 12.dp, bottom = 16.dp)
335+
.padding(top = 12.dp, bottom = 16.dp),
337336
)
338337
}
339338

@@ -345,7 +344,7 @@ private fun DiaryFeedbackScreen(
345344
ModalImage(
346345
imageUrl = successData.diaryContent.imageUrl ?: "",
347346
onBackClick = onChangeImageDetailVisible,
348-
modifier = modifier.padding(paddingValues)
347+
modifier = modifier.padding(paddingValues),
349348
)
350349
}
351350

@@ -356,7 +355,7 @@ private fun DiaryFeedbackScreen(
356355
onPrivateClick = {
357356
onToggleIsPublished(false)
358357
isPublishDialogVisible = false
359-
}
358+
},
360359
)
361360
} else {
362361
DiaryPublishDialog(
@@ -365,36 +364,38 @@ private fun DiaryFeedbackScreen(
365364
onPostClick = {
366365
onToggleIsPublished(true)
367366
isPublishDialogVisible = false
368-
}
367+
},
369368
)
370369
}
371370

372-
DiaryDeleteDialog(
373-
isVisible = isDeleteDialogVisible,
374-
onDismiss = { isDeleteDialogVisible = false },
375-
onDeleteClick = {
376-
isDeleteDialogVisible = false
377-
onDeleteDiary()
378-
}
379-
)
371+
// 수정기능 도입까지 삭제 기능 지원중단
372+
// DiaryDeleteDialog(
373+
// isVisible = isDeleteDialogVisible,
374+
// onDismiss = { isDeleteDialogVisible = false },
375+
// onDeleteClick = {
376+
// isDeleteDialogVisible = false
377+
// onDeleteDiary()
378+
// },
379+
// )
380380

381381
FeedbackMenuBottomSheet(
382382
isVisible = isReportBottomSheetVisible,
383383
onDismiss = { isReportBottomSheetVisible = false },
384384
onDeleteClick = {
385-
isReportBottomSheetVisible = false
386-
isDeleteDialogVisible = true
385+
// 수정기능 도입까지 삭제 기능 지원중단
386+
// isReportBottomSheetVisible = false
387+
// isDeleteDialogVisible = true
387388
},
388389
onReportClick = {
389390
isReportBottomSheetVisible = false
390391
isReportDialogVisible = true
391-
}
392+
},
392393
)
393394

394395
FeedbackReportDialog(
395396
isVisible = isReportDialogVisible,
396397
onDismiss = { isReportDialogVisible = false },
397-
onReportClick = onReportClick
398+
onReportClick = onReportClick,
398399
)
399400
}
400401

@@ -405,7 +406,7 @@ private fun DiaryFeedbackScreenPreview() {
405406
DiaryFeedbackScreen(
406407
paddingValues = PaddingValues(),
407408
uiState = UiState.Success(
408-
DiaryFeedbackUiState.Fake
409+
DiaryFeedbackUiState.Fake,
409410
),
410411
diaryId = 0L,
411412
isImageDetailVisible = false,
@@ -415,7 +416,7 @@ private fun DiaryFeedbackScreenPreview() {
415416
onToggleBookmark = { _, _ -> {} },
416417
onToggleIsPublished = {},
417418
onDeleteDiary = {},
418-
tracker = FakeTracker()
419+
tracker = FakeTracker(),
419420
)
420421
}
421422
}

‎presentation/diaryfeedback/src/main/java/com/hilingual/presentation/diaryfeedback/DiaryFeedbackViewModel.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ internal class DiaryFeedbackViewModel @Inject constructor(
121121
}
122122
}
123123

124+
@Deprecated("수정 기능이 도입되기 까지 지원 중단입니다.")
124125
fun deleteDiary() {
125126
viewModelScope.launch {
126127
diaryRepository.deleteDiary(diaryId = diaryId).onSuccess {

‎presentation/diaryfeedback/src/main/java/com/hilingual/presentation/diaryfeedback/component/FeedbackMenuBottomSheet.kt‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,25 @@ internal fun FeedbackMenuBottomSheet(
3535
onDismiss: () -> Unit,
3636
onDeleteClick: () -> Unit,
3737
onReportClick: () -> Unit,
38-
modifier: Modifier = Modifier
38+
modifier: Modifier = Modifier,
3939
) {
4040
HilingualMenuBottomSheet(
4141
isVisible = isVisible,
4242
onDismiss = onDismiss,
43-
modifier = modifier
43+
modifier = modifier,
4444
) {
45-
HilingualMenuBottomSheetItem(
46-
text = "삭제하기",
47-
iconResId = DesignSystemR.drawable.ic_delete_24,
48-
onClick = onDeleteClick,
49-
textColor = HilingualTheme.colors.alertRed
50-
)
45+
// 수정기능 도입까지 삭제 기능 지원중단
46+
// HilingualMenuBottomSheetItem(
47+
// text = "삭제하기",
48+
// iconResId = DesignSystemR.drawable.ic_delete_24,
49+
// onClick = onDeleteClick,
50+
// textColor = HilingualTheme.colors.alertRed,
51+
// )
5152

5253
HilingualMenuBottomSheetItem(
5354
text = "AI 피드백 신고하기",
5455
iconResId = DesignSystemR.drawable.ic_report_24,
55-
onClick = onReportClick
56+
onClick = onReportClick,
5657
)
5758
}
5859
}
@@ -69,7 +70,7 @@ private fun FeedbackReportPreview() {
6970
isVisible = isVisible,
7071
onDismiss = { isVisible = false },
7172
onDeleteClick = {},
72-
onReportClick = {}
73+
onReportClick = {},
7374
)
7475
}
7576
}

‎presentation/home/src/main/java/com/hilingual/presentation/home/HomeScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ internal fun HomeRoute(
188188
)
189189
navigateToDiaryFeedback(diaryId)
190190
},
191-
onDeleteClick = viewModel::deleteDiary,
191+
onDeleteClick = { /* viewModel::deleteDiary 수정기능 도입까지 삭제 기능 지원중단 */ },
192192
onPublishClick = viewModel::publishDiary,
193193
onUnpublishClick = viewModel::unpublishDiary,
194194
tracker = tracker
@@ -322,7 +322,7 @@ private fun HomeScreen(
322322
homeState.hideMoreMenu()
323323
}
324324
},
325-
onDeleteClick = { onDeleteClick(diary.diaryId) },
325+
onDeleteClick = { /* onDeleteClick(diary.diaryId) 수정기능 도입까지 삭제 기능 지원중단 */ },
326326
onPublishClick = { onPublishClick(diary.diaryId) },
327327
onUnpublishClick = { onUnpublishClick(diary.diaryId) }
328328
)

‎presentation/home/src/main/java/com/hilingual/presentation/home/HomeViewModel.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ class HomeViewModel @Inject constructor(
264264
}
265265
}
266266

267+
@Deprecated("수정 기능이 도입되기 까지 지원 중단입니다.")
267268
fun deleteDiary(diaryId: Long) {
268269
val currentState = uiState.value
269270
if (currentState !is UiState.Success) return

0 commit comments

Comments
 (0)