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.

8120183d — pyrossh

Fix locale issues

Files changed (14) hide show

lib/app.dart +6 -4
lib/main.dart +2 -4
lib/models.dart +2 -2
lib/providers/app_provider.dart +13 -82
lib/screens/bible_select_screen.dart +19 -25
lib/screens/book_select_screen.dart +3 -4
lib/screens/chapter_view_screen.dart +2 -3
lib/sheets/actions_sheet.dart +2 -6
lib/sheets/highlight_sheet.dart +1 -2
lib/theme.dart +2 -2
lib/utils.dart +97 -14
lib/widgets/chapter_app_bar.dart +1 -1
lib/widgets/scaffold_menu.dart +5 -4
lib/widgets/sliver_tile_grid.dart +2 -3

lib/app.dart CHANGED Viewed

@@ -1,27 +1,29 @@
 import "package:flutter/material.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.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/theme.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_markdown.dart";
 class App extends StatelessWidget {
+  final bool firstOpen;
   final int initialBook;
   final int initialChapter;
-  const App({super.key, required this.initialBook, required this.initialChapter});
+  const App({super.key, required this.firstOpen, required this.initialBook, required this.initialChapter});
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      title: "Only Bible App",
-      locale: context.app.locale,
+      onGenerateTitle: (context) => context.l10n.title,
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
       debugShowCheckedModeBanner: false,
       themeMode: context.app.darkMode ? ThemeMode.dark : ThemeMode.light,
       theme: lightTheme,
       darkTheme: darkTheme,
+      locale: context.app.locale,
       // initialRoute: "",
       routes: {
         // TODO: maybe have a landing page
@@ -29,7 +31,7 @@ class App extends StatelessWidget {
         "/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: ChapterViewScreen(book: initialBook, chapter: initialChapter),
+      home: firstOpen ? const BibleSelectScreen() : ChapterViewScreen(book: initialBook, chapter: initialChapter),
     );
   }
 }

lib/main.dart CHANGED Viewed

@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:intl/intl.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter_web_plugins/url_strategy.dart";
 import "package:firebase_core/firebase_core.dart";
@@ -25,13 +24,12 @@ void main() async {
   };
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
   usePathUrlStrategy();
-  print(Intl.getCurrentLocale());
   final model = AppProvider();
-  final (book, chapter) = await model.loadData();
+  final (firstOpen, book, chapter) = await model.loadData();
   runApp(
     ChangeNotifierProvider.value(
       value: model,
-      child: App(initialBook: book, initialChapter: chapter),
+      child: App(firstOpen: firstOpen, initialBook: book, initialChapter: chapter),
     ),
   );
   FlutterNativeSplash.remove();

lib/models.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/providers/app_provider.dart";
+import "package:only_bible_app/utils.dart";
 class Bible {
   final String name;
@@ -37,7 +37,7 @@ class Book {
   });
   String name(BuildContext context) {
-    return AppProvider.of(context).getBookNames(context)[index];
+    return context.bookNames[index];
   }
   bool isOldTestament() => index < 39;

lib/providers/app_provider.dart CHANGED Viewed

@@ -7,7 +7,6 @@ import "package:only_bible_app/dialog.dart";
 import "package:only_bible_app/screens/chapter_view_screen.dart";
 import "package:only_bible_app/theme.dart";
 import "package:share_plus/share_plus.dart";
-import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:only_bible_app/screens/bible_select_screen.dart";
@@ -36,6 +35,7 @@ class AppProvider extends ChangeNotifier {
   late PackageInfo packageInfo;
   late Bible bible;
   late Locale locale;
+  bool firstOpen = true;
   bool engTitles = false;
   bool darkMode = false;
   bool fontBold = false;
@@ -57,24 +57,22 @@ class AppProvider extends ChangeNotifier {
     return Provider.of(context, listen: false);
   }
-  static AppLocalizations getLocalizations(BuildContext context) {
-    return AppProvider.of(context).engTitles
-        ? lookupAppLocalizations(const Locale("en"))
-        : AppLocalizations.of(context)!;
-  }
   save() async {
     final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool("firstOpen", firstOpen);
     await prefs.setString("bibleName", bible.name);
+    await prefs.setBool("engTitles", engTitles);
     await prefs.setBool("darkMode", darkMode);
     await prefs.setBool("fontBold", fontBold);
     await prefs.setDouble("textScaleFactor", textScaleFactor);
     await prefs.setString("languageCode", locale.languageCode);
   }
-  Future<(int, int)> loadData() async {
+  Future<(bool, int, int)> loadData() async {
     packageInfo = await PackageInfo.fromPlatform();
     final prefs = await SharedPreferences.getInstance();
+    engTitles = prefs.getBool("engTitles") ?? false;
+    firstOpen = prefs.getBool("firstOpen") ?? true;
     darkMode = prefs.getBool("darkMode") ?? false;
     fontBold = prefs.getBool("fontBold") ?? false;
     textScaleFactor = prefs.getDouble("textScaleFactor") ?? 1;
@@ -84,7 +82,7 @@ class AppProvider extends ChangeNotifier {
     final book = prefs.getInt("book") ?? 0;
     final chapter = prefs.getInt("chapter") ?? 0;
     updateStatusBar();
-    return (book, chapter);
+    return (firstOpen, book, chapter);
   }
   Future<Bible> loadBible(String name) async {
@@ -103,78 +101,6 @@ class AppProvider extends ChangeNotifier {
     );
   }
-  List<String> getBookNames(BuildContext context) {
-    final l = getLocalizations(context);
-    return [
-      l.genesis,
-      l.exodus,
-      l.leviticus,
-      l.numbers,
-      l.deuteronomy,
-      l.joshua,
-      l.judges,
-      l.ruth,
-      l.firstSamuel,
-      l.secondSamuel,
-      l.firstKings,
-      l.secondKings,
-      l.firstChronicles,
-      l.secondChronicles,
-      l.ezra,
-      l.nehemiah,
-      l.esther,
-      l.job,
-      l.psalms,
-      l.proverbs,
-      l.ecclesiastes,
-      l.song_of_solomon,
-      l.isaiah,
-      l.jeremiah,
-      l.lamentations,
-      l.ezekiel,
-      l.daniel,
-      l.hosea,
-      l.joel,
-      l.amos,
-      l.obadiah,
-      l.jonah,
-      l.micah,
-      l.nahum,
-      l.habakkuk,
-      l.zephaniah,
-      l.haggai,
-      l.zechariah,
-      l.malachi,
-      l.matthew,
-      l.mark,
-      l.luke,
-      l.john,
-      l.acts,
-      l.romans,
-      l.firstCorinthians,
-      l.secondCorinthians,
-      l.galatians,
-      l.ephesians,
-      l.philippians,
-      l.colossians,
-      l.firstThessalonians,
-      l.secondThessalonians,
-      l.firstTimothy,
-      l.secondTimothy,
-      l.titus,
-      l.philemon,
-      l.hebrews,
-      l.james,
-      l.firstPeter,
-      l.secondPeter,
-      l.firstJohn,
-      l.secondJohn,
-      l.thirdJohn,
-      l.jude,
-      l.revelation,
-    ];
-  }
   hasAudio(BuildContext context) {
     return context.l10n.hasAudio == "true";
   }
@@ -240,6 +166,11 @@ class AppProvider extends ChangeNotifier {
     );
   }
+  updateFirstOpen() {
+    firstOpen = false;
+    save();
+  }
   toggleDarkMode() {
     darkMode = !darkMode;
     updateStatusBar();
@@ -554,7 +485,7 @@ class AppProvider extends ChangeNotifier {
           log("Could not play audio", name: "play", error: (err.toString(), pathname));
           FirebaseCrashlytics.instance.recordFlutterError(FlutterErrorDetails(exception: (err.toString(), pathname)));
           if (context.mounted) {
-            showError(context, "Could not play audio");
+            showError(context, context.l10n.audioError);
           }
           return;
         } finally {

lib/screens/bible_select_screen.dart CHANGED Viewed

@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import "package:only_bible_app/providers/app_provider.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
@@ -11,37 +10,32 @@ class BibleSelectScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final locales = AppLocalizations.supportedLocales.sortedBy((e) => e.languageCode);
     return ScaffoldMenu(
       child: CustomScrollView(
         physics: const BouncingScrollPhysics(),
         slivers: [
-          SliverHeading(title: context.l10n.bibleSelectTitle, showClose: true),
+          SliverHeading(title: context.l10n.bibleSelectTitle, showClose: !context.app.firstOpen),
           SliverTileGrid(
             listType: ListType.large,
             children: List.of(
-              locales.map((l) {
-                return Localizations.override(
+              context.supportedLocalizations.map((l) {
-                  context: context,
-                  locale: Locale(l.languageCode),
-                  child: Builder(
-                    builder: (context) {
-                      final bibleName = context.l10n.languageTitle;
-                      return TextButton(
+                return TextButton(
-                        child: Text(bibleName),
+                  child: Text(l.languageTitle),
-                        // child: Column(
+                  // child: Column(
-                        //   children: [
+                  //   children: [
-                        //     Text(l.name),
+                  //     Text(l.name),
-                        //     // Text("(${l.localName})"),
+                  //     // Text("(${l.localName})"),
-                        //   ],
+                  //   ],
-                        // ),
+                  // ),
-                        onPressed: () {
+                  onPressed: () {
-                          AppProvider.ofEvent(context).updateCurrentBible(context, l, bibleName);
+                    AppProvider.ofEvent(context).updateCurrentBible(context, Locale(l.localeName), l.languageTitle);
+                    if (context.appEvent.firstOpen) {
+                      context.appEvent.updateFirstOpen();
+                      context.appEvent.pushBookChapter(context, 0, 0, null);
+                    } else {
-                          Navigator.of(context).pop();
+                      Navigator.of(context).pop();
+                    }
-                        },
+                  },
-                      );
-                    },
-                  ),
                 );
               }),
             ),

lib/screens/book_select_screen.dart CHANGED Viewed

@@ -1,5 +1,5 @@
 import "package:flutter/material.dart";
-import "package:only_bible_app/providers/app_provider.dart";
+import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/scaffold_menu.dart";
 import "package:only_bible_app/screens/chapter_select_screen.dart";
 import "package:only_bible_app/widgets/sliver_heading.dart";
@@ -27,12 +27,11 @@ class BookSelectScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final localizations = AppProvider.getLocalizations(context);
     return ScaffoldMenu(
       child: CustomScrollView(
         physics: const BouncingScrollPhysics(),
         slivers: [
-          SliverHeading(title: localizations.oldTestamentTitle, showClose: true),
+          SliverHeading(title: context.l10n.oldTestamentTitle, showClose: true),
           SliverTileGrid(
             children: List.of(
               bible.getOldBooks().map((book) {
@@ -43,7 +42,7 @@ class BookSelectScreen extends StatelessWidget {
               }),
             ),
           ),
-          SliverHeading(title: localizations.newTestamentTitle, top: 30, bottom: 20),
+          SliverHeading(title: context.l10n.newTestamentTitle, top: 30, bottom: 20),
           SliverTileGrid(
             children: List.of(
               bible.getNewBooks().map((book) {

lib/screens/chapter_view_screen.dart CHANGED Viewed

@@ -31,17 +31,16 @@ class ChapterViewScreen extends StatelessWidget {
     //     );
     //   },
     // ),
-    final isDesktop = isWide(context);
     return ChangeNotifierProvider(
       create: (_) => ChapterProvider(
         book: book,
         chapter: chapter,
       ),
       child: Scaffold(
-        appBar: isDesktop ? null : const ChapterAppBar(),
+        appBar: context.isWide ? null : const ChapterAppBar(),
         backgroundColor: Theme.of(context).colorScheme.background,
         body: SafeArea(
-          child: isDesktop
+          child: context.isWide
               ? const Row(
                   children: [
                     Sidebar(),

lib/sheets/actions_sheet.dart CHANGED Viewed

@@ -9,7 +9,6 @@ class ActionsSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final app = AppProvider.of(context);
-    final isDesktop = isWide(context);
     final bottom = isIOS() ? 20.0 : 0.0;
     final height = isIOS() ? 100.0 : 65.0;
     final iconColor = app.darkMode ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
@@ -20,7 +19,7 @@ class ActionsSheet extends StatelessWidget {
       color: Theme.of(context).colorScheme.background,
       padding: EdgeInsets.only(left: 20, right: 20, bottom: bottom),
       child: Row(
-        mainAxisAlignment: isDesktop ? MainAxisAlignment.spaceEvenly : MainAxisAlignment.spaceBetween,
+        mainAxisAlignment: context.isWide ? MainAxisAlignment.spaceEvenly : MainAxisAlignment.spaceBetween,
         children: [
           IconButton(
             padding: EdgeInsets.zero,
@@ -38,10 +37,7 @@ class ActionsSheet extends StatelessWidget {
               if (audioEnabled) {
                 context.appEvent.onPlay(context);
               } else {
-                showError(
-                  context,
-                  "This Bible doesn't support audio. Currently audio is only available for the Kannada Bible.",
+                showError(context, context.l10n.audioNotAvailable);
-                );
               }
             },
             icon: Icon(audioIcon, size: 34, color: audioEnabled ? iconColor : Colors.grey),

lib/sheets/highlight_sheet.dart CHANGED Viewed

@@ -8,7 +8,6 @@ class HighlightSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final isDesktop = isWide(context);
     final bottom = isIOS() ? 20.0 : 0.0;
     final height = isIOS() ? 100.0 : 65.0;
     final iconColor = context.app.darkMode ? Colors.white.withOpacity(0.9) : Colors.black.withOpacity(0.9);
@@ -23,7 +22,7 @@ class HighlightSheet extends StatelessWidget {
       color: context.theme.colorScheme.background,
       padding: EdgeInsets.only(left: 20, right: 20, bottom: bottom),
       child: Row(
-        mainAxisAlignment: isDesktop ? MainAxisAlignment.spaceEvenly : MainAxisAlignment.spaceBetween,
+        mainAxisAlignment: context.isWide ? MainAxisAlignment.spaceEvenly : MainAxisAlignment.spaceBetween,
         children: [
           IconButton(
             padding: EdgeInsets.zero,

lib/theme.dart CHANGED Viewed

@@ -65,8 +65,8 @@ final lightTheme = ThemeData(
   ),
   appBarTheme: AppBarTheme(
     backgroundColor: lightColorScheme.background,
+    foregroundColor: lightColorScheme.onBackground,
     elevation: 1,
-    foregroundColor: lightColorScheme.primary,
   ),
   bottomSheetTheme: const BottomSheetThemeData(
     elevation: 10,
@@ -188,7 +188,7 @@ final darkTheme = lightTheme.copyWith(
   shadowColor: Colors.white,
   appBarTheme: AppBarTheme(
     backgroundColor: darkColorScheme.background,
-    foregroundColor: darkColorScheme.primary,
+    foregroundColor: darkColorScheme.onBackground,
     elevation: 1,
   ),
   bottomSheetTheme: lightTheme.bottomSheetTheme.copyWith(

lib/utils.dart CHANGED Viewed

@@ -11,19 +11,110 @@ import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import "package:provider/provider.dart";
 extension MyIterable<E> on Iterable<E> {
-  Iterable<E> sortedBy(Comparable Function(E e) key) =>
+  Iterable<E> sortedBy(Comparable Function(E e) key) => toList()..sort((a, b) => key(a).compareTo(key(b)));
-      toList()..sort((a, b) => key(a).compareTo(key(b)));
 }
 extension AppContext on BuildContext {
   ThemeData get theme => Theme.of(this);
-  AppLocalizations get l10n => app.engTitles ? lookupAppLocalizations(const Locale("en")) : AppLocalizations.of(this)!;
+  AppLocalizations get l10n => app.engTitles && app.locale.languageCode != "en"
+      ? lookupAppLocalizations(const Locale("en"))
+      : AppLocalizations.of(this)!;
   AppProvider get app => Provider.of(this, listen: true);
   AppProvider get appEvent => Provider.of(this, listen: false);
   ChapterProvider get chapter => Provider.of(this, listen: true);
   ChapterProvider get chapterEvent => Provider.of(this, listen: false);
-}
+  bool get isWide {
+    if (defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS) {
+      return false;
+    }
+    final width = MediaQuery.of(this).size.width;
+    return width > 700;
+  }
+  List<AppLocalizations> get supportedLocalizations {
+    return AppLocalizations.supportedLocales
+        .sortedBy((e) => e.languageCode)
+        .map((e) => lookupAppLocalizations(e))
+        .toList();
+  }
+  List<String> get bookNames {
+    return [
+      l10n.genesis,
+      l10n.exodus,
+      l10n.leviticus,
+      l10n.numbers,
+      l10n.deuteronomy,
+      l10n.joshua,
+      l10n.judges,
+      l10n.ruth,
+      l10n.firstSamuel,
+      l10n.secondSamuel,
+      l10n.firstKings,
+      l10n.secondKings,
+      l10n.firstChronicles,
+      l10n.secondChronicles,
+      l10n.ezra,
+      l10n.nehemiah,
+      l10n.esther,
+      l10n.job,
+      l10n.psalms,
+      l10n.proverbs,
+      l10n.ecclesiastes,
+      l10n.song_of_solomon,
+      l10n.isaiah,
+      l10n.jeremiah,
+      l10n.lamentations,
+      l10n.ezekiel,
+      l10n.daniel,
+      l10n.hosea,
+      l10n.joel,
+      l10n.amos,
+      l10n.obadiah,
+      l10n.jonah,
+      l10n.micah,
+      l10n.nahum,
+      l10n.habakkuk,
+      l10n.zephaniah,
+      l10n.haggai,
+      l10n.zechariah,
+      l10n.malachi,
+      l10n.matthew,
+      l10n.mark,
+      l10n.luke,
+      l10n.john,
+      l10n.acts,
+      l10n.romans,
+      l10n.firstCorinthians,
+      l10n.secondCorinthians,
+      l10n.galatians,
+      l10n.ephesians,
+      l10n.philippians,
+      l10n.colossians,
+      l10n.firstThessalonians,
+      l10n.secondThessalonians,
+      l10n.firstTimothy,
+      l10n.secondTimothy,
+      l10n.titus,
+      l10n.philemon,
+      l10n.hebrews,
+      l10n.james,
+      l10n.firstPeter,
+      l10n.secondPeter,
+      l10n.firstJohn,
+      l10n.secondJohn,
+      l10n.thirdJohn,
+      l10n.jude,
+      l10n.revelation,
+    ];
+  }
+}
 bool isDesktop() {
   return defaultTargetPlatform == TargetPlatform.macOS ||
@@ -39,14 +130,6 @@ bool isAndroid() {
   return defaultTargetPlatform == TargetPlatform.android;
 }
-bool isWide(BuildContext context) {
-  if (defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS) {
-    return false;
-  }
-  final width = MediaQuery.of(context).size.width;
-  return width > 700;
-}
 createNoTransitionPageRoute(Widget page) {
   return PageRouteBuilder(
     opaque: false,
@@ -57,7 +140,7 @@ createNoTransitionPageRoute(Widget page) {
 }
 createSlideRoute({required BuildContext context, TextDirection? slideDir, required Widget page}) {
-  if (isWide(context) || slideDir == null) {
+  if (context.isWide || slideDir == null) {
     return PageRouteBuilder(
       pageBuilder: (context, _, __) {
         return page;
@@ -93,5 +176,5 @@ openUrl(BuildContext context, String url) async {
     }
   }
   if (!context.mounted) return;
-  showError(context, "Could not open browser");
+  showError(context, context.l10n.urlError);
 }

lib/widgets/chapter_app_bar.dart CHANGED Viewed

@@ -17,7 +17,7 @@ class ChapterAppBar extends StatelessWidget implements PreferredSizeWidget {
     final model = ChapterProvider.of(context);
     final selectedBook = app.bible.books[model.book];
     final bookName = selectedBook.name(context);
-    final isDesktop = isWide(context);
+    final isDesktop = context.isWide;
     return SafeArea(
       child: Container(
         padding: EdgeInsets.only(left: 18, right: 5, top: isDesktop ? 5 : 0),

lib/widgets/scaffold_menu.dart CHANGED Viewed

@@ -10,15 +10,16 @@ class ScaffoldMenu extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final pageWidth = MediaQuery.of(context).size.width;
+    final isWide = context.isWide && !context.app.firstOpen;
     return Scaffold(
-      backgroundColor: Colors.transparent,
+      backgroundColor: isWide ? Colors.transparent : context.theme.colorScheme.background,
       body: SafeArea(
         child: Container(
           color: Colors.black.withOpacity(0.7),
-          margin: EdgeInsets.only(left: isWide(context) ? 250 : 0),
+          margin: EdgeInsets.only(left: isWide ? 250 : 0),
           child: Container(
-            color: backgroundColor ?? Theme.of(context).colorScheme.background,
+            color: backgroundColor ?? context.theme.colorScheme.background,
-            margin: EdgeInsets.only(right: isWide(context) ? pageWidth - 750 : 0),
+            margin: EdgeInsets.only(right: isWide ? pageWidth - 750 : 0),
             child: child,
           ),
         ),

lib/widgets/sliver_tile_grid.dart CHANGED Viewed

@@ -32,15 +32,14 @@ class SliverTileGrid extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final isDesktop = isWide(context);
-    final spacing = isDesktop ? 16.0 : 12.0;
+    final spacing = context.isWide ? 16.0 : 12.0;
     return SliverPadding(
       padding: const EdgeInsets.symmetric(horizontal: 20),
       sliver: SliverGrid.count(
         crossAxisCount: listType.crossAxisCount(),
         crossAxisSpacing: spacing,
         mainAxisSpacing: spacing,
-        childAspectRatio: listType.childAspectRatio(isDesktop),
+        childAspectRatio: listType.childAspectRatio(context.isWide),
         children: children,
       ),
     );

~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