Add WEB bible implementation for the reader and search

* The WEB is not yet enabled in search

Author: Correct-Syntax

lib/common/bibles.dart

@@ -3,11 +3,13 @@ const List<String> bibleVersions = [
   'OET-RV',
   'OET-LV',
   'KJV',
+  'WEB',
 ];
 
 /// Mapping bibleCodes to the full Bible version name
 const Map<String, String> bibleVersionsMapping = {
   'OET-RV': 'Open English Translation Readers Version',
   'OET-LV': 'Open English Translation Literal Version',
   'KJV': 'King James Version',
+  'WEB': 'The World English Bible',
 };

lib/models/bibles/web_bible.dart

@@ -0,0 +1,121 @@
+import 'dart:developer';
+import '../../common/enums.dart';
+import '../json_to_bible.dart';
+import '../search_result.dart';
+
+/// The World English Bible (WEB) implementation.
+///
+/// The WEB is displayed in chapters verse-by-verse.
+class WEBBibleImpl extends JsonToBible {
+  WEBBibleImpl(Map<String, dynamic> json) : super(json: json);
+
+  @override
+  Future<String> getBook(
+    Area readerArea,
+    String bookCode,
+    List<String> bookmarks,
+    bool showSpecialMarks,
+    bool showChaptersAndVerses,
+  ) async {
+    String htmlText = '';
+    String chapterNumberHtml = '';
+    String chapterNumber = '1';
+    String verseNumber = '1';
+
+    for (Map item in json['content']) {
+      // Chapter 'chapter'
+      if (item['type'] == 'chapter') {
+        chapterNumber = item['number'];
+
+        String chapterId = '${readerArea.name}-$bookCode-$chapterNumber';
+
+        chapterNumberHtml = '''<span class="c" id="$chapterId">
+          ${showChaptersAndVerses ? chapterNumber : ''}
+        </span>''';
+      }
+
+      // Paragraph 'para'
+      if (item['type'] == 'para') {
+        // 'para' type items always have inner 'content'
+        for (dynamic paraItem in item['content']) {
+          if (paraItem is String) {
+            if (item['marker'] == 'p') {
+              String verseText = paraItem
+                  .replaceAll('*j', '') // Remove leftover instances of j* from the original usfm
+                  .replaceAll(RegExp(r'¦G([0-9])*\d+'), ''); // For now, remove all Strong's numbers
+
+              htmlText += '$verseText</p>';
+            }
+          } else if (paraItem is Map) {
+            String itemType = paraItem['type'];
+
+            if (itemType == 'verse') {
+              verseNumber = paraItem['number'];
+
+              String verseId = '${readerArea.name}-$bookCode-$chapterNumber-$verseNumber';
+              String bookmarkIcon = bookmarkIconHTML(verseId, bookmarks);
+
+              if (verseNumber == '1') {
+                htmlText += """<p ondblclick="onCreateBookmark("$verseId")" class="p" id="$verseId">
+                  $chapterNumberHtml$bookmarkIcon<sup>${showChaptersAndVerses ? verseNumber : ''}</sup>&nbsp;""";
+              } else {
+                htmlText += """<p ondblclick=onCreateBookmark("$verseId") class="p" id="$verseId">
+$bookmarkIcon<sup>${showChaptersAndVerses ? verseNumber : ''}</sup>&nbsp;""";
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return htmlText;
+  }
+
+  @override
+  Future<List<SearchResult>> getSearchResults(String bookCode, String searchTerm) async {
+    List<SearchResult> results = [];
+
+    String chapterNumber = '';
+    String verseNumber = '';
+    String verseText = '';
+
+    for (Map item in json['content']) {
+      // Chapter 'chapter'
+      if (item['type'] == 'chapter') {
+        chapterNumber = item['number'];
+      }
+
+      // Paragraph 'para'
+      if (item['type'] == 'para') {
+        // 'para' type items always have inner 'content'
+        for (dynamic paraItem in item['content']) {
+          if (paraItem is String) {
+            if (item['marker'] == 'p') {
+              verseText = paraItem
+                  .replaceAll('*j', '') // Remove leftover instances of j* from the original usfm
+                  .replaceAll(RegExp(r'¦G([0-9])*\d+'), ''); // For now, remove all Strong's numbers
+            }
+          } else if (paraItem is Map) {
+            String itemType = paraItem['type'];
+
+            if (itemType == 'verse') {
+              verseNumber = paraItem['number'];
+
+              bool isSearchTermInVerse = verseText.toLowerCase().contains(searchTerm);
+              if (isSearchTermInVerse == true) {
+                results.add(SearchResult(
+                  bookCode: bookCode,
+                  chapter: int.parse(chapterNumber),
+                  verse: int.parse(verseNumber),
+                  verseText: verseText,
+                ));
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return results;
+  }
+}

lib/services/reader_service.dart

@@ -3,6 +3,7 @@ import '../common/enums.dart';
 import '../models/bibles/kjv_bible.dart';
 import '../models/bibles/oet_lv_bible.dart';
 import '../models/bibles/oet_rv_bible.dart';
+import '../models/bibles/web_bible.dart';
 import 'bibles_service.dart';
 
 class ReaderService {
@@ -30,6 +31,9 @@ class ReaderService {
     } else if (bibleCode == 'KJV') {
       var bibleImpl = KJVBibleImpl(json);
       return await bibleImpl.getBook(area, bookCode, bookmarks, showMarks, showChaptersAndVerses);
+    } else if (bibleCode == 'WEB') {
+      var bibleImpl = WEBBibleImpl(json);
+      return await bibleImpl.getBook(area, bookCode, bookmarks, showMarks, showChaptersAndVerses);
     } else {
       return 'Invalid bibleCode.';
     }

lib/ui/views/reader/reader_view.dart

@@ -65,7 +65,7 @@ class ReaderView extends StackedView<ReaderViewModel> {
                       controller: viewModel.webviewController,
                     ),
                   ),
-                  if (viewModel.primaryAreaBible != 'KJV' || viewModel.secondaryAreaBible != 'KJV')
+                  if (viewModel.primaryAreaBible.startsWith('OET') || viewModel.secondaryAreaBible.startsWith('OET'))
                     Container(
                       color: context.theme.appColors.background,
                       padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 12.0),