[Presentation] Added the reset filters button to the materials and mo…

…nsters page
Wolfteam · Jul 11, 2021 · 1a53e88 · 1a53e88
1 parent ce05dab
commit 1a53e88
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 16 deletions.
diff --git a/lib/presentation/materials/widgets/material_bottom_sheet.dart b/lib/presentation/materials/widgets/material_bottom_sheet.dart
@@ -11,6 +11,7 @@ import 'package:genshindb/presentation/shared/item_popupmenu_filter.dart';
 import 'package:genshindb/presentation/shared/loading.dart';
 import 'package:genshindb/presentation/shared/rarity_rating.dart';
 import 'package:genshindb/presentation/shared/sort_direction_popupmenu_filter.dart';
+import 'package:genshindb/presentation/shared/styles.dart';
 
 class MaterialBottomSheet extends StatelessWidget {
   final ignoredSubStats = [
@@ -22,18 +23,13 @@ class MaterialBottomSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
+    final theme = Theme.of(context);
 
     return CommonBottomSheet(
       titleIcon: GenshinDb.filter,
       title: s.filters,
-      onOk: () {
-        context.read<MaterialsBloc>().add(const MaterialsEvent.applyFilterChanges());
-        Navigator.pop(context);
-      },
-      onCancel: () {
-        context.read<MaterialsBloc>().add(const MaterialsEvent.cancelChanges());
-        Navigator.pop(context);
-      },
+      showOkButton: false,
+      showCancelButton: false,
       child: BlocBuilder<MaterialsBloc, MaterialsState>(
         builder: (context, state) => state.map(
           loading: (_) => const Loading(),
@@ -71,6 +67,32 @@ class MaterialBottomSheet extends StatelessWidget {
                   )
                 ],
               ),
+              ButtonBar(
+                buttonPadding: Styles.edgeInsetHorizontal10,
+                children: <Widget>[
+                  OutlinedButton(
+                    onPressed: () {
+                      context.read<MaterialsBloc>().add(const MaterialsEvent.cancelChanges());
+                      Navigator.pop(context);
+                    },
+                    child: Text(s.cancel, style: TextStyle(color: theme.primaryColor)),
+                  ),
+                  OutlinedButton(
+                    onPressed: () {
+                      context.read<MaterialsBloc>().add(const MaterialsEvent.resetFilters());
+                      Navigator.pop(context);
+                    },
+                    child: Text(s.reset, style: TextStyle(color: theme.primaryColor)),
+                  ),
+                  ElevatedButton(
+                    onPressed: () {
+                      context.read<MaterialsBloc>().add(const MaterialsEvent.applyFilterChanges());
+                      Navigator.pop(context);
+                    },
+                    child: Text(s.ok),
+                  )
+                ],
+              ),
             ],
           ),
         ),

diff --git a/lib/presentation/monsters/widgets/monster_bottom_sheet.dart b/lib/presentation/monsters/widgets/monster_bottom_sheet.dart
@@ -9,23 +9,19 @@ import 'package:genshindb/presentation/shared/genshin_db_icons.dart';
 import 'package:genshindb/presentation/shared/item_popupmenu_filter.dart';
 import 'package:genshindb/presentation/shared/loading.dart';
 import 'package:genshindb/presentation/shared/sort_direction_popupmenu_filter.dart';
+import 'package:genshindb/presentation/shared/styles.dart';
 
 class MonsterBottomSheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
+    final theme = Theme.of(context);
 
     return CommonBottomSheet(
       titleIcon: GenshinDb.filter,
       title: s.filters,
-      onOk: () {
-        context.read<MonstersBloc>().add(const MonstersEvent.applyFilterChanges());
-        Navigator.pop(context);
-      },
-      onCancel: () {
-        context.read<MonstersBloc>().add(const MonstersEvent.cancelChanges());
-        Navigator.pop(context);
-      },
+      showCancelButton: false,
+      showOkButton: false,
       child: BlocBuilder<MonstersBloc, MonstersState>(
         builder: (context, state) => state.map(
           loading: (_) => const Loading(),
@@ -57,6 +53,32 @@ class MonsterBottomSheet extends StatelessWidget {
                   )
                 ],
               ),
+              ButtonBar(
+                buttonPadding: Styles.edgeInsetHorizontal10,
+                children: <Widget>[
+                  OutlinedButton(
+                    onPressed: () {
+                      context.read<MonstersBloc>().add(const MonstersEvent.cancelChanges());
+                      Navigator.pop(context);
+                    },
+                    child: Text(s.cancel, style: TextStyle(color: theme.primaryColor)),
+                  ),
+                  OutlinedButton(
+                    onPressed: () {
+                      context.read<MonstersBloc>().add(const MonstersEvent.resetFilters());
+                      Navigator.pop(context);
+                    },
+                    child: Text(s.reset, style: TextStyle(color: theme.primaryColor)),
+                  ),
+                  ElevatedButton(
+                    onPressed: () {
+                      context.read<MonstersBloc>().add(const MonstersEvent.applyFilterChanges());
+                      Navigator.pop(context);
+                    },
+                    child: Text(s.ok),
+                  )
+                ],
+              ),
             ],
           ),
         ),