updated new flutter version

2023-12-15 21:34:23 +08:00
parent bcf21d90ac
commit f8a90ad305
20 changed files with 304 additions and 297 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,6 @@
 /build/

 # Web related
-lib/generated_plugin_registrant.dart

 # Symbolication related
 app.*.symbols
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -472,6 +472,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "under_renovation" : MessageLookupByLibrary.simpleMessage("The store is under renovation"),
    "unpaid" : MessageLookupByLibrary.simpleMessage("Unpaid"),
    "update_success" : MessageLookupByLibrary.simpleMessage("Updated success"),
+    "used_and_trust_by" : MessageLookupByLibrary.simpleMessage("Used & trusted by"),
    "user_account_created_success" : MessageLookupByLibrary.simpleMessage("User account created success"),
    "user_registration" : MessageLookupByLibrary.simpleMessage("User registration"),
    "user_registration_desc" : MessageLookupByLibrary.simpleMessage("Please enter your mobile phone number then click the \'Get code\' button to get the validation code."),
--- a/lib/generated/intl/messages_zh_CN.dart
+++ b/lib/generated/intl/messages_zh_CN.dart
@@ -468,6 +468,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "under_renovation" : MessageLookupByLibrary.simpleMessage("本店还在装修"),
    "unpaid" : MessageLookupByLibrary.simpleMessage("未付款"),
    "update_success" : MessageLookupByLibrary.simpleMessage("更新成功"),
+    "used_and_trust_by" : MessageLookupByLibrary.simpleMessage("客户展示"),
    "user_account_created_success" : MessageLookupByLibrary.simpleMessage("用户账号成功创建"),
    "user_registration" : MessageLookupByLibrary.simpleMessage("用户注册"),
    "user_registration_desc" : MessageLookupByLibrary.simpleMessage("请输入您的手机号码，然后单击“获取验证码”按钮。"),
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -4118,6 +4118,16 @@ class S {
      args: [],
    );
  }
+
+  /// `Used & trusted by`
+  String get used_and_trust_by {
+    return Intl.message(
+      'Used & trusted by',
+      name: 'used_and_trust_by',
+      desc: '',
+      args: [],
+    );
+  }
 }

 class AppLocalizationDelegate extends LocalizationsDelegate<S> {
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -406,5 +406,6 @@
  "domain_unavailable_token": "{domain} (unavailable)",
  "place_order_now": "Place order now",
  "mobile": "mobile",
-  "renew_service_now": "Renew service now"
+  "renew_service_now": "Renew service now",
+  "used_and_trust_by": "Used & trusted by"
 }
--- a/lib/l10n/intl_zh_CN.arb
+++ b/lib/l10n/intl_zh_CN.arb
@@ -402,5 +402,6 @@
  "domain_unavailable_token": "{domain} (不可用)",
  "place_order_now": "马上下单",
  "mobile": "手机",
-  "renew_service_now": "马上续期"
+  "renew_service_now": "马上续期",
+  "used_and_trust_by": "客户展示"
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -11,6 +11,7 @@ import 'package:geolocator/geolocator.dart' as geolocator;
 import 'package:url_strategy/url_strategy.dart';
 import 'models/located_address.dart';
 import 'pages/create_online_store_1.dart';
+import 'pages/download.dart';
 import 'pages/me.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:splashscreen/splashscreen.dart';
@@ -196,6 +197,11 @@ class MyApp extends StatelessWidget {
              CreateOnlineStore1()
          );
        }
+        if (pathElements[1] == 'download') {
+          return MaterialPageRoute(builder: (BuildContext context) =>
+              Download()
+          );
+        }
        return MaterialPageRoute(
          builder: (BuildContext context) =>
              Home(title: Constants.APP_TITLE,),
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@@ -17,6 +17,7 @@ import '../store/store.dart';
 import '../utils/http_util.dart';
 import '../utils/utils.dart';
 import '../widgets/desktop/desktop_Index_carousel.dart';
+import '../widgets/desktop/desktop_customers_logo.dart';
 import '../widgets/desktop/desktop_index_main_content_1.dart';
 import '../widgets/desktop/desktop_index_main_content_2.dart';
 import '../widgets/desktop/desktop_index_main_content_3.dart';
@@ -92,6 +93,7 @@ class HomeState extends State<Home> {
                    DesktopIndexCarousel(galleries),
                    DesktopIndexMainContent1(content1Message),
                    DesktopIndexMainContent2(content2),
+                    CustomersLogo(),
                    DesktopIndexMainContent3(content2),
                  ],
                ),
@@ -105,6 +107,7 @@ class HomeState extends State<Home> {
                      DesktopIndexCarousel(galleries),
                      DesktopIndexMainContent1(content1Message),
                      DesktopIndexMainContent2(content2),
+                      CustomersLogo(),
                      DesktopIndexMainContent3(content2),
                    ],
                  ),
--- a/lib/widgets/desktop/desktop_customers_logo.dart
+++ b/lib/widgets/desktop/desktop_customers_logo.dart
@@ -0,0 +1,127 @@
+
+import 'dart:async';
+import 'dart:collection';
+
+import 'package:flutter/material.dart';
+
+import '../../generated/l10n.dart';
+import '../../utils/http_util.dart';
+import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dart';
+
+class CustomersLogo extends StatefulWidget {
+
+  const CustomersLogo({Key key}) : super(key: key);
+
+  @override
+  State<StatefulWidget> createState() => CustomersLogoState();
+}
+
+class CustomersLogoState extends State<CustomersLogo> {
+  double sideSpace = 0;
+  double mainSpace = 1200;
+  bool _visible = true;
+  List<dynamic> images = [];
+  var timer;
+
+  @override
+  Widget build(BuildContext context) {
+    if (MediaQuery.of(context).size.width <= 1200) {
+      mainSpace = MediaQuery.of(context).size.width;
+      sideSpace = 0;
+    } else {
+      mainSpace = 1200;
+      sideSpace = (MediaQuery.of(context).size.width - 1200) / 2;
+    }
+    return Container(
+      width: MediaQuery.of(context).size.width,
+      margin: EdgeInsets.only(top: 20.0),
+      padding: EdgeInsets.symmetric(vertical: 20.0, horizontal: 0.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Container(
+            width: sideSpace,
+          ),
+          Container(
+            padding: EdgeInsets.symmetric(horizontal: 16, vertical: 0),
+            width: mainSpace,
+            child: _getBody(),
+          ),
+          Container(
+            width: sideSpace,
+          ),
+        ],
+      ),
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _loadData();
+    timer = Timer.periodic(
+      const Duration(seconds: 10,), ((t) {
+        setState(() {
+          _visible = false;
+        });
+        Future.delayed(const Duration(milliseconds: 500), () {
+          _loadData();
+        });
+      })
+    );
+  }
+
+  void _loadData() {
+    HttpUtil.httpGet('v1/get-random-customer-logos')
+        .then((value) {
+      print('the value: $value');
+      if (mounted) {
+        setState(() {
+          images = value;
+          _visible = true;
+        });
+      }
+    });
+  }
+
+  Widget _getBody() {
+    List<Widget> children = [];
+    for (int i = 0; i < images.length; i++) {
+      Container container = Container(
+        padding: EdgeInsets.only(left: 0, top: 0, right: 0, bottom: 0),
+        child: Util.showImage(images[i]['image'], width: mainSpace / 8),
+      );
+      children.add(container);
+    }
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      mainAxisAlignment: MainAxisAlignment.start,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Container(
+          padding: EdgeInsets.only(top: 0, bottom: 16, left: 0, right: 0),
+          child: Text(
+            S.of(context).used_and_trust_by,
+            style: TextStyle(
+              fontSize: 20.0,
+              fontWeight: FontWeight.bold,
+              color: Colors.blueGrey,
+            ),
+          ),
+        ),
+        AnimatedOpacity(
+          opacity: _visible ? 1.0 : 0.0,
+          duration: const Duration(milliseconds: 500),
+          child: Container(
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: children,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
--- a/lib/widgets/desktop/desktop_pay_now.dart
+++ b/lib/widgets/desktop/desktop_pay_now.dart
@@ -392,5 +392,3 @@ class DesktopPayNowState extends State<DesktopPayNow> {
    });
  }
 }
-
-// 198.54.117.10
--- a/lib/widgets/desktop/desktop_stripe_pay_web.dart
+++ b/lib/widgets/desktop/desktop_stripe_pay_web.dart
@@ -66,7 +66,7 @@ class DesktopStripePayWebState extends State<DesktopStripePayWeb> {
      ),
    );
    if (widget.stripePaymentMethod == null) {
-      form = CardForm(card: card, formKey: formKey,);
+      form = CardForm(card: card, formKey: formKey, displayPostalCode: false,);
      body = ListView(
        children: <Widget>[
          form,
--- a/lib/widgets/general/attribute/check_options.dart
+++ b/lib/widgets/general/attribute/check_options.dart
@@ -275,20 +275,40 @@ class CheckOptionsState extends OptionsBaseState<CheckOptions> {
        }
      }

-      var disabledRule = Rule.getRule(extraJson, Rule.RULE_DISABLED_IF_FIELD_EQUALS_TO);
+      var disabledRule =
+      Rule.getRule(extraJson, Rule.RULE_DISABLED_IF_FIELD_EQUALS_TO);
      if (disabledRule != null) {
        if (disabledRule is List) {
          for (var i = 0; i < (disabledRule as List).length; i++) {
            Map<String, dynamic> disabledRule1 = disabledRule[i];
-            List<String> attValues = Utils.getSelectedAttributeValue(selections, disabledRule1[Rule.RULE_KEY_FIELD_KEY]);
-            if (attValues.length > 0 && disabledRule1.containsKey(attValues[0])) {
+            List<String> attValues = Utils.getSelectedAttributeValue(
+                selections, disabledRule1[Rule.RULE_KEY_FIELD_KEY]);
+            if (attValues.length > 0 &&
+                disabledRule1.containsKey(attValues[0])) {
              disabled = true;
            }
+            if (attValues.length > 0) {
+              for (String s in attValues) {
+                if (disabledRule1.containsKey(s) && disabledRule1[s]) {
+                  disabled = true;
+                  break;
+                }
+              }
+            }
+            if (disabled) {
+              break;
+            }
          }
        } else {
-          List<String> attValues = Utils.getSelectedAttributeValue(selections, disabledRule[Rule.RULE_KEY_FIELD_KEY]);
-          if (attValues.length > 0 && disabledRule.containsKey(attValues[0])) {
-            disabled = true;
+          List<String> attValues = Utils.getSelectedAttributeValue(
+              selections, disabledRule[Rule.RULE_KEY_FIELD_KEY]);
+          if (attValues.length > 0) {
+            for (String s in attValues) {
+              if (disabledRule.containsKey(s) && disabledRule[s]) {
+                disabled = true;
+                break;
+              }
+            }
          }
        }
      }
--- a/lib/widgets/general/attribute/qty_options.dart
+++ b/lib/widgets/general/attribute/qty_options.dart
@@ -283,20 +283,40 @@ class QtyOptionsState extends OptionsBaseState<QtyOptions> {
        }
      }

-      var disabledRule = Rule.getRule(extraJson, Rule.RULE_DISABLED_IF_FIELD_EQUALS_TO);
+      var disabledRule =
+      Rule.getRule(extraJson, Rule.RULE_DISABLED_IF_FIELD_EQUALS_TO);
      if (disabledRule != null) {
        if (disabledRule is List) {
          for (var i = 0; i < (disabledRule as List).length; i++) {
            Map<String, dynamic> disabledRule1 = disabledRule[i];
-            List<String> attValues = Utils.getSelectedAttributeValue(selections, disabledRule1[Rule.RULE_KEY_FIELD_KEY]);
-            if (attValues.length > 0 && disabledRule1.containsKey(attValues[0])) {
+            List<String> attValues = Utils.getSelectedAttributeValue(
+                selections, disabledRule1[Rule.RULE_KEY_FIELD_KEY]);
+            if (attValues.length > 0 &&
+                disabledRule1.containsKey(attValues[0])) {
              disabled = true;
            }
+            if (attValues.length > 0) {
+              for (String s in attValues) {
+                if (disabledRule1.containsKey(s) && disabledRule1[s]) {
+                  disabled = true;
+                  break;
+                }
+              }
+            }
+            if (disabled) {
+              break;
+            }
          }
        } else {
-          List<String> attValues = Utils.getSelectedAttributeValue(selections, disabledRule[Rule.RULE_KEY_FIELD_KEY]);
-          if (attValues.length > 0 && disabledRule.containsKey(attValues[0])) {
-            disabled = true;
+          List<String> attValues = Utils.getSelectedAttributeValue(
+              selections, disabledRule[Rule.RULE_KEY_FIELD_KEY]);
+          if (attValues.length > 0) {
+            for (String s in attValues) {
+              if (disabledRule.containsKey(s) && disabledRule[s]) {
+                disabled = true;
+                break;
+              }
+            }
          }
        }
      }
--- a/lib/widgets/general/attribute/radio_options.dart
+++ b/lib/widgets/general/attribute/radio_options.dart
@@ -187,20 +187,40 @@ class RadioOptionsState extends OptionsBaseState<RadioOptions> {
        }
      }

-      var disabledRule = Rule.getRule(extraJson, Rule.RULE_DISABLED_IF_FIELD_EQUALS_TO);
+      var disabledRule =
+      Rule.getRule(extraJson, Rule.RULE_DISABLED_IF_FIELD_EQUALS_TO);
      if (disabledRule != null) {
        if (disabledRule is List) {
          for (var i = 0; i < (disabledRule as List).length; i++) {
            Map<String, dynamic> disabledRule1 = disabledRule[i];
-            List<String> attValues = Utils.getSelectedAttributeValue(selections, disabledRule1[Rule.RULE_KEY_FIELD_KEY]);
-            if (attValues.length > 0 && disabledRule1.containsKey(attValues[0])) {
+            List<String> attValues = Utils.getSelectedAttributeValue(
+                selections, disabledRule1[Rule.RULE_KEY_FIELD_KEY]);
+            if (attValues.length > 0 &&
+                disabledRule1.containsKey(attValues[0])) {
              disabled = true;
            }
+            if (attValues.length > 0) {
+              for (String s in attValues) {
+                if (disabledRule1.containsKey(s) && disabledRule1[s]) {
+                  disabled = true;
+                  break;
+                }
+              }
+            }
+            if (disabled) {
+              break;
+            }
          }
        } else {
-          List<String> attValues = Utils.getSelectedAttributeValue(selections, disabledRule[Rule.RULE_KEY_FIELD_KEY]);
-          if (attValues.length > 0 && disabledRule.containsKey(attValues[0])) {
-            disabled = true;
+          List<String> attValues = Utils.getSelectedAttributeValue(
+              selections, disabledRule[Rule.RULE_KEY_FIELD_KEY]);
+          if (attValues.length > 0) {
+            for (String s in attValues) {
+              if (disabledRule.containsKey(s) && disabledRule[s]) {
+                disabled = true;
+                break;
+              }
+            }
          }
        }
      }
--- a/lib/widgets/general/download_item.dart
+++ b/lib/widgets/general/download_item.dart
@@ -2,6 +2,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
+import "package:universal_html/html.dart";

 import '../../constants.dart';
 import '../../generated/l10n.dart';
@@ -22,7 +23,7 @@ class DownloadItem extends StatefulWidget {
 }

 class DownloadItemState extends State<DownloadItem> {
-  final double buttonWidth = 114.0;
+  final double buttonWidth = 122.0;
  final double iconWidth = 48.0;

  @override
@@ -275,8 +276,14 @@ class DownloadItemState extends State<DownloadItem> {
          ],
        ),
        onPressed: () async {
-          if (await canLaunch(downloadUrl)) {
-            await launch('$downloadUrl');
+          if (kIsWeb) {
+            AnchorElement anchorElement = new AnchorElement(href: downloadUrl);
+            anchorElement.download = downloadUrl;
+            anchorElement.click();
+          } else {
+            if (!await launchUrl(Uri.parse('$downloadUrl'))) {
+              throw 'Could not launch $downloadUrl';
+            }
          }
        },
      );
--- a/lib/widgets/mobile/mobile_stripe_pay_web.dart
+++ b/lib/widgets/mobile/mobile_stripe_pay_web.dart
@@ -53,7 +53,7 @@ class MobileStripePayWebState extends State<MobileStripePayWeb> {
      ),
    );
    if (widget.stripePaymentMethod == null) {
-      form = CardForm(card: card, formKey: formKey,);
+      form = CardForm(card: card, formKey: formKey, displayPostalCode: false,);
      body = ListView(
        children: <Widget>[form,],
      );
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -8,21 +8,17 @@ import Foundation
 import catcher
 import device_info_plus_macos
 import flutter_local_notifications
-import package_info
 import package_info_plus_macos
 import path_provider_macos
 import sqflite
 import url_launcher_macos
-import wakelock_macos

 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  CatcherPlugin.register(with: registry.registrar(forPlugin: "CatcherPlugin"))
  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
-  FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-  WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin"))
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -28,7 +28,7 @@ packages:
      name: awesome_card
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.5"
+    version: "1.1.7"
  badges:
    dependency: "direct main"
    description:
@@ -85,20 +85,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.3.1"
-  chewie:
-    dependency: transitive
-    description:
-      name: chewie
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.2"
-  chewie_audio:
-    dependency: transitive
-    description:
-      name: chewie_audio
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
  clock:
    dependency: transitive
    description:
@@ -133,7 +119,7 @@ packages:
      name: credit_card_validator
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
  cross_file:
    dependency: transitive
    description:
@@ -279,13 +265,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.0.1"
-  flutter_html:
-    dependency: "direct main"
-    description:
-      name: flutter_html
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
  flutter_inappwebview:
    dependency: "direct main"
    description:
@@ -300,13 +279,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.9.1"
-  flutter_layout_grid:
-    dependency: transitive
-    description:
-      name: flutter_layout_grid
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.3"
  flutter_local_notifications:
    dependency: "direct main"
    description:
@@ -340,13 +312,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.6.4"
-  flutter_math_fork:
-    dependency: transitive
-    description:
-      name: flutter_math_fork
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.3+1"
  flutter_plugin_android_lifecycle:
    dependency: transitive
    description:
@@ -361,13 +326,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.8.2"
-  flutter_slidable:
-    dependency: transitive
-    description:
-      name: flutter_slidable
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.0"
  flutter_spinkit:
    dependency: "direct main"
    description:
@@ -382,13 +340,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.3.4"
-  flutter_svg:
-    dependency: transitive
-    description:
-      name: flutter_svg
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.22.0"
  flutter_web_plugins:
    dependency: "direct main"
    description: flutter
@@ -498,7 +449,7 @@ packages:
      name: http
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.13.3"
+    version: "0.13.4"
  http_parser:
    dependency: transitive
    description:
@@ -575,14 +526,7 @@ packages:
      name: mask_text_input_formatter
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.12.11"
+    version: "2.3.0"
  material_color_utilities:
    dependency: transitive
    description:
@@ -604,20 +548,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.0.0"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
-  numerus:
-    dependency: transitive
-    description:
-      name: numerus
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.1"
  octo_image:
    dependency: transitive
    description:
@@ -625,13 +555,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.0.0+1"
-  package_info:
-    dependency: "direct main"
-    description:
-      name: package_info
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.2"
  package_info_plus:
    dependency: transitive
    description:
@@ -681,20 +604,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.8.2"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.1"
-  path_parsing:
-    dependency: transitive
-    description:
-      name: path_parsing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.1"
  path_provider:
    dependency: "direct main"
    description:
@@ -743,7 +652,7 @@ packages:
      name: percent_indicator
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.1"
+    version: "4.2.2"
  petitparser:
    dependency: transitive
    description:
@@ -764,7 +673,7 @@ packages:
      name: pinput
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0"
+    version: "1.2.2"
  platform:
    dependency: transitive
    description:
@@ -785,7 +694,7 @@ packages:
      name: plugin_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.1"
+    version: "2.1.2"
  process:
    dependency: transitive
    description:
@@ -793,13 +702,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "4.2.3"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.0.0"
  pub_semver:
    dependency: transitive
    description:
@@ -814,13 +716,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.0"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
  redux:
    dependency: transitive
    description:
@@ -869,7 +764,7 @@ packages:
      name: simple_animations
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.1.1"
+    version: "4.2.0"
  sky_engine:
    dependency: transitive
    description: flutter
@@ -943,24 +838,10 @@ packages:
    description:
      path: "."
      ref: HEAD
-      resolved-ref: b4e027a18e177653f9d0ad3931f71c9e26711901
-      url: "git://github.com/ezet/stripe-sdk.git"
+      resolved-ref: "1c614cbb782fa664a2dda65377c85520dfaea92e"
+      url: "https://github.com/ezet/stripe-sdk.git"
    source: git
    version: "5.0.0-nullsafety.1"
-  supercharged:
-    dependency: transitive
-    description:
-      name: supercharged
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  supercharged_dart:
-    dependency: transitive
-    description:
-      name: supercharged_dart
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
  synchronized:
    dependency: transitive
    description:
@@ -989,13 +870,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.2.0"
-  tuple:
-    dependency: transitive
-    description:
-      name: tuple
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
  typed_data:
    dependency: transitive
    description:
@@ -1003,27 +877,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.3.0"
-  uni_links2:
-    dependency: transitive
+  universal_html:
+    dependency: "direct main"
    description:
-      name: uni_links2
+      name: universal_html
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.6.0+2"
-  uni_links2_platform_interface:
-    dependency: transitive
-    description:
-      name: uni_links2_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0+2"
-  uni_links_web2:
-    dependency: transitive
-    description:
-      name: uni_links_web2
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.0+2"
+    version: "2.0.8"
  universal_io:
    dependency: "direct main"
    description:
@@ -1037,7 +897,21 @@ packages:
      name: url_launcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.0.9"
+    version: "6.1.5"
+  url_launcher_android:
+    dependency: transitive
+    description:
+      name: url_launcher_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.17"
+  url_launcher_ios:
+    dependency: transitive
+    description:
+      name: url_launcher_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.17"
  url_launcher_linux:
    dependency: transitive
    description:
@@ -1058,7 +932,7 @@ packages:
      name: url_launcher_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.4"
+    version: "2.1.0"
  url_launcher_web:
    dependency: transitive
    description:
@@ -1094,83 +968,34 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.1.2"
-  video_player:
-    dependency: transitive
-    description:
-      name: video_player
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.19"
-  video_player_android:
-    dependency: transitive
-    description:
-      name: video_player_android
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.3.4"
-  video_player_avfoundation:
-    dependency: transitive
-    description:
-      name: video_player_avfoundation
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.3.5"
-  video_player_platform_interface:
-    dependency: transitive
-    description:
-      name: video_player_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.0.0"
-  video_player_web:
-    dependency: transitive
-    description:
-      name: video_player_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.10"
-  wakelock:
-    dependency: transitive
-    description:
-      name: wakelock
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.3+3"
-  wakelock_macos:
-    dependency: transitive
-    description:
-      name: wakelock_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.0+2"
-  wakelock_platform_interface:
-    dependency: transitive
-    description:
-      name: wakelock_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.1+2"
-  wakelock_web:
-    dependency: transitive
-    description:
-      name: wakelock_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.0+2"
-  wakelock_windows:
-    dependency: transitive
-    description:
-      name: wakelock_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.0+1"
  webview_flutter:
    dependency: transitive
    description:
      name: webview_flutter
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.10"
+    version: "3.0.4"
+  webview_flutter_android:
+    dependency: transitive
+    description:
+      name: webview_flutter_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.9.1"
+  webview_flutter_platform_interface:
+    dependency: transitive
+    description:
+      name: webview_flutter_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.1"
+  webview_flutter_wkwebview:
+    dependency: transitive
+    description:
+      name: webview_flutter_wkwebview
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.9.1"
  win32:
    dependency: transitive
    description:
@@ -1207,5 +1032,5 @@ packages:
    source: hosted
    version: "2.2.1"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
-  flutter: ">=2.8.0"
+  dart: ">=2.17.0 <3.0.0"
+  flutter: ">=3.0.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # 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
+version: 1.0.1+2

 environment:
  sdk: ">=2.7.0 <3.0.0"
@@ -43,8 +43,8 @@ dependencies:
  splashscreen: ^1.3.5
  carousel_slider: ^4.0.0
  badges: ^2.0.1
-  url_launcher: ^6.0.9 #^5.7.10
-  flutter_html: ^2.1.1
+  url_launcher: ^6.1.5 #^6.0.9 #^5.7.10
+#  flutter_html: ^2.1.1
  flutter_markdown: ^0.6.4 #^0.5.1
  hive: ^2.0.4 #^1.4.4+1
  hive_flutter: ^1.1.0 #^0.3.1
@@ -54,7 +54,7 @@ dependencies:
  email_validator: ^2.0.1
  flappy_search_bar: ^1.7.2
  flutter_launcher_icons: ^0.9.1 #^0.8.1
-  package_info: ^2.0.2
+#  package_info: ^2.0.2
  catcher: ^0.6.8 #^0.4.2
  share: ^2.0.4 #^0.6.5+4
  universal_io: ^2.0.4 #^1.0.2
@@ -64,7 +64,7 @@ dependencies:
  flutter_inappwebview: ^5.3.2 #^4.0.0+4
  youtube_player_iframe: ^2.2.1 #^1.2.0+2
  fluttertoast: ^8.0.8 #^7.1.8
-  percent_indicator: ^3.0.1
+  percent_indicator: ^4.2.2 #^3.0.1
  image_picker: ^0.8.0+3 #^0.6.7+22
  countdown: ^0.1.0
  gender_selection: ^1.0.0
@@ -83,7 +83,7 @@ dependencies:
 #      url: git://github.com/romme86/stripe-sdk.git
  stripe_sdk:
    git:
-      url: git://github.com/ezet/stripe-sdk.git
+      url: https://github.com/ezet/stripe-sdk.git
  uuid: ^3.0.4 #^2.2.2
  ffi: ^1.0.0
 #  firebase_messaging: ^10.0.4 #^7.0.3
@@ -91,12 +91,14 @@ dependencies:
  geolocator: ^7.4.0 #^6.2.1
  url_strategy: ^0.2.0
  hovering: ^1.0.4
+  universal_html: ^2.0.8

 #dev_dependencies:
 #  flutter_test:
 #    sdk: flutter

 #dependency_overrides:
+#  webview_flutter: ^3.0.4
 #  path: ^1.8.0

 # For information on the generic Dart part of this file, see the
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:flutter_wisetronic/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}