refactor: remove flex

johannesvedder · Apr 16, 2024 · 6509e85 · 6509e85
1 parent 01133cc
commit 6509e85
Showing 1 changed file with 21 additions and 25 deletions.
diff --git a/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart b/app/lib/screens/study/tasks/observation/questionnaire_task_widget.dart
@@ -40,27 +40,24 @@ class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final questionnaireWidget = QuestionnaireWidget(
-      widget.task.questions.questions,
-      header: widget.task.header,
-      footer: widget.task.footer,
-      onChange: _responseValidator,
-      onComplete: (qs) => setState(() {
-        response = qs;
-      }),
-    );
-    return Flex(direction: Axis.vertical, children: [
-      Expanded(
-        child: Column(
-          children: [
-            Expanded(
-              child: Form(
-                key: formKey,
-                child: questionnaireWidget,
-              ),
+    return Column(
+      children: [
+        Expanded(
+          child: Form(
+            key: formKey,
+            child: QuestionnaireWidget(
+              widget.task.questions.questions,
+              header: widget.task.header,
+              footer: widget.task.footer,
+              onChange: _responseValidator,
+              onComplete: (qs) => setState(() {
+                response = qs;
+              }),
             ),
-            if (response != null && responseValidator)
-              ElevatedButton.icon(
+          ),
+        ),
+        response != null && responseValidator
+            ? ElevatedButton.icon(
                 style: ButtonStyle(backgroundColor: MaterialStateProperty.all<Color>(Colors.green)),
                 onPressed: () async {
                   if (isRedundantClick(loginClickTime)) {
@@ -83,11 +80,10 @@ class _QuestionnaireTaskWidgetState extends State<QuestionnaireTaskWidget> {
                 },
                 icon: _isLoading ? const CircularProgressIndicator(color: Colors.white) : const Icon(Icons.check),
                 label: Text(AppLocalizations.of(context)!.complete),
-              ),
-          ],
-        ),
-      )
-    ]);
+              )
+            : const SizedBox.shrink(),
+      ],
+    );
   }
 
   void _responseValidator(QuestionnaireState qs) {