only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs

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

0ad8d9db — pyrossh

remove reactive

Files changed (10) hide show

lib/app.dart +2 -2
lib/main.dart +3 -5
lib/screens/chapter_view_screen.dart +0 -1
lib/state.dart +74 -77
lib/widgets/menu.dart +13 -16
lib/widgets/play_button.dart +3 -3
lib/widgets/verse_list.dart +0 -1
lib/widgets/verse_view.dart +7 -11
pubspec.lock +1 -17
pubspec.yaml +0 -2

lib/app.dart CHANGED Viewed

@@ -1,6 +1,5 @@
 import "package:flutter/material.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.dart";
-import "package:flutter_reactive_value/flutter_reactive_value.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
 import "package:only_bible_app/state.dart";
 import "package:only_bible_app/theme.dart";
@@ -13,12 +12,13 @@ class App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    final model = AppModel.of(context);
     return MaterialApp(
       title: "Only Bible App",
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
       debugShowCheckedModeBanner: false,
-      themeMode: darkMode.reactiveValue(context) ? ThemeMode.dark : ThemeMode.light,
+      themeMode: model.darkMode ? ThemeMode.dark : ThemeMode.light,
       theme: lightTheme,
       darkTheme: darkTheme,
       home: ChapterViewScreen(book: initialBook, chapter: initialChapter),

lib/main.dart CHANGED Viewed

@@ -4,7 +4,6 @@ import "package:firebase_core/firebase_core.dart";
 // import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import "package:only_bible_app/options.dart";
-import "package:flutter_persistent_value_notifier/flutter_persistent_value_notifier.dart";
 import "package:flutter_native_splash/flutter_native_splash.dart";
 import "package:only_bible_app/state.dart";
 import "package:only_bible_app/app.dart";
@@ -30,12 +29,11 @@ void main() async {
   //   return true;
   // };
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
-  await initPersistentValueNotifier();
+  final model = AppModel();
-  final (bible, book, chapter, darkMode, fontBold) = await loadData();
+  final (book, chapter) = await model.loadData();
-  await updateStatusBar();
   runApp(
     ChangeNotifierProvider(
-      create: (context) => AppModel(bible: bible, darkMode: darkMode, fontBold: fontBold),
+      create: (context) => model,
       child: App(initialBook: book, initialChapter: chapter),
     ),
   );

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:flutter_reactive_value/flutter_reactive_value.dart";
 import "package:flutter_swipe_detector/flutter_swipe_detector.dart";
 import "package:only_bible_app/widgets/actions_bar.dart";
 import "package:only_bible_app/widgets/header.dart";

lib/state.dart CHANGED Viewed

@@ -2,7 +2,6 @@ import "dart:convert";
 import "package:flutter/foundation.dart" show defaultTargetPlatform, TargetPlatform;
 import "package:flutter/services.dart";
 import "package:flutter/material.dart";
-import "package:flutter_persistent_value_notifier/flutter_persistent_value_notifier.dart";
 import "package:just_audio/just_audio.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
 import "package:only_bible_app/utils/dialog.dart";
@@ -11,14 +10,11 @@ import "package:provider/provider.dart";
 import "package:shared_preferences/shared_preferences.dart";
 class AppModel extends ChangeNotifier {
-  final Bible bible;
+  Bible bible = bibles.first;
-  bool darkMode;
-  bool fontBold;
-  bool isPlaying = false;
+  bool darkMode = false;
+  bool fontBold = false;
   int fontSizeDelta = 0;
-  AppModel({required this.bible, this.darkMode = false, this.fontBold = false});
   static AppModel of(BuildContext context) {
     return Provider.of(context, listen: true);
   }
@@ -34,6 +30,26 @@ class AppModel extends ChangeNotifier {
     // save fontBold
   }
+  Future<(int, int)> loadData() async {
+    final prefs = await SharedPreferences.getInstance();
+    final bibleId = prefs.getInt("bibleId") ?? 1;
+    darkMode = prefs.getBool("darkMode") ?? false;
+    fontBold = prefs.getBool("fontBold") ?? false;
+    fontSizeDelta = prefs.getInt("fontSizeDelta") ?? 0;
+    final selectedBible = bibles.firstWhere((it) => it.id == bibleId);
+    final books = await getBibleFromAsset(selectedBible.name);
+    bible = Bible.withBooks(
+      id: selectedBible.id,
+      name: selectedBible.name,
+      books: books,
+    );
+    // await Future.delayed(Duration(seconds: 3));
+    final book = prefs.getInt("book") ?? 0;
+    final chapter = prefs.getInt("chapter") ?? 0;
+    updateStatusBar();
+    return (book, chapter);
+  }
   // changeBible() {
   //   save();
   // }
@@ -41,6 +57,49 @@ class AppModel extends ChangeNotifier {
   // final Future<Bible>
   // load() {
   // }
+  toggleMode() async {
+    darkMode = !darkMode;
+    updateStatusBar();
+    notifyListeners();
+    (await SharedPreferences.getInstance()).setBool("darkMode", darkMode);
+  }
+  updateStatusBar() {
+    if (darkMode) {
+      SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+        systemNavigationBarColor: Color(0xFF1F1F22),
+        statusBarColor: Color(0xFF1F1F22),
+        systemNavigationBarIconBrightness: Brightness.light,
+        statusBarIconBrightness: Brightness.light,
+      ));
+    } else {
+      SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+        systemNavigationBarColor: Colors.white,
+        statusBarColor: Colors.white,
+        systemNavigationBarIconBrightness: Brightness.dark,
+        statusBarIconBrightness: Brightness.dark,
+      ));
+    }
+  }
+  toggleBold() async {
+    fontBold = !fontBold;
+    notifyListeners();
+    (await SharedPreferences.getInstance()).setBool("fontBold", fontBold);
+  }
+  increaseFont() async {
+    fontSizeDelta += 1;
+    notifyListeners();
+    (await SharedPreferences.getInstance()).setInt("fontSizeDelta", fontSizeDelta);
+  }
+  decreaseFont() async {
+    fontSizeDelta -= 1;
+    notifyListeners();
+    (await SharedPreferences.getInstance()).setInt("fontSizeDelta", fontSizeDelta);
+  }
 }
 class ChapterViewModel extends ChangeNotifier {
@@ -48,6 +107,7 @@ class ChapterViewModel extends ChangeNotifier {
   final int chapter;
   final List<int> selectedVerses;
   final player = AudioPlayer();
+  bool isPlaying = false;
   static ChapterViewModel of(BuildContext context) {
     return Provider.of(context, listen: true);
@@ -88,12 +148,14 @@ class ChapterViewModel extends ChangeNotifier {
   onPlay(BuildContext context) async {
     final bibleModel = AppModel.ofEvent(context);
     final model = ChapterViewModel.ofEvent(context);
-    if (isPlaying.value) {
+    if (isPlaying) {
       await player.pause();
-      isPlaying.value = false;
+      isPlaying = false;
+      notifyListeners();
     } else {
       try {
-        isPlaying.value = true;
+        isPlaying = true;
+        notifyListeners();
         for (final v in selectedVerses) {
           final bibleName = bibleModel.bible.name;
           final book = (model.book + 1).toString().padLeft(2, "0");
@@ -111,43 +173,13 @@ class ChapterViewModel extends ChangeNotifier {
         showError(context, "Could not play audio");
       } finally {
         await player.pause();
-        isPlaying.value = false;
+        isPlaying = false;
+        notifyListeners();
       }
     }
   }
 }
-Future<(Bible, int, int, bool, bool)> loadData() async {
-  final prefs = await SharedPreferences.getInstance();
-  final bibleId = prefs.getInt("bibleId") ?? 1;
-  final book = prefs.getInt("book") ?? 0;
-  final chapter = prefs.getInt("chapter") ?? 0;
-  final darkMode = prefs.getBool("darkMode") ?? false;
-  final fontBold = prefs.getBool("fontBold") ?? false;
-  final selectedBible = bibles.firstWhere((it) => it.id == bibleId);
-  final books = await getBibleFromAsset(selectedBible.name);
-  final loadedBible = Bible.withBooks(
-    id: selectedBible.id,
-    name: selectedBible.name,
-    books: books,
-  );
-  // await Future.delayed(Duration(seconds: 3));
-  return (loadedBible, book, chapter, darkMode, fontBold);
-}
-final darkMode = PersistentValueNotifier<bool>(
-  sharedPreferencesKey: "darkMode",
-  initialValue: false,
-);
-final fontBold = PersistentValueNotifier<bool>(
-  sharedPreferencesKey: "fontBold",
-  initialValue: false,
-);
-final isPlaying = ValueNotifier(false);
-final fontSizeDelta = ValueNotifier(0);
 bool isWide(BuildContext context) {
   if (defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS) {
     return false;
@@ -156,41 +188,6 @@ bool isWide(BuildContext context) {
   return width > 600;
 }
-toggleMode() {
-  darkMode.value = !darkMode.value;
-  updateStatusBar();
-}
-toggleBold() {
-  fontBold.value = !fontBold.value;
-}
-increaseFont() {
-  fontSizeDelta.value += 1;
-}
-decreaseFont() {
-  fontSizeDelta.value -= 1;
-}
-updateStatusBar() {
-  if (darkMode.value) {
-    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-      systemNavigationBarColor: Color(0xFF1F1F22),
-      statusBarColor: Color(0xFF1F1F22),
-      systemNavigationBarIconBrightness: Brightness.light,
-      statusBarIconBrightness: Brightness.light,
-    ));
-  } else {
-    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-      systemNavigationBarColor: Colors.white,
-      statusBarColor: Colors.white,
-      systemNavigationBarIconBrightness: Brightness.dark,
-      statusBarIconBrightness: Brightness.dark,
-    ));
-  }
-}
 changeBible(BuildContext context, int i) {
   // TODO: maybe use a future as the bible needs to load
   // loadBible();

lib/widgets/menu.dart CHANGED Viewed

@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:flutter_reactive_value/flutter_reactive_value.dart";
 import "package:only_bible_app/state.dart";
 class Menu extends StatelessWidget {
@@ -19,34 +18,32 @@ class Menu extends StatelessWidget {
             value: 1,
             child: StatefulBuilder(
               builder: (BuildContext menuContext, StateSetter setState) {
+                final model = AppModel.of(context);
-                final modeIcon = darkMode.reactiveValue(menuContext) ? Icons.dark_mode : Icons.light_mode;
+                final modeIcon = model.darkMode ? Icons.dark_mode : Icons.light_mode;
-                final boldColor = fontBold.reactiveValue(menuContext) ? Colors.red : Colors.grey;
+                final boldColor = model.fontBold ? Colors.red : Colors.grey;
                 return Column(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     IconButton(
                       icon: Icon(modeIcon, size: 28),
-                      onPressed: toggleMode,
+                      onPressed: model.toggleMode,
                     ),
                     Container(margin: const EdgeInsets.only(top: spacing)),
                     // TODO: figure out bold active/inactive color
-                    const IconButton(
+                    IconButton(
-                      icon: Icon(Icons.format_bold, size: 28),
+                      icon: const Icon(Icons.format_bold, size: 28),
-                      onPressed: toggleBold,
+                      onPressed: model.toggleBold,
                     ),
                     Container(margin: const EdgeInsets.only(top: spacing)),
-                    const IconButton(
+                    IconButton(
-                      icon: Icon(Icons.add_circle, size: 28),
+                      icon: const Icon(Icons.add_circle, size: 28),
-                      onPressed: increaseFont,
+                      onPressed: model.increaseFont,
                     ),
                     Container(margin: const EdgeInsets.only(top: spacing)),
-                    const IconButton(
+                    IconButton(
-                      icon: Icon(
-                        Icons.remove_circle,
+                      icon: const Icon(Icons.remove_circle, size: 28),
-                        size: 28,
-                      ),
-                      onPressed: decreaseFont,
+                      onPressed: model.decreaseFont,
                     ),
                   ],
                 );

lib/widgets/play_button.dart CHANGED Viewed

@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:flutter_reactive_value/flutter_reactive_value.dart";
 import "package:only_bible_app/state.dart";
 class PlayButton extends StatelessWidget {
@@ -7,13 +6,14 @@ class PlayButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    final model = ChapterViewModel.of(context);
-    final icon = isPlaying.reactiveValue(context) ? Icons.pause_circle_filled : Icons.play_circle_fill;
+    final icon = model.isPlaying ? Icons.pause_circle_filled : Icons.play_circle_fill;
     final size = isWide(context) ? 28.0 : 42.0;
     return IconButton(
       icon: Icon(icon, size: size),
       onPressed: () {
-        ChapterViewModel.ofEvent(context).onPlay(context);
+        model.onPlay(context);
       },
     );
   }

lib/widgets/verse_list.dart CHANGED Viewed

@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:flutter_reactive_value/flutter_reactive_value.dart";
 import "package:only_bible_app/widgets/verse_view.dart";
 import "package:only_bible_app/state.dart";

lib/widgets/verse_view.dart CHANGED Viewed

@@ -1,6 +1,5 @@
 import "package:flutter/material.dart";
-import "package:flutter_reactive_value/flutter_reactive_value.dart";
-import 'package:only_bible_app/state.dart';
+import "package:only_bible_app/state.dart";
 class VerseText extends StatelessWidget {
   final int index;
@@ -10,18 +9,15 @@ class VerseText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    final model = AppModel.of(context);
     final selected = ChapterViewModel.of(context).isVerseSelected(index);
-    final delta = fontSizeDelta.reactiveValue(context);
-    final bodySize = Theme.of(context).textTheme.bodyMedium!.fontSize! + delta;
+    final bodySize = Theme.of(context).textTheme.bodyMedium!.fontSize! + model.fontSizeDelta;
-    final weight =
-        fontBold.reactiveValue(context) ? FontWeight.w600 : Theme.of(context).textTheme.bodyMedium!.fontWeight;
+    final weight = model.fontBold ? FontWeight.w600 : Theme.of(context).textTheme.bodyMedium!.fontWeight;
-    onTap() {
-      ChapterViewModel.ofEvent(context).onVerseSelected(index);
-    }
     return GestureDetector(
-      onTap: onTap,
+      onTap: () {
+        ChapterViewModel.ofEvent(context).onVerseSelected(index);
+      },
       child: DecoratedBox(
         decoration: BoxDecoration(
           color: selected ? Theme.of(context).highlightColor : Theme.of(context).colorScheme.background,

pubspec.lock CHANGED Viewed

@@ -320,22 +320,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.1"
-  flutter_persistent_value_notifier:
-    dependency: "direct main"
-    description:
-      name: flutter_persistent_value_notifier
-      sha256: ed949e8081346f9bb2f709a3dd1f71bdf842e5bfed332650c046321ec935013a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  flutter_reactive_value:
-    dependency: "direct main"
-    description:
-      name: flutter_reactive_value
-      sha256: aa3432e96233e4186fdaf0a1e2f7dd8169957d03252dbde24f1dd6e177e6bdd7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4"
   flutter_swipe_detector:
     dependency: "direct main"
     description:
@@ -931,4 +915,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.0.6 <4.0.0"
-  flutter: ">=3.7.0"
+  flutter: ">=3.3.0"

pubspec.yaml CHANGED Viewed

@@ -13,8 +13,6 @@ dependencies:
     sdk: flutter
   intl: any
   path_provider: ^2.0.15
-  flutter_persistent_value_notifier: ^1.0.2
-  flutter_reactive_value: ^1.0.4
   just_audio: ^0.9.34
   shared_preferences: ^2.2.0
   flutter_native_splash: ^2.3.1

~repos /only-bible-app

git clone https://pyrossh.dev/repos/only-bible-app.git Discussions: https://groups.google.com/g/rust-embed-devs

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

git clone https://pyrossh.dev/repos/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs