From 258b67cb4c1a1c31f9e9250bfa0c1788dc2b87b1 Mon Sep 17 00:00:00 2001 From: dodo Date: Thu, 16 Jul 2026 21:38:55 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[fix/#219]=20=EC=86=8C=EB=B9=84=EC=9E=90=20?= =?UTF-8?q?PendingScreen=EC=97=90=EC=84=9C=20=EA=B0=80=EA=B2=A9=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumermatching/screen/ConsumerMatchingPendingScreen.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/presentation/consumer-matching/src/main/java/com/ssing/presentation/consumermatching/screen/ConsumerMatchingPendingScreen.kt b/presentation/consumer-matching/src/main/java/com/ssing/presentation/consumermatching/screen/ConsumerMatchingPendingScreen.kt index 64f10ccd..adf7df4d 100644 --- a/presentation/consumer-matching/src/main/java/com/ssing/presentation/consumermatching/screen/ConsumerMatchingPendingScreen.kt +++ b/presentation/consumer-matching/src/main/java/com/ssing/presentation/consumermatching/screen/ConsumerMatchingPendingScreen.kt @@ -156,7 +156,6 @@ internal fun ConsumerMatchingPendingScreen( tags = state.tags, location = state.location, duration = state.duration, - price = state.price, equipmentStatus = "착용 완료", borderColor = SSINGTheme.colors.borderAlternative, ) From 20d1ec65686a184fdcee4b1a9c6c17db07273b81 Mon Sep 17 00:00:00 2001 From: dodo Date: Thu, 16 Jul 2026 22:17:59 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[fix/#219]=20=EA=B0=95=EC=82=AC-=EB=A0=88?= =?UTF-8?q?=EC=8A=A8=20=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EC=8B=9C=20?= =?UTF-8?q?=ED=99=88=20=EC=9D=B4=EB=8F=99=20-=20BackHandler=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20-=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=20=EB=96=A0=EC=9E=88=EB=8A=94=20=EA=B2=BD=EC=9A=B0=EB=8A=94=20?= =?UTF-8?q?=EB=8B=AB=EB=8A=94=20=EC=B2=98=EB=A6=AC(=ED=99=88=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99X)=20-=20=ED=83=91=EB=B0=94=20=EB=92=A4=EB=A1=9C?= =?UTF-8?q?=EA=B0=80=EA=B8=B0=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=EC=97=90?= =?UTF-8?q?=EB=8F=84=20=ED=99=88=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ssing/instructor/InstructorMainNavHost.kt | 6 ++++++ .../instructorlessondetail/LessonDetailContract.kt | 2 +- .../instructorlessondetail/LessonDetailViewModel.kt | 4 ++-- .../navigation/InstructorLessonNavigation.kt | 4 +++- .../screen/LessonDetailScreen.kt | 12 +++++++++++- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/instructor/src/main/java/com/ssing/instructor/InstructorMainNavHost.kt b/app/instructor/src/main/java/com/ssing/instructor/InstructorMainNavHost.kt index 5d4fd555..6867a4dd 100644 --- a/app/instructor/src/main/java/com/ssing/instructor/InstructorMainNavHost.kt +++ b/app/instructor/src/main/java/com/ssing/instructor/InstructorMainNavHost.kt @@ -91,6 +91,12 @@ internal fun InstructorMainNavHost( navigateToMatching = { navController.navigate(route = InstructorMatching()) }, + navigateToHome = { + navController.navigate( + route = InstructorHome, + navOptions = navController.clearBackStackNavOptions(), + ) + } ) instructorProfileNavGraph( paddingValues = paddingValues, diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt index c187988b..9529af73 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt @@ -62,7 +62,7 @@ internal interface LessonDetailContract { } sealed interface Effect { - data object NavigateBack : Effect + data object NavigateToHome : Effect data object NavigateToMatching : Effect data class ShowToast(val message: String) : Effect } diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailViewModel.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailViewModel.kt index 3182dbe7..a75fda00 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailViewModel.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailViewModel.kt @@ -117,12 +117,12 @@ internal class LessonDetailViewModel @Inject constructor( if (it is ApiException) { sendEffect(LessonDetailContract.Effect.ShowToast(it.uiMessage)) } - sendEffect(LessonDetailContract.Effect.NavigateBack) + sendEffect(LessonDetailContract.Effect.NavigateToHome) } } } - fun onBackClick() = sendEffect(LessonDetailContract.Effect.NavigateBack) + fun onBackClick() = sendEffect(LessonDetailContract.Effect.NavigateToHome) fun onMatchingClick() = sendEffect(LessonDetailContract.Effect.NavigateToMatching) diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/navigation/InstructorLessonNavigation.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/navigation/InstructorLessonNavigation.kt index dbc80240..762f3303 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/navigation/InstructorLessonNavigation.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/navigation/InstructorLessonNavigation.kt @@ -10,12 +10,13 @@ import com.ssing.presentation.instructorlessondetail.screen.LessonDetailRoute import kotlinx.serialization.Serializable @Serializable -data class InstructorLesson(val lessonId :Long): Route +data class InstructorLesson(val lessonId: Long) : Route fun NavGraphBuilder.instructorLessonNavGraph( paddingValues: PaddingValues, navController: NavController, navigateToMatching: () -> Unit, + navigateToHome: () -> Unit, ) { composable( deepLinks = listOf( @@ -24,6 +25,7 @@ fun NavGraphBuilder.instructorLessonNavGraph( ) { LessonDetailRoute( navigateBack = navController::popBackStack, + navigateToHome = navigateToHome, navigateToMatching = navigateToMatching, ) } diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt index 2abded92..87d9918b 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt @@ -1,5 +1,6 @@ package com.ssing.presentation.instructorlessondetail.screen +import androidx.activity.compose.BackHandler import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier @@ -19,6 +20,7 @@ import com.ssing.presentation.instructorlessondetail.LessonDetailViewModel internal fun LessonDetailRoute( navigateBack: () -> Unit, navigateToMatching: () -> Unit, + navigateToHome: () -> Unit, modifier: Modifier = Modifier, viewModel: LessonDetailViewModel = hiltViewModel(), ) { @@ -28,11 +30,19 @@ internal fun LessonDetailRoute( HandleUiEffects(viewModel.uiEffect) { effect -> when (effect) { is LessonDetailContract.Effect.ShowToast -> context.toast(effect.message) - LessonDetailContract.Effect.NavigateBack -> navigateBack() + LessonDetailContract.Effect.NavigateToHome -> navigateToHome() LessonDetailContract.Effect.NavigateToMatching -> navigateToMatching() } } + BackHandler { + when { + state.showReadyDialog -> viewModel.onReadyDialogDismiss() + state.showLessonEndDialog -> viewModel.onLessonEndDialogDismiss() + else -> navigateToHome() + } + } + LessonDetailScreen( state = state, onBackClick = viewModel::onBackClick, From 1c68fda24167a021448af0816d2f18a148589df1 Mon Sep 17 00:00:00 2001 From: dodo Date: Thu, 16 Jul 2026 23:01:30 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[fix/#219]=20=EA=B0=95=EC=82=AC-=EB=A0=88?= =?UTF-8?q?=EC=8A=A8=20phase=20=EC=A0=84=ED=99=98=20=EC=8B=9C=20=EB=A1=9C?= =?UTF-8?q?=EB=94=A9=20=EC=83=81=ED=83=9C=20=EC=A0=9C=EA=B1=B0=20-=20?= =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=EB=A7=88=EB=8B=A4=20Loading=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=EB=A5=BC=20=EC=A0=84=ED=99=98=ED=95=B4=20=EB=A1=9C=EB=94=A9=20?= =?UTF-8?q?=EC=A4=91=EC=97=90=EB=8A=94=20=EB=B9=88=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=85=B8=EC=B6=9C=EB=8F=BC=20=EA=B9=9C=EB=B0=95=20=EA=B1=B0?= =?UTF-8?q?=EB=A6=AC=EB=8A=94=20=EA=B1=B8=EB=A1=9C=20=EB=B3=B4=EC=98=80?= =?UTF-8?q?=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/instructorlessondetail/LessonDetailContract.kt | 2 +- .../instructorlessondetail/LessonDetailViewModel.kt | 2 -- .../instructorlessondetail/screen/LessonDetailScreen.kt | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt index 9529af73..e6c5ffc5 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt @@ -47,7 +47,7 @@ internal interface LessonDetailContract { ) sealed interface LessonDetailPhase { - data object Loading : LessonDetailPhase + data object Init : LessonDetailPhase data class LessonDetailBefore(val before: LessonDetailBeforeUiModel) : LessonDetailPhase data class LessonDetailOngoing(val ongoing: LessonDetailOngoingUiModel) : LessonDetailPhase data class LessonDetailCompleted(val completed: LessonDetailCompletedUiModel) : diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailViewModel.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailViewModel.kt index a75fda00..275f81a3 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailViewModel.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailViewModel.kt @@ -88,8 +88,6 @@ internal class LessonDetailViewModel @Inject constructor( } private fun loadLessonDetail() { - updateState { copy(phase = LessonDetailContract.LessonDetailPhase.Loading) } - viewModelScope.launch { instructorLessonDetailRepository.fetchInstructorLessonDetail(lessonId) .onSuccess { result -> diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt index 87d9918b..662dc7ea 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt @@ -86,7 +86,7 @@ private fun LessonDetailScreen( modifier: Modifier = Modifier, ) { when (val phase = state.phase) { - is LessonDetailPhase.Loading -> {} + is LessonDetailPhase.Init -> {} is LessonDetailPhase.LessonDetailBefore -> LessonDetailBeforeScreen( before = phase.before, From d35fea77798dc0ef1f25c6340078ab97b12a6f12 Mon Sep 17 00:00:00 2001 From: dodo Date: Thu, 16 Jul 2026 23:06:00 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[fix/#219]=20=EA=B0=95=EC=82=AC-=EB=A0=88?= =?UTF-8?q?=EC=8A=A8=20=EC=B4=88=EA=B8=B0=EA=B0=92=EC=9D=84=20=EB=8D=94?= =?UTF-8?q?=EB=AF=B8=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=8C=80=EC=8B=A0=20Les?= =?UTF-8?q?sonDetailInit=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LessonDetailContract.kt | 33 ++----------------- .../screen/LessonDetailScreen.kt | 2 +- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt index e6c5ffc5..35b6c567 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/LessonDetailContract.kt @@ -5,49 +5,20 @@ import com.ssing.presentation.instructorlessondetail.model.LessonDetailBeforeUiM import com.ssing.presentation.instructorlessondetail.model.LessonDetailCanceledUiModel import com.ssing.presentation.instructorlessondetail.model.LessonDetailCompletedUiModel import com.ssing.presentation.instructorlessondetail.model.LessonDetailOngoingUiModel -import com.ssing.presentation.instructorlessondetail.model.TeamParticipantsInfo import com.ssing.presentation.instructorlessondetail.screen.CancelReasonState -import kotlinx.collections.immutable.persistentListOf internal interface LessonDetailContract { @Immutable data class State( - val phase: LessonDetailPhase = LessonDetailPhase.LessonDetailBefore( - before = LessonDetailBeforeUiModel( - isInstructorReady = false, - participantReadyCount = 2, - participantTotalCount = 5, - tags = persistentListOf("스노보드", "자격증이 있어요"), - classTitle = "김OO님 팀, 홍지민님 팀 총 5명", - location = "OOO 리조트", - duration = "0시간", - price = 0, - teams = persistentListOf( - TeamParticipantsInfo( - teamNickname = "김OO", - teamCount = 0, - participants = persistentListOf("38세 남", "12세 여", "9세 남"), - price = 0, - isReady = true, - ), - TeamParticipantsInfo( - teamNickname = "김OO", - teamCount = 0, - participants = persistentListOf("38세 남", "12세 여", "9세 남"), - price = 0, - isReady = false, - ), - ), - ), - ), + val phase: LessonDetailPhase = LessonDetailPhase.LessonDetailInit, val showReadyDialog: Boolean = false, val showLessonEndDialog: Boolean = false, val cancelReasonState: CancelReasonState = CancelReasonState(), ) sealed interface LessonDetailPhase { - data object Init : LessonDetailPhase + data object LessonDetailInit : LessonDetailPhase data class LessonDetailBefore(val before: LessonDetailBeforeUiModel) : LessonDetailPhase data class LessonDetailOngoing(val ongoing: LessonDetailOngoingUiModel) : LessonDetailPhase data class LessonDetailCompleted(val completed: LessonDetailCompletedUiModel) : diff --git a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt index 662dc7ea..4100dcd6 100644 --- a/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt +++ b/presentation/instructor-lesson/src/main/java/com/ssing/presentation/instructorlessondetail/screen/LessonDetailScreen.kt @@ -86,7 +86,7 @@ private fun LessonDetailScreen( modifier: Modifier = Modifier, ) { when (val phase = state.phase) { - is LessonDetailPhase.Init -> {} + is LessonDetailPhase.LessonDetailInit -> {} is LessonDetailPhase.LessonDetailBefore -> LessonDetailBeforeScreen( before = phase.before, From da638d1d76f344537fa3d3e4b1e21b18983c39d5 Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 01:33:47 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[fix/#219]=20=ED=91=B8=EC=8B=9C=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=95=B1=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ssing/core/notification/PushNotificationService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/notification/src/main/java/com/ssing/core/notification/PushNotificationService.kt b/core/notification/src/main/java/com/ssing/core/notification/PushNotificationService.kt index 44c1007a..1e431a5d 100644 --- a/core/notification/src/main/java/com/ssing/core/notification/PushNotificationService.kt +++ b/core/notification/src/main/java/com/ssing/core/notification/PushNotificationService.kt @@ -82,7 +82,7 @@ class PushNotificationService : FirebaseMessagingService() { ) } val notification = NotificationCompat.Builder(this, DEFAULT_CHANNEL_ID) - .setSmallIcon(android.R.drawable.ic_dialog_info) + .setSmallIcon(applicationInfo.icon) .setContentTitle(title) .setContentText(body) .apply { pendingIntent?.let { setContentIntent(it) } } From e42049189b0e3bb9c25954589b27703cb047e184 Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 01:47:18 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[fix/#219]=20=EB=B0=94=ED=85=80=EB=B0=94=20?= =?UTF-8?q?pressed=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EC=98=81=EC=97=AD=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/common/component/SsingBottomBar.kt | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/core/ui/src/main/java/com/ssing/core/ui/common/component/SsingBottomBar.kt b/core/ui/src/main/java/com/ssing/core/ui/common/component/SsingBottomBar.kt index 55304db6..f545ebdf 100644 --- a/core/ui/src/main/java/com/ssing/core/ui/common/component/SsingBottomBar.kt +++ b/core/ui/src/main/java/com/ssing/core/ui/common/component/SsingBottomBar.kt @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.Text @@ -99,10 +100,6 @@ private fun SsingBottomBarItem( Column( modifier = modifier - .background( - color = if (isPressed) SSINGTheme.colors.borderDisabled else Color.Transparent, - shape = RoundedCornerShape(12.dp), - ) .clickable( interactionSource = interactionSource, indication = null, @@ -111,15 +108,25 @@ private fun SsingBottomBarItem( .padding(top = 8.dp, bottom = 12.dp), horizontalAlignment = Alignment.CenterHorizontally, ) { - Icon( - imageVector = ImageVector.vectorResource(iconRes), - contentDescription = stringResource(tab.titleRes), - tint = textColor, - ) - Text( - text = stringResource(tab.titleRes), - style = SSINGTheme.typography.caption.md11, - color = textColor, - ) + Column( + modifier = Modifier + .widthIn(min = 40.dp) + .background( + color = if (isPressed) SSINGTheme.colors.borderDisabled else Color.Transparent, + shape = RoundedCornerShape(12.dp), + ), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + imageVector = ImageVector.vectorResource(iconRes), + contentDescription = stringResource(tab.titleRes), + tint = textColor, + ) + Text( + text = stringResource(tab.titleRes), + style = SSINGTheme.typography.caption.md11, + color = textColor, + ) + } } } From c06a27a9ff64c7544752998b3af91ecc5d4519e0 Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 01:57:23 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[fix/#219]=20=ED=91=B8=EC=8B=9C=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=A0=84=EC=9A=A9=20?= =?UTF-8?q?=ED=91=B8=EC=8B=9C=20=EC=95=84=EC=9D=B4=EC=BD=98=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/notification/PushNotificationService.kt | 2 +- .../src/main/res/drawable-hdpi/ic_stat_name.png | Bin 0 -> 571 bytes .../src/main/res/drawable-mdpi/ic_stat_name.png | Bin 0 -> 382 bytes .../src/main/res/drawable-xhdpi/ic_stat_name.png | Bin 0 -> 763 bytes .../main/res/drawable-xxhdpi/ic_stat_name.png | Bin 0 -> 1127 bytes .../main/res/drawable-xxxhdpi/ic_stat_name.png | Bin 0 -> 1553 bytes 6 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 core/notification/src/main/res/drawable-hdpi/ic_stat_name.png create mode 100644 core/notification/src/main/res/drawable-mdpi/ic_stat_name.png create mode 100644 core/notification/src/main/res/drawable-xhdpi/ic_stat_name.png create mode 100644 core/notification/src/main/res/drawable-xxhdpi/ic_stat_name.png create mode 100644 core/notification/src/main/res/drawable-xxxhdpi/ic_stat_name.png diff --git a/core/notification/src/main/java/com/ssing/core/notification/PushNotificationService.kt b/core/notification/src/main/java/com/ssing/core/notification/PushNotificationService.kt index 1e431a5d..bcea4dd8 100644 --- a/core/notification/src/main/java/com/ssing/core/notification/PushNotificationService.kt +++ b/core/notification/src/main/java/com/ssing/core/notification/PushNotificationService.kt @@ -82,7 +82,7 @@ class PushNotificationService : FirebaseMessagingService() { ) } val notification = NotificationCompat.Builder(this, DEFAULT_CHANNEL_ID) - .setSmallIcon(applicationInfo.icon) + .setSmallIcon(R.drawable.ic_stat_name) .setContentTitle(title) .setContentText(body) .apply { pendingIntent?.let { setContentIntent(it) } } diff --git a/core/notification/src/main/res/drawable-hdpi/ic_stat_name.png b/core/notification/src/main/res/drawable-hdpi/ic_stat_name.png new file mode 100644 index 0000000000000000000000000000000000000000..dca735eb63fefdadef92f1e0b74a1fedf436f3b9 GIT binary patch literal 571 zcmV-B0>u4^P)1hFM@txXdGqa1W`h?W|JB1D`bhy=ySHL4-VA{wGeLif6c4}9Qp&iDMz@BVrB-m0pUl$4a@nAt0QgWWn; z5oqL{WtqU^nkg$Za6M?qv4&lm+cy+DfsHzz538DZVp#l53O>bpJcxZbf&+NYjmg?p{Iat$%MzXpvl$pahP`+JYjxfQ z-iMVuukoc0TGYHd12?hBuW$3?$|pP{dtJfrLB=)S9A+{{xf+C$;x6+d4&hz=9iQH2 z3(xv}+kPkQFf+mZEJ6L!5FYAQohxW4#6Lt7V(?#McUeZC&y7m%-z@X(m z{e|$%q61!*amR@EunR&LaZ^_oz@)F+?0#ExFS(n3*pfcC2%g53Y|VoB|5-=^g^u97 zR?opW-p37{fVWo2gHoYbEk2Y@lx3fF|E3-s!v}Z`>$GN3pm4uMua|tZ>zb0ork$4i zRpEG|`Le*qr|^SzW6?k7IX=eQcu3cl3^qHAvtc(mn9+45g$)njJ?$dkuT|npl1*>m zPiZDYhvv%y8=uF|(u{lk#6K;{37faz3;b%)H+G+9Qc_YX$v?Q{UsL!RlV|_{002ov JPDHLkV1jfi6l4GZ literal 0 HcmV?d00001 diff --git a/core/notification/src/main/res/drawable-mdpi/ic_stat_name.png b/core/notification/src/main/res/drawable-mdpi/ic_stat_name.png new file mode 100644 index 0000000000000000000000000000000000000000..3a69d15bd79106de1a3bc8c7c8f0cafdac6a73b5 GIT binary patch literal 382 zcmV-^0fGLBP)*wV+pf1 c6Y;-j0-3~#Oq1g2jsO4v07*qoM6N<$f^Ai*pa1{> literal 0 HcmV?d00001 diff --git a/core/notification/src/main/res/drawable-xhdpi/ic_stat_name.png b/core/notification/src/main/res/drawable-xhdpi/ic_stat_name.png new file mode 100644 index 0000000000000000000000000000000000000000..ffddee082feeab53ab8ba189cd2e541165a39619 GIT binary patch literal 763 zcmVg+dls$Y&`F zB@$UsvhX#HuR%P1XU@IXx&M3LJ2%(8_g$P{{c7et&vVZI&b;q=-}g2&L?V$$BogtM z*-HG3r?ErFQxBnc+h2a*0c_E_)I!+K-~(iNigUF#l@PQM@5u*ne8(Nws6DBJkTdaX ze*PTiu}ypa3rsu`d+-6C#0gqcF7$2+LMu;js`gY2lb(`=URwp{F1?3kzK{>tsXZ0J zgx_=(_=0PLnnl=+y|~AXS;BvcE;ZJD@NxCqV_vWvmHRi9Y zG59#IqL8B|I~2cP*P;x+aA{bZgMsDPCk>V0PRlFiPrCsbQ}zcr7V4mIGt8X_gER1j zcGLj(mz|%^9RcGZAOnf15pfY7g*3!rEOp3u%J<94Pt?6Bkw!*NdY zCPMKp^Z(vjkv)yvg(h^vbEyX#q9c?dS+0z8hN@`rNVz_Ges zRWSeDzt2kV6d|{RUUzq1ZT?~J3?9Q3R*!cD7F}<}9|9HkL8obdDj?WAd?SI2(XG9y zfpC-Xp(YmG`$d!XrUt^b;zbFqxW{An*5}UuZP=>w)D`nLpMzoIA$X4MI#1mp)E4vK zM3h6X_NM~#ub=NEY%v~bZ)zaiWb@xbl)`PpwZ8|H3*koLRS6x^r#-2IkWH5Sc-*7) tsfDo1@EZ2xTReorwJs8gL?V%L`2%4AM)ji3^q>F$002ovPDHLkV1l+gekT9` literal 0 HcmV?d00001 diff --git a/core/notification/src/main/res/drawable-xxhdpi/ic_stat_name.png b/core/notification/src/main/res/drawable-xxhdpi/ic_stat_name.png new file mode 100644 index 0000000000000000000000000000000000000000..ed494fb4f5f398efc09e68b8ddf368ff7d8567e9 GIT binary patch literal 1127 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 DfSK{2 literal 0 HcmV?d00001