Skip to content

refactor(setting): presentation을 기능별 폴더로 정리 (#1088) #2053

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
OnlyReadOneBook merged 6 commits into from
Sep 19, 2026
Merged

refactor(setting): presentation을 기능별 폴더로 정리 (#1088) #2053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
929b180
refactor(setting): group presentation files by feature (#1088)
OnlyReadOneBook Sep 13, 2026
e963609
Merge remote-tracking branch 'origin/develop' into refactor/1088-sett…
OnlyReadOneBook Sep 19, 2026
3c42a76
Merge remote-tracking branch 'origin/develop' into refactor/1088-sett…
OnlyReadOneBook Sep 19, 2026
b334339
test(setting): RadioGroupTest 를 이동한 RadioGroup 패키지로 옮긴다 (#1088)
OnlyReadOneBook Sep 19, 2026
8cd2e26
Merge remote-tracking branch 'origin/develop' into refactor/1088-sett…
OnlyReadOneBook Sep 19, 2026
33df769
Merge remote-tracking branch 'origin/develop' into refactor/1088-sett…
OnlyReadOneBook Sep 19, 2026
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
5 changes: 2 additions & 3 deletions ...tation/screen/ConnectedAccountsContent.kt → ...ation/account/ConnectedAccountsContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.account

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
Expand All @@ -17,8 +17,7 @@ import androidx.compose.ui.unit.dp
import com.afternote.core.ui.theme.AfternoteDesign
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.component.SocialAccountRow
import com.afternote.feature.setting.presentation.viewmodel.ConnectedAccountsUiState
import com.afternote.feature.setting.presentation.account.component.SocialAccountRow

/**
* 연결된 계정 화면의 상태 없는 본문.
Expand Down
12 changes: 5 additions & 7 deletions ...ntation/screen/ConnectedAccountsScreen.kt → ...tation/account/ConnectedAccountsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.account

import android.app.Activity
import androidx.compose.material3.SnackbarHostState
Expand All @@ -16,12 +16,10 @@ import com.afternote.core.domain.error.CoreAuthFailure
import com.afternote.core.ui.findActivity
import com.afternote.feature.setting.presentation.BuildConfig
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.social.KakaoAuthResult
import com.afternote.feature.setting.presentation.social.requestGoogleIdToken
import com.afternote.feature.setting.presentation.social.requestKakaoAccessToken
import com.afternote.feature.setting.presentation.social.toKakaoAuthResult
import com.afternote.feature.setting.presentation.viewmodel.ConnectedAccountsEvent
import com.afternote.feature.setting.presentation.viewmodel.ConnectedAccountsViewModel
import com.afternote.feature.setting.presentation.account.social.KakaoAuthResult
import com.afternote.feature.setting.presentation.account.social.requestGoogleIdToken
import com.afternote.feature.setting.presentation.account.social.requestKakaoAccessToken
import com.afternote.feature.setting.presentation.account.social.toKakaoAuthResult

@Composable
fun ConnectedAccountsScreen(
Expand Down
2 changes: 1 addition & 1 deletion ...ion/viewmodel/ConnectedAccountsUiState.kt → ...ation/account/ConnectedAccountsUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.viewmodel
package com.afternote.feature.setting.presentation.account

data class ConnectedAccountsUiState(
val isLoading: Boolean = false,
Expand Down
2 changes: 1 addition & 1 deletion ...n/viewmodel/ConnectedAccountsViewModel.kt → ...ion/account/ConnectedAccountsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.viewmodel
package com.afternote.feature.setting.presentation.account

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
2 changes: 1 addition & 1 deletion ...sentation/viewmodel/SocialAccountState.kt → ...resentation/account/SocialAccountState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.viewmodel
package com.afternote.feature.setting.presentation.account

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
Expand Down
4 changes: 2 additions & 2 deletions ...resentation/component/SocialAccountRow.kt → ...ion/account/component/SocialAccountRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.component
package com.afternote.feature.setting.presentation.account.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Column
Expand All @@ -20,7 +20,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.afternote.core.ui.theme.AfternoteDesign
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.viewmodel.SocialAccountState
import com.afternote.feature.setting.presentation.account.SocialAccountState

@Composable
fun SocialAccountRow(
Expand Down
2 changes: 1 addition & 1 deletion ...g/presentation/social/GoogleLinkHelper.kt → ...tation/account/social/GoogleLinkHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.social
package com.afternote.feature.setting.presentation.account.social

import android.content.Context
import androidx.credentials.CredentialManager
Expand Down
2 changes: 1 addition & 1 deletion ...ng/presentation/social/KakaoAuthResult.kt → ...ntation/account/social/KakaoAuthResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.social
package com.afternote.feature.setting.presentation.account.social

import com.afternote.core.domain.error.CoreAuthFailure

Expand Down
2 changes: 1 addition & 1 deletion ...ng/presentation/social/KakaoLinkHelper.kt → ...ntation/account/social/KakaoLinkHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.social
package com.afternote.feature.setting.presentation.account.social

import android.app.Activity
import com.afternote.core.domain.error.CoreAuthFailure
Expand Down
5 changes: 2 additions & 3 deletions ...resentation/screen/AppLockSetupContent.kt → ...esentation/applock/AppLockSetupContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.applock

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
Expand All @@ -12,8 +12,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.presentation.component.InsertPasswordContent
import com.afternote.feature.setting.presentation.component.PinSetupStep
import com.afternote.feature.setting.presentation.shared.component.InsertPasswordContent

/**
* 앱 잠금 비밀번호 설정 화면의 상태 없는 본문.
Expand Down
4 changes: 1 addition & 3 deletions ...presentation/screen/AppLockSetupScreen.kt → ...resentation/applock/AppLockSetupScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.applock

import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand All @@ -7,8 +7,6 @@ import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Modifier
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.afternote.feature.setting.presentation.component.PinSetupStep
import com.afternote.feature.setting.presentation.viewmodel.AppLockSetupViewModel

@Composable
fun AppLockSetupScreen(
Expand Down
2 changes: 1 addition & 1 deletion ...entation/viewmodel/AppLockSetupUiState.kt → ...esentation/applock/AppLockSetupUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.viewmodel
package com.afternote.feature.setting.presentation.applock

data class AppLockSetupUiState(
val pin: String = "",
Expand Down
2 changes: 1 addition & 1 deletion ...tation/viewmodel/AppLockSetupViewModel.kt → ...entation/applock/AppLockSetupViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.viewmodel
package com.afternote.feature.setting.presentation.applock

import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
Expand Down
2 changes: 1 addition & 1 deletion ...ng/presentation/component/PinSetupStep.kt → ...ting/presentation/applock/PinSetupStep.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.component
package com.afternote.feature.setting.presentation.applock

enum class PinSetupStep {
ENTER_NEW, // "비밀번호를 입력해 주세요."
Expand Down
9 changes: 3 additions & 6 deletions ...ntation/screen/DeliveryConditionScreen.kt → ...ation/delivery/DeliveryConditionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.delivery

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
Expand Down Expand Up @@ -32,11 +32,8 @@ import com.afternote.core.model.delivery.DeliveryConditionType
import com.afternote.core.ui.theme.AfternoteDesign
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.component.RadioGroup
import com.afternote.feature.setting.presentation.component.RadioGroupItem
import com.afternote.feature.setting.presentation.viewmodel.DeliveryConditionError
import com.afternote.feature.setting.presentation.viewmodel.DeliveryConditionUiState
import com.afternote.feature.setting.presentation.viewmodel.DeliveryConditionViewModel
import com.afternote.feature.setting.presentation.delivery.component.RadioGroup
import com.afternote.feature.setting.presentation.delivery.component.RadioGroupItem

@Composable
fun DeliveryConditionScreen(
Expand Down
2 changes: 1 addition & 1 deletion ...ion/viewmodel/DeliveryConditionUiState.kt → ...tion/delivery/DeliveryConditionUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.viewmodel
package com.afternote.feature.setting.presentation.delivery

import com.afternote.core.model.delivery.DeliveryConditionItem
import com.afternote.core.model.delivery.DeliveryConditionType
Expand Down
2 changes: 1 addition & 1 deletion ...n/viewmodel/DeliveryConditionViewModel.kt → ...on/delivery/DeliveryConditionViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.viewmodel
package com.afternote.feature.setting.presentation.delivery

import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
Expand Down
2 changes: 1 addition & 1 deletion ...ting/presentation/component/RadioGroup.kt → ...entation/delivery/component/RadioGroup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.component
package com.afternote.feature.setting.presentation.delivery.component

import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.runtime.Composable
Expand Down
2 changes: 1 addition & 1 deletion .../presentation/component/RadioGroupCard.kt → ...tion/delivery/component/RadioGroupCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.component
package com.afternote.feature.setting.presentation.delivery.component

import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.tween
Expand Down
2 changes: 1 addition & 1 deletion .../presentation/component/RadioGroupItem.kt → ...tion/delivery/component/RadioGroupItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.component
package com.afternote.feature.setting.presentation.delivery.component

data class RadioGroupItem(
val title: String,
Expand Down
10 changes: 4 additions & 6 deletions ...ting/presentation/screen/SettingScreen.kt → ...etting/presentation/home/SettingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.home

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
Expand Down Expand Up @@ -30,11 +30,9 @@ import com.afternote.core.ui.popup.Popup
import com.afternote.core.ui.popup.PopupType
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.component.SettingMenuItem
import com.afternote.feature.setting.presentation.component.SettingProfile
import com.afternote.feature.setting.presentation.component.SettingSection
import com.afternote.feature.setting.presentation.viewmodel.SettingUiState
import com.afternote.feature.setting.presentation.viewmodel.SettingViewModel
import com.afternote.feature.setting.presentation.home.component.SettingProfile
import com.afternote.feature.setting.presentation.home.component.SettingSection
import com.afternote.feature.setting.presentation.shared.component.SettingMenuItem
import kotlinx.coroutines.launch

// 설정-메인
Expand Down
2 changes: 1 addition & 1 deletion ...resentation/viewmodel/SettingViewModel.kt → ...ing/presentation/home/SettingViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.viewmodel
package com.afternote.feature.setting.presentation.home

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
2 changes: 1 addition & 1 deletion ...entation/screen/WithdrawConfirmContent.kt → ...esentation/home/WithdrawConfirmContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.home

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down
5 changes: 1 addition & 4 deletions ...sentation/screen/WithdrawConfirmScreen.kt → ...resentation/home/WithdrawConfirmScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.home

import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand All @@ -8,9 +8,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.afternote.core.ui.popup.Popup
import com.afternote.core.ui.popup.PopupType
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.viewmodel.SettingUiState
import com.afternote.feature.setting.presentation.viewmodel.SettingViewModel
import com.afternote.feature.setting.presentation.viewmodel.WithdrawUiState

@Composable
fun WithdrawConfirmScreen(
Expand Down
3 changes: 1 addition & 2 deletions ...resentation/screen/WithdrawGuideScreen.kt → .../presentation/home/WithdrawGuideScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.home

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -32,7 +32,6 @@ import com.afternote.core.ui.button.CheckboxState
import com.afternote.core.ui.theme.AfternoteDesign
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.viewmodel.SettingUiState

// 설정 - 회원 탈퇴 안내
@Composable
Expand Down
2 changes: 1 addition & 1 deletion .../presentation/component/SettingProfile.kt → ...entation/home/component/SettingProfile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.component
package com.afternote.feature.setting.presentation.home.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
Expand Down
2 changes: 1 addition & 1 deletion .../presentation/component/SettingSection.kt → ...entation/home/component/SettingSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.component
package com.afternote.feature.setting.presentation.home.component

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
Expand Down
44 changes: 22 additions & 22 deletions .../src/main/kotlin/com/afternote/feature/setting/presentation/navigation/SettingNavGraph.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ import androidx.navigation.compose.composable
import androidx.navigation.navigation
import androidx.navigation.toRoute
import com.afternote.core.ui.Route
import com.afternote.feature.setting.presentation.component.PinSetupStep
import com.afternote.feature.setting.presentation.screen.AppLockSetupScreen
import com.afternote.feature.setting.presentation.screen.ConnectedAccountsScreen
import com.afternote.feature.setting.presentation.screen.DeliveryConditionScreen
import com.afternote.feature.setting.presentation.screen.NoticeListScreen
import com.afternote.feature.setting.presentation.screen.NotificationSettingScreen
import com.afternote.feature.setting.presentation.screen.PassKeyListScreen
import com.afternote.feature.setting.presentation.screen.PassKeyMakingScreen
import com.afternote.feature.setting.presentation.screen.PassKeyPasswordScreen
import com.afternote.feature.setting.presentation.screen.PassKeyScreen
import com.afternote.feature.setting.presentation.screen.ProfileEditScreen
import com.afternote.feature.setting.presentation.screen.PushNotificationScreen
import com.afternote.feature.setting.presentation.screen.ReceiverEditScreen
import com.afternote.feature.setting.presentation.screen.ReceiverListScreen
import com.afternote.feature.setting.presentation.screen.ReceiverManageScreen
import com.afternote.feature.setting.presentation.screen.ReceiverRegisterScreen
import com.afternote.feature.setting.presentation.screen.SettingScreen
import com.afternote.feature.setting.presentation.screen.WithdrawConfirmScreen
import com.afternote.feature.setting.presentation.screen.WithdrawGuideScreen
import com.afternote.feature.setting.presentation.viewmodel.PassKeyViewModel
import com.afternote.feature.setting.presentation.viewmodel.ReceiverListViewModel
import com.afternote.feature.setting.presentation.viewmodel.SettingViewModel
import com.afternote.feature.setting.presentation.account.ConnectedAccountsScreen
import com.afternote.feature.setting.presentation.applock.AppLockSetupScreen
import com.afternote.feature.setting.presentation.applock.PinSetupStep
import com.afternote.feature.setting.presentation.delivery.DeliveryConditionScreen
import com.afternote.feature.setting.presentation.home.SettingScreen
import com.afternote.feature.setting.presentation.home.SettingViewModel
import com.afternote.feature.setting.presentation.home.WithdrawConfirmScreen
import com.afternote.feature.setting.presentation.home.WithdrawGuideScreen
import com.afternote.feature.setting.presentation.notice.NoticeListScreen
import com.afternote.feature.setting.presentation.notification.NotificationSettingScreen
import com.afternote.feature.setting.presentation.notification.PushNotificationScreen
import com.afternote.feature.setting.presentation.passkey.PassKeyListScreen
import com.afternote.feature.setting.presentation.passkey.PassKeyMakingScreen
import com.afternote.feature.setting.presentation.passkey.PassKeyPasswordScreen
import com.afternote.feature.setting.presentation.passkey.PassKeyScreen
import com.afternote.feature.setting.presentation.passkey.PassKeyViewModel
import com.afternote.feature.setting.presentation.profile.ProfileEditScreen
import com.afternote.feature.setting.presentation.receiver.ReceiverEditScreen
import com.afternote.feature.setting.presentation.receiver.ReceiverListScreen
import com.afternote.feature.setting.presentation.receiver.ReceiverListViewModel
import com.afternote.feature.setting.presentation.receiver.ReceiverManageScreen
import com.afternote.feature.setting.presentation.receiver.ReceiverRegisterScreen

fun NavGraphBuilder.settingNavGraph(
graphScopedParentEntry: () -> NavBackStackEntry,
Expand Down
4 changes: 2 additions & 2 deletions ...g/presentation/screen/NoticeListScreen.kt → ...g/presentation/notice/NoticeListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.notice

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -16,7 +16,7 @@ import com.afternote.core.ui.theme.AfternoteDesign
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.domain.Notice
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.component.NoticeListItem
import com.afternote.feature.setting.presentation.notice.component.NoticeListItem

// 설정 - 공지사항
@Composable
Expand Down
2 changes: 1 addition & 1 deletion .../presentation/component/NoticeListItem.kt → ...tation/notice/component/NoticeListItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.component
package com.afternote.feature.setting.presentation.notice.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
Expand Down
2 changes: 1 addition & 1 deletion ...on/screen/NotificationPermissionAction.kt → ...ification/NotificationPermissionAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.notification

internal enum class NotificationPermissionAction {
RequestPermission,
Expand Down
8 changes: 3 additions & 5 deletions ...ation/screen/NotificationSettingScreen.kt → ...notification/NotificationSettingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.notification

import android.Manifest
import android.app.Activity
Expand Down Expand Up @@ -43,10 +43,8 @@ import com.afternote.core.ui.findActivity
import com.afternote.core.ui.theme.AfternoteDesign
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.component.DeviceAlarmOffSection
import com.afternote.feature.setting.presentation.component.SettingMenuItem
import com.afternote.feature.setting.presentation.viewmodel.PushNotificationEvent
import com.afternote.feature.setting.presentation.viewmodel.PushNotificationViewModel
import com.afternote.feature.setting.presentation.notification.component.DeviceAlarmOffSection
import com.afternote.feature.setting.presentation.shared.component.SettingMenuItem

@Composable
fun NotificationSettingScreen(
Expand Down
5 changes: 2 additions & 3 deletions ...ntation/screen/PushNotificationContent.kt → ...n/notification/PushNotificationContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.notification

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
Expand All @@ -15,8 +15,7 @@ import androidx.compose.ui.unit.dp
import com.afternote.core.ui.theme.AfternoteDesign
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.component.PushToggleSection
import com.afternote.feature.setting.presentation.viewmodel.PushNotificationUiState
import com.afternote.feature.setting.presentation.notification.component.PushToggleSection

/**
* 푸시 알림 설정 화면의 상태 없는 본문.
Expand Down
9 changes: 3 additions & 6 deletions ...entation/screen/PushNotificationScreen.kt → ...on/notification/PushNotificationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.feature.setting.presentation.screen
package com.afternote.feature.setting.presentation.notification

import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand All @@ -9,11 +9,8 @@ import com.afternote.core.ui.popup.ServerErrorPopup
import com.afternote.core.ui.theme.AfternoteDesign
import com.afternote.core.ui.topbar.DetailTopBar
import com.afternote.feature.setting.presentation.R
import com.afternote.feature.setting.presentation.component.DeviceAlarmOffSection
import com.afternote.feature.setting.presentation.component.PushToggleSection
import com.afternote.feature.setting.presentation.viewmodel.PushNotificationSaveFailure
import com.afternote.feature.setting.presentation.viewmodel.PushNotificationUiState
import com.afternote.feature.setting.presentation.viewmodel.PushNotificationViewModel
import com.afternote.feature.setting.presentation.notification.component.DeviceAlarmOffSection
import com.afternote.feature.setting.presentation.notification.component.PushToggleSection

@Composable
fun PushNotificationScreen(
Expand Down
Loading
Loading