Fix scrollables, wakelock, html unescape

arianneorpilla · Mar 13, 2023 · 1fa1651 · 1fa1651
1 parent 0f54e33
commit 1fa1651
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/yuuna/lib/src/pages/implementations/player_source_page.dart b/yuuna/lib/src/pages/implementations/player_source_page.dart
@@ -113,6 +113,8 @@ class _PlayerSourcePageState extends BaseSourcePageState<PlayerSourcePage>
           ]);
         }
 
+        Wakelock.enable();
+
         break;
       case AppLifecycleState.paused:
       case AppLifecycleState.inactive:
@@ -1795,6 +1797,7 @@ class _PlayerSourcePageState extends BaseSourcePageState<PlayerSourcePage>
 
   /// This hides or shows the menu.
   void toggleMenuVisibility() async {
+    Wakelock.enable();
     _menuHideTimer?.cancel();
     _isMenuHidden.value = !_isMenuHidden.value;
     if (!_isMenuHidden.value) {

diff --git a/yuuna/lib/src/pages/implementations/player_transcript_page.dart b/yuuna/lib/src/pages/implementations/player_transcript_page.dart
@@ -142,6 +142,7 @@ class _PlayerTranscriptPageState extends BasePageState<PlayerTranscriptPage> {
 
   Widget buildSubtitles() {
     return ScrollablePositionedList.builder(
+      padding: const EdgeInsets.only(bottom: 48),
       physics: const BouncingScrollPhysics(),
       itemScrollController: _itemScrollController,
       itemPositionsListener: _itemPositionsListener,

diff --git a/yuuna/lib/src/pages/implementations/recursive_dictionary_history_page.dart b/yuuna/lib/src/pages/implementations/recursive_dictionary_history_page.dart
@@ -27,11 +27,16 @@ class _RecursiveDictionaryHistoryPageState
       resizeToAvoidBottomInset: false,
       backgroundColor: Theme.of(context).colorScheme.background,
       appBar: buildAppBar(),
-      body: DictionaryResultPage(
-        result: widget.result,
-        onSearch: onSearch,
-        onStash: onStash,
-        updateHistory: false,
+      body: SafeArea(
+        left: false,
+        top: false,
+        right: false,
+        child: DictionaryResultPage(
+          result: widget.result,
+          onSearch: onSearch,
+          onStash: onStash,
+          updateHistory: false,
+        ),
       ),
     );
   }

diff --git a/yuuna/pubspec.lock b/yuuna/pubspec.lock
@@ -835,6 +835,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.15.2"
+  html_unescape:
+    dependency: transitive
+    description:
+      name: html_unescape
+      sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   http:
     dependency: "direct main"
     description:
@@ -1647,8 +1655,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "6c9163c97e869114485bd1f90ba005db2fae8188"
-      resolved-ref: "6c9163c97e869114485bd1f90ba005db2fae8188"
+      ref: ff4a7900d66338c7322a7335f14714f7cb964b82
+      resolved-ref: ff4a7900d66338c7322a7335f14714f7cb964b82
       url: "https://github.com/lrorpilla/subtitle"
     source: git
     version: "0.1.0-beta.2"

diff --git a/yuuna/pubspec.yaml b/yuuna/pubspec.yaml
@@ -114,7 +114,7 @@ dependencies:
   subtitle:
     git:
       url: https://github.com/lrorpilla/subtitle
-      ref: 6c9163c97e869114485bd1f90ba005db2fae8188
+      ref: ff4a7900d66338c7322a7335f14714f7cb964b82
   system_info: ^1.0.1
   transparent_image: ^2.0.1
   url_launcher: ^6.0.20