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.

c5b56aa0 — pyrossh

implement Atom2

Files changed (6) hide show

lib/actions.dart +8 -0
lib/actions.freezed.dart +309 -0
lib/atom.dart +72 -0
lib/screens/bible_select_screen.dart +7 -5
lib/state.dart +10 -30
lib/utils.dart +13 -1

lib/actions.dart ADDED Viewed

@@ -0,0 +1,8 @@
+import "package:freezed_annotation/freezed_annotation.dart";
+part "actions.freezed.dart";
+@freezed
+class AppAction with _$AppAction {
+  const factory AppAction.firstOpenDone() = FirstOpenDone;
+  const factory AppAction.setLanguageCode(String code) = SetLanguageCode;
+}

lib/actions.freezed.dart ADDED Viewed

@@ -0,0 +1,309 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+part of 'actions.dart';
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+T _$identity<T>(T value) => value;
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+/// @nodoc
+mixin _$AppAction {
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() firstOpenDone,
+    required TResult Function(String code) setLanguageCode,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? firstOpenDone,
+    TResult? Function(String code)? setLanguageCode,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? firstOpenDone,
+    TResult Function(String code)? setLanguageCode,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(FirstOpenDone value) firstOpenDone,
+    required TResult Function(SetLanguageCode value) setLanguageCode,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(FirstOpenDone value)? firstOpenDone,
+    TResult? Function(SetLanguageCode value)? setLanguageCode,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(FirstOpenDone value)? firstOpenDone,
+    TResult Function(SetLanguageCode value)? setLanguageCode,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+}
+/// @nodoc
+abstract class $AppActionCopyWith<$Res> {
+  factory $AppActionCopyWith(AppAction value, $Res Function(AppAction) then) =
+      _$AppActionCopyWithImpl<$Res, AppAction>;
+}
+/// @nodoc
+class _$AppActionCopyWithImpl<$Res, $Val extends AppAction>
+    implements $AppActionCopyWith<$Res> {
+  _$AppActionCopyWithImpl(this._value, this._then);
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+}
+/// @nodoc
+abstract class _$$FirstOpenDoneCopyWith<$Res> {
+  factory _$$FirstOpenDoneCopyWith(
+          _$FirstOpenDone value, $Res Function(_$FirstOpenDone) then) =
+      __$$FirstOpenDoneCopyWithImpl<$Res>;
+}
+/// @nodoc
+class __$$FirstOpenDoneCopyWithImpl<$Res>
+    extends _$AppActionCopyWithImpl<$Res, _$FirstOpenDone>
+    implements _$$FirstOpenDoneCopyWith<$Res> {
+  __$$FirstOpenDoneCopyWithImpl(
+      _$FirstOpenDone _value, $Res Function(_$FirstOpenDone) _then)
+      : super(_value, _then);
+}
+/// @nodoc
+class _$FirstOpenDone implements FirstOpenDone {
+  const _$FirstOpenDone();
+  @override
+  String toString() {
+    return 'AppAction.firstOpenDone()';
+  }
+  @override
+  bool operator ==(dynamic other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType && other is _$FirstOpenDone);
+  }
+  @override
+  int get hashCode => runtimeType.hashCode;
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() firstOpenDone,
+    required TResult Function(String code) setLanguageCode,
+  }) {
+    return firstOpenDone();
+  }
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? firstOpenDone,
+    TResult? Function(String code)? setLanguageCode,
+  }) {
+    return firstOpenDone?.call();
+  }
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? firstOpenDone,
+    TResult Function(String code)? setLanguageCode,
+    required TResult orElse(),
+  }) {
+    if (firstOpenDone != null) {
+      return firstOpenDone();
+    }
+    return orElse();
+  }
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(FirstOpenDone value) firstOpenDone,
+    required TResult Function(SetLanguageCode value) setLanguageCode,
+  }) {
+    return firstOpenDone(this);
+  }
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(FirstOpenDone value)? firstOpenDone,
+    TResult? Function(SetLanguageCode value)? setLanguageCode,
+  }) {
+    return firstOpenDone?.call(this);
+  }
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(FirstOpenDone value)? firstOpenDone,
+    TResult Function(SetLanguageCode value)? setLanguageCode,
+    required TResult orElse(),
+  }) {
+    if (firstOpenDone != null) {
+      return firstOpenDone(this);
+    }
+    return orElse();
+  }
+}
+abstract class FirstOpenDone implements AppAction {
+  const factory FirstOpenDone() = _$FirstOpenDone;
+}
+/// @nodoc
+abstract class _$$SetLanguageCodeCopyWith<$Res> {
+  factory _$$SetLanguageCodeCopyWith(
+          _$SetLanguageCode value, $Res Function(_$SetLanguageCode) then) =
+      __$$SetLanguageCodeCopyWithImpl<$Res>;
+  @useResult
+  $Res call({String code});
+}
+/// @nodoc
+class __$$SetLanguageCodeCopyWithImpl<$Res>
+    extends _$AppActionCopyWithImpl<$Res, _$SetLanguageCode>
+    implements _$$SetLanguageCodeCopyWith<$Res> {
+  __$$SetLanguageCodeCopyWithImpl(
+      _$SetLanguageCode _value, $Res Function(_$SetLanguageCode) _then)
+      : super(_value, _then);
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? code = null,
+  }) {
+    return _then(_$SetLanguageCode(
+      null == code
+          ? _value.code
+          : code // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+/// @nodoc
+class _$SetLanguageCode implements SetLanguageCode {
+  const _$SetLanguageCode(this.code);
+  @override
+  final String code;
+  @override
+  String toString() {
+    return 'AppAction.setLanguageCode(code: $code)';
+  }
+  @override
+  bool operator ==(dynamic other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$SetLanguageCode &&
+            (identical(other.code, code) || other.code == code));
+  }
+  @override
+  int get hashCode => Object.hash(runtimeType, code);
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$SetLanguageCodeCopyWith<_$SetLanguageCode> get copyWith =>
+      __$$SetLanguageCodeCopyWithImpl<_$SetLanguageCode>(this, _$identity);
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function() firstOpenDone,
+    required TResult Function(String code) setLanguageCode,
+  }) {
+    return setLanguageCode(code);
+  }
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function()? firstOpenDone,
+    TResult? Function(String code)? setLanguageCode,
+  }) {
+    return setLanguageCode?.call(code);
+  }
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function()? firstOpenDone,
+    TResult Function(String code)? setLanguageCode,
+    required TResult orElse(),
+  }) {
+    if (setLanguageCode != null) {
+      return setLanguageCode(code);
+    }
+    return orElse();
+  }
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(FirstOpenDone value) firstOpenDone,
+    required TResult Function(SetLanguageCode value) setLanguageCode,
+  }) {
+    return setLanguageCode(this);
+  }
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(FirstOpenDone value)? firstOpenDone,
+    TResult? Function(SetLanguageCode value)? setLanguageCode,
+  }) {
+    return setLanguageCode?.call(this);
+  }
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(FirstOpenDone value)? firstOpenDone,
+    TResult Function(SetLanguageCode value)? setLanguageCode,
+    required TResult orElse(),
+  }) {
+    if (setLanguageCode != null) {
+      return setLanguageCode(this);
+    }
+    return orElse();
+  }
+}
+abstract class SetLanguageCode implements AppAction {
+  const factory SetLanguageCode(final String code) = _$SetLanguageCode;
+  String get code;
+  @JsonKey(ignore: true)
+  _$$SetLanguageCodeCopyWith<_$SetLanguageCode> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/atom.dart CHANGED Viewed

@@ -2,6 +2,78 @@ import "package:flutter/material.dart";
 import "package:flutter/scheduler.dart";
 import "package:get_storage/get_storage.dart";
+final List<Atom2> atoms = [];
+void dispatch<A>(A a) {
+  for (final atom in atoms) {
+    final typeName = a.runtimeType.toString().replaceAll("_\$", "");
+    for (final entry in atom.reducer.entries) {
+      if (typeName == entry.key.toString()) {
+        final newValue = entry.value.call(atom.valueNotifier.value, a);
+        atom.valueNotifier.value = newValue;
+        if (atom.box != null) {
+          if (newValue == null) {
+            atom.box!.remove(atom.key);
+          } else {
+            atom.box!.write(atom.key, newValue);
+          }
+          atom.box!.save();
+        }
+      }
+    }
+  }
+}
+class Atom2<T, A> {
+  late ValueNotifier<T> valueNotifier;
+  final String key;
+  final GetStorage? box;
+  final Map<Type, dynamic Function(dynamic, dynamic)> reducer;
+  Atom2({required this.key, required T initialState, this.box, required this.reducer}) {
+    valueNotifier = ValueNotifier(box != null ? box!.read<T>(key) ?? initialState : initialState);
+    atoms.add(this);
+  }
+  get value => valueNotifier.value;
+  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`
+      valueNotifier.removeListener(listenerWrapper.listener!);
+    };
+    valueNotifier.addListener(listenerWrapper.listener!);
+    return valueNotifier.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
+    valueNotifier.notifyListeners();
+  }
+}
 class Atom<T> extends ValueNotifier<T> {
   final String key;
   final GetStorage? box;

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -1,4 +1,6 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/actions.dart";
+import "package:only_bible_app/atom.dart";
 import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
@@ -24,15 +26,15 @@ class BibleSelectScreen extends StatelessWidget {
                       ? Column(
                           mainAxisAlignment: MainAxisAlignment.center,
                           children: [
-                            Text(l.localeLanguageTitle),
+                            Text(l.localeLanguageTitle, textScaleFactor: 1.3),
-                            Text("(${l.languageTitle})", textScaleFactor: 0.7),
+                            Text("(${l.languageTitle})", textScaleFactor: 0.8),
                           ],
                         )
-                      : Text(l.languageTitle),
+                      : Text(l.languageTitle, textScaleFactor: 1.1),
                   onPressed: () {
                     if (firstOpen.value) {
-                      firstOpen.set!();
+                      dispatch(const FirstOpenDone());
-                    } else {}
+                    }
                     updateCurrentBible(context, l.localeName, l.languageTitle);
                   },
                 );

lib/state.dart CHANGED Viewed

@@ -1,10 +1,10 @@
-import "dart:convert";
 import "dart:developer";
 import "package:firebase_crashlytics/firebase_crashlytics.dart";
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:get_storage/get_storage.dart";
 import "package:just_audio/just_audio.dart";
+import "package:only_bible_app/actions.dart";
 import "package:only_bible_app/atom.dart";
 import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/models.dart";
@@ -24,21 +24,21 @@ final bibleAtom = AsyncAtom(
   callback: loadBible,
 );
-final Atom<bool> firstOpen = Atom<bool>(
+final firstOpen = Atom2<bool, AppAction>(
   box: box,
   key: "firstOpen",
-  initialValue: true,
+  initialState: true,
-  set: () {
+  reducer: {
-    firstOpen.value = false;
+    FirstOpenDone: (state, action) => false,
   },
 );
-final Atom<String> languageCode = Atom<String>(
+final languageCode = Atom2<String, AppAction>(
   box: box,
   key: "languageCode",
-  initialValue: "en",
+  initialState: "en",
-  update: (String v) {
+  reducer: {
-    languageCode.value = v;
+    SetLanguageCode: (state, action) => (action as SetLanguageCode).code,
   },
 );
@@ -53,31 +53,11 @@ final Atom<String> bibleName = Atom<String>(
 updateCurrentBible(BuildContext context, String code, String name) async {
   hideActions(context);
-  languageCode.value = code;
+  dispatch(SetLanguageCode(code));
   bibleName.update!(name);
   pushBookChapter(context, name, 0, 0, null);
 }
-Future<Bible> loadBible(String name) async {
-  final bytes = await rootBundle.load("assets/bibles/$name.txt");
-  final books = getBibleFromText(name, utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
-// await Future.delayed(Duration(seconds: 2));
-  return Bible(
-    name: name,
-    books: books,
-  );
-}
-// Trace customTrace;
-// if (!isDesktop()) {
-//   customTrace = FirebasePerformance.instance.newTrace("loadBible");
-//   await customTrace.start();
-// }
-// bibleLoading = Future.delayed(const Duration(seconds: 2)).then((value) => getBibleFromAsset(bibleName.value));
-// if (!isDesktop()) {
-//   await customTrace.stop();
-// }
 final Atom<bool> engTitles = Atom<bool>(
   box: box,
   key: "engTitles",

lib/utils.dart CHANGED Viewed

@@ -1,5 +1,7 @@
-import "dart:typed_data";
+import "dart:convert";
+import "package:flutter/services.dart";
 import "package:only_bible_app/dialog.dart";
+import "package:only_bible_app/models.dart";
 import "package:only_bible_app/state.dart";
 import "package:url_launcher/url_launcher.dart";
 import "package:flutter/foundation.dart" show defaultTargetPlatform, TargetPlatform;
@@ -181,3 +183,13 @@ Future<Uint8List> convertText(String langCode, String text) async {
   ));
   return ttsResponse.audio.buffer.asUint8List();
 }
+Future<Bible> loadBible(String name) async {
+  final bytes = await rootBundle.load("assets/bibles/$name.txt");
+  final books = getBibleFromText(name, utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
+// await Future.delayed(Duration(seconds: 2));
+  return Bible(
+    name: name,
+    books: books,
+  );
+}

~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.