Cleanup

Author: Correct-Syntax

lib/services/reader_service.dart

@@ -4,26 +4,22 @@ import '../models/bibles/kjv_bible.dart';
 import '../models/bibles/oet_lv_bible.dart';
 import '../models/bibles/oet_rv_bible.dart';
 import 'bibles_service.dart';
-import 'settings_service.dart';
 
 class ReaderService {
   final _biblesService = locator<BiblesService>();
-  final _settingsService = locator<SettingsService>();
 
   Map<String, dynamic> get primaryAreaJson => _biblesService.primaryAreaJson;
   Map<String, dynamic> get secondaryAreaJson => _biblesService.secondaryAreaJson;
 
   /// An "Area" is the area in the reader where bible text is displayed and scrolled.
-  Future<String> getReaderBookHTML(Area area, ViewBy viewBy, String bibleCode, String bookCode) async {
+  String getReaderBookHTML(Area area, ViewBy viewBy, String bibleCode, String bookCode, List<String> bookmarks) {
     Map<String, dynamic> json;
     if (area == Area.primary) {
       json = primaryAreaJson;
     } else {
       json = secondaryAreaJson;
     }
 
-    List<String> bookmarks = await _settingsService.getBookmarks();
-
     if (bibleCode == 'OET-LV') {
       var bibleImpl = OETLiteralBibleImpl(json);
       return bibleImpl.getBook(area, bookCode, bookmarks, viewBy);

lib/ui/views/reader/reader_view.dart

@@ -18,9 +18,9 @@ class ReaderView extends StackedView<ReaderViewModel> {
   const ReaderView({super.key});
 
   @override
-  void onViewModelReady(ReaderViewModel viewModel) {
+  void onViewModelReady(ReaderViewModel viewModel) async {
     super.onViewModelReady(viewModel);
-    viewModel.initilize();
+    await viewModel.initilize();
   }
 
   @override

lib/ui/views/reader/reader_viewmodel.dart

@@ -35,6 +35,8 @@ class ReaderViewModel extends ReactiveViewModel {
   bool get showSecondaryArea => _settingsService.showSecondaryArea;
   bool get linkReaderAreaScrolling => _settingsService.linkReaderAreaScrolling;
 
+  List<String> get bookmarks => _settingsService.bookmarks;
+
   ReaderViewModel({required this.context});
 
   final BuildContext context;
@@ -44,21 +46,24 @@ class ReaderViewModel extends ReactiveViewModel {
   bool isPrimaryReaderAreaPopupActive = false;
   bool isSecondaryReaderAreaPopupActive = false;
 
-  void initilize() async {
+  Future<void> initilize() async {
     await setupWebviewController();
     await _biblesService.reloadBiblesJson();
 
-    String primaryAreaHTML = await _readerService.getReaderBookHTML(
+    String primaryAreaHTML = _readerService.getReaderBookHTML(
       Area.primary,
       viewBy,
       primaryAreaBible,
       bookCode,
+      bookmarks,
     );
-    String secondaryAreaHTML = await _readerService.getReaderBookHTML(
+
+    String secondaryAreaHTML = _readerService.getReaderBookHTML(
       Area.secondary,
       viewBy,
       secondaryAreaBible,
       bookCode,
+      bookmarks,
     );
 
     await initilizeReaderWebview(
@@ -108,7 +113,7 @@ class ReaderViewModel extends ReactiveViewModel {
           },
         ),
       );
-    AndroidWebViewController.enableDebugging(true);
+    await AndroidWebViewController.enableDebugging(true);
   }
 
   /// Initilizes the webview html with everything except for the reader area contents.
@@ -497,11 +502,12 @@ class ReaderViewModel extends ReactiveViewModel {
   Future<void> updateReaderAreas() async {
     await _biblesService.reloadBiblesJson();
 
-    String primaryAreaHTML = await _readerService.getReaderBookHTML(Area.primary, viewBy, primaryAreaBible, bookCode);
+    String primaryAreaHTML =
+        _readerService.getReaderBookHTML(Area.primary, viewBy, primaryAreaBible, bookCode, bookmarks);
     await updateReaderAreaHTMLContent(Area.primary, primaryAreaHTML);
     if (showSecondaryArea == true) {
       String secondaryAreaHTML =
-          await _readerService.getReaderBookHTML(Area.secondary, viewBy, secondaryAreaBible, bookCode);
+          _readerService.getReaderBookHTML(Area.secondary, viewBy, secondaryAreaBible, bookCode, bookmarks);
       await updateReaderAreaHTMLContent(Area.secondary, secondaryAreaHTML);
     }
 

test/helpers/test_helpers.mocks.dart

@@ -1466,11 +1466,12 @@ class MockReaderService extends _i1.Mock implements _i11.ReaderService {
       ) as Map<String, dynamic>);
 
   @override
-  _i5.Future<String> getReaderBookHTML(
+  String getReaderBookHTML(
     _i8.Area? area,
     _i8.ViewBy? viewBy,
     String? bibleCode,
     String? bookCode,
+    List<String>? bookmarks,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1480,9 +1481,10 @@ class MockReaderService extends _i1.Mock implements _i11.ReaderService {
             viewBy,
             bibleCode,
             bookCode,
+            bookmarks,
           ],
         ),
-        returnValue: _i5.Future<String>.value(_i3.dummyValue<String>(
+        returnValue: _i3.dummyValue<String>(
           this,
           Invocation.method(
             #getReaderBookHTML,
@@ -1491,10 +1493,11 @@ class MockReaderService extends _i1.Mock implements _i11.ReaderService {
               viewBy,
               bibleCode,
               bookCode,
+              bookmarks,
             ],
           ),
-        )),
-        returnValueForMissingStub: _i5.Future<String>.value(_i3.dummyValue<String>(
+        ),
+        returnValueForMissingStub: _i3.dummyValue<String>(
           this,
           Invocation.method(
             #getReaderBookHTML,
@@ -1503,10 +1506,11 @@ class MockReaderService extends _i1.Mock implements _i11.ReaderService {
               viewBy,
               bibleCode,
               bookCode,
+              bookmarks,
             ],
           ),
-        )),
-      ) as _i5.Future<String>);
+        ),
+      ) as String);
 }
 
 /// A class which mocks [JsonService].