Fix notification delivery and settings flows
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user