only-bible-app

The only bible app you will ever need. No ads. No in-app purchases. No distractions.

10bedde4 — pyrossh

fix selected verses

Files changed (3) hide show

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -1,7 +1,7 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/models.dart";
 import "package:only_bible_app/navigation.dart";
-import 'package:only_bible_app/store/state.dart';
+import "package:only_bible_app/store/state.dart";
 import "package:only_bible_app/utils.dart";
 class ActionsSheet extends StatelessWidget {

lib/store/actions.dart CHANGED Viewed

@@ -36,12 +36,13 @@ class SetPlaying implements AppAction {
   const SetPlaying(this.value);
 }
-class SetSelectedVerses implements AppAction {
+class SelectVerse implements AppAction {
-  final List<Verse> value;
+  final Verse verse;
-  const SetSelectedVerses(this.value);
+  const SelectVerse(this.verse);
 }
 class ClearSelectedVerses implements AppAction {
   const ClearSelectedVerses();
 }

lib/store/state.dart CHANGED Viewed

@@ -144,15 +144,19 @@ final isPlaying = Atom(
   },
 );
-final selectedVersesAtom = Atom(
+final selectedVersesAtom = Atom<List<Verse>, AppAction>(
   key: "selectedVerses",
-  initialState: List<Verse>.from([]),
+  initialState: [],
   reducer: (state, action) {
-    if (action is SetSelectedVerses) {
+    if (action is SelectVerse) {
-      return action.value;
+      if (isVerseSelected(action.verse)) {
+        return (state as List<Verse>).removeBy((it) => it.index == action.verse.index).toList();
+      } else {
+        return (state as List<Verse>).addBy(action.verse).toList();
+      }
     }
     if (action is ClearSelectedVerses) {
-      return [];
+      return List<Verse>.from([]);
     }
     return state;
   },
@@ -199,11 +203,7 @@ bool watchVerseSelected(BuildContext context, Verse v) {
 }
 void onVerseSelected(BuildContext context, Bible bible, Verse v) {
-  if (isVerseSelected(v)) {
+  dispatch(SelectVerse(v));
-    dispatch(SetSelectedVerses(selectedVersesAtom.value.removeBy((it) => it.index == v.index).toList()));
-  } else {
-    dispatch(SetSelectedVerses(selectedVersesAtom.value.addBy(v).toList()));
-  }
   if (selectedVersesAtom.value.isNotEmpty) {
     showActions(context, bible);
   }