chore: upgrade flutter version

JordyHers-org · Oct 8, 2023 · 6450f1e · 6450f1e
1 parent c67d95c
commit 6450f1e
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 41 deletions.
diff --git a/lib/app/pages/notification_page.dart b/lib/app/pages/notification_page.dart
@@ -126,13 +126,13 @@ class _NotificationPageState extends State<NotificationPage> {
                   itemCount: data.length,
                   itemBuilder: (context, index) {
                     return Dismissible(
-                      background: Card(
+                      background: const Card(
                         color: Colors.red,
                         child: Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 8),
+                          padding: EdgeInsets.symmetric(horizontal: 8),
                           child: Row(
                             mainAxisAlignment: MainAxisAlignment.end,
-                            children: const [
+                            children: [
                               Icon(
                                 Icons.delete_forever,
                                 color: Colors.white,

diff --git a/lib/models/child_model/child_model.freezed.dart b/lib/models/child_model/child_model.freezed.dart
@@ -201,8 +201,9 @@ class _$_ChildModel implements _ChildModel {
       this.token,
       this.batteryLevel,
       @AppUsageInfoConverter()
-      final List<AppUsageInfo> appsUsageModel = const <AppUsageInfo>[],
-      @GeoPointConverter() this.position})
+          final List<AppUsageInfo> appsUsageModel = const <AppUsageInfo>[],
+      @GeoPointConverter()
+          this.position})
       : _appsUsageModel = appsUsageModel;
 
   factory _$_ChildModel.fromJson(Map<String, dynamic> json) =>

diff --git a/test/helpers/test_helpers.mocks.dart b/test/helpers/test_helpers.mocks.dart
@@ -1,31 +1,32 @@
-// Mocks generated by Mockito 5.4.0 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in times_up_flutter/test/helpers/test_helpers.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
 
-import 'package:cloud_firestore/cloud_firestore.dart' as _i13;
+import 'package:cloud_firestore/cloud_firestore.dart' as _i14;
 import 'package:firebase_auth/firebase_auth.dart' as _i2;
 import 'package:firebase_auth_platform_interface/firebase_auth_platform_interface.dart'
-    as _i14;
+    as _i15;
 import 'package:firebase_messaging/firebase_messaging.dart' as _i8;
-import 'package:flutter/material.dart' as _i15;
+import 'package:flutter/material.dart' as _i16;
 import 'package:flutter_local_notifications/flutter_local_notifications.dart'
     as _i7;
 import 'package:geolocator/geolocator.dart' as _i4;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:times_up_flutter/models/child_model/child_model.dart' as _i3;
+import 'package:times_up_flutter/models/email_model.dart' as _i13;
 import 'package:times_up_flutter/models/notification_model/notification_model.dart'
     as _i12;
-import 'package:times_up_flutter/services/app_usage_local_service.dart' as _i18;
+import 'package:times_up_flutter/services/app_usage_local_service.dart' as _i19;
 import 'package:times_up_flutter/services/app_usage_service.dart' as _i11;
 import 'package:times_up_flutter/services/auth.dart' as _i5;
 import 'package:times_up_flutter/services/database.dart' as _i10;
 import 'package:times_up_flutter/services/geo_locator_service.dart' as _i6;
-import 'package:times_up_flutter/services/notification_service.dart' as _i19;
-import 'package:times_up_flutter/sign_in/email_sign_in_bloc.dart' as _i16;
-import 'package:times_up_flutter/sign_in/email_sign_in_model.dart' as _i17;
+import 'package:times_up_flutter/services/notification_service.dart' as _i20;
+import 'package:times_up_flutter/sign_in/email_sign_in_bloc.dart' as _i17;
+import 'package:times_up_flutter/sign_in/email_sign_in_model.dart' as _i18;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -168,6 +169,21 @@ class _FakeFirebaseMessaging_11 extends _i1.SmartFake
 /// See the documentation for Mockito's code generation for more information.
 class MockAuthBase extends _i1.Mock implements _i5.AuthBase {
   @override
+  bool get isFirstLogin => (super.noSuchMethod(
+        Invocation.getter(#isFirstLogin),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+  @override
+  void setFirstLogin({bool? isFirstLogin}) => super.noSuchMethod(
+        Invocation.method(
+          #setFirstLogin,
+          [],
+          {#isFirstLogin: isFirstLogin},
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
   _i9.Future<_i2.User> signInAnonymously() => (super.noSuchMethod(
         Invocation.method(
           #signInAnonymously,
@@ -443,10 +459,21 @@ class MockDatabase extends _i1.Mock implements _i10.Database {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
+  _i9.Future<void> sendEmail({required _i13.EmailModel? email}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #sendEmail,
+          [],
+          {#email: email},
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
   _i9.Future<_i3.ChildModel> getUserCurrentChild(
     String? key,
     _i11.AppUsageService? apps,
-    _i13.GeoPoint? latLong, {
+    _i14.GeoPoint? latLong, {
     String? battery,
   }) =>
       (super.noSuchMethod(
@@ -665,7 +692,7 @@ class MockUser extends _i1.Mock implements _i2.User {
       ) as _i9.Future<_i2.UserCredential>);
   @override
   _i9.Future<_i2.UserCredential> linkWithProvider(
-          _i14.AuthProvider? provider) =>
+          _i15.AuthProvider? provider) =>
       (super.noSuchMethod(
         Invocation.method(
           #linkWithProvider,
@@ -689,7 +716,7 @@ class MockUser extends _i1.Mock implements _i2.User {
       ) as _i9.Future<_i2.UserCredential>);
   @override
   _i9.Future<_i2.UserCredential> reauthenticateWithProvider(
-          _i14.AuthProvider? provider) =>
+          _i15.AuthProvider? provider) =>
       (super.noSuchMethod(
         Invocation.method(
           #reauthenticateWithProvider,
@@ -713,7 +740,7 @@ class MockUser extends _i1.Mock implements _i2.User {
       ) as _i9.Future<_i2.UserCredential>);
   @override
   _i9.Future<_i2.UserCredential> reauthenticateWithPopup(
-          _i14.AuthProvider? provider) =>
+          _i15.AuthProvider? provider) =>
       (super.noSuchMethod(
         Invocation.method(
           #reauthenticateWithPopup,
@@ -736,7 +763,7 @@ class MockUser extends _i1.Mock implements _i2.User {
         )),
       ) as _i9.Future<_i2.UserCredential>);
   @override
-  _i9.Future<void> reauthenticateWithRedirect(_i14.AuthProvider? provider) =>
+  _i9.Future<void> reauthenticateWithRedirect(_i15.AuthProvider? provider) =>
       (super.noSuchMethod(
         Invocation.method(
           #reauthenticateWithRedirect,
@@ -746,7 +773,7 @@ class MockUser extends _i1.Mock implements _i2.User {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  _i9.Future<_i2.UserCredential> linkWithPopup(_i14.AuthProvider? provider) =>
+  _i9.Future<_i2.UserCredential> linkWithPopup(_i15.AuthProvider? provider) =>
       (super.noSuchMethod(
         Invocation.method(
           #linkWithPopup,
@@ -769,7 +796,7 @@ class MockUser extends _i1.Mock implements _i2.User {
         )),
       ) as _i9.Future<_i2.UserCredential>);
   @override
-  _i9.Future<void> linkWithRedirect(_i14.AuthProvider? provider) =>
+  _i9.Future<void> linkWithRedirect(_i15.AuthProvider? provider) =>
       (super.noSuchMethod(
         Invocation.method(
           #linkWithRedirect,
@@ -965,11 +992,11 @@ class MockUser extends _i1.Mock implements _i2.User {
 /// A class which mocks [NavigatorObserver].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNavigatorObserver extends _i1.Mock implements _i15.NavigatorObserver {
+class MockNavigatorObserver extends _i1.Mock implements _i16.NavigatorObserver {
   @override
   void didPush(
-    _i15.Route<dynamic>? route,
-    _i15.Route<dynamic>? previousRoute,
+    _i16.Route<dynamic>? route,
+    _i16.Route<dynamic>? previousRoute,
   ) =>
       super.noSuchMethod(
         Invocation.method(
@@ -983,8 +1010,8 @@ class MockNavigatorObserver extends _i1.Mock implements _i15.NavigatorObserver {
       );
   @override
   void didPop(
-    _i15.Route<dynamic>? route,
-    _i15.Route<dynamic>? previousRoute,
+    _i16.Route<dynamic>? route,
+    _i16.Route<dynamic>? previousRoute,
   ) =>
       super.noSuchMethod(
         Invocation.method(
@@ -998,8 +1025,8 @@ class MockNavigatorObserver extends _i1.Mock implements _i15.NavigatorObserver {
       );
   @override
   void didRemove(
-    _i15.Route<dynamic>? route,
-    _i15.Route<dynamic>? previousRoute,
+    _i16.Route<dynamic>? route,
+    _i16.Route<dynamic>? previousRoute,
   ) =>
       super.noSuchMethod(
         Invocation.method(
@@ -1013,8 +1040,8 @@ class MockNavigatorObserver extends _i1.Mock implements _i15.NavigatorObserver {
       );
   @override
   void didReplace({
-    _i15.Route<dynamic>? newRoute,
-    _i15.Route<dynamic>? oldRoute,
+    _i16.Route<dynamic>? newRoute,
+    _i16.Route<dynamic>? oldRoute,
   }) =>
       super.noSuchMethod(
         Invocation.method(
@@ -1029,8 +1056,8 @@ class MockNavigatorObserver extends _i1.Mock implements _i15.NavigatorObserver {
       );
   @override
   void didStartUserGesture(
-    _i15.Route<dynamic>? route,
-    _i15.Route<dynamic>? previousRoute,
+    _i16.Route<dynamic>? route,
+    _i16.Route<dynamic>? previousRoute,
   ) =>
       super.noSuchMethod(
         Invocation.method(
@@ -1055,7 +1082,7 @@ class MockNavigatorObserver extends _i1.Mock implements _i15.NavigatorObserver {
 /// A class which mocks [EmailSignInBloc].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockEmailSignInBloc extends _i1.Mock implements _i16.EmailSignInBloc {
+class MockEmailSignInBloc extends _i1.Mock implements _i17.EmailSignInBloc {
   @override
   _i5.AuthBase get auth => (super.noSuchMethod(
         Invocation.getter(#auth),
@@ -1069,11 +1096,11 @@ class MockEmailSignInBloc extends _i1.Mock implements _i16.EmailSignInBloc {
         ),
       ) as _i5.AuthBase);
   @override
-  _i9.Stream<_i17.EmailSignInModel> get modelStream => (super.noSuchMethod(
+  _i9.Stream<_i18.EmailSignInModel> get modelStream => (super.noSuchMethod(
         Invocation.getter(#modelStream),
-        returnValue: _i9.Stream<_i17.EmailSignInModel>.empty(),
-        returnValueForMissingStub: _i9.Stream<_i17.EmailSignInModel>.empty(),
-      ) as _i9.Stream<_i17.EmailSignInModel>);
+        returnValue: _i9.Stream<_i18.EmailSignInModel>.empty(),
+        returnValueForMissingStub: _i9.Stream<_i18.EmailSignInModel>.empty(),
+      ) as _i9.Stream<_i18.EmailSignInModel>);
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -1137,7 +1164,7 @@ class MockEmailSignInBloc extends _i1.Mock implements _i16.EmailSignInBloc {
     String? password,
     String? name,
     String? surname,
-    _i17.EmailSignInFormType? formType,
+    _i18.EmailSignInFormType? formType,
     bool? isLoading,
     bool? submitted,
   }) =>
@@ -1162,7 +1189,7 @@ class MockEmailSignInBloc extends _i1.Mock implements _i16.EmailSignInBloc {
 /// A class which mocks [AppUsage].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockAppUsage extends _i1.Mock implements _i18.AppUsage {}
+class MockAppUsage extends _i1.Mock implements _i19.AppUsage {}
 
 /// A class which mocks [FireStoreDatabase].
 ///
@@ -1175,6 +1202,18 @@ class MockFireStoreDatabase extends _i1.Mock implements _i10.FireStoreDatabase {
         returnValueForMissingStub: '',
       ) as String);
   @override
+  _i5.AuthBase get auth => (super.noSuchMethod(
+        Invocation.getter(#auth),
+        returnValue: _FakeAuthBase_8(
+          this,
+          Invocation.getter(#auth),
+        ),
+        returnValueForMissingStub: _FakeAuthBase_8(
+          this,
+          Invocation.getter(#auth),
+        ),
+      ) as _i5.AuthBase);
+  @override
   _i6.GeoLocatorService get geo => (super.noSuchMethod(
         Invocation.getter(#geo),
         returnValue: _FakeGeoLocatorService_9(
@@ -1241,6 +1280,17 @@ class MockFireStoreDatabase extends _i1.Mock implements _i10.FireStoreDatabase {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
+  _i9.Future<void> sendEmail({required _i13.EmailModel? email}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #sendEmail,
+          [],
+          {#email: email},
+        ),
+        returnValue: _i9.Future<void>.value(),
+        returnValueForMissingStub: _i9.Future<void>.value(),
+      ) as _i9.Future<void>);
+  @override
   _i9.Future<void> setTokenOnFireStore(Map<String, dynamic>? token) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1323,7 +1373,7 @@ class MockFireStoreDatabase extends _i1.Mock implements _i10.FireStoreDatabase {
   _i9.Future<_i3.ChildModel> getUserCurrentChild(
     String? key,
     _i11.AppUsageService? apps,
-    _i13.GeoPoint? latLong, {
+    _i14.GeoPoint? latLong, {
     String? battery,
   }) =>
       (super.noSuchMethod(
@@ -1368,7 +1418,7 @@ class MockFireStoreDatabase extends _i1.Mock implements _i10.FireStoreDatabase {
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockNotificationService extends _i1.Mock
-    implements _i19.NotificationService {
+    implements _i20.NotificationService {
   @override
   _i7.FlutterLocalNotificationsPlugin get flutterLocalNotificationsPlugin =>
       (super.noSuchMethod(

diff --git a/test/services/app_usage_local_service_test.dart b/test/services/app_usage_local_service_test.dart
@@ -19,7 +19,7 @@ void main() {
           'com.messenger.app1': [1800.0, 1640887200.0, 1640890800.0],
         };
 
-        TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+        TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(channel, (MethodCall methodCall) async {
           if (methodCall.method == 'getUsage') {
             return fakeUsage;