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.

0662e02d — pyrossh

fix dark mode colors

Files changed (5) hide show

lib/providers/app_provider.dart +27 -13
lib/theme.dart +14 -0
lib/widgets/highlight_button.dart +4 -3
lib/widgets/highlight_sheet.dart +12 -20
lib/widgets/verses_view.dart +38 -44

lib/providers/app_provider.dart CHANGED Viewed

@@ -5,6 +5,7 @@ import "package:firebase_storage/firebase_storage.dart";
 import "package:just_audio/just_audio.dart";
 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";
@@ -57,7 +58,9 @@ class AppProvider extends ChangeNotifier {
   }
   static AppLocalizations getLocalizations(BuildContext context) {
+    return AppProvider.of(context).engTitles
-    return AppProvider.of(context).engTitles ? lookupAppLocalizations(const Locale("en")) : AppLocalizations.of(context)!;
+        ? lookupAppLocalizations(const Locale("en"))
+        : AppLocalizations.of(context)!;
   }
   save() async {
@@ -383,28 +386,39 @@ class AppProvider extends ChangeNotifier {
     Navigator.of(context).pop();
   }
-  static Color fromHexS(String hexString) {
-    return Color(int.parse(hexString, radix: 16));
-  }
-  String toHexS(Color c) => '${c.alpha.toRadixString(16).padLeft(2, '0')}'
-      '${c.red.toRadixString(16).padLeft(2, '0')}'
-      '${c.green.toRadixString(16).padLeft(2, '0')}'
-      '${c.blue.toRadixString(16).padLeft(2, '0')}';
   Color? getHighlight(Verse v) {
     final key = "${v.book}:${v.chapter}:${v.index}:highlight";
     if (box.hasData(key)) {
       // box.remove(key);
       // print(box.read(key));
-      return fromHexS(box.read(key));
+      final index = box.read<int>(key);
+      if (index == null) {
+        return null;
+      }
+      return darkMode ? darkHighlights[index] : lightHighlights[index];
     }
     return null;
   }
+  TextStyle getHighlightStyle(BuildContext context, Verse v) {
+    if (isVerseSelected(v)) {
+      return TextStyle(
+        backgroundColor: darkMode ? Colors.grey.shade800 : Colors.grey.shade200,
+      );
+    }
+    if (darkMode) {
+      return TextStyle(
+        color: getHighlight(v) ?? context.theme.colorScheme.onBackground,
+      );
+    }
+    return TextStyle(
+      backgroundColor: getHighlight(v) ?? context.theme.colorScheme.background,
+    );
+  }
-  void setHighlight(BuildContext context, List<Verse> verses, Color c) {
+  void setHighlight(BuildContext context, List<Verse> verses, int index) {
     for (final v in verses) {
-      box.write("${v.book}:${v.chapter}:${v.index}:highlight", toHexS(c));
+      box.write("${v.book}:${v.chapter}:${v.index}:highlight", index);
     }
     box.save();
   }

lib/theme.dart CHANGED Viewed

@@ -1,5 +1,19 @@
 import "package:flutter/material.dart";
+const lightHighlights = [
+  Color(0xFFDAEFFE),
+  Color(0xFFFFFCB2),
+  Color(0xFFFFDDF3),
+  Color(0xFFE6FCC3),
+];
+const darkHighlights = [
+  Color(0xFF69A9FC),
+  Color(0xFFFFEB66),
+  Color(0xFFFF66B3),
+  Color(0xFF48F334),
+];
 const lightColorScheme = ColorScheme.light(
   background: Colors.white,
   onBackground: Color(0xFF010101),

lib/widgets/highlight_button.dart CHANGED Viewed

@@ -1,15 +1,16 @@
 import "package:flutter/material.dart";
 class HighlightButton extends StatelessWidget {
+  final int index;
   final Color color;
-  final Function(Color c) onColorSelected;
+  final Function(int) onHighlightSelected;
-  const HighlightButton({super.key, required this.color, required this.onColorSelected});
+  const HighlightButton({super.key, required this.index, required this.color, required this.onHighlightSelected});
   @override
   Widget build(BuildContext context) {
     return InkWell(
-      onTap: () => onColorSelected(color),
+      onTap: () => onHighlightSelected(index),
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 10),
         decoration: BoxDecoration(

lib/widgets/highlight_sheet.dart CHANGED Viewed

@@ -1,4 +1,5 @@
 import "package:flutter/material.dart";
+import "package:only_bible_app/theme.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/highlight_button.dart";
@@ -10,36 +11,27 @@ class HighlightSheet extends StatelessWidget {
     final isDesktop = isWide(context);
     final bottom = isIOS() ? 20.0 : 0.0;
     final height = isIOS() ? 100.0 : 80.0;
-    void onHighlight(Color c) {
+    void onHighlight(int index) {
       final verses = context.appEvent.selectedVerses;
-      context.appEvent.setHighlight(context, verses, c);
+      context.appEvent.setHighlight(context, verses, index);
       context.appEvent.closeActions(context);
     }
+    // context.app.darkMode ? const Color(0xFF69A9FC) :
     return Container(
       height: height,
-      color: Theme.of(context).colorScheme.background,
+      color: context.theme.colorScheme.background,
       padding: EdgeInsets.only(left: 20, right: 20, top: isDesktop ? 10 : 10, bottom: bottom),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-        children: [
+        children: List.generate(
+          4,
-          HighlightButton(
+          (i) => HighlightButton(
+            index: i,
-            color: const Color(0xFFDAEFFE),
+            color: context.app.darkMode ? darkHighlights[i] : lightHighlights[i],
-            onColorSelected: onHighlight,
+            onHighlightSelected: onHighlight,
           ),
-          HighlightButton(
-            color: const Color(0xFFFFFBB1),
-            onColorSelected: onHighlight,
-          ),
+        ),
-          HighlightButton(
-            color: const Color(0xFFFFDEF3),
-            onColorSelected: onHighlight,
-          ),
-          HighlightButton(
-            color: const Color(0xFFE6FCC3),
-            onColorSelected: onHighlight,
-          ),
-        ],
       ),
     );
   }

lib/widgets/verses_view.dart CHANGED Viewed

@@ -34,7 +34,7 @@ class VersesView extends StatelessWidget {
               // ),
               Align(
                 alignment: Alignment.centerLeft,
-                child:  Text.rich(
+                child: Text.rich(
                   // scrollPhysics: const BouncingScrollPhysics(),
                   // contextMenuBuilder: null,
                   textScaleFactor: app.textScaleFactor,
@@ -44,57 +44,51 @@ class VersesView extends StatelessWidget {
                   TextSpan(
                     style: app.fontBold
                         ? textStyle.copyWith(
-                      fontWeight: FontWeight.w500,
+                            fontWeight: FontWeight.w500,
-                    )
+                          )
                         : textStyle,
                     // recognizer: TapAndPanGestureRecognizer()..onDragEnd = (e) => print("Hello"),
                     children: chapter.verses
                         .map(
                           (v) => [
-                        WidgetSpan(
+                            WidgetSpan(
-                          child: Transform.translate(
+                              child: Transform.translate(
-                            offset: const Offset(0, -2),
+                                offset: const Offset(0, -2),
-                            child: Text("${v.index + 1} ", style: Theme.of(context).textTheme.labelMedium),
+                                child: Text("${v.index + 1} ", style: Theme.of(context).textTheme.labelMedium),
-                          ),
+                              ),
-                        ),
+                            ),
-                        if (app.hasNote(v))
+                            if (app.hasNote(v))
-                          WidgetSpan(
+                              WidgetSpan(
-                            child: Padding(
+                                child: Padding(
-                              padding: const EdgeInsets.only(left: 3, right: 3),
+                                  padding: const EdgeInsets.only(left: 3, right: 3),
-                              child: GestureDetector(
+                                  child: GestureDetector(
-                                onTap: () {
+                                    onTap: () {
-                                  app.showNoteField(context, v);
+                                      app.showNoteField(context, v);
-                                },
+                                    },
-                                child: const Icon(
+                                    child: const Icon(
-                                  Icons.sticky_note_2_outlined,
+                                      Icons.sticky_note_2_outlined,
-                                  size: 18,
+                                      size: 18,
-                                  color: Colors.blue,
+                                      color: Colors.blue,
+                                    ),
+                                  ),
                                 ),
                               ),
+                            TextSpan(
+                              text: "${v.text}\n",
+                              style: context.app.getHighlightStyle(context, v),
+                              recognizer: TapGestureRecognizer()
+                                ..onTap = () {
+                                  context.appEvent.onVerseSelected(context, v);
+                                  // AppModel.ofEvent(context).showHighlightMenu(context, v, details.globalPosition);
+                                },
                             ),
+                            const WidgetSpan(
+                              child: Padding(
+                                padding: EdgeInsets.only(top: 16, bottom: 16),
-                          ),
+                              ),
-                        TextSpan(
+                            ),
-                          text: "${v.text}\n",
-                          style: context.app.isVerseSelected(v)
-                              ? TextStyle(
+                          ],
-                            backgroundColor: app.darkMode ? Colors.grey.shade800 : Colors.grey.shade200,
-                          )
+                        )
-                              : TextStyle(
-                            backgroundColor: app.getHighlight(v) ?? context.theme.colorScheme.background,
-                          ),
-                          recognizer: TapGestureRecognizer()
-                            ..onTap = () {
-                              context.appEvent.onVerseSelected(context, v);
-                              // AppModel.ofEvent(context).showHighlightMenu(context, v, details.globalPosition);
-                            },
-                        ),
-                        const WidgetSpan(
-                          child: Padding(
-                            padding: EdgeInsets.only(top: 16, bottom: 16),
-                          ),
-                        ),
-                      ],
-                    )
                         .expand((element) => element)
                         .toList(),
                   ),

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