update flutter things

Author: JavaSaBr

ui_flutter/README.md

@@ -6,7 +6,7 @@ Flutter implementation of UI for jCRM
 
 ## Run UI
 ```shell
-flutter run -d chrome --dart-define=base_url=https://localhost:8090
+flutter run -d chrome --wasm --dart-define=base_url=https://localhost:8090
 ```
 
 This project is a starting point for a Flutter application.

ui_flutter/analysis_options.yaml

@@ -9,6 +9,9 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+formatter:
+  page_width: 120
+
 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`
@@ -27,3 +30,4 @@ linter:
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+

ui_flutter/lib/main.dart

@@ -3,13 +3,12 @@ import 'package:provider/provider.dart';
 
 import 'src/jcrm/ui/flutter/config/application_config.dart';
 import 'src/jcrm/ui/flutter/app/application_widget.dart';
-import 'src/jcrm/ui/flutter/service/security_service.dart';
 
 import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 
 void main() {
   setUrlStrategy(PathUrlStrategy());
   runApp(ApplicationConfig((context, child) {
-    return ApplicationWidget(context.watch<SecurityService>());
+    return ApplicationWidget(context.watch());
   }));
 }

ui_flutter/lib/src/jcrm/ui/flutter/config/application_config.dart

@@ -7,31 +7,19 @@ import 'package:jcrm_ui_flutter/src/jcrm/ui/flutter/service/http_service.dart';
 import 'package:jcrm_ui_flutter/src/jcrm/ui/flutter/service/registration_service.dart';
 import 'package:jcrm_ui_flutter/src/jcrm/ui/flutter/service/security_service.dart';
 
-import 'dart:html';
+import 'package:web/web.dart';
 
 class ApplicationConfig extends MultiProvider {
   ApplicationConfig(TransitionBuilder appBuilder, {Key? appKey})
       : super(
             key: appKey,
             providers: [
-              Provider(create: (context) => ErrorService())
+              Provider(create: (context) => ErrorService()),
+              Provider(create: (context) => HttpService(context.read())),
+              Provider(create: (context) => RegistrationService(context.read())),
+              ChangeNotifierProvider(create: (context) => SecurityService(context.read(), window.localStorage)),
+              RepositoriesConfig(),
+              UiServicesConfig()
             ],
-            child: MultiProvider(
-                providers: [
-                  Provider(create: (context) => HttpService(context.read<ErrorService>()))
-                ],
-                child: MultiProvider(
-                    providers: [
-                      Provider(create: (context) => RegistrationService(context.read<HttpService>()))
-                    ],
-                    child: MultiProvider(
-                        providers: [
-                          ChangeNotifierProvider(create: (context) => SecurityService(context.read<HttpService>(), window.localStorage)),
-                        ],
-                        child: MultiProvider(
-                            providers: [
-                              RepositoriesConfig(),
-                              UiServicesConfig()
-                            ],
-                            builder: appBuilder)))));
+            builder: appBuilder);
 }

ui_flutter/lib/src/jcrm/ui/flutter/config/repositories_config.dart

@@ -1,13 +1,9 @@
 import 'package:provider/provider.dart';
 import 'package:jcrm_ui_flutter/src/jcrm/ui/flutter/repository/user_repository.dart';
-import 'package:jcrm_ui_flutter/src/jcrm/ui/flutter/service/http_service.dart';
-import 'package:jcrm_ui_flutter/src/jcrm/ui/flutter/service/security_service.dart';
 
 class RepositoriesConfig extends MultiProvider {
   RepositoriesConfig({super.key})
       : super(providers: [
-          Provider(create: (context) => UserRepository(
-              context.read<HttpService>(),
-              context.read<SecurityService>()))
+          Provider(create: (context) => UserRepository(context.read(), context.read()))
         ]);
 }

ui_flutter/lib/src/jcrm/ui/flutter/page/book_details.dart

@@ -34,11 +34,11 @@ class BookDetailsScreen extends StatelessWidget {
           children: [
             Text(
               book!.title,
-              style: Theme.of(context).textTheme.headline4,
+              style: Theme.of(context).textTheme.headlineMedium,
             ),
             Text(
               book!.author.name,
-              style: Theme.of(context).textTheme.subtitle1,
+              style: Theme.of(context).textTheme.titleSmall,
             ),
             TextButton(
               child: const Text('View author (Push)'),

ui_flutter/lib/src/jcrm/ui/flutter/page/home_page.dart

@@ -71,7 +71,7 @@ class MyHomePageState extends State<MyHomePage> {
             ),
             Text(
               '$_counter',
-              style: Theme.of(context).textTheme.headline4,
+              style: Theme.of(context).textTheme.headlineMedium,
             ),
           ],
         ),

ui_flutter/lib/src/jcrm/ui/flutter/page/sign_in.dart

@@ -41,7 +41,7 @@ class _SignInScreenState extends State<SignInScreen> {
             mainAxisAlignment: MainAxisAlignment.center,
             mainAxisSize: MainAxisSize.min,
             children: [
-              Text('Sign in', style: Theme.of(context).textTheme.headline4),
+              Text('Sign in', style: Theme.of(context).textTheme.headlineMedium),
               TextField(
                 decoration: const InputDecoration(labelText: 'Username'),
                 controller: _usernameController,

ui_flutter/lib/src/jcrm/ui/flutter/routing.dart

@@ -1,6 +1,3 @@
-// Copyright 2021, the Flutter project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
 
 export 'routing/delegate.dart';
 export 'routing/parsed_route.dart';

ui_flutter/lib/src/jcrm/ui/flutter/service/security_service.dart

@@ -1,4 +1,4 @@
-import 'dart:html';
+import 'package:web/web.dart';
 
 import 'package:flutter/material.dart';
 import 'package:jcrm_ui_flutter/src/jcrm/ui/flutter/entity/user.dart';
@@ -42,7 +42,7 @@ class SecurityService extends ChangeNotifier {
       if (ex is HttpException && ex.error.errorCode == Errors.tokenExpired) {
         return refreshToken(restoredToken);
       } else {
-        _localStorage.remove(localStorageKeyToken);
+        _localStorage.removeItem(localStorageKeyToken);
         internalAuthenticate(User.none, emptyToken);
       }
     }
@@ -59,7 +59,7 @@ class SecurityService extends ChangeNotifier {
       _localStorage[localStorageKeyToken] = response.token;
     } catch (ex) {
       if (ex is HttpException && ex.error.errorCode == Errors.tokenMaxRefreshed) {
-        _localStorage.remove(localStorageKeyToken);
+        _localStorage.removeItem(localStorageKeyToken);
       }
       internalAuthenticate(User.none, emptyToken);
     }

ui_flutter/pubspec.yaml

@@ -5,27 +5,12 @@ description: Flutter implementation of UI for jCRM
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.19.0 <3.0.0"
+  sdk: ^3.5.0
+  flutter: ^3.24.5
 
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
     sdk: flutter
@@ -36,64 +21,20 @@ dependencies:
   quiver: ^3.2.1
   url_launcher: ^6.2.1
   intl: ^0.20.1
+  web: ^1.1.0
 
   adaptive_navigation: ^0.0.10
   url_strategy: ^0.3.0
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
   data_table_2: ^2.5.16
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
+  integration_test:
+    sdk: flutter
   flutter_lints: ^5.0.0
 
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
   uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages