[Presentation] Minor rename

Wolfteam · Jul 13, 2021 · b9a0f07 · b9a0f07
1 parent 5dad0d3
commit b9a0f07
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/lib/presentation/artifacts/artifacts_page.dart b/lib/presentation/artifacts/artifacts_page.dart
@@ -80,7 +80,7 @@ class _ArtifactsPageState extends State<ArtifactsPage> with AutomaticKeepAliveCl
     return SliverPadding(
       padding: const EdgeInsets.symmetric(horizontal: 5),
       sliver: SliverStaggeredGrid.countBuilder(
-        crossAxisCount: GridUtils.getCrossAxisCount(context),
+        crossAxisCount: GridUtils.getCrossAxisCountForGrids(context),
         itemBuilder: (ctx, index) => ArtifactCard.item(item: artifacts[index], isInSelectionMode: widget.isInSelectionMode),
         itemCount: artifacts.length,
         crossAxisSpacing: isPortrait ? 10 : 5,

diff --git a/lib/presentation/characters/characters_page.dart b/lib/presentation/characters/characters_page.dart
@@ -83,7 +83,7 @@ class _CharactersPageState extends State<CharactersPage> with AutomaticKeepAlive
     return SliverPadding(
       padding: const EdgeInsets.symmetric(horizontal: 5),
       sliver: SliverStaggeredGrid.countBuilder(
-        crossAxisCount: GridUtils.getCrossAxisCount(context),
+        crossAxisCount: GridUtils.getCrossAxisCountForGrids(context),
         itemBuilder: (ctx, index) => CharacterCard.item(char: characters[index], isInSelectionMode: widget.isInSelectionMode),
         itemCount: characters.length,
         crossAxisSpacing: isPortrait ? 10 : 5,

diff --git a/lib/presentation/inventory/widgets/characters_inventory_tab_page.dart b/lib/presentation/inventory/widgets/characters_inventory_tab_page.dart
@@ -8,6 +8,7 @@ import 'package:genshindb/presentation/characters/widgets/character_card.dart';
 import 'package:genshindb/presentation/shared/app_fab.dart';
 import 'package:genshindb/presentation/shared/loading.dart';
 import 'package:genshindb/presentation/shared/mixins/app_fab_mixin.dart';
+import 'package:genshindb/presentation/shared/utils/grid_utils.dart';
 
 class CharactersInventoryTabPage extends StatefulWidget {
   @override
@@ -39,7 +40,7 @@ class _CharactersInventoryTabPageState extends State<CharactersInventoryTabPage>
             loading: (_) => const Loading(useScaffold: false),
             loaded: (state) => StaggeredGridView.countBuilder(
               controller: scrollController,
-              crossAxisCount: isPortrait ? 2 : 3,
+              crossAxisCount: GridUtils.getCrossAxisCountForGrids(context),
               itemBuilder: (ctx, index) => CharacterCard.item(char: state.characters[index]),
               itemCount: state.characters.length,
               crossAxisSpacing: isPortrait ? 10 : 5,

diff --git a/lib/presentation/inventory/widgets/materials_inventory_tab_page.dart b/lib/presentation/inventory/widgets/materials_inventory_tab_page.dart
@@ -5,6 +5,7 @@ import 'package:genshindb/application/bloc.dart';
 import 'package:genshindb/presentation/materials/widgets/material_card.dart';
 import 'package:genshindb/presentation/shared/loading.dart';
 import 'package:genshindb/presentation/shared/mixins/app_fab_mixin.dart';
+import 'package:genshindb/presentation/shared/utils/grid_utils.dart';
 
 class MaterialsInventoryTabPage extends StatefulWidget {
   @override
@@ -24,7 +25,7 @@ class _MaterialsInventoryTabPageState extends State<MaterialsInventoryTabPage> w
             loading: (_) => const Loading(useScaffold: false),
             loaded: (state) => StaggeredGridView.countBuilder(
               controller: scrollController,
-              crossAxisCount: isPortrait ? 3 : 5,
+              crossAxisCount: GridUtils.getCrossAxisCountForGrids(context, forPortrait: 3),
               itemBuilder: (ctx, index) => MaterialCard.quantity(item: state.materials[index]),
               itemCount: state.materials.length,
               crossAxisSpacing: isPortrait ? 10 : 5,

diff --git a/lib/presentation/inventory/widgets/weapons_inventory_tab_page.dart b/lib/presentation/inventory/widgets/weapons_inventory_tab_page.dart
@@ -6,6 +6,7 @@ import 'package:genshindb/domain/extensions/string_extensions.dart';
 import 'package:genshindb/presentation/shared/app_fab.dart';
 import 'package:genshindb/presentation/shared/loading.dart';
 import 'package:genshindb/presentation/shared/mixins/app_fab_mixin.dart';
+import 'package:genshindb/presentation/shared/utils/grid_utils.dart';
 import 'package:genshindb/presentation/weapons/weapons_page.dart';
 import 'package:genshindb/presentation/weapons/widgets/weapon_card.dart';
 
@@ -39,7 +40,7 @@ class _WeaponsInventoryTabPageState extends State<WeaponsInventoryTabPage> with
             loading: (_) => const Loading(useScaffold: false),
             loaded: (state) => StaggeredGridView.countBuilder(
               controller: scrollController,
-              crossAxisCount: isPortrait ? 2 : 3,
+              crossAxisCount: GridUtils.getCrossAxisCountForGrids(context),
               itemBuilder: (ctx, index) => WeaponCard.item(weapon: state.weapons[index]),
               itemCount: state.weapons.length,
               crossAxisSpacing: isPortrait ? 10 : 5,

diff --git a/lib/presentation/shared/utils/grid_utils.dart b/lib/presentation/shared/utils/grid_utils.dart
@@ -2,18 +2,18 @@ import 'package:flutter/material.dart';
 import 'package:responsive_builder/responsive_builder.dart';
 
 class GridUtils {
-  static int getCrossAxisCount(BuildContext context) {
+  static int getCrossAxisCountForGrids(BuildContext context, {int? forPortrait, int? forLandscape}) {
     final isPortrait = MediaQuery.of(context).orientation == Orientation.portrait;
     final size = MediaQuery.of(context).size;
     final deviceType = getDeviceType(size);
     final refinedSize = getRefinedSize(size);
     int crossAxisCount = 2;
     switch (deviceType) {
       case DeviceScreenType.mobile:
-        crossAxisCount = isPortrait ? 2 : 3;
+        crossAxisCount = isPortrait ? forPortrait ?? 2 : forLandscape ?? 3;
         break;
       case DeviceScreenType.tablet:
-        crossAxisCount = isPortrait ? 3 : 5;
+        crossAxisCount = isPortrait ? forPortrait ?? 3 : forLandscape ?? 5;
         break;
       case DeviceScreenType.desktop:
         switch (refinedSize) {

diff --git a/lib/presentation/weapons/weapons_page.dart b/lib/presentation/weapons/weapons_page.dart
@@ -83,7 +83,7 @@ class _WeaponsPageState extends State<WeaponsPage> with AutomaticKeepAliveClient
     return SliverPadding(
       padding: const EdgeInsets.symmetric(horizontal: 5),
       sliver: SliverStaggeredGrid.countBuilder(
-        crossAxisCount: GridUtils.getCrossAxisCount(context),
+        crossAxisCount: GridUtils.getCrossAxisCountForGrids(context),
         itemBuilder: (ctx, index) {
           final weapon = weapons[index];
           return WeaponCard(