diff --git a/analysis_options.yaml b/analysis_options.yaml index 3c4f23c5..64d00722 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -10,9 +10,7 @@ include: package:flutter_lints/flutter.yaml analyzer: - plugins: - - custom_lint - + linter: # The lint rules applied to this project can be customized in the # section below to disable rules from the `package:flutter_lints/flutter.yaml` diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a580e400..3b0409ad 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -208,7 +208,7 @@ SPEC CHECKSUMS: FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629 FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917 FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8 - Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_appauth: 914057fda669db5073d3ca9d94ea932e7df3c964 flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4 flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13 diff --git a/lib/core/database/riverpod.dart b/lib/core/database/riverpod.dart deleted file mode 100644 index 8d92323d..00000000 --- a/lib/core/database/riverpod.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:on_time_front/core/database/database.dart'; -import 'package:riverpod_annotation/riverpod_annotation.dart'; - -part 'riverpod.g.dart'; - -@riverpod -AppDatabase appDatabse(Ref ref) { - return AppDatabase(); -} diff --git a/lib/presentation/calendar/screens/calendar_screen.dart b/lib/presentation/calendar/screens/calendar_screen.dart index f1a751bd..42f52467 100644 --- a/lib/presentation/calendar/screens/calendar_screen.dart +++ b/lib/presentation/calendar/screens/calendar_screen.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; import 'package:on_time_front/core/di/di_setup.dart'; @@ -12,14 +11,14 @@ import 'package:on_time_front/presentation/shared/components/calendar/centered_c import 'package:on_time_front/presentation/shared/theme/calendar_theme.dart'; import 'package:table_calendar/table_calendar.dart'; -class CalendarScreen extends ConsumerStatefulWidget { +class CalendarScreen extends StatefulWidget { const CalendarScreen({super.key}); @override - ConsumerState createState() => _CalendarScreenState(); + State createState() => _CalendarScreenState(); } -class _CalendarScreenState extends ConsumerState { +class _CalendarScreenState extends State { DateTime _selectedDate = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day); diff --git a/pubspec.lock b/pubspec.lock index 98b4a2bb..da69ea3f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -33,14 +33,6 @@ packages: url: "https://pub.dev" source: hosted version: "7.3.0" - analyzer_plugin: - dependency: transitive - description: - name: analyzer_plugin - sha256: "1d460d14e3c2ae36dc2b32cef847c4479198cf87704f63c3c3c8150ee50c3916" - url: "https://pub.dev" - source: hosted - version: "0.12.0" ansi: dependency: transitive description: @@ -192,14 +184,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" - ci: - dependency: transitive - description: - name: ci - sha256: "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13" - url: "https://pub.dev" - source: hosted - version: "0.1.0" cli_util: dependency: transitive description: @@ -264,38 +248,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.8" - custom_lint: - dependency: "direct dev" - description: - name: custom_lint - sha256: "021897cce2b6c783b2521543e362e7fe1a2eaab17bf80514d8de37f99942ed9e" - url: "https://pub.dev" - source: hosted - version: "0.7.3" - custom_lint_builder: - dependency: transitive - description: - name: custom_lint_builder - sha256: e4235b9d8cef59afe621eba086d245205c8a0a6c70cd470be7cb17494d6df32d - url: "https://pub.dev" - source: hosted - version: "0.7.3" - custom_lint_core: - dependency: transitive - description: - name: custom_lint_core - sha256: "6dcee8a017181941c51a110da7e267c1d104dc74bec8862eeb8c85b5c8759a9e" - url: "https://pub.dev" - source: hosted - version: "0.7.1" - custom_lint_visitor: - dependency: transitive - description: - name: custom_lint_visitor - sha256: "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8" - url: "https://pub.dev" - source: hosted - version: "1.0.0+7.3.0" dart_style: dependency: transitive description: @@ -530,14 +482,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_riverpod: - dependency: "direct main" - description: - name: flutter_riverpod - sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" - url: "https://pub.dev" - source: hosted - version: "2.6.1" flutter_secure_storage: dependency: "direct main" description: @@ -732,14 +676,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" - hotreloader: - dependency: transitive - description: - name: hotreloader - sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b - url: "https://pub.dev" - source: hosted - version: "4.3.0" http: dependency: "direct main" description: @@ -912,26 +848,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "11.0.1" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.10" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.1" lints: dependency: transitive description: @@ -1148,46 +1084,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - riverpod: - dependency: transitive - description: - name: riverpod - sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" - url: "https://pub.dev" - source: hosted - version: "2.6.1" - riverpod_analyzer_utils: - dependency: transitive - description: - name: riverpod_analyzer_utils - sha256: "837a6dc33f490706c7f4632c516bcd10804ee4d9ccc8046124ca56388715fdf3" - url: "https://pub.dev" - source: hosted - version: "0.5.9" - riverpod_annotation: - dependency: "direct main" - description: - name: riverpod_annotation - sha256: e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8 - url: "https://pub.dev" - source: hosted - version: "2.6.1" - riverpod_generator: - dependency: "direct dev" - description: - name: riverpod_generator - sha256: "120d3310f687f43e7011bb213b90a436f1bbc300f0e4b251a72c39bccb017a4f" - url: "https://pub.dev" - source: hosted - version: "2.6.4" - riverpod_lint: - dependency: "direct dev" - description: - name: riverpod_lint - sha256: b05408412b0f75dec954e032c855bc28349eeed2d2187f94519e1ddfdf8b3693 - url: "https://pub.dev" - source: hosted - version: "2.6.4" rxdart: dependency: "direct main" description: @@ -1369,14 +1265,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.12.1" - state_notifier: - dependency: transitive - description: - name: state_notifier - sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb - url: "https://pub.dev" - source: hosted - version: "1.0.0" stream_channel: dependency: transitive description: @@ -1421,10 +1309,10 @@ packages: dependency: transitive description: name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.6" + version: "0.7.4" timezone: dependency: transitive description: @@ -1549,10 +1437,10 @@ packages: dependency: transitive description: name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.1.4" verbose: dependency: transitive description: @@ -1682,5 +1570,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.8.0-0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml index c8d71b3b..b483894f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,8 +46,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 dio: ^5.7.0 - flutter_riverpod: ^2.6.1 - riverpod_annotation: ^2.6.1 + mockito: ^5.4.4 equatable: ^2.0.5 collection: ^1.18.0 @@ -104,9 +103,7 @@ dev_dependencies: flutter_lints: ^5.0.0 husky: ^0.1.7 commitlint_cli: ^0.7.2 - riverpod_generator: ^2.6.2 - custom_lint: ^0.7.0 - riverpod_lint: ^2.6.2 + json_serializable: ^6.9.0 injectable_generator: ^2.6.2 diff --git a/test/config/riverpod_test.dart b/test/config/riverpod_test.dart deleted file mode 100644 index 90219111..00000000 --- a/test/config/riverpod_test.dart +++ /dev/null @@ -1,12 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:on_time_front/core/database/database.dart'; -import 'package:on_time_front/core/database/riverpod.dart'; - -void main() { - test('[appDatabaseProvider] should provide AppDatabase', () { - final container = ProviderContainer(); - final appDatabase = container.read(appDatabseProvider); - expect(appDatabase, isA()); - }); -} diff --git a/test/helpers/provider_container.dart b/test/helpers/provider_container.dart deleted file mode 100644 index 30fb1596..00000000 --- a/test/helpers/provider_container.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_test/flutter_test.dart'; - -/// A testing utility which creates a [ProviderContainer] and automatically -/// disposes it at the end of the test. -ProviderContainer createContainer({ - ProviderContainer? parent, - List overrides = const [], - List? observers, -}) { - // Create a ProviderContainer, and optionally allow specifying parameters. - final container = ProviderContainer( - parent: parent, - overrides: overrides, - observers: observers, - ); - - // When the test ends, dispose the container. - addTearDown(container.dispose); - - return container; -} diff --git a/widgetbook/macos/Flutter/GeneratedPluginRegistrant.swift b/widgetbook/macos/Flutter/GeneratedPluginRegistrant.swift index dc3be9f8..bb3bec86 100644 --- a/widgetbook/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/widgetbook/macos/Flutter/GeneratedPluginRegistrant.swift @@ -14,6 +14,7 @@ import flutter_web_auth import google_sign_in_ios import path_provider_foundation import shared_preferences_foundation +import sign_in_with_apple import sqlite3_flutter_libs import url_launcher_macos import webview_flutter_wkwebview @@ -28,6 +29,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin")) Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin")) diff --git a/widgetbook/pubspec.lock b/widgetbook/pubspec.lock index 0e0d0d58..a03f30c3 100644 --- a/widgetbook/pubspec.lock +++ b/widgetbook/pubspec.lock @@ -434,14 +434,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_riverpod: - dependency: transitive - description: - name: flutter_riverpod - sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" - url: "https://pub.dev" - source: hosted - version: "2.6.1" flutter_secure_storage: dependency: transitive description: @@ -1019,22 +1011,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - riverpod: - dependency: transitive - description: - name: riverpod - sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" - url: "https://pub.dev" - source: hosted - version: "2.6.1" - riverpod_annotation: - dependency: transitive - description: - name: riverpod_annotation - sha256: e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8 - url: "https://pub.dev" - source: hosted - version: "2.6.1" rxdart: dependency: transitive description: @@ -1115,6 +1091,30 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + sign_in_with_apple: + dependency: transitive + description: + name: sign_in_with_apple + sha256: "8bd875c8e8748272749eb6d25b896f768e7e9d60988446d543fe85a37a2392b8" + url: "https://pub.dev" + source: hosted + version: "7.0.1" + sign_in_with_apple_platform_interface: + dependency: transitive + description: + name: sign_in_with_apple_platform_interface + sha256: "981bca52cf3bb9c3ad7ef44aace2d543e5c468bb713fd8dda4275ff76dfa6659" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + sign_in_with_apple_web: + dependency: transitive + description: + name: sign_in_with_apple_web + sha256: f316400827f52cafcf50d00e1a2e8a0abc534ca1264e856a81c5f06bd5b10fed + url: "https://pub.dev" + source: hosted + version: "3.0.0" simple_gesture_detector: dependency: transitive description: @@ -1176,14 +1176,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.12.1" - state_notifier: - dependency: transitive - description: - name: state_notifier - sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb - url: "https://pub.dev" - source: hosted - version: "1.0.0" stream_channel: dependency: transitive description: