Fix flutter analyze, removed deprecated willpopscope

IMGIITRoorkee · Feb 22, 2024 · 44c9c92 · 44c9c92
1 parent 41b0d4d
commit 44c9c92
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 18 deletions.
diff --git a/noticeboard/lib/bloc/connectivity_status_bloc.dart b/noticeboard/lib/bloc/connectivity_status_bloc.dart
@@ -21,13 +21,19 @@ class ConnectivityStatusBloc {
   ConnectivityStatusBloc._() {
     _eventStream.listen((connectivityEvent) {
       if (connectivityEvent == ConnectivityStatus.notConnected &&
-          previousResult == ConnectivityStatus.connected && context.mounted) {
+          previousResult == ConnectivityStatus.connected &&
+          context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(networkSnackBar);
       } else if (connectivityEvent == ConnectivityStatus.connected &&
-          previousResult == ConnectivityStatus.notConnected && context.mounted) {
+          previousResult == ConnectivityStatus.notConnected &&
+          context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(backOnlineSnackbar);
       }
       previousResult = connectivityEvent;
     });
   }
+
+  void disposeStream() {
+    _eventController.close();
+  }
 }
diff --git a/noticeboard/lib/bloc/list_notices_bloc.dart b/noticeboard/lib/bloc/list_notices_bloc.dart
@@ -314,7 +314,6 @@ class ListNoticesBloc {
             DynamicFetch.fetchInstituteNotices)
           filterResult.endpoint =
               'api/noticeboard/institute_notices/?start=${filterResult.startDate}&end=${filterResult.endDate}';
-        // TODO: Add the if condition for Institute Notices case
       }
       PaginatedInfo paginatedInfo = await _listNoticesRepository
           .fetchFilteredNotices(filterResult.endpoint!, page);

diff --git a/noticeboard/lib/routes/routing.dart b/noticeboard/lib/routes/routing.dart
@@ -6,7 +6,6 @@ import './routing_constants.dart';
 import '../screens/login.dart';
 import '../screens/list_notices.dart';
 import '../screens/launching.dart';
-import '../models/notice_intro.dart';
 import '../screens/notice_detail.dart';
 
 class MyRouter {

diff --git a/noticeboard/lib/screens/bottom_navigation.dart b/noticeboard/lib/screens/bottom_navigation.dart
@@ -55,16 +55,18 @@ class _MyBottomNavigationBarState extends State<MyBottomNavigationBar> {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
+    return PopScope(
+      canPop: false,
+      onPopInvoked: (didPop) async {
+        if (didPop) {
+          return;
+        }
         await Future.delayed(
           Duration(milliseconds: 500),
         );
         if (Platform.isAndroid) {
           SystemNavigator.pop();
-          return true;
         } else {
-          return false;
         }
       },
       child: StreamBuilder<int>(

diff --git a/noticeboard/lib/screens/filters.dart b/noticeboard/lib/screens/filters.dart
@@ -55,7 +55,7 @@ class _FiltersState extends State<Filters> {
                 child: GestureDetector(
                   onTap: () {
                     _filtersBloc.eventSink.add(FilterEvents.resetGlobalSlug);
-                    WidgetsBinding.instance!.addPostFrameCallback((time) {
+                    WidgetsBinding.instance.addPostFrameCallback((time) {
                       onFilterClear();
                     });
                   },

diff --git a/noticeboard/lib/screens/launching.dart b/noticeboard/lib/screens/launching.dart
@@ -12,7 +12,6 @@ import '../models/notice_intro.dart';
 import '../services/api_service/api_service.dart';
 import '../services/auth/auth_repository.dart';
 import '../global/global_functions.dart';
-import '../styles/launching_constants.dart';
 import '../styles/login_constants.dart';
 
 class Launcher extends StatefulWidget {

diff --git a/noticeboard/lib/screens/notice_detail.dart b/noticeboard/lib/screens/notice_detail.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'package:noticeboard/bloc/connectivity_status_bloc.dart';
-import 'package:noticeboard/enum/connectivity_status_enum.dart';
 import 'package:noticeboard/enum/notice_content_enum.dart';
 import 'package:noticeboard/routes/routing_constants.dart';
 import 'package:url_launcher/url_launcher_string.dart';
@@ -23,6 +22,7 @@ class NoticeDetail extends StatefulWidget {
 
 class _NoticeDetailState extends State<NoticeDetail> {
   final NoticeIntro? noticeIntro;
+  // ignore: unused_element
   _NoticeDetailState({this.noticeIntro});
   final ConnectivityStatusBloc _connectivityStatusBloc =
       ConnectivityStatusBloc();
@@ -44,10 +44,10 @@ class _NoticeDetailState extends State<NoticeDetail> {
   @override
   void dispose() {
     _noticeContentBloc.disposeStreams();
-    if(_timer.isActive){
-       _timer.cancel();
+    if (_timer.isActive) {
+      _timer.cancel();
     }
-   
+
     super.dispose();
   }
 
@@ -92,15 +92,18 @@ class _NoticeDetailState extends State<NoticeDetail> {
                 }
               }
             },
-            child: WillPopScope(
-              onWillPop: () async {
+            child: PopScope(
+              canPop: false,
+              onPopInvoked: (didPop) async {
+                if (didPop) {
+                  return;
+                }
                 if (previousRoute == launchingRoute) {
                   navigatorKey.currentState!
                       .pushReplacementNamed(bottomNavigationRoute);
                 } else {
                   navigatorKey.currentState!.pop();
                 }
-                return false;
               },
               child: Container(
                 width: _width,

diff --git a/noticeboard/lib/screens/profile.dart b/noticeboard/lib/screens/profile.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:noticeboard/bloc/connectivity_status_bloc.dart';
-import 'package:noticeboard/enum/connectivity_status_enum.dart';
 import 'package:noticeboard/global/global_constants.dart';
 import 'package:noticeboard/global/global_functions.dart';
 import 'package:noticeboard/models/user_profile.dart';