[Presentation] Added an option to set the axis size on the loading an…

…d nothing found columns
Wolfteam · May 23, 2022 · ec36cb3 · ec36cb3
1 parent 0c47420
commit ec36cb3
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 31 deletions.
diff --git a/lib/presentation/shared/dialogs/birthdays_per_month_dialog.dart b/lib/presentation/shared/dialogs/birthdays_per_month_dialog.dart
@@ -9,6 +9,7 @@ import 'package:shiori/injection.dart';
 import 'package:shiori/presentation/shared/dialogs/dialog_list_item_row.dart';
 import 'package:shiori/presentation/shared/extensions/media_query_extensions.dart';
 import 'package:shiori/presentation/shared/loading.dart';
+import 'package:shiori/presentation/shared/nothing_found_column.dart';
 
 class BirthdaysPerMonthDialog extends StatelessWidget {
   final int month;
@@ -48,24 +49,26 @@ class BirthdaysPerMonthDialog extends StatelessWidget {
         ],
         content: BlocBuilder<BirthdaysPerMonthBloc, BirthdaysPerMonthState>(
           builder: (context, state) => state.maybeMap(
-            loaded: (state) => SizedBox(
-              height: mq.getHeightForDialogs(state.characters.length + state.characters.length ~/ 2),
-              width: mq.getWidthForDialogs(),
-              child: ListView.builder(
-                itemCount: state.characters.length,
-                itemBuilder: (context, index) {
-                  final char = state.characters[index];
-                  return DialogListItemRow(
-                    itemType: ItemType.character,
-                    itemKey: char.key,
-                    image: char.image,
-                    name: char.name,
-                    getRowEndWidget: (_) => _RowEndColumn(character: char),
-                  );
-                },
-              ),
-            ),
-            orElse: () => const Loading(useScaffold: false),
+            loaded: (state) => state.characters.isEmpty
+                ? const NothingFoundColumn(mainAxisSize: MainAxisSize.min)
+                : SizedBox(
+                    height: mq.getHeightForDialogs(state.characters.length + state.characters.length ~/ 2),
+                    width: mq.getWidthForDialogs(),
+                    child: ListView.builder(
+                      itemCount: state.characters.length,
+                      itemBuilder: (context, index) {
+                        final char = state.characters[index];
+                        return DialogListItemRow(
+                          itemType: ItemType.character,
+                          itemKey: char.key,
+                          image: char.image,
+                          name: char.name,
+                          getRowEndWidget: (_) => _RowEndColumn(character: char),
+                        );
+                      },
+                    ),
+                  ),
+            orElse: () => const Loading(useScaffold: false, mainAxisSize: MainAxisSize.min),
           ),
         ),
       ),

diff --git a/lib/presentation/shared/dialogs/changelog_dialog.dart b/lib/presentation/shared/dialogs/changelog_dialog.dart
@@ -22,7 +22,7 @@ class ChangelogDialog extends StatelessWidget {
           child: SingleChildScrollView(
             child: BlocBuilder<ChangelogBloc, ChangelogState>(
               builder: (ctx, state) => state.map(
-                loading: (_) => const Loading(useScaffold: false),
+                loading: (_) => const Loading(useScaffold: false, mainAxisSize: MainAxisSize.min),
                 loadedState: (state) => MarkdownBody(data: state.changelog),
               ),
             ),

diff --git a/lib/presentation/shared/dialogs/characters_per_region_dialog.dart b/lib/presentation/shared/dialogs/characters_per_region_dialog.dart
@@ -49,7 +49,7 @@ class CharactersPerRegionDialog extends StatelessWidget {
         content: BlocBuilder<CharactersPerRegionBloc, CharactersPerRegionState>(
           builder: (context, state) => state.maybeMap(
             loaded: (state) => state.items.isEmpty
-                ? const NothingFoundColumn()
+                ? const NothingFoundColumn(mainAxisSize: MainAxisSize.min)
                 : SizedBox(
                     height: mq.getHeightForDialogs(state.items.length + 1),
                     width: mq.getWidthForDialogs(),
@@ -58,7 +58,7 @@ class CharactersPerRegionDialog extends StatelessWidget {
                       itemBuilder: (context, index) => DialogListItemRow.fromItem(itemType: ItemType.character, item: state.items[index]),
                     ),
                   ),
-            orElse: () => const Loading(useScaffold: false),
+            orElse: () => const Loading(useScaffold: false, mainAxisSize: MainAxisSize.min),
           ),
         ),
       ),

diff --git a/lib/presentation/shared/dialogs/items_ascension_stats_dialog.dart b/lib/presentation/shared/dialogs/items_ascension_stats_dialog.dart
@@ -8,6 +8,7 @@ import 'package:shiori/presentation/shared/dialogs/dialog_list_item_row.dart';
 import 'package:shiori/presentation/shared/extensions/i18n_extensions.dart';
 import 'package:shiori/presentation/shared/extensions/media_query_extensions.dart';
 import 'package:shiori/presentation/shared/loading.dart';
+import 'package:shiori/presentation/shared/nothing_found_column.dart';
 
 class ItemsAscensionStatsDialog extends StatelessWidget {
   final ItemType itemType;
@@ -50,15 +51,17 @@ class ItemsAscensionStatsDialog extends StatelessWidget {
         ],
         content: BlocBuilder<ItemsAscensionStatsBloc, ItemsAscensionStatsState>(
           builder: (context, state) => state.maybeMap(
-            loaded: (state) => SizedBox(
-              height: mq.getHeightForDialogs(state.items.length + 1),
-              width: mq.getWidthForDialogs(),
-              child: ListView.builder(
-                itemCount: state.items.length,
-                itemBuilder: (context, index) => DialogListItemRow.fromItem(itemType: itemType, item: state.items[index]),
-              ),
-            ),
-            orElse: () => const Loading(useScaffold: false),
+            loaded: (state) => state.items.isEmpty
+                ? const NothingFoundColumn(mainAxisSize: MainAxisSize.min)
+                : SizedBox(
+                    height: mq.getHeightForDialogs(state.items.length + 1),
+                    width: mq.getWidthForDialogs(),
+                    child: ListView.builder(
+                      itemCount: state.items.length,
+                      itemBuilder: (context, index) => DialogListItemRow.fromItem(itemType: itemType, item: state.items[index]),
+                    ),
+                  ),
+            orElse: () => const Loading(useScaffold: false, mainAxisSize: MainAxisSize.min),
           ),
         ),
       ),

diff --git a/lib/presentation/shared/loading.dart b/lib/presentation/shared/loading.dart
@@ -3,13 +3,19 @@ import 'package:shiori/generated/l10n.dart';
 
 class Loading extends StatelessWidget {
   final bool useScaffold;
-  const Loading({this.useScaffold = true});
+  final MainAxisSize mainAxisSize;
+
+  const Loading({
+    this.useScaffold = true,
+    this.mainAxisSize = MainAxisSize.max,
+  });
 
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
     final body = Column(
       mainAxisAlignment: MainAxisAlignment.center,
+      mainAxisSize: mainAxisSize,
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: <Widget>[
         const Center(

diff --git a/lib/presentation/shared/nothing_found_column.dart b/lib/presentation/shared/nothing_found_column.dart
@@ -6,17 +6,20 @@ class NothingFoundColumn extends StatelessWidget {
   final String? msg;
   final IconData icon;
   final EdgeInsets padding;
+  final MainAxisSize mainAxisSize;
 
   const NothingFoundColumn({
     this.msg,
     this.icon = Icons.info,
     this.padding = const EdgeInsets.only(bottom: 30, right: 20, left: 20),
+    this.mainAxisSize = MainAxisSize.max,
   });
 
   @override
   Widget build(BuildContext context) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
+      mainAxisSize: mainAxisSize,
       children: [NothingFound(msg: msg, icon: icon, padding: padding)],
     );
   }