Fixed Paddings

lib/widgets/buttons/round_button_widget.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 
-class RoundAddButton extends StatelessWidget {
+class RoundIconButton extends StatelessWidget {
   final VoidCallback onPressed;
   final IconData iconData;
 
-  const RoundAddButton(
+  const RoundIconButton(
       {super.key, required this.onPressed, required this.iconData});
 
   @override

lib/widgets/buttons/submit_form_button.dart

@@ -2,6 +2,7 @@ import 'package:awesome_dialog/awesome_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:smoke_cess_app/providers/page_provider.dart';
+import 'package:smoke_cess_app/widgets/buttons/round_button_widget.dart';
 
 class SubmitFormButton extends StatelessWidget {
   final Future<int> Function() submitCallback;
@@ -14,7 +15,7 @@ class SubmitFormButton extends StatelessWidget {
     PageProvider pageProvider = context.watch<PageProvider>();
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 16.0),
-      child: ElevatedButton(
+      child: RoundIconButton(
         onPressed: () async {
           int success = await submitCallback();
           if (context.mounted) {
@@ -37,7 +38,7 @@ class SubmitFormButton extends StatelessWidget {
             }
           }
         },
-        child: const Text('Speichern'),
+        iconData: Icons.check_outlined,
       ),
     );
   }

lib/widgets/entry_detail_title.dart

@@ -11,18 +11,22 @@ class EntryDetailTitle extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      mainAxisAlignment: MainAxisAlignment.start,
       children: [
         Text(
           DateFormat.MMMd('de').format(date),
           style:
               const TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
         ),
-        Text(
+        Flexible(
-          entryData,
+            child: Container(
-          style:
+                padding: const EdgeInsets.symmetric(horizontal: 5.0),
-              const TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
+                child: Text(
-        )
+                  entryData,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(
+                      color: Colors.white, fontWeight: FontWeight.bold),
+                )))
       ],
     );
   }

lib/widgets/entry_detail_widget.dart

@@ -22,33 +22,37 @@ class EntryDetail extends StatelessWidget {
     );
     final Color color = Theme.of(context).colorScheme.primary.withOpacity(0.8);
     final Widget title = EntryDetailTitle(date: date, entryData: entryData);
-    return Card(
+    return entryComment != null
-        child: entryComment != null
+        ? ExpansionTile(
-            ? ExpansionTile(
+            iconColor: Colors.white,
-                iconColor: Colors.white,
+            collapsedIconColor: Colors.white,
-                collapsedIconColor: Colors.white,
+            collapsedShape: shape,
-                collapsedShape: shape,
+            shape: shape,
-                shape: shape,
+            leading: icon,
-                leading: icon,
+            title: title,
-                title: title,
+            collapsedBackgroundColor: color,
-                collapsedBackgroundColor: color,
+            backgroundColor:
-                backgroundColor:
+                Theme.of(context).colorScheme.secondary.withOpacity(0.8),
-                    Theme.of(context).colorScheme.secondary.withOpacity(0.8),
+            children: entryComment != null
-                children: entryComment != null
+                ? [
-                    ? [
+                    Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-                        Text(
+                      Padding(
-                          entryComment ?? '',
+                          padding: const EdgeInsets.fromLTRB(10, 0, 10, 10),
-                          style: const TextStyle(
+                          child: Text(
-                              color: Colors.white, fontWeight: FontWeight.bold),
+                            entryComment ?? '',
-                        )
+                            style: const TextStyle(
-                      ]
+                                color: Colors.white,
-                    : [],
+                                fontWeight: FontWeight.bold),
-              )
+                          ))
-            : ListTile(
+                    ])
-                shape: shape,
+                  ]
-                leading: icon,
+                : [],
-                title: title,
+          )
-                tileColor: color,
+        : ListTile(
-              ));
+            shape: shape,
+            leading: icon,
+            title: title,
+            tileColor: color,
+          );
   }
 }

lib/widgets/history_list_widget.dart

@@ -39,11 +39,13 @@ class HistoryList<T> extends StatelessWidget {
     return Expanded(
         child: ListView(
             children: history.map((T entry) {
-      return EntryDetail(
+      return Padding(
-          date: dateSelector(entry),
+          padding: const EdgeInsets.only(bottom: 5),
-          entryData: entryDataSelector(entry),
+          child: EntryDetail(
-          entryComment: _getComment(entry),
+              date: dateSelector(entry),
-          iconData: _getIcon(entry));
+              entryData: entryDataSelector(entry),
+              entryComment: _getComment(entry),
+              iconData: _getIcon(entry)));
     }).toList()));
   }
 }

lib/widgets/view_form/mood_form.dart

@@ -26,9 +26,6 @@ class MoodForm extends StatelessWidget {
           title: 'Beschreibe deine Stimmung',
           child: MyTextFormField('Beschreibe deine Stimmung'),
         ),
-        const SizedBox(
-          height: 80,
-        ),
         SubmitFormButton(
           submitCallback: inputModel.saveMood,
           updateTasks: () => tasksModel.setTaskDone(Pages.mood),

lib/widgets/view_form/relapse_form.dart

@@ -27,9 +27,6 @@ class RelapseForm extends StatelessWidget {
           title: 'Beschreibe deinen Rückfall',
           child: MyTextFormField('Beschreibe deinen Rückfall'),
         ),
-        const SizedBox(
-          height: 80,
-        ),
         SubmitFormButton(
           submitCallback: inputModel.saveRelapse,
           updateTasks: () => tasksModel.setTaskDone(Pages.mood),

lib/widgets/view_form/relapse_view.dart

@@ -14,7 +14,7 @@ class RelapseView extends StatelessWidget {
       HistoryList<Relapse>(
         history: tasksModel.relapseHistory,
         dateSelector: (Relapse relapse) => relapse.date,
-        entryDataSelector: (Relapse relapse) => 'Grund: ${relapse.category}',
+        entryDataSelector: (Relapse relapse) => relapse.category,
         entryCommentSelector: (Relapse relapse) =>
             'Kommentar: ${relapse.comment}',
         icon: Icons.smoke_free_outlined,

lib/widgets/view_form/sleep_form.dart

@@ -39,9 +39,6 @@ class SleepForm extends StatelessWidget {
           title: 'Schlafbeschreibung',
           child: MyTextFormField('Beschreibe deinen Schlaf'),
         ),
-        const SizedBox(
-          height: 80,
-        ),
         SubmitFormButton(
           submitCallback: () =>
               inputModel.saveSleep(SleepTimes.wokeUpAt, SleepTimes.sleptAt),

lib/widgets/view_form/view_form_page.dart

@@ -21,18 +21,20 @@ class ViewFormPage extends StatelessWidget {
     TasksProvider tasksProvider = context.watch<TasksProvider>();
     return Column(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
       Expanded(
-          child: Center(
+          child: Padding(
-        child: pageProvider.showForm
+              padding: const EdgeInsets.fromLTRB(10, 10, 10, 10),
-            ? ChangeNotifierProvider(
+              child: Center(
-                create: (context) => InputProvider(),
+                child: pageProvider.showForm
-                child: form,
+                    ? ChangeNotifierProvider(
-              )
+                        create: (context) => InputProvider(),
-            : view,
+                        child: form,
-      )),
+                      )
+                    : view,
+              ))),
       if (!pageProvider.showForm)
         Container(
           margin: EdgeInsets.symmetric(vertical: height * 0.02),
-          child: RoundAddButton(
+          child: RoundIconButton(
             iconData: Icons.add_outlined,
             onPressed: tasksProvider.tasks[page] ?? true
                 ? () => pageProvider.swap()