[Presentation] Crash fix on the inventory_page.dart

Wolfteam · Jan 9, 2022 · 7ab9e0e · 7ab9e0e
1 parent 294610b
commit 7ab9e0e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/assets/i18n/ru.json b/assets/i18n/ru.json
@@ -10235,7 +10235,7 @@
     {
       "key": "vaporize-reverse",
       "name": "Пар (на оборот)",
-      "effect": "Добавляет х1.5 к урону, если нанести Пиро урон по Крио.",
+      "effect": "Добавляет х1.5 к урону, если нанести Пиро урон по Гидро.",
       "description": null
     },
     {

diff --git a/lib/presentation/inventory/inventory_page.dart b/lib/presentation/inventory/inventory_page.dart
@@ -8,32 +8,17 @@ import 'package:shiori/presentation/inventory/widgets/clear_all_dialog.dart';
 import 'package:shiori/presentation/inventory/widgets/materials_inventory_tab_page.dart';
 import 'package:shiori/presentation/inventory/widgets/weapons_inventory_tab_page.dart';
 import 'package:shiori/presentation/shared/shiori_icons.dart';
+import 'package:shiori/presentation/shared/styles.dart';
 
 class InventoryPage extends StatelessWidget {
-  final tabs = const [
-    Tab(icon: Icon(Icons.people)),
-    Tab(icon: Icon(Shiori.crossed_swords)),
-    Tab(icon: Icon(Shiori.cubes)),
-  ];
-
   @override
   Widget build(BuildContext context) {
-    final s = S.of(context);
     return BlocProvider(
       create: (context) => Injection.inventoryBloc..add(const InventoryEvent.init()),
       child: DefaultTabController(
         length: 3,
         child: Scaffold(
-          appBar: AppBar(
-            title: Text(s.myInventory),
-            bottom: TabBar(tabs: tabs, indicatorColor: Theme.of(context).colorScheme.secondary),
-            actions: [
-              IconButton(
-                icon: const Icon(Icons.clear_all),
-                onPressed: () => _showClearInventoryDialog(context),
-              )
-            ],
-          ),
+          appBar: const _AppBar(),
           body: SafeArea(
             child: TabBarView(
               children: [
@@ -47,14 +32,41 @@ class InventoryPage extends StatelessWidget {
       ),
     );
   }
+}
+
+class _AppBar extends StatelessWidget implements PreferredSizeWidget {
+  const _AppBar({Key? key}) : super(key: key);
 
-  Future<void> _showClearInventoryDialog(BuildContext context) async {
-    await showDialog(
-      context: context,
-      builder: (_) => BlocProvider.value(
-        value: context.read<InventoryBloc>(),
-        child: const ClearAllDialog(),
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return AppBar(
+      title: Text(s.myInventory),
+      bottom: TabBar(
+        tabs: const [
+          Tab(icon: Icon(Icons.people)),
+          Tab(icon: Icon(Shiori.crossed_swords)),
+          Tab(icon: Icon(Shiori.cubes)),
+        ],
+        indicatorColor: Theme.of(context).colorScheme.secondary,
       ),
+      actions: [
+        IconButton(
+          icon: const Icon(Icons.clear_all),
+          splashRadius: Styles.mediumButtonSplashRadius,
+          onPressed: () => showDialog(
+            context: context,
+            builder: (_) => BlocProvider.value(
+              value: context.read<InventoryBloc>(),
+              child: const ClearAllDialog(),
+            ),
+          ),
+        )
+      ],
     );
   }
+
+  @override
+  //toolbar + tabbar + indicator height
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight + 46 + 2);
 }