only-bible-app

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

3d32fc8b — pyrossh

Add Highlight History

Files changed (5) hide show

lib/store/actions_navigation.dart +39 -0
lib/store/actions_state.dart +14 -3
lib/store/app_state.dart +41 -0
lib/widgets/highlight_history_sheet.dart +288 -0
lib/widgets/home_app_bar.dart +7 -0

lib/store/actions_navigation.dart CHANGED Viewed

@@ -6,11 +6,50 @@ import "package:only_bible_app/store/app_state.dart";
 import "package:only_bible_app/utils.dart";
 import "package:only_bible_app/widgets/book_select_sheet.dart";
+import "package:only_bible_app/widgets/highlight_history_sheet.dart";
 import "package:only_bible_app/widgets/settings_sheet.dart";
 import "package:share_plus/share_plus.dart";
 String _stripRedTags(String text) => text.replaceAll(RegExp(r"</?red>"), "");
+class ShowHighlightHistoryAction extends ReduxAction<AppState> {
+  final BuildContext buildContext;
+  final Bible bible;
+  ShowHighlightHistoryAction(this.buildContext, this.bible);
+  @override
+  AppState? reduce() {
+    showModalBottomSheet(
+      context: buildContext,
+      isDismissible: true,
+      enableDrag: true,
+      showDragHandle: true,
+      useSafeArea: true,
+      isScrollControlled: true,
+      builder: (context) {
+        final surface = Theme.of(context).colorScheme.surface;
+        return Theme(
+          data: Theme.of(context).copyWith(
+            bottomSheetTheme: BottomSheetThemeData(
+              backgroundColor: surface,
+              dragHandleColor: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+          ),
+          child: DraggableScrollableSheet(
+            expand: false,
+            initialChildSize: 0.6,
+            minChildSize: 0.4,
+            maxChildSize: 0.9,
+            builder: (_, __) => HighlightHistorySheet(bible: bible),
+          ),
+        );
+      },
+    );
+    return null;
+  }
+}
 class ShowSettingsAction extends ReduxAction<AppState> {
   final BuildContext buildContext;
   final Bible bible;

lib/store/actions_state.dart CHANGED Viewed

@@ -139,10 +139,21 @@ class SetHighlightAction extends ReduxAction<AppState> {
   @override
   AppState reduce() {
     final updated = Map<String, int>.from(state.highlights);
+    final now = DateTime.now();
-    for (final v in verses) {
+    final newEntries = verses.map((v) {
       updated["${v.book}:${v.chapter}:${v.index}"] = colorIndex;
+      return HighlightHistoryEntry(
+        book: v.book,
+        chapter: v.chapter,
+        verseIndex: v.index,
+        colorIndex: colorIndex,
+        timestamp: now,
-    }
+      );
+    }).toList();
+    // Keep last 500 entries
+    final updatedHistory = [...state.highlightHistory, ...newEntries];
+    final trimmed = updatedHistory.length > 500 ? updatedHistory.sublist(updatedHistory.length - 500) : updatedHistory;
-    return state.copy(highlights: updated, selectedVerses: []);
+    return state.copy(highlights: updated, selectedVerses: [], highlightHistory: trimmed);
   }
 }

lib/store/app_state.dart CHANGED Viewed

@@ -4,6 +4,38 @@ import "package:only_bible_app/theme.dart";
 import "package:async_redux/async_redux.dart";
 export "package:async_redux/async_redux.dart" show BuildContextExtensionForProviderAndConnector;
+class HighlightHistoryEntry {
+  final int book;
+  final int chapter;
+  final int verseIndex;
+  final int colorIndex;
+  final DateTime timestamp;
+  const HighlightHistoryEntry({
+    required this.book,
+    required this.chapter,
+    required this.verseIndex,
+    required this.colorIndex,
+    required this.timestamp,
+  });
+  Map<String, dynamic> toJson() => {
+        "book": book,
+        "chapter": chapter,
+        "verseIndex": verseIndex,
+        "colorIndex": colorIndex,
+        "timestamp": timestamp.toIso8601String(),
+      };
+  factory HighlightHistoryEntry.fromJson(Map<String, dynamic> json) => HighlightHistoryEntry(
+        book: json["book"] as int,
+        chapter: json["chapter"] as int,
+        verseIndex: json["verseIndex"] as int,
+        colorIndex: json["colorIndex"] as int,
+        timestamp: DateTime.parse(json["timestamp"] as String),
+      );
+}
 class AppState {
   final bool engTitles;
   final int fontWeight;
@@ -13,6 +45,7 @@ class AppState {
   final int savedChapter;
   final List<Verse> selectedVerses;
   final Map<String, int> highlights;
+  final List<HighlightHistoryEntry> highlightHistory;
   final Bible bible;
   AppState({
@@ -24,6 +57,7 @@ class AppState {
     this.savedChapter = 0,
     this.selectedVerses = const [],
     this.highlights = const {},
+    this.highlightHistory = const [],
     required this.bible,
   });
@@ -36,6 +70,7 @@ class AppState {
     int? savedChapter,
     List<Verse>? selectedVerses,
     Map<String, int>? highlights,
+    List<HighlightHistoryEntry>? highlightHistory,
     Bible? bible,
   }) {
     return AppState(
@@ -47,6 +82,7 @@ class AppState {
       savedChapter: savedChapter ?? this.savedChapter,
       selectedVerses: selectedVerses ?? this.selectedVerses,
       highlights: highlights ?? this.highlights,
+      highlightHistory: highlightHistory ?? this.highlightHistory,
       bible: bible ?? this.bible,
     );
   }
@@ -60,6 +96,7 @@ class AppState {
         "savedBook": savedBook,
         "savedChapter": savedChapter,
         "highlights": highlights,
+        "highlightHistory": highlightHistory.map((e) => e.toJson()).toList(),
       };
   factory AppState.fromJson(Map<String, dynamic> json, Bible bible) => AppState(
@@ -70,6 +107,10 @@ class AppState {
         savedBook: json["savedBook"] as int? ?? 0,
         savedChapter: json["savedChapter"] as int? ?? 0,
         highlights: (json["highlights"] as Map<String, dynamic>?)?.map((k, v) => MapEntry(k, v as int)) ?? const {},
+        highlightHistory: (json["highlightHistory"] as List<dynamic>?)
+                ?.map((e) => HighlightHistoryEntry.fromJson(e as Map<String, dynamic>))
+                .toList() ??
+            const [],
         bible: bible,
       );

lib/widgets/highlight_history_sheet.dart ADDED Viewed

@@ -0,0 +1,288 @@
+import "package:flutter/material.dart";
+import "package:only_bible_app/gen/bible.gen.dart";
+import "package:only_bible_app/store/actions_navigation.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";
+class HighlightHistorySheet extends StatefulWidget {
+  final Bible bible;
+  const HighlightHistorySheet({super.key, required this.bible});
+  @override
+  State<HighlightHistorySheet> createState() => _HighlightHistorySheetState();
+}
+class _HighlightHistorySheetState extends State<HighlightHistorySheet> {
+  // Tracks which day groups are expanded; today (index 0) starts open.
+  final Set<int> _expanded = {0};
+  String _formatTime(DateTime dt) {
+    final h = dt.hour.toString().padLeft(2, "0");
+    final m = dt.minute.toString().padLeft(2, "0");
+    return "$h:$m";
+  }
+  String _ordinal(int day) {
+    if (day >= 11 && day <= 13) return "${day}th";
+    switch (day % 10) {
+      case 1:
+        return "${day}st";
+      case 2:
+        return "${day}nd";
+      case 3:
+        return "${day}rd";
+      default:
+        return "${day}th";
+    }
+  }
+  String _formatDate(DateTime dt) {
+    const weekdays = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
+    const months = [
+      "January",
+      "February",
+      "March",
+      "April",
+      "May",
+      "June",
+      "July",
+      "August",
+      "September",
+      "October",
+      "November",
+      "December",
+    ];
+    final weekday = weekdays[dt.weekday - 1];
+    return "$weekday ${_ordinal(dt.day)} ${months[dt.month - 1]}, ${dt.year}";
+  }
+  List<InlineSpan> _parseRedText(String raw, TextStyle base, TextStyle redStyle) {
+    final spans = <InlineSpan>[];
+    final exp = RegExp(r"<red>(.*?)<\/red>", dotAll: true);
+    int cursor = 0;
+    for (final match in exp.allMatches(raw)) {
+      if (match.start > cursor) {
+        spans.add(TextSpan(text: raw.substring(cursor, match.start), style: base));
+      }
+      spans.add(TextSpan(text: match.group(1), style: redStyle));
+      cursor = match.end;
+    }
+    if (cursor < raw.length) {
+      spans.add(TextSpan(text: raw.substring(cursor), style: base));
+    }
+    return spans;
+  }
+  void _toggle(int index) {
+    setState(() {
+      if (_expanded.contains(index)) {
+        _expanded.remove(index);
+      } else {
+        _expanded.add(index);
+      }
+    });
+  }
+  @override
+  Widget build(BuildContext context) {
+    final history = context.select((s) => s.highlightHistory);
+    final darkMode = context.select((s) => s.darkMode);
+    final colorScheme = Theme.of(context).colorScheme;
+    // Group by date (newest first)
+    final reversed = history.reversed.toList();
+    final Map<String, List<HighlightHistoryEntry>> grouped = {};
+    for (final entry in reversed) {
+      final key = _formatDate(entry.timestamp);
+      grouped.putIfAbsent(key, () => []).add(entry);
+    }
+    final dateKeys = grouped.keys.toList();
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            "Highlight History",
+            style: Theme.of(context).textTheme.headlineMedium,
+          ),
+          const SizedBox(height: 12),
+          if (grouped.isEmpty)
+            Expanded(
+              child: Center(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Icon(Icons.highlight_outlined, size: 48, color: colorScheme.outlineVariant),
+                    const SizedBox(height: 12),
+                    Text(
+                      "No highlights yet",
+                      style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: colorScheme.outline),
+                    ),
+                  ],
+                ),
+              ),
+            )
+          else
+            Expanded(
+              child: ListView.builder(
+                itemCount: dateKeys.length,
+                itemBuilder: (context, i) {
+                  final dateLabel = dateKeys[i];
+                  final entries = grouped[dateLabel]!;
+                  final isExpanded = _expanded.contains(i);
+                  return Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      // Accordion header
+                      InkWell(
+                        onTap: () => _toggle(i),
+                        borderRadius: BorderRadius.circular(6),
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 10),
+                          child: Row(
+                            children: [
+                              Expanded(
+                                child: Text(
+                                  dateLabel,
+                                  style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                                        color: colorScheme.primary,
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                ),
+                              ),
+                              Text(
+                                "${entries.length}",
+                                style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                                      color: colorScheme.outline,
+                                    ),
+                              ),
+                              const SizedBox(width: 4),
+                              AnimatedRotation(
+                                turns: isExpanded ? 0.5 : 0,
+                                duration: const Duration(milliseconds: 200),
+                                child: Icon(
+                                  Icons.keyboard_arrow_down,
+                                  size: 20,
+                                  color: colorScheme.primary,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                      // Accordion body
+                      AnimatedCrossFade(
+                        firstChild: const SizedBox.shrink(),
+                        secondChild: Column(
+                          children: entries.map((entry) {
+                            final bookName = widget.bible.books?[entry.book].name ?? "Book ${entry.book + 1}";
+                            final chapterNum = entry.chapter + 1;
+                            final verseNum = entry.verseIndex + 1;
+                            final highlightColor =
+                                darkMode ? darkHighlights[entry.colorIndex] : lightHighlights[entry.colorIndex];
+                            final verseText =
+                                widget.bible.books?[entry.book].chapters?[entry.chapter].verses?[entry.verseIndex].text;
+                            return InkWell(
+                              onTap: () {
+                                Navigator.of(context).pop();
+                                context.dispatch(GoToChapterAction(
+                                  context.router,
+                                  entry.book,
+                                  entry.chapter,
+                                  verse: entry.verseIndex,
+                                ));
+                              },
+                              borderRadius: BorderRadius.circular(6),
+                              child: Padding(
+                                padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 2),
+                                child: Row(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    SizedBox(
+                                      height: 20,
+                                      child: Padding(
+                                        padding: const EdgeInsets.only(top: 4),
+                                        child: Center(
+                                          child: Container(
+                                            width: 14,
+                                            height: 14,
+                                            decoration: BoxDecoration(
+                                              color: highlightColor,
+                                              shape: BoxShape.circle,
+                                              border:
+                                                  Border.all(color: Theme.of(context).colorScheme.onSurface, width: 1),
+                                            ),
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                                    const SizedBox(width: 10),
+                                    Expanded(
+                                      child: Column(
+                                        crossAxisAlignment: CrossAxisAlignment.start,
+                                        children: [
+                                          Row(
+                                            children: [
+                                              Expanded(
+                                                child: Text(
+                                                  "$bookName $chapterNum:$verseNum",
+                                                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                                                        fontWeight: FontWeight.w600,
+                                                      ),
+                                                ),
+                                              ),
+                                              Text(
+                                                _formatTime(entry.timestamp),
+                                                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                                                      color: colorScheme.outline,
+                                                    ),
+                                              ),
+                                            ],
+                                          ),
+                                          if (verseText != null && verseText.isNotEmpty) ...[
+                                            const SizedBox(height: 2),
+                                            RichText(
+                                              text: TextSpan(
+                                                children: _parseRedText(
+                                                  verseText,
+                                                  Theme.of(context).textTheme.bodySmall!.copyWith(
+                                                        color: colorScheme.onSurfaceVariant,
+                                                      ),
+                                                  Theme.of(context).textTheme.bodySmall!.copyWith(
+                                                        color: Colors.red,
+                                                      ),
+                                                ),
+                                              ),
+                                            ),
+                                          ],
+                                        ],
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            );
+                          }).toList(),
+                        ),
+                        crossFadeState: isExpanded ? CrossFadeState.showSecond : CrossFadeState.showFirst,
+                        duration: const Duration(milliseconds: 200),
+                      ),
+                      Divider(color: colorScheme.outlineVariant, height: 1),
+                    ],
+                  );
+                },
+              ),
+            ),
+          const SizedBox(height: 16),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/home_app_bar.dart CHANGED Viewed

@@ -69,6 +69,13 @@ class HomeAppBar extends StatelessWidget implements PreferredSizeWidget {
             //     ),
             //   ),
             // ),
+            IconButton(
+              enableFeedback: true,
+              key: const Key("historyButton"),
+              padding: EdgeInsets.zero,
+              icon: const Icon(Icons.history, size: 28),
+              onPressed: () => context.dispatch(ShowHighlightHistoryAction(context, bible)),
+            ),
             IconButton(
               enableFeedback: true,
               key: const Key("bible"),

~repos /only-bible-app

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