Skip to content

Fix notification setting #73

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
Chaeyeonggg merged 4 commits into from
May 20, 2026
Merged

Fix notification setting #73

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a977178
refactor: 알림 설정 페이지 경로 수정
nuk0325 May 19, 2026
a579458
feat: 전체 알림 토글 로직 수정
nuk0325 May 19, 2026
7c18e87
feat: 전체 알림 토글 로직 수정
nuk0325 May 19, 2026
32bc1c0
Merge branch 'refactor' into fix-notification-setting
Chaeyeonggg May 20, 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
38 changes: 32 additions & 6 deletions lib/features/challenge/detail/widgets/notification_settings_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,39 @@ class _NotificationSettingsDialogState
"전체 알림",
"모든 알림 받기",
allNotifications,
(val) => setState(() => allNotifications = val),
(val) => setState(() {
allNotifications = val;
dailyReminder = val;
mateReaction = val;
mateVerification = val;
}),
),
_buildDailyReminderSection(),
_buildSwitchRow(
"메이트 반응 소식",
"다른 참여자들이 내 인증글에 반응 시 알림",
mateReaction,
(val) => setState(() => mateReaction = val),
(val) => setState(() {
mateReaction = val;
if (!val) {
allNotifications = false;
} else if (dailyReminder && mateVerification) {
allNotifications = true;
}
}),
),
_buildSwitchRow(
"메이트 인증 소식",
"다른 참여자들이 인증 완료 시 알림",
mateVerification,
(val) => setState(() => mateVerification = val),
(val) => setState(() {
mateVerification = val;
if (!val) {
allNotifications = false;
} else if (dailyReminder && mateReaction) {
allNotifications = true;
}
}),
),
const SizedBox(height: 24),

Expand Down Expand Up @@ -129,7 +148,7 @@ class _NotificationSettingsDialogState
String title,
String subtitle,
bool value,
ValueChanged<bool> onChanged,
ValueChanged<bool>? onChanged,
) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 10),
Expand Down Expand Up @@ -192,11 +211,18 @@ class _NotificationSettingsDialogState
"일일 리마인더",
"매일 $selectedTime 알림",
dailyReminder,
(val) => setState(() => dailyReminder = val),
(val) => setState(() {
dailyReminder = val;
if (!val) {
allNotifications = false;
} else if (mateReaction && mateVerification) {
allNotifications = true;
}
}),
),

// 2. 리마인더가 활성화되었을 때만 드롭다운 표시
if (dailyReminder)
if (dailyReminder && allNotifications)
Padding(
padding: const EdgeInsets.only(bottom: 20),
child: GestureDetector(
Expand Down