Merge pull request #192 from tusharlock10/develop

Develop

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+flutter analyze

lib/main.dart

@@ -7,7 +7,7 @@ import 'package:paladinsedge/firebase_options.dart' as firebase_options;
 import 'package:paladinsedge/providers/index.dart' as providers;
 import 'package:paladinsedge/screens/index.dart' as screens;
 import 'package:paladinsedge/theme/index.dart' as theme;
-import 'package:paladinsedge/utilities/messaging.dart' as messaging;
+import 'package:paladinsedge/utilities/index.dart' as utilities;
 import 'package:responsive_framework/responsive_framework.dart';
 
 void main() async {
@@ -16,9 +16,9 @@ void main() async {
  options: firebase_options.DefaultFirebaseOptions.currentPlatform,
  );
 
- messaging.Messaging.onMessage();
- messaging.Messaging.onBackgroundMessage();
- messaging.Messaging.registerLocalNotification();
+ utilities.Messaging.onMessage();
+ utilities.Messaging.onBackgroundMessage();
+ utilities.Messaging.registerLocalNotification();
 
  runApp(const ProviderScope(child: PaladinsEdgeApp()));
 }
@@ -33,33 +33,35 @@ class PaladinsEdgeApp extends ConsumerWidget {
 
  return OverlaySupport.global(
  toastTheme: ToastThemeData(alignment: Alignment.bottomCenter),
- child: MaterialApp(
- navigatorObservers: const [],
- debugShowCheckedModeBanner: false,
- themeMode: themeMode,
- theme: theme.lightTheme,
- darkTheme: theme.darkTheme,
- routes: screens.routes,
- title: "Paladins Edge",
- color: Colors.white,
- scrollBehavior: BouncingScrollBehavior(),
- builder: (context, widget) => ResponsiveWrapper.builder(
- widget,
- defaultScale: true,
- breakpoints: [
- const ResponsiveBreakpoint.resize(
- constants.ResponsiveBreakpoints.mobile,
- name: MOBILE,
- ),
- const ResponsiveBreakpoint.autoScale(
- constants.ResponsiveBreakpoints.tablet,
- name: TABLET,
- ),
- const ResponsiveBreakpoint.resize(
- constants.ResponsiveBreakpoints.desktop,
- name: DESKTOP,
- ),
- ],
+ child: GestureDetector(
+ onTap: () => utilities.unFocusNode(context),
+ child: MaterialApp(
+ debugShowCheckedModeBanner: false,
+ themeMode: themeMode,
+ theme: theme.lightTheme,
+ darkTheme: theme.darkTheme,
+ routes: screens.routes,
+ title: "Paladins Edge",
+ color: Colors.white,
+ scrollBehavior: BouncingScrollBehavior(),
+ builder: (context, widget) => ResponsiveWrapper.builder(
+ widget,
+ defaultScale: true,
+ breakpoints: [
+ const ResponsiveBreakpoint.resize(
+ constants.ResponsiveBreakpoints.mobile,
+ name: MOBILE,
+ ),
+ const ResponsiveBreakpoint.autoScale(
+ constants.ResponsiveBreakpoints.tablet,
+ name: TABLET,
+ ),
+ const ResponsiveBreakpoint.resize(
+ constants.ResponsiveBreakpoints.desktop,
+ name: DESKTOP,
+ ),
+ ],
+ ),
  ),
  ),
  );

lib/screens/bottom_tabs/bottom_tabs.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:paladinsedge/data_classes/index.dart' as data_classes;
 import 'package:paladinsedge/screens/index.dart' as screens;
+import 'package:paladinsedge/utilities/index.dart' as utilities;
 import 'package:paladinsedge/widgets/index.dart' as widgets;
 
 class BottomTabs extends HookWidget {
@@ -37,6 +38,8 @@ class BottomTabs extends HookWidget {
  return Scaffold(
  drawer: const widgets.AppDrawer(),
  drawerEnableOpenDragGesture: false,
+ onDrawerChanged: (isOpened) =>
+ isOpened ? utilities.unFocusNode(context) : null,
  body: IndexedStack(
  children: _pages.map((page) => page.screen).toList(),
  index: selectedPageIndex.value,

lib/screens/champions/champion_item.dart

@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:paladinsedge/models/index.dart' as models;
 import 'package:paladinsedge/screens/index.dart' as screens;
 import 'package:paladinsedge/theme/index.dart' as theme;
+import 'package:paladinsedge/utilities/index.dart' as utilities;
 import 'package:paladinsedge/widgets/index.dart' as widgets;
 
-class ChampionItem extends StatelessWidget {
+class ChampionItem extends HookWidget {
  final models.Champion champion;
  final models.PlayerChampion? playerChampion;
  final double height;
@@ -21,12 +23,25 @@ class ChampionItem extends StatelessWidget {
  Widget build(
  BuildContext context,
  ) {
+ // Variables
  final textTheme = Theme.of(context).textTheme;
  MaterialColor levelColor = Colors.blueGrey;
  if (playerChampion?.level != null && playerChampion!.level > 49) {
  levelColor = Colors.orange;
  }
 
+ // Methods
+ final onTapChampion = useCallback(
+ () {
+ utilities.unFocusNode(context);
+ Navigator.of(context).pushNamed(
+ screens.ChampionDetail.routeName,
+ arguments: champion,
+ );
+ },
+ [],
+ );
+
  return SizedBox(
  width: width,
  height: height,
@@ -36,8 +51,7 @@ class ChampionItem extends StatelessWidget {
  ),
  child: InkWell(
  borderRadius: const BorderRadius.all(Radius.circular(15)),
- onTap: () => Navigator.of(context)
- .pushNamed(screens.ChampionDetail.routeName, arguments: champion),
+ onTap: onTapChampion,
  child: Padding(
  padding: const EdgeInsets.all(10),
  child: Row(

lib/screens/search/lower_search_item.dart

@@ -4,6 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:paladinsedge/api/index.dart' as api;
 import 'package:paladinsedge/providers/index.dart' as providers;
 import 'package:paladinsedge/screens/index.dart' as screens;
+import 'package:paladinsedge/utilities/index.dart' as utilities;
 
 class LowerSearchItem extends HookConsumerWidget {
  final api.LowerSearch lowerSearch;
@@ -24,6 +25,7 @@ class LowerSearchItem extends HookConsumerWidget {
  // Methods
  final onTap = useCallback(
  () {
+ utilities.unFocusNode(context);
  playersProvider.setPlayerId(lowerSearch.playerId);
  Navigator.of(context).pushNamed(screens.PlayerDetail.routeName);
  },

lib/screens/search/search.dart

@@ -7,6 +7,7 @@ import 'package:paladinsedge/screens/search/lower_search_list.dart';
 import 'package:paladinsedge/screens/search/search_history.dart';
 import 'package:paladinsedge/screens/search/top_search_bar.dart';
 import 'package:paladinsedge/screens/search/top_search_list.dart';
+import 'package:paladinsedge/utilities/index.dart' as utilities;
 
 class Search extends HookConsumerWidget {
  static const routeName = '/search';
@@ -41,6 +42,7 @@ class Search extends HookConsumerWidget {
  isLoading.value = false;
 
  if (exactMatch) {
+ utilities.unFocusNode(context);
  Navigator.of(context).pushNamed(screens.PlayerDetail.routeName);
  }
  },

lib/screens/search/top_search_item.dart

@@ -5,6 +5,7 @@ import 'package:jiffy/jiffy.dart';
 import 'package:paladinsedge/models/index.dart' as models;
 import 'package:paladinsedge/providers/index.dart' as providers;
 import 'package:paladinsedge/screens/index.dart' as screens;
+import 'package:paladinsedge/utilities/index.dart' as utilities;
 import 'package:paladinsedge/widgets/index.dart' as widgets;
 
 class TopSearchItem extends HookConsumerWidget {
@@ -26,6 +27,7 @@ class TopSearchItem extends HookConsumerWidget {
  // Methods
  final onTap = useCallback(
  () {
+ utilities.unFocusNode(context);
  playersProvider.setPlayerId(player.playerId);
  Navigator.of(context).pushNamed(screens.PlayerDetail.routeName);
  },

lib/utilities/responsive.dart

@@ -16,3 +16,6 @@ T responsiveCondition<T>(
 
  return mobile;
 }
+
+unFocusNode(BuildContext context) =>
+ FocusScope.of(context).requestFocus(FocusNode());

lib/widgets/champion_loadout_card.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:paladinsedge/data_classes/index.dart' as data_classes;
 import 'package:paladinsedge/models/index.dart' as models;
+import 'package:paladinsedge/utilities/index.dart' as utilities;
 import 'package:paladinsedge/widgets/index.dart' as widgets;
 
 class ChampionLoadoutCard extends HookWidget {
@@ -28,6 +29,7 @@ class ChampionLoadoutCard extends HookWidget {
  () {
  if (card == null || champion == null) return;
 
+ utilities.unFocusNode(context);
  widgets.showLoadoutCardDetailSheet(
  data_classes.ShowLoadoutDetailsOptions(
  card: card!,

lib/widgets/loadout_deck_card.dart

@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:paladinsedge/data_classes/index.dart' as data_classes;
 import 'package:paladinsedge/models/index.dart' as models;
 import 'package:paladinsedge/theme/index.dart' as theme;
+import 'package:paladinsedge/utilities/index.dart' as utilities;
 import 'package:paladinsedge/widgets/index.dart' as widgets;
 
-class LoadoutDeckCard extends StatelessWidget {
+class LoadoutDeckCard extends HookWidget {
  final double imageHeight;
  final double imageWidth;
  final models.Card card;
@@ -26,6 +28,24 @@ class LoadoutDeckCard extends StatelessWidget {
 
  @override
  Widget build(BuildContext context) {
+ // Methods
+ final onTapCard = useCallback(
+ () {
+ utilities.unFocusNode(context);
+ widgets.showLoadoutCardDetailSheet(
+ data_classes.ShowLoadoutDetailsOptions(
+ context: context,
+ champion: champion,
+ card: card,
+ cardPoints: loadoutCard.level,
+ onSliderChange: onSliderChange,
+ sliderFixed: sliderFixed,
+ ),
+ );
+ },
+ [],
+ );
+
  return SizedBox(
  height: imageHeight,
  width: imageWidth,
@@ -34,16 +54,7 @@ class LoadoutDeckCard extends StatelessWidget {
  child: ClipRRect(
  borderRadius: const BorderRadius.all(Radius.circular(5)),
  child: GestureDetector(
- onTap: () => widgets.showLoadoutCardDetailSheet(
- data_classes.ShowLoadoutDetailsOptions(
- context: context,
- champion: champion,
- card: card,
- cardPoints: loadoutCard.level,
- onSliderChange: onSliderChange,
- sliderFixed: sliderFixed,
- ),
- ),
+ onTap: onTapCard,
  child: Stack(
  children: [
  SizedBox(

package.json

@@ -0,0 +1,8 @@
+{
+ "devDependencies": {
+ "husky": "^7.0.4"
+ },
+ "scripts": {
+ "prepare": "husky install"
+ }
+}