Merge branch 'main' into dependabot/pub/http-1.1.0

.github/workflows/build-flutter.yml

@@ -1,5 +1,5 @@
 name: Build and Test Flutter App
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test:
@@ -16,7 +16,7 @@ jobs:
           channel: 'stable'
           architecture: x64
       - run: flutter pub get
-      - run: flutter analyze --no-fatal-infos
+      - run: flutter analyze
       - run: flutter build apk
 
       # Upload APK as a build artifact

lib/src/pages/home/home.dart

@@ -211,8 +211,9 @@ class _HomeState extends ConsumerState<Home> {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
+    return PopScope(
+      canPop: false,
+      onPopInvoked: (_) async {
         showGeneralDialog(
           context: context,
           barrierLabel: "Barrier",
@@ -223,7 +224,6 @@ class _HomeState extends ConsumerState<Home> {
             return buildLogOUtDialog();
           },
         );
-        return false;
       },
       child: Scaffold(
         appBar: buildAppBar(context: context),

lib/src/pages/leaderboards/monthly_leaderboard.dart

@@ -75,13 +75,12 @@ class _MonthlyLeaderBoardPageState
   Widget build(BuildContext context) {
     final Size size = MediaQuery.of(context).size;
     final monthlyLeadersState = ref.watch(monthlyLeaderBoardProvider);
-    return WillPopScope(
-        onWillPop: () async {
+    return PopScope(
+        onPopInvoked: (_) async {
           ref
               .watch(monthlyLeaderBoardProvider.notifier)
               .refreshMonthlyLeaderList(
                   DateTime.now().year, DateTime.now().month);
-          return true;
         },
         child: Scaffold(
           appBar: AppBar(

pubspec.yaml

@@ -1,7 +1,7 @@
 name: blt
 description: The BLT-Flutter App
 
-version: 1.0.4+1
+version: 1.0.5+1
 publish_to: none
 
 environment: