only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git

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

3c9e3d1c — pyrossh

remove old Atom

Files changed (6) hide show

lib/atom.dart +3 -62
lib/navigation.dart +22 -16
lib/sheets/actions_sheet.dart +2 -2
lib/store/actions.dart +33 -1
lib/store/state.dart +40 -34
lib/widgets/verses_view.dart +1 -1

lib/atom.dart CHANGED Viewed

@@ -2,7 +2,7 @@ import "package:flutter/material.dart";
 import "package:flutter/scheduler.dart";
 import "package:get_storage/get_storage.dart";
-final List<Atom2> atoms = [];
+final List<Atom> atoms = [];
 void dispatch<T, A>(A a) {
   for (final atom in atoms) {
@@ -19,13 +19,13 @@ void dispatch<T, A>(A a) {
   }
 }
-class Atom2<T, A> {
+class Atom<T, A> {
   late ValueNotifier<T> valueNotifier;
   final String key;
   final GetStorage? box;
   final dynamic Function(dynamic, dynamic) reducer;
-  Atom2({required this.key, required T initialState, this.box, required this.reducer}) {
+  Atom({required this.key, required T initialState, this.box, required this.reducer}) {
     valueNotifier = ValueNotifier(box != null ? box!.read<T>(key) ?? initialState : initialState);
     atoms.add(this);
   }
@@ -69,65 +69,6 @@ class Atom2<T, A> {
   }
 }
-class Atom<T> extends ValueNotifier<T> {
-  final String key;
-  final GetStorage? box;
-  Function()? set;
-  Function(T)? update;
-  Atom({required this.key, required T initialValue, this.box, this.set, this.update})
-      : super(box != null ? box.read<T>(key) ?? initialValue : initialValue);
-  @override
-  set value(T newValue) {
-    super.value = newValue;
-    if (box != null) {
-      if (newValue == null) {
-        box!.remove(key);
-      } else {
-        box!.write(key, newValue);
-      }
-      box!.save();
-    }
-  }
-  T watch(BuildContext context) {
-    final elementRef = WeakReference(context as Element);
-    final listenerWrapper = _ListenerWrapper();
-    listenerWrapper.listener = () {
-      assert(
-        SchedulerBinding.instance.schedulerPhase != SchedulerPhase.persistentCallbacks,
-        """
-            Do not mutate state (by setting the value of the ValueNotifier
-            that you are subscribed to) during a `build` method. If you need
-            to schedule a value update after `build` has completed, use
-            `SchedulerBinding.instance.scheduleTask(updateTask, Priority.idle)`,
-            `SchedulerBinding.addPostFrameCallback(updateTask)`, '
-          or similar.
-          """,
-      );
-      // If the element has not been garbage collected (causing
-      // `elementRef.target` to be null), or unmounted
-      if (elementRef.target?.mounted ?? false) {
-        // Mark the element as needing to be rebuilt
-        elementRef.target!.markNeedsBuild();
-      }
-      // Remove the listener -- only listen to one change per `build`
-      removeListener(listenerWrapper.listener!);
-    };
-    addListener(listenerWrapper.listener!);
-    return value;
-  }
-  /// Use this method to notify listeners of deeper changes, e.g. when a value
-  /// is added to or removed from a set which is stored in the value of a
-  /// `ValueNotifier<Set<T>>`.
-  void notifyChanged() {
-    // ignore: invalid_use_of_protected_member, invalid_use_of_visible_for_testing_member
-    notifyListeners();
-  }
-}
 class _ListenerWrapper {
   void Function()? listener;
 }

lib/navigation.dart CHANGED Viewed

@@ -15,19 +15,25 @@ import "package:only_bible_app/widgets/scaffold_markdown.dart";
 import "package:share_plus/share_plus.dart";
 import "package:only_bible_app/atom.dart";
-final Atom<bool> actionsShown = Atom<bool>(
+final actionsShownAtom = Atom(
   key: "actionsShown",
-  initialValue: false,
+  initialState: false,
-  update: (bool v) {
+  reducer: (state, action) {
+    if (action is SetActionsShown) {
-    actionsShown.value = v;
+      return action.value;
+    }
+    return state;
   },
 );
-final Atom<bool> highlightsShown = Atom<bool>(
+final highlightsShownAtom = Atom(
   key: "highlightsShown",
-  initialValue: false,
+  initialState: false,
-  update: (bool v) {
+  reducer: (state, action) {
+    if (action is SetHighlightsShown) {
-    highlightsShown.value = v;
+      return action.value;
+    }
+    return state;
   },
 );
@@ -225,8 +231,8 @@ showSettings(BuildContext context, Bible bible) {
 }
 showActions(BuildContext context, Bible bible) {
-  if (!actionsShown.value) {
+  if (!actionsShownAtom.value) {
-    actionsShown.value = true;
+    dispatch(const SetActionsShown(true));
     Scaffold.of(context).showBottomSheet(
       enableDrag: false,
       clipBehavior: Clip.antiAliasWithSaveLayer,
@@ -236,15 +242,15 @@ showActions(BuildContext context, Bible bible) {
 }
 hideActions(BuildContext context) {
-  if (actionsShown.value) {
+  if (actionsShownAtom.value) {
-    actionsShown.value = false;
+    dispatch(const SetActionsShown(false));
-    clearSelections();
+    dispatch(const ClearSelectedVerses());
     Navigator.of(context).pop();
   }
 }
 showHighlights(BuildContext context) {
-  highlightsShown.value = true;
+  dispatch(const SetHighlightsShown(true));
   Scaffold.of(context).showBottomSheet(
     enableDrag: false,
     clipBehavior: Clip.antiAliasWithSaveLayer,
@@ -253,8 +259,8 @@ showHighlights(BuildContext context) {
 }
 hideHighlights(BuildContext context) {
-  if (highlightsShown.value) {
+  if (highlightsShownAtom.value) {
-    highlightsShown.value = false;
+    dispatch(const SetHighlightsShown(false));
     Navigator.of(context).pop();
   }
 }

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -40,12 +40,12 @@ class ActionsSheet extends StatelessWidget {
           ),
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => showNoteField(context, bible, selectedVerses.value.first),
+            onPressed: () => showNoteField(context, bible, selectedVersesAtom.value.first),
             icon: Icon(Icons.post_add_outlined, size: 34, color: iconColor),
           ),
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => shareVerses(context, bible, selectedVerses.value),
+            onPressed: () => shareVerses(context, bible, selectedVersesAtom.value),
             icon: Icon(Icons.share_outlined, size: 34, color: iconColor),
           ),
         ],

lib/store/actions.dart CHANGED Viewed

@@ -1,3 +1,5 @@
+import "package:only_bible_app/models.dart";
 sealed class AppAction {}
 class FirstOpenDone implements AppAction {}
@@ -10,7 +12,9 @@ class UpdateBible implements AppAction {
 }
 class ToggleEngTitles implements AppAction {}
 class ToggleBoldFont implements AppAction {}
 class ToggleDarkMode implements AppAction {}
 class UpdateTextScale implements AppAction {
@@ -24,4 +28,32 @@ class UpdateChapter implements AppAction {
   final int chapter;
   const UpdateChapter(this.book, this.chapter);
-}
+}
+class SetPlaying implements AppAction {
+  final bool value;
+  const SetPlaying(this.value);
+}
+class SetSelectedVerses implements AppAction {
+  final List<Verse> value;
+  const SetSelectedVerses(this.value);
+}
+class ClearSelectedVerses implements AppAction {
+  const ClearSelectedVerses();
+}
+class SetActionsShown implements AppAction {
+  final bool value;
+  const SetActionsShown(this.value);
+}
+class SetHighlightsShown implements AppAction {
+  final bool value;
+  const SetHighlightsShown(this.value);
+}

lib/store/state.dart CHANGED Viewed

@@ -24,7 +24,7 @@ final bibleAtom = AsyncAtom(
   callback: loadBible,
 );
-final firstOpenAtom = Atom2(
+final firstOpenAtom = Atom(
   box: box,
   key: "firstOpen",
   initialState: true,
@@ -36,7 +36,7 @@ final firstOpenAtom = Atom2(
   },
 );
-final languageCodeAtom = Atom2(
+final languageCodeAtom = Atom(
   box: box,
   key: "languageCode",
   initialState: "en",
@@ -48,7 +48,7 @@ final languageCodeAtom = Atom2(
   },
 );
-final bibleNameAtom = Atom2(
+final bibleNameAtom = Atom(
   box: box,
   key: "bibleName",
   initialState: "English",
@@ -60,7 +60,7 @@ final bibleNameAtom = Atom2(
   },
 );
-final engTitlesAtom = Atom2(
+final engTitlesAtom = Atom(
   box: box,
   key: "engTitles",
   initialState: false,
@@ -72,7 +72,7 @@ final engTitlesAtom = Atom2(
   },
 );
-final boldFontAtom = Atom2(
+final boldFontAtom = Atom(
   box: box,
   key: "boldFont",
   initialState: false,
@@ -84,7 +84,7 @@ final boldFontAtom = Atom2(
   },
 );
-final darkModeAtom = Atom2(
+final darkModeAtom = Atom(
   box: box,
   key: "darkMode",
   initialState: false,
@@ -97,7 +97,7 @@ final darkModeAtom = Atom2(
   },
 );
-final textScaleAtom = Atom2(
+final textScaleAtom = Atom(
   box: box,
   key: "textScale",
   initialState: 0.0,
@@ -109,7 +109,7 @@ final textScaleAtom = Atom2(
   },
 );
-final savedBookAtom = Atom2(
+final savedBookAtom = Atom(
   box: box,
   key: "savedBook",
   initialState: 0,
@@ -121,7 +121,7 @@ final savedBookAtom = Atom2(
   },
 );
-final savedChapterAtom = Atom2(
+final savedChapterAtom = Atom(
   box: box,
   key: "savedChapter",
   initialState: 0,
@@ -133,27 +133,31 @@ final savedChapterAtom = Atom2(
   },
 );
-final Atom<bool> isPlaying = Atom<bool>(
+final isPlaying = Atom(
   key: "isPlaying",
-  initialValue: false,
+  initialState: false,
-  update: (bool v) {
+  reducer: (state, action) {
+    if (action is SetPlaying) {
-    isPlaying.value = v;
+      return action.value;
+    }
+    return state;
   },
 );
-final Atom<List<Verse>> selectedVerses = Atom<List<Verse>>(
+final selectedVersesAtom = Atom(
   key: "selectedVerses",
-  initialValue: [],
-  update: (List<Verse> verses) {
+  initialState: List<Verse>.from([]),
+  reducer: (state, action) {
-    selectedVerses.value = verses;
+    if (action is SetSelectedVerses) {
+      return action.value;
+    }
-// selectedVerses.notifyChanged();
+    if (action is ClearSelectedVerses) {
+      return [];
+    }
+    return state;
   },
 );
-void clearSelections() {
-  selectedVerses.value.clear();
-}
 Color? getHighlight(Verse v) {
   final key = "${v.book}:${v.chapter}:${v.index}:highlight";
   if (box.hasData(key)) {
@@ -169,7 +173,7 @@ Color? getHighlight(Verse v) {
 }
 void setHighlight(BuildContext context, int index) {
-  for (final v in selectedVerses.value) {
+  for (final v in selectedVersesAtom.value) {
     box.write("${v.book}:${v.chapter}:${v.index}:highlight", index);
   }
   box.save();
@@ -177,7 +181,7 @@ void setHighlight(BuildContext context, int index) {
 }
 void removeHighlight(BuildContext context) {
-  for (final v in selectedVerses.value) {
+  for (final v in selectedVersesAtom.value) {
     box.remove("${v.book}:${v.chapter}:${v.index}:highlight");
   }
   box.save();
@@ -185,23 +189,25 @@ void removeHighlight(BuildContext context) {
 }
 bool isVerseSelected(Verse v) {
-  return selectedVerses.value.any((el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index);
+  return selectedVersesAtom.value.any((el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index);
 }
 bool watchVerseSelected(BuildContext context, Verse v) {
+  return selectedVersesAtom
+      .watch(context)
-  return selectedVerses.watch(context).any((el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index);
+      .any((el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index);
 }
 void onVerseSelected(BuildContext context, Bible bible, Verse v) {
   if (isVerseSelected(v)) {
-    selectedVerses.update!(selectedVerses.value.removeBy((it) => it.index == v.index).toList());
+    dispatch(SetSelectedVerses(selectedVersesAtom.value.removeBy((it) => it.index == v.index).toList()));
   } else {
-    selectedVerses.update!(selectedVerses.value.addBy(v).toList());
+    dispatch(SetSelectedVerses(selectedVersesAtom.value.addBy(v).toList()));
   }
-  if (selectedVerses.value.isNotEmpty) {
+  if (selectedVersesAtom.value.isNotEmpty) {
     showActions(context, bible);
   }
-  if (selectedVerses.value.isEmpty) {
+  if (selectedVersesAtom.value.isEmpty) {
     hideActions(context);
   }
 }
@@ -235,7 +241,7 @@ clearEvents(BuildContext context) {
 pause() async {
   await player.pause();
-  isPlaying.value = false;
+  dispatch(const SetPlaying(false));
 }
 class BufferAudioSource extends StreamAudioSource {
@@ -261,11 +267,11 @@ class BufferAudioSource extends StreamAudioSource {
 }
 onPlay(BuildContext context, Bible bible) async {
-  final versesToPlay = List<Verse>.from(selectedVerses.value);
+  final versesToPlay = List<Verse>.from(selectedVersesAtom.value);
   if (isPlaying.value) {
     pause();
   } else {
-    isPlaying.value = true;
+    dispatch(const SetPlaying(true));
     for (final v in versesToPlay) {
       final pathname = "${bible.name}|${v.book}|${v.chapter}|${v.index}";
       try {
@@ -304,5 +310,5 @@ deleteNote(BuildContext context, Verse v) {
   box.save();
   hideNoteField(context);
 // TODO: hack to re-render this page
-  selectedVerses.notifyChanged();
+  selectedVersesAtom.notifyChanged();
 }

lib/widgets/verses_view.dart CHANGED Viewed

@@ -89,7 +89,7 @@ class VersesView extends StatelessWidget {
                 ),
               ),
               Padding(
-                padding: EdgeInsets.only(bottom: actionsShown.watch(context) ? 120 : 0),
+                padding: EdgeInsets.only(bottom: actionsShownAtom.watch(context) ? 120 : 0),
               ),
             ],
           ),

~repos /only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git

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