Fix notification delivery and settings flows

This commit is contained in:
Dwindi Ramadhana
2026-05-31 20:40:20 +07:00
parent 5195ba19ad
commit 2bd8e3666a
12 changed files with 1419 additions and 435 deletions

View File

@@ -124,6 +124,14 @@ class _DzikirScreenState extends ConsumerState<DzikirScreen>
return _todayKey;
}
bool _isFocusMode(String mode) {
return mode == 'focus' || mode == 'slide';
}
bool _useCircleCounterButton(String position) {
return position == 'fabCircle' || position == 'circle';
}
Future<void> _loadData() async {
_refreshTodayScope();
setState(() {
@@ -658,7 +666,7 @@ class _DzikirScreenState extends ConsumerState<DzikirScreen>
.listenable(keys: ['default']),
builder: (_, settingsBox, __) {
final settings = settingsBox.get('default') ?? AppSettings();
final isFocusMode = settings.dzikirDisplayMode == 'focus';
final isFocusMode = _isFocusMode(settings.dzikirDisplayMode);
return Scaffold(
appBar: AppBar(
@@ -1172,7 +1180,9 @@ class _DzikirScreenState extends ConsumerState<DzikirScreen>
);
},
),
if (settings.dzikirCounterButtonPosition == 'fabCircle')
if (_useCircleCounterButton(
settings.dzikirCounterButtonPosition,
))
Positioned(
right: 8,
bottom: 12,