Migrates codebase due to Riverpod upgrade

olmps · Nov 17, 2021 · 68b047d · 68b047d
1 parent b067304
commit 68b047d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/lib/application/pages/execution/collection_execution_page.dart b/lib/application/pages/execution/collection_execution_page.dart
@@ -16,8 +16,6 @@ import 'package:memo/application/utils/bottom_sheet.dart';
 import 'package:memo/application/view-models/execution/collection_execution_vm.dart';
 import 'package:memo/application/widgets/animatable_progress.dart';
 import 'package:memo/application/widgets/material/asset_icon_button.dart';
-import 'package:memo/application/widgets/theme/destructive_button.dart';
-import 'package:memo/application/widgets/theme/secondary_button.dart';
 
 class CollectionExecutionPage extends ConsumerStatefulWidget {
   @override
@@ -103,14 +101,15 @@ class _ExecutionAppBar extends ConsumerWidget implements PreferredSizeWidget {
   }
 
   /// Displays an bottom sheet alert to reinforce the discard of the current execution.
-  Future<void> _showCloseSheet(BuildContext context) async {
+  Future<void> _showCloseSheet(BuildContext context, WidgetRef ref) async {
     return showDestructiveOperationModalBottomSheet(
       context,
+      ref,
       title: strings.executionDiscardStudy,
       message: strings.executionDiscardStudyDescription,
       destructiveActionTitle: strings.executionDiscard.toUpperCase(),
       cancelActionTitle: strings.executionBackToStudy.toUpperCase(),
-      onDestructiveTapped: readCoordinator(context).pop,
+      onDestructiveTapped: readCoordinator(ref).pop,
       onCancelTapped: Navigator.of(context).pop,
     );
   }

diff --git a/lib/application/utils/bottom_sheet.dart b/lib/application/utils/bottom_sheet.dart
@@ -70,7 +70,8 @@ Future<T?> showSnappableDraggableModalBottomSheet<T>(
 
 /// Uses [showSnappableDraggableModalBottomSheet] to present a modal bottom sheet tha confirms a destructive operation.
 Future<T?> showDestructiveOperationModalBottomSheet<T>(
-  BuildContext context, {
+  BuildContext context,
+  WidgetRef ref, {
   required String title,
   required String message,
   required String destructiveActionTitle,
@@ -82,6 +83,7 @@ Future<T?> showDestructiveOperationModalBottomSheet<T>(
 
   return showSnappableDraggableModalBottomSheet(
     context,
+    ref,
     isDismissible: true,
     child: Column(
       mainAxisSize: MainAxisSize.min,

diff --git a/lib/application/widgets/theme/memo_terminal.dart b/lib/application/widgets/theme/memo_terminal.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:layoutr/common_layout.dart';
 import 'package:memo/application/constants/dimensions.dart' as dimens;
 import 'package:memo/application/constants/images.dart' as images;
@@ -13,7 +14,7 @@ import 'package:memo/application/widgets/theme/terminal_window.dart';
 /// A terminal-styled component that presents a `Memo` question and answer that can be updated.
 ///
 /// Use [questionController] and [answerController] to control the Memo content being edited.
-class MemoTerminal extends HookWidget {
+class MemoTerminal extends ConsumerWidget {
   const MemoTerminal({
     required this.memoIndex,
     this.questionController,
@@ -37,8 +38,8 @@ class MemoTerminal extends HookWidget {
   final ScrollController? scrollController;
 
   @override
-  Widget build(BuildContext context) {
-    final theme = useTheme();
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = useTheme(ref);
     final textTheme = Theme.of(context).textTheme;
 
     final questionController = this.questionController ?? useTextEditingController();
@@ -79,6 +80,7 @@ class MemoTerminal extends HookWidget {
 
     Future<void> removeDialogConfirmation() => showDestructiveOperationModalBottomSheet(
           context,
+          ref,
           title: strings.removeMemoTitle,
           message: strings.removeMemoMessage,
           destructiveActionTitle: strings.remove.toUpperCase(),

diff --git a/lib/application/widgets/theme/terminal_window.dart b/lib/application/widgets/theme/terminal_window.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:layoutr/common_layout.dart';
 import 'package:memo/application/constants/dimensions.dart' as dimens;
 import 'package:memo/application/theme/theme_controller.dart';
 
 /// A container that decorates [body] with a terminal style.
-class TerminalWindow extends HookWidget {
+class TerminalWindow extends StatelessWidget {
   const TerminalWindow({required this.body, required this.borderColor, required this.fadeGradient});
 
   final Widget body;
@@ -36,15 +36,15 @@ class TerminalWindow extends HookWidget {
   }
 }
 
-class _TerminalHeader extends HookWidget {
+class _TerminalHeader extends ConsumerWidget {
   const _TerminalHeader({required this.fadeGradient});
 
   final List<Color> fadeGradient;
   static const _actionsAmount = 3;
 
   @override
-  Widget build(BuildContext context) {
-    final theme = useTheme();
+  Widget build(BuildContext context, WidgetRef ref) {
+    final theme = useTheme(ref);
 
     final pseudoActions = List.generate(
       _actionsAmount,