From af9b666e305e07c0811c18f883b7700d72f4f8bc Mon Sep 17 00:00:00 2001
From: Gabby Gurdin <ggurdin@gmail.com>
Date: Sun, 11 Feb 2024 11:27:35 -0500
Subject: [PATCH] remove expanded widget

---
 lib/pangea/widgets/igc/word_data_card.dart | 110 ++++++++++-----------
 1 file changed, 53 insertions(+), 57 deletions(-)

diff --git a/lib/pangea/widgets/igc/word_data_card.dart b/lib/pangea/widgets/igc/word_data_card.dart
index 2ef498887..9cf3da98f 100644
--- a/lib/pangea/widgets/igc/word_data_card.dart
+++ b/lib/pangea/widgets/igc/word_data_card.dart
@@ -1,12 +1,5 @@
 import 'dart:developer';
 
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:http/http.dart';
-import 'package:matrix/matrix.dart';
-
 import 'package:fluffychat/pangea/constants/language_keys.dart';
 import 'package:fluffychat/pangea/controllers/contextual_definition_controller.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
@@ -18,6 +11,12 @@ import 'package:fluffychat/pangea/widgets/common/bot_face_svg.dart';
 import 'package:fluffychat/pangea/widgets/common/p_circular_loader.dart';
 import 'package:fluffychat/pangea/widgets/igc/card_header.dart';
 import 'package:fluffychat/widgets/matrix.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:http/http.dart';
+import 'package:matrix/matrix.dart';
+
 import '../../models/word_data_model.dart';
 import '../flag.dart';
 import 'card_error_widget.dart';
@@ -178,57 +177,54 @@ class WordDataCardView extends StatelessWidget {
     return Scrollbar(
       thumbVisibility: true,
       controller: scrollController,
-      child: Expanded(
-        child: SingleChildScrollView(
-          controller: scrollController,
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              CardHeader(
-                text: controller.widget.word,
-                botExpression: BotExpression.down,
+      child: SingleChildScrollView(
+        controller: scrollController,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            CardHeader(
+              text: controller.widget.word,
+              botExpression: BotExpression.down,
+            ),
+            if (controller.widget.choiceFeedback != null)
+              Text(
+                controller.widget.choiceFeedback!,
+                style: BotStyle.text(context),
               ),
-              if (controller.widget.choiceFeedback != null)
-                Text(
-                  controller.widget.choiceFeedback!,
-                  style: BotStyle.text(context),
-                ),
-              const SizedBox(height: 5.0),
-              if (controller.wordData != null &&
-                  controller.wordNetError == null)
-                WordNetInfo(
-                  wordData: controller.wordData!,
-                  activeL1: controller.activeL1!,
-                  activeL2: controller.activeL2!,
-                ),
-              if (controller.isLoadingWordNet) const PCircular(),
-              const SizedBox(height: 5.0),
-              // if (controller.widget.hasInfo &&
-              //     !controller.isLoadingContextualDefinition &&
-              //     controller.contextualDefinitionRes == null)
-              //   Material(
-              //     type: MaterialType.transparency,
-              //     child: ListTile(
-              //       leading: const BotFace(
-              //           width: 40, expression: BotExpression.surprised),
-              //       title: Text(L10n.of(context)!.askPangeaBot),
-              //       onTap: controller.handleGetDefinitionButtonPress,
-              //     ),
-              //   ),
-              if (controller.isLoadingContextualDefinition) const PCircular(),
-              if (controller.contextualDefinitionRes != null)
-                Text(
-                  controller.contextualDefinitionRes!.text,
-                  style: BotStyle.text(context),
-                ),
-              if (controller.definitionError != null)
-                Text(
-                  L10n.of(context)!.sorryNoResults,
-                  style: BotStyle.text(context),
-                ),
-            ],
-          ),
+            const SizedBox(height: 5.0),
+            if (controller.wordData != null && controller.wordNetError == null)
+              WordNetInfo(
+                wordData: controller.wordData!,
+                activeL1: controller.activeL1!,
+                activeL2: controller.activeL2!,
+              ),
+            if (controller.isLoadingWordNet) const PCircular(),
+            const SizedBox(height: 5.0),
+            // if (controller.widget.hasInfo &&
+            //     !controller.isLoadingContextualDefinition &&
+            //     controller.contextualDefinitionRes == null)
+            //   Material(
+            //     type: MaterialType.transparency,
+            //     child: ListTile(
+            //       leading: const BotFace(
+            //           width: 40, expression: BotExpression.surprised),
+            //       title: Text(L10n.of(context)!.askPangeaBot),
+            //       onTap: controller.handleGetDefinitionButtonPress,
+            //     ),
+            //   ),
+            if (controller.isLoadingContextualDefinition) const PCircular(),
+            if (controller.contextualDefinitionRes != null)
+              Text(
+                controller.contextualDefinitionRes!.text,
+                style: BotStyle.text(context),
+              ),
+            if (controller.definitionError != null)
+              Text(
+                L10n.of(context)!.sorryNoResults,
+                style: BotStyle.text(context),
+              ),
+          ],
         ),
       ),
     );