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.

0a263db5 — pyrossh

use bloc

Files changed (13) hide show

lib/app.dart +35 -22
lib/atom.dart +39 -0
lib/blocs/bible_bloc.dart +28 -0
lib/blocs/bible_bloc.freezed.dart +725 -0
lib/blocs/bible_event.dart +7 -0
lib/blocs/bible_state.dart +8 -0
lib/main.dart +0 -1
lib/models.dart +10 -2
lib/screens/bible_select_screen.dart +3 -0
lib/screens/chapter_view_screen.dart +67 -40
lib/state.dart +4 -15
lib/widgets/bible_loader.dart +0 -27
macos/Podfile.lock +0 -29

lib/app.dart CHANGED Viewed

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

lib/atom.dart CHANGED Viewed

@@ -64,3 +64,42 @@ class Atom<T> extends ValueNotifier<T> {
 class _ListenerWrapper {
   void Function()? listener;
 }
+class AsyncAtom<T> extends ValueNotifier<T> {
+  final T Function(T) callback;
+  AsyncAtom(super._value, this.callback);
+  @override
+  get value {
+    return callback(this.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`
+      removeListener(listenerWrapper.listener!);
+    };
+    addListener(listenerWrapper.listener!);
+    return value;
+  }
+}

lib/blocs/bible_bloc.dart ADDED Viewed

@@ -0,0 +1,28 @@
+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 ADDED Viewed

@@ -0,0 +1,725 @@
+// 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 ADDED Viewed

@@ -0,0 +1,7 @@
+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 ADDED Viewed

@@ -0,0 +1,8 @@
+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/main.dart CHANGED Viewed

@@ -34,7 +34,6 @@ void main() async {
   );
   await initState();
   updateStatusBar(darkMode.value);
-  bibleCache.value = loadBible(bibleName.value);
   runApp(const App());
   FlutterNativeSplash.remove();
 }

lib/models.dart CHANGED Viewed

@@ -63,14 +63,21 @@ class Chapter {
 class Verse {
   final int index;
+  final String bibleName;
   final int book;
   final int chapter;
   final String text;
+  const Verse({
+    required this.index,
+    required this.text,
+    required this.bibleName,
-  const Verse({required this.index, required this.text, required this.chapter, required this.book});
+    required this.chapter,
+    required this.book,
+  });
 }
-List<Book> getBibleFromText(String text) {
+List<Book> getBibleFromText(String bibleName, String text) {
   final List<Book> books = [];
   final lines = text.split("\n");
   for (var (index, line) in lines.indexed) {
@@ -103,6 +110,7 @@ List<Book> getBibleFromText(String text) {
           Verse(
             index: verseNo - 1,
             text: verseText,
+            bibleName: bibleName,
             chapter: chapter - 1,
             book: book - 1,
           ),

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -1,4 +1,6 @@
 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";
@@ -29,6 +31,7 @@ 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!();

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -1,11 +1,14 @@
 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/utils.dart";
-import "package:only_bible_app/widgets/bible_loader.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 int bookIndex;
   final int chapterIndex;
@@ -13,50 +16,74 @@ class ChapterViewScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    return BlocBuilder<BibleBloc, BibleState>(builder: (context, state) {
-    if (context.isWide) {
+      if (!context.isWide) {
+        return 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 Scaffold(
+              appBar: ChapterAppBar(book: book, chapter: chapter),
+              backgroundColor: Theme.of(context).colorScheme.background,
+              body: SafeArea(
+                child: VersesView(chapter: chapter),
+              ),
+            );
+          },
+          error: () => ColoredBox(
+            color: Theme.of(context).colorScheme.background,
+            child: const Center(
+              child: Text("Could not load the bible"),
+            ),
+          ),
+        );
+      }
       return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.background,
-        body: SafeArea(
-          child: Row(
+        body: Row(
-            children: [
+          children: [
-              const Sidebar(),
+            const Sidebar(),
-              Flexible(
+            Flexible(
-                child: BibleLoader(
+              child: state.when(
+                loading: () => ColoredBox(
+                  color: Theme.of(context).colorScheme.background,
+                  child: const Center(
+                    child: CircularProgressIndicator(),
+                  ),
+                ),
-                  builder: (bible) {
+                success: (Bible bible) {
-                    final book = bible.books[bookIndex];
+                  final book = bible.books[bookIndex];
-                    final chapter = book.chapters[chapterIndex];
+                  final chapter = book.chapters[chapterIndex];
-                    return Column(
+                  return Column(
-                      children: [
+                    children: [
-                        ChapterAppBar(book: book, chapter: chapter),
+                      ChapterAppBar(book: book, chapter: chapter),
-                        const Padding(
+                      const Padding(
-                          padding: EdgeInsets.only(bottom: 10),
+                        padding: EdgeInsets.only(bottom: 10),
-                          child: Divider(height: 5, indent: 20, endIndent: 20, thickness: 1.5),
+                        child: Divider(height: 5, indent: 20, endIndent: 20, thickness: 1.5),
-                        ),
+                      ),
-                        Flexible(
+                      Flexible(
-                          child: VersesView(chapter: chapter),
+                        child: VersesView(chapter: chapter),
-                        ),
+                      ),
-                      ],
+                    ],
-                    );
+                  );
-                  },
+                },
+                error: () => ColoredBox(
+                  color: Theme.of(context).colorScheme.background,
+                  child: const Center(
+                    child: Text("Could not load the bible"),
+                  ),
                 ),
               ),
+            ),
-            ],
+          ],
-          ),
         ),
       );
-    }
-    return BibleLoader(
-      builder: (bible) {
-        final book = bible.books[bookIndex];
-        final chapter = book.chapters[chapterIndex];
-        return Scaffold(
-          appBar: ChapterAppBar(book: book, chapter: chapter),
-          backgroundColor: Theme.of(context).colorScheme.background,
-          body: SafeArea(
-            child: VersesView(chapter: chapter),
-          ),
-        );
+    });
-      },
-    );
   }
 }

lib/state.dart CHANGED Viewed

@@ -55,34 +55,23 @@ final Atom<Bible> bible = Atom<Bible>(
   },
 );
-final bibleCache = Atom<Future<Bible?>?>(
-  key: "bible",
-  initialValue: null,
-);
 updateCurrentBible(BuildContext context, Locale l, String name) async {
   hideActions(context);
   languageCode.value = l.languageCode;
   bibleName.update!(name);
-  bibleCache.value = loadBible(name);
 }
-Future<Bible> getBibleFromAsset(String file) async {
+Future<Bible> getBibleFromAsset(String bibleName) async {
-  final bytes = await rootBundle.load("assets/bibles/$file.txt");
+  final bytes = await rootBundle.load("assets/bibles/$bibleName.txt");
-  final books = getBibleFromText(utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
+  final books = getBibleFromText(bibleName, utf8.decode(bytes.buffer.asUint8List(), allowMalformed: false));
   // await Future.delayed(Duration(seconds: 1));
   return Bible.withBooks(
-    name: bibleName.value,
+    name: bibleName,
     books: books,
   );
 }
-// CachedValue(
-// () => factorial(originalValue),
-// ).withDependency(() => originalValue)
 Future<Bible?> loadBible(String name) async {
-  print("loadBible ${name}");
   return getBibleFromAsset(name).then((value) {
     bible.update!(value);
     return value;

lib/widgets/bible_loader.dart DELETED Viewed

@@ -1,27 +0,0 @@
-import "package:flutter/material.dart";
-import "package:only_bible_app/models.dart";
-import "package:only_bible_app/state.dart";
-class BibleLoader extends StatelessWidget {
-  final Function(Bible) builder;
-  const BibleLoader({super.key, required this.builder});
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder(
-      future: bibleCache.watch(context),
-      builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.done) {
-          return builder(snapshot.data!);
-        }
-        return ColoredBox(
-          color: Theme.of(context).colorScheme.background,
-          child: const Center(
-            child: CircularProgressIndicator(),
-          ),
-        );
-      },
-    );
-  }
-}

macos/Podfile.lock CHANGED Viewed

@@ -6,9 +6,6 @@ PODS:
   - Firebase/Crashlytics (10.12.0):
     - Firebase/CoreOnly
     - FirebaseCrashlytics (~> 10.12.0)
-  - Firebase/Storage (10.12.0):
-    - Firebase/CoreOnly
-    - FirebaseStorage (~> 10.12.0)
   - firebase_core (2.15.0):
     - Firebase/CoreOnly (~> 10.12.0)
     - FlutterMacOS
@@ -17,13 +14,6 @@ PODS:
     - Firebase/Crashlytics (~> 10.12.0)
     - firebase_core
     - FlutterMacOS
-  - firebase_storage (11.2.5):
-    - Firebase/CoreOnly (~> 10.12.0)
-    - Firebase/Storage (~> 10.12.0)
-    - firebase_core
-    - FlutterMacOS
-  - FirebaseAppCheckInterop (10.13.0)
-  - FirebaseAuthInterop (10.13.0)
   - FirebaseCore (10.12.0):
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
@@ -53,12 +43,6 @@ PODS:
     - GoogleUtilities/Environment (~> 7.10)
     - nanopb (< 2.30910.0, >= 2.30908.0)
     - PromisesSwift (~> 2.1)
-  - FirebaseStorage (10.12.0):
-    - FirebaseAppCheckInterop (~> 10.0)
-    - FirebaseAuthInterop (~> 10.0)
-    - FirebaseCore (~> 10.0)
-    - FirebaseCoreExtension (~> 10.0)
-    - GTMSessionFetcher/Core (< 4.0, >= 2.1)
   - FlutterMacOS (1.0.0)
   - GoogleDataTransport (9.2.5):
     - GoogleUtilities/Environment (~> 7.7)
@@ -71,7 +55,6 @@ PODS:
   - "GoogleUtilities/NSData+zlib (7.11.5)"
   - GoogleUtilities/UserDefaults (7.11.5):
     - GoogleUtilities/Logger
-  - GTMSessionFetcher/Core (3.1.1)
   - just_audio (0.0.1):
     - FlutterMacOS
   - nanopb (2.30909.0):
@@ -99,7 +82,6 @@ DEPENDENCIES:
   - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`)
   - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`)
   - firebase_crashlytics (from `Flutter/ephemeral/.symlinks/plugins/firebase_crashlytics/macos`)
-  - firebase_storage (from `Flutter/ephemeral/.symlinks/plugins/firebase_storage/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
   - just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/macos`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
@@ -111,18 +93,14 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - Firebase
-    - FirebaseAppCheckInterop
-    - FirebaseAuthInterop
     - FirebaseCore
     - FirebaseCoreExtension
     - FirebaseCoreInternal
     - FirebaseCrashlytics
     - FirebaseInstallations
     - FirebaseSessions
-    - FirebaseStorage
     - GoogleDataTransport
     - GoogleUtilities
-    - GTMSessionFetcher
     - nanopb
     - PromisesObjC
     - PromisesSwift
@@ -134,8 +112,6 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos
   firebase_crashlytics:
     :path: Flutter/ephemeral/.symlinks/plugins/firebase_crashlytics/macos
-  firebase_storage:
-    :path: Flutter/ephemeral/.symlinks/plugins/firebase_storage/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
   just_audio:
@@ -156,20 +132,15 @@ SPEC CHECKSUMS:
   Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
   firebase_core: ff59797157ca9adda4440071643761b41fcd03b3
   firebase_crashlytics: 223f1e85437fa85822439e51db3cd0be7dd35b23
-  firebase_storage: d873afdc6a0b5307ffa2bb4a5ca9282cb0b922f3
-  FirebaseAppCheckInterop: 5e12dc623d443dedffcde9c6f3ed41510125d8ef
-  FirebaseAuthInterop: 74875bde5d15636522a8fe98beb561df7a54db58
   FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
   FirebaseCoreExtension: ce60f9db46d83944cf444664d6d587474128eeca
   FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e
   FirebaseCrashlytics: c4d111b7430c49744c74bcc6346ea00868661ac8
   FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f
   FirebaseSessions: 991fb4c20b3505eef125f7cbfa20a5b5b189c2a4
-  FirebaseStorage: 1d7ca8c8953fc61ccacaa7c612696b5402968a0d
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
   GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
-  GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
   just_audio: 9b67ca7b97c61cfc9784ea23cd8cc55eb226d489
   nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
   package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce

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