Merge pull request #622 from ibrahimozkn/hpi-studyu/fix/ui-fix

fix: UI overflows
hpi-studyu · May 25, 2024 · d7498b2 · d7498b2
2 parents 019541f + 22a958c
commit d7498b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/app/lib/screens/study/dashboard/dashboard.dart b/app/lib/screens/study/dashboard/dashboard.dart
@@ -312,7 +312,7 @@ class StudyFinishedPlaceholder extends StatelessWidget {
     const fontSize = 30.0;
     const textStyle = TextStyle(fontSize: fontSize);
     final theme = Theme.of(context);
-    return Center(
+    return SingleChildScrollView(
       child: Padding(
         padding: const EdgeInsets.fromLTRB(32, 32, 32, 32),
         child: Column(

diff --git a/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart b/app/lib/screens/study/dashboard/task_overview_tab/task_overview.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
@@ -79,7 +80,7 @@ class _TaskOverviewState extends State<TaskOverview> {
               const SizedBox(height: 16),
               Row(
                 children: [
-                  Text(AppLocalizations.of(context)!.intervention_current, style: theme.textTheme.titleLarge),
+                  Expanded(child: Text(AppLocalizations.of(context)!.intervention_current, style: theme.textTheme.titleLarge)),
                   const Spacer(),
                   Text(
                     '${widget.subject!.daysLeftForPhase(widget.subject!.getInterventionIndexForDate(DateTime.now()))} ${AppLocalizations.of(context)!.days_left}',

diff --git a/app/lib/screens/study/report/report_history.dart b/app/lib/screens/study/report/report_history.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
@@ -61,9 +62,12 @@ class ReportHistoryItem extends StatelessWidget {
                   MdiIcons.fromString(subject.study.iconName) ?? MdiIcons.accountHeart,
                   color: isActiveStudy ? Colors.white : Colors.black,
                 ),
-                Text(
-                  subject.study.title!,
-                  style: theme.textTheme.headlineSmall!.copyWith(color: isActiveStudy ? Colors.white : Colors.black),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: Text(
+                    subject.study.title!,
+                    style: theme.textTheme.headlineSmall!.copyWith(color: isActiveStudy ? Colors.white : Colors.black),
+                  ),
                 ),
               ],
             ),