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.

5eb27b64 — pyrossh

improve state

Files changed (22) hide show

lib/app.dart +23 -35
lib/atom.dart +12 -35
lib/blocs/bible_bloc.dart +0 -28
lib/blocs/bible_bloc.freezed.dart +0 -725
lib/blocs/bible_event.dart +0 -7
lib/blocs/bible_state.dart +0 -8
lib/models.dart +23 -24
lib/models.freezed.dart +152 -0
lib/navigation.dart +14 -14
lib/screens/bible_select_screen.dart +2 -9
lib/screens/book_select_screen.dart +1 -0
lib/screens/chapter_select_screen.dart +3 -2
lib/screens/chapter_view_screen.dart +54 -52
lib/sheets/actions_sheet.dart +6 -4
lib/sheets/settings_sheet.dart +4 -2
lib/state.dart +17 -26
lib/utils.dart +17 -1
lib/widgets/chapter_app_bar.dart +7 -6
lib/widgets/note_sheet.dart +3 -2
lib/widgets/verses_view.dart +6 -5
pubspec.lock +8 -32
pubspec.yaml +2 -4

lib/app.dart CHANGED Viewed

@@ -1,7 +1,5 @@
 import "package:flutter/material.dart";
-import "package:flutter_bloc/flutter_bloc.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.dart";
-import "package:only_bible_app/blocs/bible_bloc.dart";
 import "package:only_bible_app/screens/bible_select_screen.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
 import "package:only_bible_app/state.dart";
@@ -14,39 +12,29 @@ class App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return BlocProvider<BibleBloc>(
+    return MaterialApp(
-      create: (context) => BibleBloc(null)
+      onGenerateTitle: (context) => context.l.title,
-        ..add(
-          firstOpen.value ? const BibleEvent.firstLoad() : BibleEvent.load(bibleName.value),
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      debugShowCheckedModeBanner: false,
+      themeMode: darkMode.watch(context) ? ThemeMode.dark : ThemeMode.light,
+      theme: lightTheme,
+      darkTheme: darkTheme,
+      locale: Locale(languageCode.watch(context)),
+      // initialRoute: "",
+      routes: {
+        // TODO: maybe have a landing page
+        // "/": (context) => const ScaffoldMarkdown(title: "Privacy Policy", file: "privacy-policy.md"),
+        "/privacy-policy": (context) => const ScaffoldMarkdown(title: "Privacy Policy", file: "privacy-policy.md"),
+        "/about-us": (context) => const ScaffoldMarkdown(title: "About Us", file: "about-us.md"),
+      },
+      home: firstOpen.value
+          ? const BibleSelectScreen()
+          : ChapterViewScreen(
+              bibleName: bibleName.value,
+              bookIndex: savedBook.value,
+              chapterIndex: savedChapter.value,
-        ),
+            ),
-      child: Builder(
-        builder: (context) {
-          return MaterialApp(
-            onGenerateTitle: (context) => context.l.title,
-            localizationsDelegates: AppLocalizations.localizationsDelegates,
-            supportedLocales: AppLocalizations.supportedLocales,
-            debugShowCheckedModeBanner: false,
-            themeMode: darkMode.watch(context) ? ThemeMode.dark : ThemeMode.light,
-            theme: lightTheme,
-            darkTheme: darkTheme,
-            locale: Locale(languageCode.watch(context)),
-            // initialRoute: "",
-            routes: {
-              // TODO: maybe have a landing page
-              // "/": (context) => const ScaffoldMarkdown(title: "Privacy Policy", file: "privacy-policy.md"),
-              "/privacy-policy": (context) =>
-                  const ScaffoldMarkdown(title: "Privacy Policy", file: "privacy-policy.md"),
-              "/about-us": (context) => const ScaffoldMarkdown(title: "About Us", file: "about-us.md"),
-            },
-            home: firstOpen.value
-                ? const BibleSelectScreen()
-                : ChapterViewScreen(
-                    bookIndex: savedBook.value,
-                    chapterIndex: savedChapter.value,
-                  ),
-          );
-        },
-      ),
     );
   }
 }

lib/atom.dart CHANGED Viewed

@@ -65,41 +65,18 @@ class _ListenerWrapper {
   void Function()? listener;
 }
-class AsyncAtom<T> extends ValueNotifier<T> {
+class AsyncAtom<P extends String, E extends Future> {
+  final Map<P, E> cache = {};
-  final T Function(T) callback;
+  final E Function(P) callback;
-  AsyncAtom(super._value, this.callback);
+  AsyncAtom({required this.callback});
-  @override
-  get value {
+  E getValue(P param) {
+    if (cache.containsKey(param)) {
-    return callback(this.value);
+      return cache[param]!;
-  }
+    }
-  T watch(BuildContext context) {
-    final elementRef = WeakReference(context as Element);
-    final listenerWrapper = _ListenerWrapper();
+    final v = callback(param);
-    listenerWrapper.listener = () {
-      assert(
-      SchedulerBinding.instance.schedulerPhase != SchedulerPhase.persistentCallbacks,
-      """
+    cache[param] = v;
-            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;
+    return v;
   }
-}
+}

lib/blocs/bible_bloc.dart DELETED Viewed

@@ -1,28 +0,0 @@
-import "package:bloc/bloc.dart";
-import "package:freezed_annotation/freezed_annotation.dart";
-import "package:only_bible_app/models.dart";
-import "package:only_bible_app/state.dart";
-part "bible_bloc.freezed.dart";
-part "bible_event.dart";
-part "bible_state.dart";
-class BibleBloc extends Bloc<BibleEvent, BibleState> {
-  final String? bibleName;
-  BibleBloc(this.bibleName) : super(const _Loading()) {
-    on<NoBible>((event, emit) {
-      emit(const _Loading());
-    });
-    on<LoadBible>((event, emit) async {
-      try {
-        emit(const _Loading());
-        final bible = await loadBible(event.name);
-        emit(_Success(bible!));
-      } catch (e) {
-        emit(const _Error());
-      }
-    });
-  }
-}

lib/blocs/bible_bloc.freezed.dart DELETED Viewed

@@ -1,725 +0,0 @@
-// 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 'bible_bloc.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 _$BibleEvent {
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>({
-    required TResult Function() firstLoad,
-    required TResult Function(String name) load,
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? firstLoad,
-    TResult? Function(String name)? load,
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? firstLoad,
-    TResult Function(String name)? load,
-    required TResult orElse(),
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>({
-    required TResult Function(NoBible value) firstLoad,
-    required TResult Function(LoadBible value) load,
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>({
-    TResult? Function(NoBible value)? firstLoad,
-    TResult? Function(LoadBible value)? load,
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>({
-    TResult Function(NoBible value)? firstLoad,
-    TResult Function(LoadBible value)? load,
-    required TResult orElse(),
-  }) =>
-      throw _privateConstructorUsedError;
-}
-/// @nodoc
-abstract class $BibleEventCopyWith<$Res> {
-  factory $BibleEventCopyWith(
-          BibleEvent value, $Res Function(BibleEvent) then) =
-      _$BibleEventCopyWithImpl<$Res, BibleEvent>;
-}
-/// @nodoc
-class _$BibleEventCopyWithImpl<$Res, $Val extends BibleEvent>
-    implements $BibleEventCopyWith<$Res> {
-  _$BibleEventCopyWithImpl(this._value, this._then);
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-}
-/// @nodoc
-abstract class _$$NoBibleCopyWith<$Res> {
-  factory _$$NoBibleCopyWith(_$NoBible value, $Res Function(_$NoBible) then) =
-      __$$NoBibleCopyWithImpl<$Res>;
-}
-/// @nodoc
-class __$$NoBibleCopyWithImpl<$Res>
-    extends _$BibleEventCopyWithImpl<$Res, _$NoBible>
-    implements _$$NoBibleCopyWith<$Res> {
-  __$$NoBibleCopyWithImpl(_$NoBible _value, $Res Function(_$NoBible) _then)
-      : super(_value, _then);
-}
-/// @nodoc
-class _$NoBible implements NoBible {
-  const _$NoBible();
-  @override
-  String toString() {
-    return 'BibleEvent.firstLoad()';
-  }
-  @override
-  bool operator ==(dynamic other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$NoBible);
-  }
-  @override
-  int get hashCode => runtimeType.hashCode;
-  @override
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>({
-    required TResult Function() firstLoad,
-    required TResult Function(String name) load,
-  }) {
-    return firstLoad();
-  }
-  @override
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? firstLoad,
-    TResult? Function(String name)? load,
-  }) {
-    return firstLoad?.call();
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? firstLoad,
-    TResult Function(String name)? load,
-    required TResult orElse(),
-  }) {
-    if (firstLoad != null) {
-      return firstLoad();
-    }
-    return orElse();
-  }
-  @override
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>({
-    required TResult Function(NoBible value) firstLoad,
-    required TResult Function(LoadBible value) load,
-  }) {
-    return firstLoad(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>({
-    TResult? Function(NoBible value)? firstLoad,
-    TResult? Function(LoadBible value)? load,
-  }) {
-    return firstLoad?.call(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>({
-    TResult Function(NoBible value)? firstLoad,
-    TResult Function(LoadBible value)? load,
-    required TResult orElse(),
-  }) {
-    if (firstLoad != null) {
-      return firstLoad(this);
-    }
-    return orElse();
-  }
-}
-abstract class NoBible implements BibleEvent {
-  const factory NoBible() = _$NoBible;
-}
-/// @nodoc
-abstract class _$$LoadBibleCopyWith<$Res> {
-  factory _$$LoadBibleCopyWith(
-          _$LoadBible value, $Res Function(_$LoadBible) then) =
-      __$$LoadBibleCopyWithImpl<$Res>;
-  @useResult
-  $Res call({String name});
-}
-/// @nodoc
-class __$$LoadBibleCopyWithImpl<$Res>
-    extends _$BibleEventCopyWithImpl<$Res, _$LoadBible>
-    implements _$$LoadBibleCopyWith<$Res> {
-  __$$LoadBibleCopyWithImpl(
-      _$LoadBible _value, $Res Function(_$LoadBible) _then)
-      : super(_value, _then);
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? name = null,
-  }) {
-    return _then(_$LoadBible(
-      null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-    ));
-  }
-}
-/// @nodoc
-class _$LoadBible implements LoadBible {
-  const _$LoadBible(this.name);
-  @override
-  final String name;
-  @override
-  String toString() {
-    return 'BibleEvent.load(name: $name)';
-  }
-  @override
-  bool operator ==(dynamic other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$LoadBible &&
-            (identical(other.name, name) || other.name == name));
-  }
-  @override
-  int get hashCode => Object.hash(runtimeType, name);
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$LoadBibleCopyWith<_$LoadBible> get copyWith =>
-      __$$LoadBibleCopyWithImpl<_$LoadBible>(this, _$identity);
-  @override
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>({
-    required TResult Function() firstLoad,
-    required TResult Function(String name) load,
-  }) {
-    return load(name);
-  }
-  @override
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? firstLoad,
-    TResult? Function(String name)? load,
-  }) {
-    return load?.call(name);
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? firstLoad,
-    TResult Function(String name)? load,
-    required TResult orElse(),
-  }) {
-    if (load != null) {
-      return load(name);
-    }
-    return orElse();
-  }
-  @override
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>({
-    required TResult Function(NoBible value) firstLoad,
-    required TResult Function(LoadBible value) load,
-  }) {
-    return load(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>({
-    TResult? Function(NoBible value)? firstLoad,
-    TResult? Function(LoadBible value)? load,
-  }) {
-    return load?.call(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>({
-    TResult Function(NoBible value)? firstLoad,
-    TResult Function(LoadBible value)? load,
-    required TResult orElse(),
-  }) {
-    if (load != null) {
-      return load(this);
-    }
-    return orElse();
-  }
-}
-abstract class LoadBible implements BibleEvent {
-  const factory LoadBible(final String name) = _$LoadBible;
-  String get name;
-  @JsonKey(ignore: true)
-  _$$LoadBibleCopyWith<_$LoadBible> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-/// @nodoc
-mixin _$BibleState {
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>({
-    required TResult Function() loading,
-    required TResult Function(Bible bible) success,
-    required TResult Function() error,
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? loading,
-    TResult? Function(Bible bible)? success,
-    TResult? Function()? error,
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? loading,
-    TResult Function(Bible bible)? success,
-    TResult Function()? error,
-    required TResult orElse(),
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>({
-    required TResult Function(_Loading value) loading,
-    required TResult Function(_Success value) success,
-    required TResult Function(_Error value) error,
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>({
-    TResult? Function(_Loading value)? loading,
-    TResult? Function(_Success value)? success,
-    TResult? Function(_Error value)? error,
-  }) =>
-      throw _privateConstructorUsedError;
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>({
-    TResult Function(_Loading value)? loading,
-    TResult Function(_Success value)? success,
-    TResult Function(_Error value)? error,
-    required TResult orElse(),
-  }) =>
-      throw _privateConstructorUsedError;
-}
-/// @nodoc
-abstract class $BibleStateCopyWith<$Res> {
-  factory $BibleStateCopyWith(
-          BibleState value, $Res Function(BibleState) then) =
-      _$BibleStateCopyWithImpl<$Res, BibleState>;
-}
-/// @nodoc
-class _$BibleStateCopyWithImpl<$Res, $Val extends BibleState>
-    implements $BibleStateCopyWith<$Res> {
-  _$BibleStateCopyWithImpl(this._value, this._then);
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-}
-/// @nodoc
-abstract class _$$_LoadingCopyWith<$Res> {
-  factory _$$_LoadingCopyWith(
-          _$_Loading value, $Res Function(_$_Loading) then) =
-      __$$_LoadingCopyWithImpl<$Res>;
-}
-/// @nodoc
-class __$$_LoadingCopyWithImpl<$Res>
-    extends _$BibleStateCopyWithImpl<$Res, _$_Loading>
-    implements _$$_LoadingCopyWith<$Res> {
-  __$$_LoadingCopyWithImpl(_$_Loading _value, $Res Function(_$_Loading) _then)
-      : super(_value, _then);
-}
-/// @nodoc
-class _$_Loading implements _Loading {
-  const _$_Loading();
-  @override
-  String toString() {
-    return 'BibleState.loading()';
-  }
-  @override
-  bool operator ==(dynamic other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$_Loading);
-  }
-  @override
-  int get hashCode => runtimeType.hashCode;
-  @override
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>({
-    required TResult Function() loading,
-    required TResult Function(Bible bible) success,
-    required TResult Function() error,
-  }) {
-    return loading();
-  }
-  @override
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? loading,
-    TResult? Function(Bible bible)? success,
-    TResult? Function()? error,
-  }) {
-    return loading?.call();
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? loading,
-    TResult Function(Bible bible)? success,
-    TResult Function()? error,
-    required TResult orElse(),
-  }) {
-    if (loading != null) {
-      return loading();
-    }
-    return orElse();
-  }
-  @override
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>({
-    required TResult Function(_Loading value) loading,
-    required TResult Function(_Success value) success,
-    required TResult Function(_Error value) error,
-  }) {
-    return loading(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>({
-    TResult? Function(_Loading value)? loading,
-    TResult? Function(_Success value)? success,
-    TResult? Function(_Error value)? error,
-  }) {
-    return loading?.call(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>({
-    TResult Function(_Loading value)? loading,
-    TResult Function(_Success value)? success,
-    TResult Function(_Error value)? error,
-    required TResult orElse(),
-  }) {
-    if (loading != null) {
-      return loading(this);
-    }
-    return orElse();
-  }
-}
-abstract class _Loading implements BibleState {
-  const factory _Loading() = _$_Loading;
-}
-/// @nodoc
-abstract class _$$_SuccessCopyWith<$Res> {
-  factory _$$_SuccessCopyWith(
-          _$_Success value, $Res Function(_$_Success) then) =
-      __$$_SuccessCopyWithImpl<$Res>;
-  @useResult
-  $Res call({Bible bible});
-}
-/// @nodoc
-class __$$_SuccessCopyWithImpl<$Res>
-    extends _$BibleStateCopyWithImpl<$Res, _$_Success>
-    implements _$$_SuccessCopyWith<$Res> {
-  __$$_SuccessCopyWithImpl(_$_Success _value, $Res Function(_$_Success) _then)
-      : super(_value, _then);
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? bible = null,
-  }) {
-    return _then(_$_Success(
-      null == bible
-          ? _value.bible
-          : bible // ignore: cast_nullable_to_non_nullable
-              as Bible,
-    ));
-  }
-}
-/// @nodoc
-class _$_Success implements _Success {
-  const _$_Success(this.bible);
-  @override
-  final Bible bible;
-  @override
-  String toString() {
-    return 'BibleState.success(bible: $bible)';
-  }
-  @override
-  bool operator ==(dynamic other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$_Success &&
-            (identical(other.bible, bible) || other.bible == bible));
-  }
-  @override
-  int get hashCode => Object.hash(runtimeType, bible);
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$_SuccessCopyWith<_$_Success> get copyWith =>
-      __$$_SuccessCopyWithImpl<_$_Success>(this, _$identity);
-  @override
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>({
-    required TResult Function() loading,
-    required TResult Function(Bible bible) success,
-    required TResult Function() error,
-  }) {
-    return success(bible);
-  }
-  @override
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? loading,
-    TResult? Function(Bible bible)? success,
-    TResult? Function()? error,
-  }) {
-    return success?.call(bible);
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? loading,
-    TResult Function(Bible bible)? success,
-    TResult Function()? error,
-    required TResult orElse(),
-  }) {
-    if (success != null) {
-      return success(bible);
-    }
-    return orElse();
-  }
-  @override
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>({
-    required TResult Function(_Loading value) loading,
-    required TResult Function(_Success value) success,
-    required TResult Function(_Error value) error,
-  }) {
-    return success(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>({
-    TResult? Function(_Loading value)? loading,
-    TResult? Function(_Success value)? success,
-    TResult? Function(_Error value)? error,
-  }) {
-    return success?.call(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>({
-    TResult Function(_Loading value)? loading,
-    TResult Function(_Success value)? success,
-    TResult Function(_Error value)? error,
-    required TResult orElse(),
-  }) {
-    if (success != null) {
-      return success(this);
-    }
-    return orElse();
-  }
-}
-abstract class _Success implements BibleState {
-  const factory _Success(final Bible bible) = _$_Success;
-  Bible get bible;
-  @JsonKey(ignore: true)
-  _$$_SuccessCopyWith<_$_Success> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-/// @nodoc
-abstract class _$$_ErrorCopyWith<$Res> {
-  factory _$$_ErrorCopyWith(_$_Error value, $Res Function(_$_Error) then) =
-      __$$_ErrorCopyWithImpl<$Res>;
-}
-/// @nodoc
-class __$$_ErrorCopyWithImpl<$Res>
-    extends _$BibleStateCopyWithImpl<$Res, _$_Error>
-    implements _$$_ErrorCopyWith<$Res> {
-  __$$_ErrorCopyWithImpl(_$_Error _value, $Res Function(_$_Error) _then)
-      : super(_value, _then);
-}
-/// @nodoc
-class _$_Error implements _Error {
-  const _$_Error();
-  @override
-  String toString() {
-    return 'BibleState.error()';
-  }
-  @override
-  bool operator ==(dynamic other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType && other is _$_Error);
-  }
-  @override
-  int get hashCode => runtimeType.hashCode;
-  @override
-  @optionalTypeArgs
-  TResult when<TResult extends Object?>({
-    required TResult Function() loading,
-    required TResult Function(Bible bible) success,
-    required TResult Function() error,
-  }) {
-    return error();
-  }
-  @override
-  @optionalTypeArgs
-  TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function()? loading,
-    TResult? Function(Bible bible)? success,
-    TResult? Function()? error,
-  }) {
-    return error?.call();
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeWhen<TResult extends Object?>({
-    TResult Function()? loading,
-    TResult Function(Bible bible)? success,
-    TResult Function()? error,
-    required TResult orElse(),
-  }) {
-    if (error != null) {
-      return error();
-    }
-    return orElse();
-  }
-  @override
-  @optionalTypeArgs
-  TResult map<TResult extends Object?>({
-    required TResult Function(_Loading value) loading,
-    required TResult Function(_Success value) success,
-    required TResult Function(_Error value) error,
-  }) {
-    return error(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult? mapOrNull<TResult extends Object?>({
-    TResult? Function(_Loading value)? loading,
-    TResult? Function(_Success value)? success,
-    TResult? Function(_Error value)? error,
-  }) {
-    return error?.call(this);
-  }
-  @override
-  @optionalTypeArgs
-  TResult maybeMap<TResult extends Object?>({
-    TResult Function(_Loading value)? loading,
-    TResult Function(_Success value)? success,
-    TResult Function(_Error value)? error,
-    required TResult orElse(),
-  }) {
-    if (error != null) {
-      return error(this);
-    }
-    return orElse();
-  }
-}
-abstract class _Error implements BibleState {
-  const factory _Error() = _$_Error;
-}

lib/blocs/bible_event.dart DELETED Viewed

@@ -1,7 +0,0 @@
-part of "bible_bloc.dart";
-@freezed
-class BibleEvent with _$BibleEvent {
-  const factory BibleEvent.firstLoad() = NoBible;
-  const factory BibleEvent.load(String name) = LoadBible;
-}

lib/blocs/bible_state.dart DELETED Viewed

@@ -1,8 +0,0 @@
-part of "bible_bloc.dart";
-@freezed
-class BibleState with _$BibleState {
-  const factory BibleState.loading() = _Loading;
-  const factory BibleState.success(Bible bible) = _Success;
-  const factory BibleState.error() = _Error;
-}

lib/models.dart CHANGED Viewed

@@ -1,18 +1,17 @@
 import "package:flutter/material.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
 import "package:only_bible_app/utils.dart";
+part "models.freezed.dart";
+@freezed
-class Bible {
+class Bible with _$Bible {
-  final String name;
-  List<Book> books = [];
-  Bible({
+  const Bible._();
-    required this.name,
-  });
-  Bible.withBooks({
+  const factory Bible({
-    required this.name,
+    required String name,
-    required this.books,
+    required List<Book> books,
-  });
+  }) = _Bible;
   String shortName() {
     return name.substring(0, 3).toUpperCase();
@@ -99,22 +98,22 @@ List<Book> getBibleFromText(String bibleName, String text) {
     }
     if (books[book - 1].chapters.length < chapter) {
       books[book - 1].chapters.add(
-            Chapter(
+        Chapter(
-              index: chapter - 1,
+          index: chapter - 1,
-              book: book - 1,
+          book: book - 1,
-              verses: [],
+          verses: [],
-            ),
+        ),
-          );
+      );
     }
     books[book - 1].chapters[chapter - 1].verses.add(
-          Verse(
+      Verse(
-            index: verseNo - 1,
+        index: verseNo - 1,
-            text: verseText,
+        text: verseText,
-            bibleName: bibleName,
+        bibleName: bibleName,
-            chapter: chapter - 1,
+        chapter: chapter - 1,
-            book: book - 1,
+        book: book - 1,
-          ),
+      ),
-        );
+    );
   }
   return books;
 }

lib/models.freezed.dart ADDED Viewed

@@ -0,0 +1,152 @@
+// 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 'models.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 _$Bible {
+  String get name => throw _privateConstructorUsedError;
+  List<Book> get books => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $BibleCopyWith<Bible> get copyWith => throw _privateConstructorUsedError;
+}
+/// @nodoc
+abstract class $BibleCopyWith<$Res> {
+  factory $BibleCopyWith(Bible value, $Res Function(Bible) then) =
+      _$BibleCopyWithImpl<$Res, Bible>;
+  @useResult
+  $Res call({String name, List<Book> books});
+}
+/// @nodoc
+class _$BibleCopyWithImpl<$Res, $Val extends Bible>
+    implements $BibleCopyWith<$Res> {
+  _$BibleCopyWithImpl(this._value, this._then);
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? name = null,
+    Object? books = null,
+  }) {
+    return _then(_value.copyWith(
+      name: null == name
+          ? _value.name
+          : name // ignore: cast_nullable_to_non_nullable
+              as String,
+      books: null == books
+          ? _value.books
+          : books // ignore: cast_nullable_to_non_nullable
+              as List<Book>,
+    ) as $Val);
+  }
+}
+/// @nodoc
+abstract class _$$_BibleCopyWith<$Res> implements $BibleCopyWith<$Res> {
+  factory _$$_BibleCopyWith(_$_Bible value, $Res Function(_$_Bible) then) =
+      __$$_BibleCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({String name, List<Book> books});
+}
+/// @nodoc
+class __$$_BibleCopyWithImpl<$Res> extends _$BibleCopyWithImpl<$Res, _$_Bible>
+    implements _$$_BibleCopyWith<$Res> {
+  __$$_BibleCopyWithImpl(_$_Bible _value, $Res Function(_$_Bible) _then)
+      : super(_value, _then);
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? name = null,
+    Object? books = null,
+  }) {
+    return _then(_$_Bible(
+      name: null == name
+          ? _value.name
+          : name // ignore: cast_nullable_to_non_nullable
+              as String,
+      books: null == books
+          ? _value._books
+          : books // ignore: cast_nullable_to_non_nullable
+              as List<Book>,
+    ));
+  }
+}
+/// @nodoc
+class _$_Bible extends _Bible {
+  const _$_Bible({required this.name, required final List<Book> books})
+      : _books = books,
+        super._();
+  @override
+  final String name;
+  final List<Book> _books;
+  @override
+  List<Book> get books {
+    if (_books is EqualUnmodifiableListView) return _books;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_books);
+  }
+  @override
+  String toString() {
+    return 'Bible(name: $name, books: $books)';
+  }
+  @override
+  bool operator ==(dynamic other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$_Bible &&
+            (identical(other.name, name) || other.name == name) &&
+            const DeepCollectionEquality().equals(other._books, _books));
+  }
+  @override
+  int get hashCode => Object.hash(
+      runtimeType, name, const DeepCollectionEquality().hash(_books));
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$_BibleCopyWith<_$_Bible> get copyWith =>
+      __$$_BibleCopyWithImpl<_$_Bible>(this, _$identity);
+}
+abstract class _Bible extends Bible {
+  const factory _Bible(
+      {required final String name, required final List<Book> books}) = _$_Bible;
+  const _Bible._() : super._();
+  @override
+  String get name;
+  @override
+  List<Book> get books;
+  @override
+  @JsonKey(ignore: true)
+  _$$_BibleCopyWith<_$_Bible> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/navigation.dart CHANGED Viewed

@@ -81,7 +81,7 @@ updateStatusBar(bool v) {
   }
 }
-pushBookChapter(BuildContext context, int book, int chapter, TextDirection? dir) {
+pushBookChapter(BuildContext context, String bibleName, int book, int chapter, TextDirection? dir) {
   savedBook.update!(book);
   savedChapter.update!(chapter);
   clearEvents(context);
@@ -89,18 +89,18 @@ pushBookChapter(BuildContext context, int book, int chapter, TextDirection? dir)
     createSlideRoute(
       context: context,
       slideDir: dir,
-      page: ChapterViewScreen(bookIndex: book, chapterIndex: chapter),
+      page: ChapterViewScreen(bibleName: bibleName, bookIndex: book, chapterIndex: chapter),
     ),
   );
 }
-replaceBookChapter(BuildContext context, int book, int chapter) {
+replaceBookChapter(BuildContext context, String bibleName, int book, int chapter) {
   savedBook.update!(book);
   savedChapter.update!(chapter);
   clearEvents(context);
   Navigator.of(context).pushReplacement(
     createNoTransitionPageRoute(
-      ChapterViewScreen(bookIndex: book, chapterIndex: chapter),
+      ChapterViewScreen(bibleName: bibleName, bookIndex: book, chapterIndex: chapter),
     ),
   );
 }
@@ -108,11 +108,11 @@ replaceBookChapter(BuildContext context, int book, int chapter) {
 nextChapter(BuildContext context, Bible bible, int book, int chapter) {
   final selectedBook = bible.books[book];
   if (selectedBook.chapters.length > chapter + 1) {
-    pushBookChapter(context, selectedBook.index, chapter + 1, TextDirection.ltr);
+    pushBookChapter(context, bible.name, selectedBook.index, chapter + 1, TextDirection.ltr);
   } else {
     if (selectedBook.index + 1 < bible.books.length) {
       final nextBook = bible.books[selectedBook.index + 1];
-      pushBookChapter(context, nextBook.index, 0, TextDirection.ltr);
+      pushBookChapter(context, bible.name, nextBook.index, 0, TextDirection.ltr);
     }
   }
 }
@@ -123,12 +123,12 @@ previousChapter(BuildContext context, Bible bible, int book, int chapter) {
     // if (Navigator.of(context).canPop()) {
     //   Navigator.of(context).pop();
     // } else {
-    pushBookChapter(context, selectedBook.index, chapter - 1, TextDirection.rtl);
+    pushBookChapter(context, bible.name, selectedBook.index, chapter - 1, TextDirection.rtl);
     // }
   } else {
     if (selectedBook.index - 1 >= 0) {
       final prevBook = bible.books[selectedBook.index - 1];
-      pushBookChapter(context, prevBook.index, prevBook.chapters.length - 1, TextDirection.rtl);
+      pushBookChapter(context, bible.name, prevBook.index, prevBook.chapters.length - 1, TextDirection.rtl);
     }
   }
 }
@@ -208,24 +208,24 @@ shareVerses(BuildContext context, Bible bible, List<Verse> verses) {
   Share.share("$title\n$text", subject: title);
 }
-showSettings(BuildContext context) {
+showSettings(BuildContext context, Bible bible) {
   showModalBottomSheet(
     context: context,
     isDismissible: true,
     enableDrag: true,
     showDragHandle: true,
     useSafeArea: true,
-    builder: (context) => const SettingsSheet(),
+    builder: (context) => SettingsSheet(bible: bible),
   );
 }
-showActions(BuildContext context) {
+showActions(BuildContext context, Bible bible) {
   if (!actionsShown.value) {
     actionsShown.value = true;
     Scaffold.of(context).showBottomSheet(
       enableDrag: false,
       clipBehavior: Clip.antiAliasWithSaveLayer,
-      (context) => const ActionsSheet(),
+      (context) => ActionsSheet(bible: bible),
     );
   }
 }
@@ -254,7 +254,7 @@ hideHighlights(BuildContext context) {
   }
 }
-showNoteField(BuildContext context, Verse v) {
+showNoteField(BuildContext context, Bible bible, Verse v) {
   final noteText = box.read("${v.book}:${v.chapter}:${v.index}:note") ?? "";
   noteTextController.text = noteText;
   showModalBottomSheet(
@@ -264,7 +264,7 @@ showNoteField(BuildContext context, Verse v) {
     showDragHandle: true,
     useSafeArea: true,
     isScrollControlled: true,
-    builder: (context) => NoteSheet(verse: v),
+    builder: (context) => NoteSheet(bible: bible, verse: v),
   );
 }

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -1,7 +1,4 @@
 import "package:flutter/material.dart";
-import "package:flutter_bloc/flutter_bloc.dart";
-import "package:only_bible_app/blocs/bible_bloc.dart";
-import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
@@ -31,14 +28,10 @@ class BibleSelectScreen extends StatelessWidget {
                   //   ],
                   // ),
                   onPressed: () {
-                    context.read<BibleBloc>().add(BibleEvent.load(l.languageTitle));
-                    updateCurrentBible(context, Locale(l.localeName), l.languageTitle);
                     if (firstOpen.value) {
                       firstOpen.set!();
-                      pushBookChapter(context, 0, 0, null);
-                    } else {
+                    } else {}
-                      Navigator.of(context).pop();
+                    updateCurrentBible(context, l.localeName, l.languageTitle);
-                    }
                   },
                 );
               }),

lib/screens/book_select_screen.dart CHANGED Viewed

@@ -18,6 +18,7 @@ class BookSelectScreen extends StatelessWidget {
         transitionDuration: Duration.zero,
         reverseTransitionDuration: Duration.zero,
         pageBuilder: (context, _, __) => ChapterSelectScreen(
+          bible: bible,
           book: bible.books[index],
           selectedBookIndex: index,
         ),

lib/screens/chapter_select_screen.dart CHANGED Viewed

@@ -6,10 +6,11 @@ import "package:only_bible_app/widgets/sliver_tile_grid.dart";
 import "package:only_bible_app/widgets/sliver_heading.dart";
 class ChapterSelectScreen extends StatelessWidget {
+  final Bible bible;
   final Book book;
   final int selectedBookIndex;
-  const ChapterSelectScreen({super.key, required this.selectedBookIndex, required this.book});
+  const ChapterSelectScreen({super.key, required this.bible, required this.selectedBookIndex, required this.book});
   @override
   Widget build(BuildContext context) {
@@ -22,7 +23,7 @@ class ChapterSelectScreen extends StatelessWidget {
             children: List.generate(book.chapters.length, (index) {
               return TextButton(
                 child: Text("${index + 1}"),
-                onPressed: () => replaceBookChapter(context, selectedBookIndex, index),
+                onPressed: () => replaceBookChapter(context, bible.name, selectedBookIndex, index),
               );
             }),
           ),

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -1,23 +1,65 @@
 import "package:flutter/material.dart";
-import "package:flutter_bloc/flutter_bloc.dart";
-import "package:only_bible_app/blocs/bible_bloc.dart";
 import "package:only_bible_app/models.dart";
+import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/chapter_app_bar.dart";
 import "package:only_bible_app/widgets/sidebar.dart";
 import "package:only_bible_app/widgets/verses_view.dart";
 class ChapterViewScreen extends StatelessWidget {
-  // final String bibleName;
+  final String bibleName;
   final int bookIndex;
   final int chapterIndex;
-  const ChapterViewScreen({super.key, required this.bookIndex, required this.chapterIndex});
+  const ChapterViewScreen({super.key, required this.bibleName, required this.bookIndex, required this.chapterIndex});
   @override
   Widget build(BuildContext context) {
+    return FutureBuilder(
+      future: bibleAtom.getValue(bibleName),
-    return BlocBuilder<BibleBloc, BibleState>(builder: (context, state) {
+      builder: (context, state) {
-      if (!context.isWide) {
+        if (context.isWide) {
+          return Scaffold(
+            backgroundColor: Theme.of(context).colorScheme.background,
+            body: Row(
+              children: [
+                const Sidebar(),
+                Flexible(
+                  child: state.when(
+                    loading: () => ColoredBox(
+                      color: Theme.of(context).colorScheme.background,
+                      child: const Center(
+                        child: CircularProgressIndicator(),
+                      ),
+                    ),
+                    success: (Bible? bible) {
+                      final book = bible!.books[bookIndex];
+                      final chapter = book.chapters[chapterIndex];
+                      return Column(
+                        children: [
+                          ChapterAppBar(bible: bible, book: book, chapter: chapter),
+                          const Padding(
+                            padding: EdgeInsets.only(bottom: 10),
+                            child: Divider(height: 5, indent: 20, endIndent: 20, thickness: 1.5),
+                          ),
+                          Flexible(
+                            child: VersesView(bible: bible, chapter: chapter),
+                          ),
+                        ],
+                      );
+                    },
+                    error: () => ColoredBox(
+                      color: Theme.of(context).colorScheme.background,
+                      child: const Center(
+                        child: Text("Could not load the bible"),
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          );
+        }
         return state.when(
           loading: () => ColoredBox(
             color: Theme.of(context).colorScheme.background,
@@ -25,14 +67,14 @@ class ChapterViewScreen extends StatelessWidget {
               child: CircularProgressIndicator(),
             ),
           ),
-          success: (Bible bible) {
+          success: (Bible? bible) {
-            final book = bible.books[bookIndex];
+            final book = bible!.books[bookIndex];
             final chapter = book.chapters[chapterIndex];
             return Scaffold(
-              appBar: ChapterAppBar(book: book, chapter: chapter),
+              appBar: ChapterAppBar(bible: bible, book: book, chapter: chapter),
               backgroundColor: Theme.of(context).colorScheme.background,
               body: SafeArea(
-                child: VersesView(chapter: chapter),
+                child: VersesView(bible: bible, chapter: chapter),
               ),
             );
           },
@@ -43,47 +85,7 @@ class ChapterViewScreen extends StatelessWidget {
             ),
           ),
         );
-      }
-      return Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.background,
-        body: Row(
-          children: [
-            const Sidebar(),
-            Flexible(
-              child: state.when(
-                loading: () => ColoredBox(
-                  color: Theme.of(context).colorScheme.background,
-                  child: const Center(
-                    child: CircularProgressIndicator(),
-                  ),
+      },
-                ),
-                success: (Bible bible) {
-                  final book = bible.books[bookIndex];
-                  final chapter = book.chapters[chapterIndex];
-                  return Column(
-                    children: [
-                      ChapterAppBar(book: book, chapter: chapter),
-                      const Padding(
-                        padding: EdgeInsets.only(bottom: 10),
-                        child: Divider(height: 5, indent: 20, endIndent: 20, thickness: 1.5),
-                      ),
-                      Flexible(
-                        child: VersesView(chapter: chapter),
-                      ),
-                    ],
-                  );
+    );
-                },
-                error: () => ColoredBox(
-                  color: Theme.of(context).colorScheme.background,
-                  child: const Center(
-                    child: Text("Could not load the bible"),
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      );
-    });
   }
 }

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -1,11 +1,13 @@
 import "package:flutter/material.dart";
 import "package:only_bible_app/dialog.dart";
+import "package:only_bible_app/models.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 class ActionsSheet extends StatelessWidget {
+  final Bible bible;
-  const ActionsSheet({super.key});
+  const ActionsSheet({super.key, required this.bible});
   @override
   Widget build(BuildContext context) {
@@ -34,7 +36,7 @@ class ActionsSheet extends StatelessWidget {
             padding: EdgeInsets.zero,
             onPressed: () {
               if (audioEnabled) {
-                onPlay(context);
+                onPlay(context, bible);
               } else {
                 showError(context, context.l.audioNotAvailable);
               }
@@ -43,12 +45,12 @@ class ActionsSheet extends StatelessWidget {
           ),
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => showNoteField(context, selectedVerses.value.first),
+            onPressed: () => showNoteField(context, bible, selectedVerses.value.first),
             icon: Icon(Icons.post_add_outlined, size: 34, color: iconColor),
           ),
           IconButton(
             padding: EdgeInsets.zero,
-            onPressed: () => shareVerses(context, bible.value, selectedVerses.value),
+            onPressed: () => shareVerses(context, bible, selectedVerses.value),
             icon: Icon(Icons.share_outlined, size: 34, color: iconColor),
           ),
         ],

lib/sheets/settings_sheet.dart CHANGED Viewed

@@ -1,11 +1,13 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/models.dart";
 import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:settings_ui/settings_ui.dart";
 class SettingsSheet extends StatelessWidget {
+  final Bible bible;
-  const SettingsSheet({super.key});
+  const SettingsSheet({super.key, required this.bible});
   @override
   Widget build(BuildContext context) {
@@ -26,7 +28,7 @@ class SettingsSheet extends StatelessWidget {
             SettingsTile.navigation(
               leading: const Icon(Icons.book_outlined, color: Colors.blueAccent),
               title: Text(context.l.bibleTitle),
-              value: Text(bible.watch(context).name),
+              value: Text(bible.name),
               onPressed: changeBible,
             ),
             SettingsTile.navigation(

lib/state.dart CHANGED Viewed

@@ -20,6 +20,10 @@ initState() async {
   await box.initStorage;
 }
+final bibleAtom = AsyncAtom(
+  callback: loadBible,
+);
 final Atom<bool> firstOpen = Atom<bool>(
   box: box,
   key: "firstOpen",
@@ -47,36 +51,23 @@ final Atom<String> bibleName = Atom<String>(
   },
 );
-final Atom<Bible> bible = Atom<Bible>(
-  key: "bible",
-  initialValue: Bible(name: "English"),
-  update: (Bible v) {
-    bible.value = v;
-  },
-);
-updateCurrentBible(BuildContext context, Locale l, String name) async {
+updateCurrentBible(BuildContext context, String code, String name) async {
   hideActions(context);
-  languageCode.value = l.languageCode;
+  languageCode.value = code;
   bibleName.update!(name);
+  pushBookChapter(context, name, 0, 0, null);
 }
-Future<Bible> getBibleFromAsset(String bibleName) async {
+Future<Bible> loadBible(String name) async {
-  final bytes = await rootBundle.load("assets/bibles/$bibleName.txt");
+  final bytes = await rootBundle.load("assets/bibles/$name.txt");
-  final books = getBibleFromText(bibleName, utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
+  final books = getBibleFromText(name, utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
-  // await Future.delayed(Duration(seconds: 1));
+  // await Future.delayed(Duration(seconds: 2));
-  return Bible.withBooks(
+  return Bible(
-    name: bibleName,
+    name: name,
     books: books,
   );
 }
-Future<Bible?> loadBible(String name) async {
-  return getBibleFromAsset(name).then((value) {
-    bible.update!(value);
-    return value;
-  });
-}
 // Trace customTrace;
 // if (!isDesktop()) {
 //   customTrace = FirebasePerformance.instance.newTrace("loadBible");
@@ -201,14 +192,14 @@ bool watchVerseSelected(BuildContext context, Verse v) {
   return selectedVerses.watch(context).any((el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index);
 }
-void onVerseSelected(BuildContext context, Verse v) {
+void onVerseSelected(BuildContext context, Bible bible, Verse v) {
   if (isVerseSelected(v)) {
     selectedVerses.update!(selectedVerses.value.removeBy((it) => it.index == v.index).toList());
   } else {
     selectedVerses.update!(selectedVerses.value.addBy(v).toList());
   }
   if (selectedVerses.value.isNotEmpty) {
-    showActions(context);
+    showActions(context, bible);
   }
   if (selectedVerses.value.isEmpty) {
     hideActions(context);
@@ -269,14 +260,14 @@ class BufferAudioSource extends StreamAudioSource {
   }
 }
-onPlay(BuildContext context) async {
+onPlay(BuildContext context, Bible bible) async {
   final versesToPlay = List<Verse>.from(selectedVerses.value);
   if (isPlaying.value) {
     pause();
   } else {
     isPlaying.value = true;
     for (final v in versesToPlay) {
-      final pathname = "${bibleName.value}|${v.book}|${v.chapter}|${v.index}";
+      final pathname = "${bible.name}|${v.book}|${v.chapter}|${v.index}";
       try {
         final list = await convertText(context.l.audioVoice, v.text);
         await player.setAudioSource(BufferAudioSource(list));

lib/utils.dart CHANGED Viewed

@@ -7,7 +7,7 @@ import "package:flutter/material.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import "package:flutter_azure_tts/flutter_azure_tts.dart";
-extension MyIterable<E> on Iterable<E> {
+extension IterableUtils<E> on Iterable<E> {
   Iterable<E> sortedBy(Comparable Function(E e) key) => toList()..sort((a, b) => key(a).compareTo(key(b)));
   Iterable<E> removeBy(bool Function(E e) key) => toList()..removeWhere(key);
@@ -15,6 +15,22 @@ extension MyIterable<E> on Iterable<E> {
   Iterable<E> addBy(E e) => toList()..add(e);
 }
+extension AsyncSnapshotUtils<E> on AsyncSnapshot<E> {
+  TResult when<TResult extends Object?>({
+    required TResult Function() loading,
+    required TResult Function(E? v) success,
+    required TResult Function() error,
+  }) {
+    if (hasError) {
+      return error();
+    }
+    if (connectionState == ConnectionState.done) {
+      return success(data);
+    }
+    return loading();
+  }
+}
 extension AppContext on BuildContext {
   ThemeData get theme => Theme.of(this);

lib/widgets/chapter_app_bar.dart CHANGED Viewed

@@ -5,10 +5,11 @@ import "package:only_bible_app/state.dart";
 import "package:only_bible_app/utils.dart";
 class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
+  final Bible bible;
   final Book book;
   final Chapter chapter;
-  const ChapterAppBar({super.key, required this.book, required this.chapter});
+  const ChapterAppBar({super.key, required this.book, required this.chapter, required this.bible});
   @override
   Size get preferredSize => const Size.fromHeight(40);
@@ -26,7 +27,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
           children: [
             InkWell(
               enableFeedback: true,
-              onTap: () => changeBook(context, bible.value),
+              onTap: () => changeBook(context, bible),
               child: Row(
                 children: [
                   Text(
@@ -57,7 +58,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                       ),
                       icon: const Icon(Icons.chevron_left),
                       label: const Text("Prev"),
-                      onPressed: () => previousChapter(context, bible.value, book.index, chapter.index),
+                      onPressed: () => previousChapter(context, bible, book.index, chapter.index),
                     ),
                   if (isDesktop) const SizedBox(width: 10),
                   if (isDesktop)
@@ -71,7 +72,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                       ),
                       icon: const Icon(Icons.chevron_right),
                       label: const Text("Next"),
-                      onPressed: () => nextChapter(context, bible.value, book.index, chapter.index),
+                      onPressed: () => nextChapter(context, bible, book.index, chapter.index),
                     ),
                   if (isDesktop) const SizedBox(width: 20),
                   if (isDesktop)
@@ -89,7 +90,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                         ),
                       ),
                       icon: const Icon(Icons.book_outlined),
-                      label: Text(bible.watch(context).name),
+                      label: Text(bible.name),
                       onPressed: () => changeBibleFromHeader(context),
                     ),
                   Padding(
@@ -97,7 +98,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
                     child: IconButton(
                       padding: EdgeInsets.zero,
                       icon: Icon(Icons.more_vert, size: isDesktop ? 28 : 24),
-                      onPressed: () => showSettings(context),
+                      onPressed: () => showSettings(context, bible),
                     ),
                   ),
                 ],

lib/widgets/note_sheet.dart CHANGED Viewed

@@ -4,9 +4,10 @@ import "package:only_bible_app/state.dart";
 import "package:only_bible_app/widgets/modal_button.dart";
 class NoteSheet extends StatelessWidget {
+  final Bible bible;
   final Verse verse;
-  const NoteSheet({super.key, required this.verse});
+  const NoteSheet({super.key, required this.verse, required this.bible});
   @override
   Widget build(BuildContext context) {
@@ -23,7 +24,7 @@ class NoteSheet extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.only(bottom: 5, left: 15),
             child: Text(
-              "Note on ${bible.watch(context).books[verse.book].name(context)} ${verse.chapter + 1}:${verse.index + 1}",
+              "Note on ${bible.books[verse.book].name(context)} ${verse.chapter + 1}:${verse.index + 1}",
               style: Theme.of(context).textTheme.headlineMedium,
             ),
           ),

lib/widgets/verses_view.dart CHANGED Viewed

@@ -6,19 +6,20 @@ import "package:only_bible_app/navigation.dart";
 import "package:only_bible_app/state.dart";
 class VersesView extends StatelessWidget {
+  final Bible bible;
   final Chapter chapter;
-  const VersesView({super.key, required this.chapter});
+  const VersesView({super.key, required this.bible, required this.chapter});
   @override
   Widget build(BuildContext context) {
     final textStyle = DefaultTextStyle.of(context).style;
     return SwipeDetector(
       onSwipeLeft: (offset) {
-        nextChapter(context, bible.value, chapter.book, chapter.index);
+        nextChapter(context, bible, chapter.book, chapter.index);
       },
       onSwipeRight: (offset) {
-        previousChapter(context, bible.value, chapter.book, chapter.index);
+        previousChapter(context, bible, chapter.book, chapter.index);
       },
       child: SingleChildScrollView(
         physics: const BouncingScrollPhysics(),
@@ -57,7 +58,7 @@ class VersesView extends StatelessWidget {
                                   padding: const EdgeInsets.only(left: 3, right: 3),
                                   child: GestureDetector(
                                     onTap: () {
-                                      showNoteField(context, v);
+                                      showNoteField(context, bible, v);
                                     },
                                     child: const Icon(
                                       Icons.sticky_note_2_outlined,
@@ -72,7 +73,7 @@ class VersesView extends StatelessWidget {
                               style: getHighlightStyle(context, v),
                               recognizer: TapGestureRecognizer()
                                 ..onTap = () {
-                                  onVerseSelected(context, v);
+                                  onVerseSelected(context, bible, v);
                                 },
                             ),
                             const WidgetSpan(

pubspec.lock CHANGED Viewed

@@ -57,14 +57,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.16"
-  bloc:
-    dependency: "direct main"
-    description:
-      name: bloc
-      sha256: "3820f15f502372d979121de1f6b97bfcf1630ebff8fe1d52fb2b0bfa49be5b49"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -366,14 +358,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.6"
-  flutter_bloc:
-    dependency: "direct main"
-    description:
-      name: flutter_bloc
-      sha256: e74efb89ee6945bcbce74a5b3a5a3376b088e5f21f55c263fc38cbdc6237faae
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.3"
   flutter_dotenv:
     dependency: "direct main"
     description:
@@ -387,6 +371,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_hooks:
+    dependency: "direct main"
+    description:
+      name: flutter_hooks
+      sha256: "6ae13b1145c589112cbd5c4fda6c65908993a9cb18d4f82042e9c28dd9fbf611"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.20.1"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
@@ -684,14 +676,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.0.1"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   node_preamble:
     dependency: transitive
     description:
@@ -828,14 +812,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.2.4"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.5"
   pub_semver:
     dependency: transitive
     description:

pubspec.yaml CHANGED Viewed

@@ -16,6 +16,8 @@ dependencies:
   intl: any
   path_provider: ^2.0.15
   just_audio: ^0.9.34
+  just_audio_windows: ^0.2.0
+  just_audio_mpv: ^0.1.7
   shared_preferences: ^2.2.0
   flutter_native_splash: ^2.3.1
   flutter_swipe_detector: ^2.0.0
@@ -33,11 +35,7 @@ dependencies:
   flutter_dotenv: ^5.1.0
   freezed: ^2.4.1
   freezed_annotation: ^2.4.1
-  flutter_bloc: ^8.1.3
   equatable: ^2.0.5
-  bloc: ^8.1.2
-  just_audio_windows: ^0.2.0
-  just_audio_mpv: ^0.1.7
 dev_dependencies:
   flutter_test:

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