remove expanded widget

pull/1011/head
Gabby Gurdin 2 years ago
parent 5569747756
commit af9b666e30

@ -1,12 +1,5 @@
import 'dart:developer'; 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/constants/language_keys.dart';
import 'package:fluffychat/pangea/controllers/contextual_definition_controller.dart'; import 'package:fluffychat/pangea/controllers/contextual_definition_controller.dart';
import 'package:fluffychat/pangea/controllers/pangea_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/common/p_circular_loader.dart';
import 'package:fluffychat/pangea/widgets/igc/card_header.dart'; import 'package:fluffychat/pangea/widgets/igc/card_header.dart';
import 'package:fluffychat/widgets/matrix.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 '../../models/word_data_model.dart';
import '../flag.dart'; import '../flag.dart';
import 'card_error_widget.dart'; import 'card_error_widget.dart';
@ -178,57 +177,54 @@ class WordDataCardView extends StatelessWidget {
return Scrollbar( return Scrollbar(
thumbVisibility: true, thumbVisibility: true,
controller: scrollController, controller: scrollController,
child: Expanded( child: SingleChildScrollView(
child: SingleChildScrollView( controller: scrollController,
controller: scrollController, child: Column(
child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ CardHeader(
CardHeader( text: controller.widget.word,
text: controller.widget.word, botExpression: BotExpression.down,
botExpression: BotExpression.down, ),
if (controller.widget.choiceFeedback != null)
Text(
controller.widget.choiceFeedback!,
style: BotStyle.text(context),
), ),
if (controller.widget.choiceFeedback != null) const SizedBox(height: 5.0),
Text( if (controller.wordData != null && controller.wordNetError == null)
controller.widget.choiceFeedback!, WordNetInfo(
style: BotStyle.text(context), wordData: controller.wordData!,
), activeL1: controller.activeL1!,
const SizedBox(height: 5.0), activeL2: controller.activeL2!,
if (controller.wordData != null && ),
controller.wordNetError == null) if (controller.isLoadingWordNet) const PCircular(),
WordNetInfo( const SizedBox(height: 5.0),
wordData: controller.wordData!, // if (controller.widget.hasInfo &&
activeL1: controller.activeL1!, // !controller.isLoadingContextualDefinition &&
activeL2: controller.activeL2!, // controller.contextualDefinitionRes == null)
), // Material(
if (controller.isLoadingWordNet) const PCircular(), // type: MaterialType.transparency,
const SizedBox(height: 5.0), // child: ListTile(
// if (controller.widget.hasInfo && // leading: const BotFace(
// !controller.isLoadingContextualDefinition && // width: 40, expression: BotExpression.surprised),
// controller.contextualDefinitionRes == null) // title: Text(L10n.of(context)!.askPangeaBot),
// Material( // onTap: controller.handleGetDefinitionButtonPress,
// type: MaterialType.transparency, // ),
// child: ListTile( // ),
// leading: const BotFace( if (controller.isLoadingContextualDefinition) const PCircular(),
// width: 40, expression: BotExpression.surprised), if (controller.contextualDefinitionRes != null)
// title: Text(L10n.of(context)!.askPangeaBot), Text(
// onTap: controller.handleGetDefinitionButtonPress, controller.contextualDefinitionRes!.text,
// ), style: BotStyle.text(context),
// ), ),
if (controller.isLoadingContextualDefinition) const PCircular(), if (controller.definitionError != null)
if (controller.contextualDefinitionRes != null) Text(
Text( L10n.of(context)!.sorryNoResults,
controller.contextualDefinitionRes!.text, style: BotStyle.text(context),
style: BotStyle.text(context), ),
), ],
if (controller.definitionError != null)
Text(
L10n.of(context)!.sorryNoResults,
style: BotStyle.text(context),
),
],
),
), ),
), ),
); );

Loading…
Cancel
Save