only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/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.

c56cda8e — pyrossh

improve theme

Files changed (51) hide show

.gitignore +2 -1
assets/bibles/{bn.bin → bn.bin.gz} +0 -0
assets/bibles/{en_asv.bin → en_asv.bin.gz} +0 -0
assets/bibles/{en_bsb.bin → en_bsb.bin.gz} +0 -0
assets/bibles/{en_kjv.bin → en_kjv.bin.gz} +0 -0
assets/bibles/{en_net.bin → en_net.bin.gz} +0 -0
assets/bibles/{gu.bin → gu.bin.gz} +0 -0
assets/bibles/{hi.bin → hi.bin.gz} +0 -0
assets/bibles/{ja.bin → ja.bin.gz} +0 -0
assets/bibles/{kn.bin → kn.bin.gz} +0 -0
assets/bibles/{ml.bin → ml.bin.gz} +0 -0
assets/bibles/{ne.bin → ne.bin.gz} +0 -0
assets/bibles/{or.bin → or.bin.gz} +0 -0
assets/bibles/{pa.bin → pa.bin.gz} +0 -0
assets/bibles/{ta.bin → ta.bin.gz} +0 -0
assets/bibles/{te.bin → te.bin.gz} +0 -0
lib/dialog.dart +4 -2
lib/home.dart +10 -5
lib/store/actions_state.dart +6 -2
lib/store/app_state.dart +11 -14
lib/theme.dart +72 -1
lib/utils.dart +1 -1
lib/widgets/book_select_sheet.dart +0 -8
lib/widgets/book_tile.dart +7 -4
lib/widgets/home_app_bar.dart +26 -21
lib/widgets/settings_sheet.dart +31 -18
pubspec.lock +8 -0
pubspec.yaml +1 -0
screenshots/ipadScreenshots/book_select.png +0 -0
screenshots/ipadScreenshots/chapter_select.png +0 -0
screenshots/ipadScreenshots/home_dark.png +0 -0
screenshots/ipadScreenshots/home_light.png +0 -0
screenshots/ipadScreenshots/settings.png +0 -0
screenshots/ipadScreenshots/verse_select.png +0 -0
screenshots/iphoneScreenshots/book_select.png +0 -0
screenshots/iphoneScreenshots/chapter_select.png +0 -0
screenshots/iphoneScreenshots/home_dark.png +0 -0
screenshots/iphoneScreenshots/home_light.png +0 -0
screenshots/iphoneScreenshots/settings.png +0 -0
screenshots/iphoneScreenshots/verse_select.png +0 -0
screenshots/phoneScreenshots/book_select.png +0 -0
screenshots/phoneScreenshots/chapter_select.png +0 -0
screenshots/phoneScreenshots/home_dark.png +0 -0
screenshots/phoneScreenshots/home_light.png +0 -0
screenshots/phoneScreenshots/settings.png +0 -0
screenshots/phoneScreenshots/verse_select.png +0 -0
scripts/generate_flatbuffers.dart +1 -2
scripts/scrape.dart +0 -167
test/screenshot_test.dart +24 -12
test/widget_test.dart +0 -30
tts.dart +0 -127

.gitignore CHANGED Viewed

@@ -11,4 +11,5 @@ ui
 .flutter-plugins-dependencies
 .env
 .idea
-test/failures
+test/failures
+engbsb_usfm

assets/bibles/{bn.bin → bn.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{en_asv.bin → en_asv.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{en_bsb.bin → en_bsb.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{en_kjv.bin → en_kjv.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{en_net.bin → en_net.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{gu.bin → gu.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{hi.bin → hi.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{ja.bin → ja.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{kn.bin → kn.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{ml.bin → ml.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{ne.bin → ne.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{or.bin → or.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{pa.bin → pa.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{ta.bin → ta.bin.gz} RENAMED Viewed

File without changes

assets/bibles/{te.bin → te.bin.gz} RENAMED Viewed

File without changes

lib/dialog.dart CHANGED Viewed

@@ -55,8 +55,10 @@ void showBibleSelectDialog(BuildContext context, Bible bible) {
                 return ListTile(
                   selected: isSelected,
                   leading: const Icon(Icons.menu_book),
-                  title: Text(item.languageNative),
+                  title: Text(item.languageNative, style: const TextStyle(fontWeight: FontWeight.w600)),
-                  subtitle: (item.languageNative != item.languageEnglish) ? Text(item.languageEnglish) : null,
+                  subtitle: (item.languageNative != item.languageEnglish)
+                      ? Text(item.languageEnglish, style: const TextStyle(fontSize: 15, fontWeight: FontWeight.w400))
+                      : null,
                   trailing: isSelected ? const Icon(Icons.check) : null,
                   onTap: () {
                     final s = context.read();

lib/home.dart CHANGED Viewed

@@ -58,11 +58,11 @@ class Home extends StatelessWidget {
     final bible = context.select((s) => s.bible);
     final book = bible.books![bookIndex];
     final chapter = book.chapters![chapterIndex];
-    final (boldFont, fontSize, selectedVerses, _, _) =
+    final (fontWeight, fontSize, selectedVerses, _, _) =
-        context.select((s) => (s.boldFont, s.fontSize, s.selectedVerses, s.highlights, s.darkMode));
+        context.select((s) => (s.fontWeight, s.fontSize, s.selectedVerses, s.highlights, s.darkMode));
     final appState = context.read();
     final baseStyle = theme.bodyMedium!.copyWith(
-      fontWeight: boldFont ? FontWeight.w500 : FontWeight.w400,
+      fontWeight: FontWeight.values[(fontWeight ~/ 100) - 1],
       fontSize: fontSize,
     );
     return Scaffold(
@@ -94,7 +94,12 @@ class Home extends StatelessWidget {
                               style: baseStyle,
                               children: [
                                 if (v.heading != null && v.heading!.isNotEmpty)
-                                  ..._buildHeadingSpans(context, bible, v.heading!, theme.labelLarge!),
+                                  ..._buildHeadingSpans(
+                                    context,
+                                    bible,
+                                    v.heading!,
+                                    theme.labelLarge!,
+                                  ),
                                 TextSpan(
                                   text: "${v.index + 1} ",
                                   style: theme.labelMedium!.copyWith(
@@ -103,7 +108,7 @@ class Home extends StatelessWidget {
                                 ),
                                 TextSpan(
                                   text: v.text ?? "",
-                                  style: appState.getHighlightStyle(context, v, false),
+                                  style: appState.getHighlightStyle(context, v),
                                 ),
                               ],
                             ),

lib/store/actions_state.dart CHANGED Viewed

@@ -13,9 +13,13 @@ class ToggleEngTitlesAction extends ReduxAction<AppState> {
   AppState reduce() => state.copy(engTitles: !state.engTitles);
 }
-class ToggleBoldFontAction extends ReduxAction<AppState> {
+class UpdateFontWeightAction extends ReduxAction<AppState> {
+  final int value;
+  UpdateFontWeightAction(this.value);
   @override
-  AppState reduce() => state.copy(boldFont: !state.boldFont);
+  AppState reduce() => state.copy(fontWeight: value);
 }
 class ToggleDarkModeAction extends ReduxAction<AppState> {

lib/store/app_state.dart CHANGED Viewed

@@ -6,7 +6,7 @@ export "package:async_redux/async_redux.dart" show BuildContextExtensionForProvi
 class AppState {
   final bool engTitles;
-  final bool boldFont;
+  final int fontWeight;
   final bool darkMode;
   final double fontSize;
   final int savedBook;
@@ -17,7 +17,7 @@ class AppState {
   AppState({
     this.engTitles = false,
-    this.boldFont = false,
+    this.fontWeight = 400,
     this.darkMode = false,
     this.fontSize = 16.0,
     this.savedBook = 0,
@@ -29,7 +29,7 @@ class AppState {
   AppState copy({
     bool? engTitles,
-    bool? boldFont,
+    int? fontWeight,
     bool? darkMode,
     double? fontSize,
     int? savedBook,
@@ -40,7 +40,7 @@ class AppState {
   }) {
     return AppState(
       engTitles: engTitles ?? this.engTitles,
-      boldFont: boldFont ?? this.boldFont,
+      fontWeight: fontWeight ?? this.fontWeight,
       darkMode: darkMode ?? this.darkMode,
       fontSize: fontSize ?? this.fontSize,
       savedBook: savedBook ?? this.savedBook,
@@ -54,7 +54,7 @@ class AppState {
   Map<String, dynamic> toJson() => {
         "bibleName": bible.name,
         "engTitles": engTitles,
-        "boldFont": boldFont,
+        "fontWeight": fontWeight,
         "darkMode": darkMode,
         "fontSize": fontSize,
         "savedBook": savedBook,
@@ -64,7 +64,7 @@ class AppState {
   factory AppState.fromJson(Map<String, dynamic> json, Bible bible) => AppState(
         engTitles: json["engTitles"] as bool? ?? false,
-        boldFont: json["boldFont"] as bool? ?? false,
+        fontWeight: json["fontWeight"] as int? ?? (json["boldFont"] == true ? 500 : 400),
         darkMode: json["darkMode"] as bool? ?? false,
         fontSize: (json["fontSize"] as num?)?.toDouble() ?? ((json["textScale"] as num?)?.toDouble() ?? 0.0) + 16.0,
         savedBook: json["savedBook"] as int? ?? 0,
@@ -86,25 +86,22 @@ class AppState {
     );
   }
-  TextStyle getHighlightStyle(BuildContext context, Verse v, bool heading) {
+  TextStyle getHighlightStyle(BuildContext context, Verse v) {
     final isSelected = selectedVerses.any(
       (el) => el.book == v.book && el.chapter == v.chapter && el.index == v.index,
     );
-    if (!heading && isSelected) {
+    if (isSelected) {
       return TextStyle(
-        backgroundColor: darkMode ? Colors.grey.shade800 : Colors.grey.shade200,
+        backgroundColor: Theme.of(context).textSelectionTheme.selectionColor,
       );
     }
-    final highlight = getHighlight(v);
     if (darkMode) {
       return TextStyle(
-        backgroundColor: highlight?.withValues(alpha: 0.7),
-        color: highlight != null ? Colors.white : Theme.of(context).colorScheme.onSurface,
+        color: getHighlight(v) ?? Theme.of(context).colorScheme.onSurface,
       );
     }
     return TextStyle(
-      backgroundColor: highlight ?? Theme.of(context).colorScheme.surface,
+      backgroundColor: getHighlight(v) ?? Theme.of(context).colorScheme.surface,
     );
   }
 }

lib/theme.dart CHANGED Viewed

@@ -104,7 +104,7 @@ final lightTheme = ThemeData(
   textSelectionTheme: TextSelectionThemeData(
     cursorColor: Colors.black,
     selectionHandleColor: Colors.black,
-    selectionColor: const Color(0xAAF8D0DC),
+    selectionColor: Colors.grey.shade200,
   ),
   inputDecorationTheme: const InputDecorationTheme(
     focusColor: Colors.transparent,
@@ -165,6 +165,39 @@ final lightTheme = ThemeData(
       ),
     ),
   ),
+  segmentedButtonTheme: SegmentedButtonThemeData(
+    style: ButtonStyle(
+      backgroundColor: WidgetStateProperty.resolveWith((states) {
+        if (states.contains(WidgetState.selected)) {
+          return lightColorScheme.primary;
+        }
+        return Colors.grey.shade100;
+      }),
+      foregroundColor: WidgetStateProperty.resolveWith((states) {
+        if (states.contains(WidgetState.selected)) {
+          return lightColorScheme.onPrimary;
+        }
+        return lightColorScheme.onSurface;
+      }),
+      textStyle: WidgetStatePropertyAll(
+        TextStyle(
+          fontSize: 16,
+          fontWeight: FontWeight.w700,
+          color: lightColorScheme.onSurface,
+          letterSpacing: 0,
+        ),
+      ),
+    ),
+  ),
+  toggleButtonsTheme: ToggleButtonsThemeData(
+    borderRadius: const BorderRadius.all(Radius.circular(12)),
+    borderColor: lightColorScheme.scrim,
+    selectedBorderColor: lightColorScheme.scrim,
+    selectedColor: lightColorScheme.onPrimary,
+    fillColor: lightColorScheme.primary,
+    color: lightColorScheme.onSurface,
+    constraints: const BoxConstraints(minHeight: 40, minWidth: 140),
+  ),
   textTheme: TextTheme(
     bodyMedium: TextStyle(
       fontSize: 16,
@@ -209,6 +242,39 @@ final lightTheme = ThemeData(
 final darkTheme = lightTheme.copyWith(
   brightness: Brightness.dark,
   colorScheme: darkColorScheme,
+  segmentedButtonTheme: SegmentedButtonThemeData(
+    style: ButtonStyle(
+      backgroundColor: WidgetStateProperty.resolveWith((states) {
+        if (states.contains(WidgetState.selected)) {
+          return darkColorScheme.primary;
+        }
+        return darkColorScheme.surfaceContainerHigh;
+      }),
+      foregroundColor: WidgetStateProperty.resolveWith((states) {
+        if (states.contains(WidgetState.selected)) {
+          return darkColorScheme.onPrimary;
+        }
+        return darkColorScheme.onSurface;
+      }),
+      textStyle: WidgetStatePropertyAll(
+        TextStyle(
+          fontSize: 16,
+          fontWeight: FontWeight.w700,
+          color: darkColorScheme.onSurface,
+          letterSpacing: 0,
+        ),
+      ),
+    ),
+  ),
+  toggleButtonsTheme: ToggleButtonsThemeData(
+    borderRadius: const BorderRadius.all(Radius.circular(12)),
+    borderColor: darkColorScheme.outline,
+    selectedBorderColor: darkColorScheme.outline,
+    selectedColor: darkColorScheme.onPrimary,
+    fillColor: darkColorScheme.primary,
+    color: darkColorScheme.onSurface,
+    constraints: const BoxConstraints(minHeight: 40, minWidth: 140),
+  ),
   primaryColor: const Color(0xFF4C2323),
   primaryColorDark: const Color(0xFF3C1B1C),
   primaryColorLight: const Color(0xFF7F3D3C),
@@ -227,6 +293,11 @@ final darkTheme = lightTheme.copyWith(
     shadowColor: Colors.white,
     surfaceTintColor: const Color(0xFF141415),
   ),
+  textSelectionTheme: TextSelectionThemeData(
+    cursorColor: Colors.white,
+    selectionHandleColor: Colors.white,
+    selectionColor: Colors.blueGrey.shade800,
+  ),
   dialogTheme: DialogThemeData(
     backgroundColor: darkColorScheme.surface,
     elevation: 1,

lib/utils.dart CHANGED Viewed

@@ -75,7 +75,7 @@ Future<Uint8List> convertText(String langCode, String text) async {
 }
 Future<Bible> loadBible(String name) async {
-  final data = await rootBundle.load("assets/bibles/$name.bin");
+  final data = await rootBundle.load("assets/bibles/$name.bin.gz");
   final decompressed = gzip.decode(data.buffer.asUint8List());
   return Bible(decompressed);
 }

lib/widgets/book_select_sheet.dart CHANGED Viewed

@@ -67,7 +67,6 @@ class _BookSelectSheetState extends State<BookSelectSheet> {
   Widget build(BuildContext context) {
     final currentBook = widget.parentContext.read().savedBook;
     final currentChapter = widget.parentContext.read().savedChapter;
-    final colorScheme = Theme.of(context).colorScheme;
     return PageView(
       controller: _pageController,
@@ -84,14 +83,7 @@ class _BookSelectSheetState extends State<BookSelectSheet> {
                     showOldTestament = index == 0;
                   });
                 },
-                borderRadius: const BorderRadius.all(Radius.circular(12)),
-                borderColor: colorScheme.scrim,
-                selectedBorderColor: colorScheme.scrim,
-                selectedColor: colorScheme.onPrimary,
-                fillColor: colorScheme.primary,
-                color: colorScheme.onSurface,
                 textStyle: Theme.of(context).textTheme.labelLarge,
-                constraints: const BoxConstraints(minHeight: 40, minWidth: 140),
                 isSelected: [showOldTestament, !showOldTestament],
                 children: [
                   Text(widget.bible.oldTestamentTitle!),

lib/widgets/book_tile.dart CHANGED Viewed

@@ -10,14 +10,17 @@ class BookTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    final tileColor = isDark ? colorScheme.surfaceContainerHigh : colorScheme.surface;
+    final borderColor = isDark ? colorScheme.outlineVariant : colorScheme.scrim;
     return Material(
-      elevation: 4,
+      elevation: isDark ? 2 : 4,
-      color: isSelected ? colorScheme.primaryContainer : colorScheme.surface,
+      color: isSelected ? colorScheme.primaryContainer : tileColor,
-      shadowColor: colorScheme.scrim,
+      shadowColor: colorScheme.shadow,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(12),
         side: BorderSide(
-          color: isSelected ? colorScheme.primary : colorScheme.scrim,
+          color: isSelected ? colorScheme.primary : borderColor,
           width: isSelected ? 2 : 1,
         ),
       ),

lib/widgets/home_app_bar.dart CHANGED Viewed

@@ -32,17 +32,14 @@ class HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
               child: Row(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  Flexible(
-                    child: InkWell(
+                  InkWell(
-                      key: const Key("bookTitle"),
+                    key: const Key("bookTitle"),
-                      enableFeedback: true,
+                    enableFeedback: true,
-                      onTap: () => context.dispatch(ShowBookSelectAction(context, context.router, bible)),
+                    onTap: () => context.dispatch(ShowBookSelectAction(context, context.router, bible)),
-                      child: Text(
+                    child: Text(
-                        book.name!,
+                      book.name!,
-                        style: Theme.of(context).textTheme.headlineMedium,
+                      style: Theme.of(context).textTheme.headlineMedium,
-                        overflow: TextOverflow.ellipsis,
-                        maxLines: 1,
+                      maxLines: 1,
-                      ),
                     ),
                   ),
                   InkWell(
@@ -60,19 +57,27 @@ class HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
                 ],
               ),
             ),
+            // InkWell(
+            //   enableFeedback: true,
+            //   onTap: () => showBibleSelectDialog(context, bible),
+            //   child: Padding(
+            //     padding: const EdgeInsets.only(left: 16, right: 16),
+            //     child: Text(
+            //       bible.languageNative!.toUpperCase(),
+            //       style: Theme.of(context).textTheme.headlineMedium,
+            //       key: const Key("bible"),
+            //     ),
+            //   ),
+            // ),
-            InkWell(
+            IconButton(
               enableFeedback: true,
-              onTap: () => showBibleSelectDialog(context, bible),
-              child: Padding(
-                padding: const EdgeInsets.only(left: 16, right: 16),
-                child: Text(
-                  bible.languageNative!.toUpperCase(),
-                  style: Theme.of(context).textTheme.headlineMedium,
-                  key: const Key("bible"),
+              key: const Key("bible"),
-                ),
+              padding: EdgeInsets.zero,
-              ),
+              icon: const Icon(Icons.menu_book, size: 28),
+              onPressed: () => showBibleSelectDialog(context, bible),
             ),
             IconButton(
+              enableFeedback: true,
               key: const Key("settingsButton"),
               padding: EdgeInsets.zero,
               icon: const Icon(Icons.more_vert, size: 28),

lib/widgets/settings_sheet.dart CHANGED Viewed

@@ -11,10 +11,13 @@ class SettingsSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final darkMode = context.select((s) => s.darkMode);
-    final boldFont = context.select((s) => s.boldFont);
+    final fontWeight = context.select((s) => s.fontWeight);
     final engTitles = context.select((s) => s.engTitles);
     final fontSize = context.select((s) => s.fontSize);
     final colorScheme = Theme.of(context).colorScheme;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    final cardColor = isDark ? colorScheme.surfaceContainerHigh : colorScheme.surface;
+    final cardBorderColor = isDark ? colorScheme.outlineVariant : colorScheme.scrim;
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 20),
@@ -29,14 +32,15 @@ class SettingsSheet extends StatelessWidget {
           const SizedBox(height: 16),
           // Theme toggle
           Material(
-            elevation: 1,
+            elevation: isDark ? 2 : 1,
             borderRadius: BorderRadius.circular(12),
+            color: cardColor,
-            color: colorScheme.surface,
+            shadowColor: colorScheme.shadow,
             child: Container(
               padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(12),
-                border: Border.all(color: colorScheme.scrim),
+                border: Border.all(color: cardBorderColor),
               ),
               child: Row(
                 children: [
@@ -66,14 +70,15 @@ class SettingsSheet extends StatelessWidget {
           const SizedBox(height: 8),
           // Font size slider
           Material(
-            elevation: 1,
+            elevation: isDark ? 2 : 1,
             borderRadius: BorderRadius.circular(12),
+            color: cardColor,
-            color: colorScheme.surface,
+            shadowColor: colorScheme.shadow,
             child: Container(
               padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(12),
-                border: Border.all(color: colorScheme.scrim),
+                border: Border.all(color: cardBorderColor),
               ),
               child: Row(
                 children: [
@@ -95,25 +100,32 @@ class SettingsSheet extends StatelessWidget {
             ),
           ),
           const SizedBox(height: 8),
-          // Bold font toggle
+          // Font weight slider
           Material(
-            elevation: 1,
+            elevation: isDark ? 2 : 1,
             borderRadius: BorderRadius.circular(12),
+            color: cardColor,
-            color: colorScheme.surface,
+            shadowColor: colorScheme.shadow,
             child: Container(
               padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(12),
-                border: Border.all(color: colorScheme.scrim),
+                border: Border.all(color: cardBorderColor),
               ),
               child: Row(
                 children: [
                   Icon(Icons.format_bold, color: colorScheme.onSurface),
                   const SizedBox(width: 12),
-                  Expanded(child: Text(bible.boldFontTitle!)),
+                  Text("$fontWeight"),
-                  Switch(
+                  Expanded(
+                    child: Slider(
-                    value: boldFont,
+                      value: fontWeight.toDouble(),
+                      min: 100,
+                      max: 900,
+                      divisions: 8,
+                      label: "$fontWeight",
-                    onChanged: (_) => context.dispatch(ToggleBoldFontAction()),
+                      onChanged: (v) => context.dispatch(UpdateFontWeightAction(v.round())),
+                    ),
                   ),
                 ],
               ),
@@ -122,14 +134,15 @@ class SettingsSheet extends StatelessWidget {
           const SizedBox(height: 8),
           // English titles toggle
           Material(
-            elevation: 1,
+            elevation: isDark ? 2 : 1,
             borderRadius: BorderRadius.circular(12),
+            color: cardColor,
-            color: colorScheme.surface,
+            shadowColor: colorScheme.shadow,
             child: Container(
               padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(12),
-                border: Border.all(color: colorScheme.scrim),
+                border: Border.all(color: cardBorderColor),
               ),
               child: Row(
                 children: [

pubspec.lock CHANGED Viewed

@@ -249,6 +249,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.9"
   dart_style:
     dependency: transitive
     description:

pubspec.yaml CHANGED Viewed

@@ -9,6 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  cupertino_icons: ^1.0.8
   path_provider: ^2.1.5
   flutter_native_splash: ^2.4.7
   flutter_swipe_detector: ^2.0.0

screenshots/ipadScreenshots/book_select.png CHANGED Viewed

Binary file

screenshots/ipadScreenshots/chapter_select.png CHANGED Viewed

Binary file

screenshots/ipadScreenshots/home_dark.png CHANGED Viewed

Binary file

screenshots/ipadScreenshots/home_light.png CHANGED Viewed

Binary file

screenshots/ipadScreenshots/settings.png CHANGED Viewed

Binary file

screenshots/ipadScreenshots/verse_select.png CHANGED Viewed

Binary file

screenshots/iphoneScreenshots/book_select.png CHANGED Viewed

Binary file

screenshots/iphoneScreenshots/chapter_select.png CHANGED Viewed

Binary file

screenshots/iphoneScreenshots/home_dark.png CHANGED Viewed

Binary file

screenshots/iphoneScreenshots/home_light.png CHANGED Viewed

Binary file

screenshots/iphoneScreenshots/settings.png CHANGED Viewed

Binary file

screenshots/iphoneScreenshots/verse_select.png CHANGED Viewed

Binary file

screenshots/phoneScreenshots/book_select.png CHANGED Viewed

Binary file

screenshots/phoneScreenshots/chapter_select.png CHANGED Viewed

Binary file

screenshots/phoneScreenshots/home_dark.png CHANGED Viewed

Binary file

screenshots/phoneScreenshots/home_light.png CHANGED Viewed

Binary file

screenshots/phoneScreenshots/settings.png CHANGED Viewed

Binary file

screenshots/phoneScreenshots/verse_select.png CHANGED Viewed

Binary file

scripts/generate_flatbuffers.dart CHANGED Viewed

@@ -4,7 +4,6 @@ import "dart:typed_data";
 import "package:flat_buffers/flat_buffers.dart" as fb;
 import "package:only_bible_app/bible_data.dart";
 // Converts bible .txt to FlatBuffer binary
 // Format: bookName|bookIndex|chapterIndex|verseNo|heading|text...
 Uint8List convertBibleToFlatBuffer(BibleItem item, String text) {
@@ -128,7 +127,7 @@ void main() async {
     final text = await file.readAsString(encoding: utf8);
     final bytes = convertBibleToFlatBuffer(item, text);
     final compressed = gzip.encode(bytes);
-    final outPath = "assets/bibles/$fileName.bin";
+    final outPath = "assets/bibles/$fileName.bin.gz";
     await File(outPath).writeAsBytes(compressed);
     final txtSize = (file.lengthSync() / 1024).toStringAsFixed(1);
     final binSize = (compressed.length / 1024).toStringAsFixed(1);

scripts/scrape.dart DELETED Viewed

@@ -1,167 +0,0 @@
-import "dart:convert";
-import "dart:io";
-import "package:http/http.dart" as http;
-import "package:html/parser.dart";
-import "package:only_bible_app/models.dart";
-final booksNames = [
-  "Genesis",
-  "Exodus",
-  "Leviticus",
-  "Numbers",
-  "Deuteronomy",
-  "Joshua",
-  "Judges",
-  "Ruth",
-  "1 Samuel",
-  "2 Samuel",
-  "1 Kings",
-  "2 Kings",
-  "1 Chronicles",
-  "2 Chronicles",
-  "Ezra",
-  "Nehemiah",
-  "Esther",
-  "Job",
-  "Psalms",
-  "Proverbs",
-  "Ecclesiastes",
-  "Song of Solomon",
-  "Isaiah",
-  "Jeremiah",
-  "Lamentations",
-  "Ezekiel",
-  "Daniel",
-  "Hosea",
-  "Joel",
-  "Amos",
-  "Obadiah",
-  "Jonah",
-  "Micah",
-  "Nahum",
-  "Habakkuk",
-  "Zephaniah",
-  "Haggai",
-  "Zechariah",
-  "Malachi",
-  "Matthew",
-  "Mark",
-  "Luke",
-  "John",
-  "Acts",
-  "Romans",
-  "1 Corinthians",
-  "2 Corinthians",
-  "Galatians",
-  "Ephesians",
-  "Philippians",
-  "Colossians",
-  "1 Thessalonians",
-  "2 Thessalonians",
-  "1 Timothy",
-  "2 Timothy",
-  "Titus",
-  "Philemon",
-  "Hebrews",
-  "James",
-  "1 Peter",
-  "2 Peter",
-  "1 John",
-  "2 John",
-  "3 John",
-  "Jude",
-  "Revelation",
-];
-class Heading {
-  int vIndex;
-  String text;
-  Heading(this.vIndex, this.text);
-  @override
-  toString() {
-    return "vIndex: $vIndex, text: $text";
-  }
-}
-Future<List<Heading>> fetchPage(String book, int chapterIndex) async {
-  print("fetching $book $chapterIndex \n");
-  final res = await http.get(
-    Uri.parse(
-      "https://raw.githubusercontent.com/kenyonbowers/Bible-JSON/main/JSON/$/1.json",
-    ),
-  );
-  var document = parse(utf8.decode(res.bodyBytes, allowMalformed: true));
-  var title = document
-      .getElementsByClassName("psalm-title")
-      .map(
-        (it) => it.nodes[0].nodes
-            .map(
-              (n) => n.attributes["class"] != null &&
-                      n.attributes["class"]!.contains("crossreference")
-                  ? ""
-                  : n.text,
-            )
-            .join(""),
-      )
-      .join("");
-  var els = document
-      .getElementsByTagName("span")
-      .where((it) => it.id.contains("en-NKJV"))
-      .where((it) => it.parent?.localName == "h3")
-      .map(
-        (it) =>
-            "${it.className.split(" ")[1]} ${it.nodes.map((n) => n.attributes["class"] != null && n.attributes["class"]!.contains("crossreference") ? "" : n.text).join("")}",
-      )
-      .map((it) {
-    final items = it.split(" ");
-    final vIndex = int.parse(items[0].split("-").last) - 1;
-    final heading = items.sublist(1).join(" ");
-    return Heading(vIndex, heading);
-  }).toList();
-  if (title != "") {
-    if (els.isNotEmpty) {
-      els.first.text = "$title<br>${els.first.text}";
-    } else {
-      els.add(Heading(0, title));
-    }
-  }
-  return els;
-}
-void main() async {
-  final engBooks = parseBible(
-    "English",
-    await File("./assets/bibles/English.txt").readAsString(),
-  );
-  print("starting");
-  // const bibleName = "English2";
-  // const outputFilename = "./assets/bibles/${bibleName}2.txt";
-  // if (File(outputFilename).existsSync()) {
-  //   File(outputFilename).deleteSync();
-  // }
-  // final outputFile = File(outputFilename).openWrite();
-  // final bibleTxt = await File("./assets/bibles/$bibleName.txt").readAsString();
-  // final books = parseBible(bibleName, bibleTxt);
-  // for (var (bookIndex, book) in books.indexed) {
-  //   for (var (chapterIndex, chapter) in book.chapters.indexed) {
-  //     for (var (verseIndex, verse) in chapter.verses.indexed) {
-  //       // print("$bookIndex $chapterIndex $verseIndex");
-  //       final engVerses = engBooks[bookIndex].chapters[chapterIndex].verses;
-  //       if (engVerses.length > verseIndex) {
-  //         final engVerseHeading = engVerses[verseIndex].heading;
-  //         if (engVerseHeading != "") {
-  //           verse.heading = engVerseHeading;
-  //         }
-  //       }
-  //       outputFile.writeln(
-  //         "${book.index}|${chapter.index}|${verse.index}|${verse.heading}|${verse.text}",
-  //       );
-  //     }
-  //   }
-  // }
-  // await outputFile.flush();
-  // await outputFile.close();
-  print("finished");
-}

test/screenshot_test.dart CHANGED Viewed

@@ -1,9 +1,11 @@
 import "package:async_redux/async_redux.dart";
 import "package:flutter/material.dart";
 import "package:flutter_test/flutter_test.dart";
+import "package:go_router/go_router.dart";
 import "package:golden_screenshot/golden_screenshot.dart";
 import "package:only_bible_app/gen/bible.gen.dart";
 import "package:only_bible_app/home.dart";
+import "package:only_bible_app/store/app_navigator.dart";
 import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
@@ -14,14 +16,24 @@ Widget buildScreenshotApp({
   required Widget home,
   ThemeMode themeMode = ThemeMode.light,
 }) {
+  final router = GoRouter(
+    initialLocation: "/",
+    routes: [
+      GoRoute(path: "/", builder: (_, __) => home),
+      GoRoute(path: "/chapter/:bookIndex/:chapterIndex", builder: (_, __) => home),
+    ],
+  );
   return StoreProvider<AppState>(
     store: store,
+    child: AppRouterScope(
+      router: router,
-    child: ScreenshotApp(
+      child: ScreenshotApp(
-      device: device,
+        device: device,
-      theme: lightTheme,
+        theme: lightTheme,
-      darkTheme: darkTheme,
+        darkTheme: darkTheme,
-      themeMode: themeMode,
+        themeMode: themeMode,
-      home: home,
+        home: home,
+      ),
     ),
   );
 }
@@ -46,7 +58,7 @@ void main() {
       await tester.pumpWidget(buildScreenshotApp(
         device: device.device,
         store: store,
-        home: const Home(),
+        home: const Home(bookIndex: 0, chapterIndex: 0),
       ));
       await tester.loadAssets();
       await tester.pump();
@@ -60,7 +72,7 @@ void main() {
       await tester.pumpWidget(buildScreenshotApp(
         device: device.device,
         store: store,
-        home: const Home(),
+        home: const Home(bookIndex: 0, chapterIndex: 0),
         themeMode: ThemeMode.dark,
       ));
       await tester.loadAssets();
@@ -73,7 +85,7 @@ void main() {
       await tester.pumpWidget(buildScreenshotApp(
         device: device.device,
         store: store,
-        home: const Home(),
+        home: const Home(bookIndex: 0, chapterIndex: 0),
       ));
       await tester.pumpAndSettle();
       await tester.tap(find.byKey(const Key("bookTitle")));
@@ -88,7 +100,7 @@ void main() {
       await tester.pumpWidget(buildScreenshotApp(
         device: device.device,
         store: store,
-        home: const Home(),
+        home: const Home(bookIndex: 0, chapterIndex: 0),
       ));
       await tester.pumpAndSettle();
       await tester.tap(find.byKey(const Key("chapterTitle")));
@@ -115,7 +127,7 @@ void main() {
       await tester.pumpWidget(buildScreenshotApp(
         device: device.device,
         store: store,
-        home: const Home(),
+        home: const Home(bookIndex: 0, chapterIndex: 0),
       ));
       await tester.loadAssets();
       await tester.pump();
@@ -127,7 +139,7 @@ void main() {
       await tester.pumpWidget(buildScreenshotApp(
         device: device.device,
         store: store,
-        home: const Home(),
+        home: const Home(bookIndex: 0, chapterIndex: 0),
       ));
       await tester.pumpAndSettle();
       await tester.tap(find.byKey(const Key("settingsButton")));

test/widget_test.dart DELETED Viewed

@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:only_bible_app/main.dart';
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}

tts.dart DELETED Viewed

@@ -1,127 +0,0 @@
-import "dart:io";
-import "dart:isolate";
-import "dart:typed_data";
-import "package:flutter_soloud/flutter_soloud.dart";
-import "package:flutter/services.dart";
-import "package:path_provider/path_provider.dart";
-import "package:sherpa_onnx/sherpa_onnx.dart" as sherpa_onnx;
-String? _modelPath;
-const _modelDir = "vits-piper-ne_NP-google-x_low";
-Future<String> _copyAsset(String assetPath, String targetPath) async {
-  final file = File(targetPath);
-  if (!await file.exists() || file.lengthSync() == 0) {
-    final data = await rootBundle.load(assetPath);
-    await file.create(recursive: true);
-    await file.writeAsBytes(
-      data.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes),
-    );
-  }
-  return targetPath;
-}
-Future<void> _ensureModelFiles() async {
-  if (_modelPath != null) return;
-  final dir = await getApplicationSupportDirectory();
-  _modelPath = p.join(dir.path, _modelDir);
-  final assetManifest = await AssetManifest.loadFromAssetBundle(rootBundle);
-  final allAssets = assetManifest.listAssets();
-  final modelAssets = allAssets.where((a) => a.startsWith("assets/$_modelDir/"));
-  for (final assetPath in modelAssets) {
-    final relativePath = assetPath.replaceFirst("assets/$_modelDir/", "");
-    await _copyAsset(assetPath, p.join(_modelPath!, relativePath));
-  }
-  sherpa_onnx.initBindings();
-}
-void _generateInIsolate(List<dynamic> args) {
-  final sendPort = args[0] as SendPort;
-  final text = args[1] as String;
-  final modelPath = args[2] as String;
-  sherpa_onnx.initBindings();
-  final modelFile = p.join(modelPath, "ne_NP-chitwan-medium.onnx");
-  final tokensFile = p.join(modelPath, "tokens.txt");
-  final dataDir = p.join(modelPath, "espeak-ng-data");
-  print("model exists: ${File(modelFile).existsSync()} $modelFile");
-  print("tokens exists: ${File(tokensFile).existsSync()} $tokensFile");
-  print("dataDir exists: ${Directory(dataDir).existsSync()} $dataDir");
-  final config = sherpa_onnx.OfflineTtsConfig(
-    model: sherpa_onnx.OfflineTtsModelConfig(
-      vits: sherpa_onnx.OfflineTtsVitsModelConfig(
-        model: modelFile,
-        tokens: tokensFile,
-        dataDir: dataDir,
-      ),
-      numThreads: 2,
-      debug: true,
-      provider: "cpu",
-    ),
-    maxNumSenetences: 1,
-  );
-  final tts = sherpa_onnx.OfflineTts(config);
-  tts.generateWithConfig(
-    text: text,
-    config: const sherpa_onnx.OfflineTtsGenerationConfig(
-      speed: 1.0,
-    ),
-    onProgress: (samples, progress) {
-      sendPort.send(Float32List.fromList(samples));
-      return 1;
-    },
-  );
-  tts.free();
-  sendPort.send(null);
-}
-Future<void> runTTS(String text) async {
-  await _ensureModelFiles();
-  final stream = SoLoud.instance.setBufferStream(
-    bufferingType: BufferingType.preserved,
-    format: BufferType.f32le,
-    channels: Channels.mono,
-    sampleRate: 24000,
-    bufferingTimeNeeds: 0.5,
-    onBuffering: (isBuffering, handle, time) {},
-  );
-  final handle = await SoLoud.instance.play(stream);
-  final receivePort = ReceivePort();
-  await Isolate.spawn(
-    _generateInIsolate,
-    [
-      receivePort.sendPort,
-      text,
-      _modelPath!,
-    ],
-  );
-  await for (final message in receivePort) {
-    if (message == null) {
-      SoLoud.instance.setDataIsEnded(stream);
-      break;
-    }
-    final samples = message as Float32List;
-    SoLoud.instance.addAudioDataStream(stream, samples.buffer.asUint8List());
-  }
-  receivePort.close();
-  await stream.soundEvents.firstWhere(
-    (e) => e.event == SoundEventType.handleIsNoMoreValid && e.handle == handle,
-  );
-  await SoLoud.instance.disposeSource(stream);
-}

~repos /only-bible-app

GIT_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/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_CONFIG_PARAMETERS="'http.version=HTTP/1.1'" git clone https://git.pyrossh.dev/only-bible-app.git
Discussions: https://groups.google.com/g/rust-embed-devs