From e045caa28f65ca49d7752293fb144ded28a6ea97 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 11 Jun 2025 13:57:54 +0200 Subject: [PATCH] clean pubspec --- .../mih_package_components/mih_package.dart | 1 - .../mih_home/mih_home_legacy.dart | 111 ++++---- Frontend/pubspec.yaml | 236 +----------------- 3 files changed, 58 insertions(+), 290 deletions(-) diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package.dart b/Frontend/lib/mih_components/mih_package_components/mih_package.dart index 54a8f8aa..9bd45661 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package.dart @@ -2,7 +2,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; import 'package:flutter/material.dart'; -// import 'package:flutter_swipe_detector/flutter_swipe_detector.dart'; // ignore: must_be_immutable class MihPackage extends StatefulWidget { diff --git a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart index f62df13f..17346b69 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart @@ -14,9 +14,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_swipe_detector/flutter_swipe_detector.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:google_nav_bar/google_nav_bar.dart'; import '../../main.dart'; import 'package:supertokens_flutter/http.dart' as http; import "package:universal_html/html.dart" as html; @@ -1169,41 +1167,42 @@ class _MIHHomeLegacyState extends State { child: Padding( padding: const EdgeInsets.only( left: 10.0, right: 10.0, bottom: 10.0, top: 0), - child: GNav( - //hoverColor: Colors.lightBlueAccent, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - iconSize: 35.0, - activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), - tabBackgroundColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - //gap: 20, - //padding: EdgeInsets.all(15), - tabs: [ - GButton( - icon: Icons.perm_identity, - text: "Personal", - onPressed: () { - setState(() { - widget.personalSelected = true; - _selectedIndex = 0; - }); - print("personal selected: ${widget.personalSelected}"); - }, - ), - GButton( - icon: Icons.business_center, - text: "Business", - onPressed: () { - setState(() { - widget.personalSelected = false; - _selectedIndex = 1; - }); - print("personal selected: ${widget.personalSelected}"); - }, - ), - ], - selectedIndex: _selectedIndex, - ), + child: Placeholder(), + // GNav( + // //hoverColor: Colors.lightBlueAccent, + // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // iconSize: 35.0, + // activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // tabBackgroundColor: + // MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // //gap: 20, + // //padding: EdgeInsets.all(15), + // tabs: [ + // GButton( + // icon: Icons.perm_identity, + // text: "Personal", + // onPressed: () { + // setState(() { + // widget.personalSelected = true; + // _selectedIndex = 0; + // }); + // print("personal selected: ${widget.personalSelected}"); + // }, + // ), + // GButton( + // icon: Icons.business_center, + // text: "Business", + // onPressed: () { + // setState(() { + // widget.personalSelected = false; + // _selectedIndex = 1; + // }); + // print("personal selected: ${widget.personalSelected}"); + // }, + // ), + // ], + // selectedIndex: _selectedIndex, + // ), ), ); } @@ -1300,34 +1299,16 @@ class _MIHHomeLegacyState extends State { final double width = size.width; final double height = size.height; - return SwipeDetector( - onSwipeLeft: (offset) { - if (_selectedIndex == 0) { - setState(() { - _selectedIndex = 1; - }); - } - //print("swipe left"); - }, - onSwipeRight: (offset) { - if (_selectedIndex == 1) { - setState(() { - _selectedIndex = 0; - }); - } - //print("swipe right"); - }, - child: MIHLayoutBuilder( - actionButton: getActionButton(), - header: getHeader(), - secondaryActionButton: getSecondaryActionButton(), - body: getBody(width, height), - actionDrawer: getActionDrawer(), - secondaryActionDrawer: getSecondaryActionDrawer(), - bottomNavBar: getBottomNavBar(), - pullDownToRefresh: true, - onPullDown: refreshNotifications, - ), + return MIHLayoutBuilder( + actionButton: getActionButton(), + header: getHeader(), + secondaryActionButton: getSecondaryActionButton(), + body: getBody(width, height), + actionDrawer: getActionDrawer(), + secondaryActionDrawer: getSecondaryActionDrawer(), + bottomNavBar: getBottomNavBar(), + pullDownToRefresh: true, + onPullDown: refreshNotifications, ); } } diff --git a/Frontend/pubspec.yaml b/Frontend/pubspec.yaml index d1fe417c..b70bdedb 100644 --- a/Frontend/pubspec.yaml +++ b/Frontend/pubspec.yaml @@ -1,68 +1,34 @@ name: mzansi_innovation_hub description: "" -# The following line prevents the package from being accidentally published to -# 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 is used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -# In Windows, build-name is used as the major, minor, and patch parts -# of the product and file versions while build-number is used as the build suffix. version: 1.1.9+70 environment: sdk: '>=3.5.3 <4.0.0' # flutter: ">=1.17.0" -# 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 flutter_web_plugins: sdk: flutter - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 font_awesome_flutter: ^10.7.0 - syncfusion_flutter_core: ^28.2.6 - syncfusion_flutter_pdfviewer: ^28.2.6 + syncfusion_flutter_core: ^29.2.10 + syncfusion_flutter_pdfviewer: ^29.2.10 universal_html: ^2.2.4 - file_picker: ^9.0.0 + file_picker: ^10.1.9 supertokens_flutter: ^0.6.3 http: ^1.2.1 - google_nav_bar: ^5.0.6 - mysql_client: ^0.0.27 - args: 2.5.0 - # gif: ^2.3.0 - gif_view: ^1.0.0 - intl: ^0.19.0 + args: ^2.7.0 + gif_view: ^1.0.3 + intl: ^0.20.2 flutter_native_splash: ^2.4.1 - #google_maps_flutter_web: ^0.5.10 - # url_strategy: ^0.3.0 - # no_screenshot: ^0.3.1 printing: ^5.13.3 - pdf: ^3.11.1 - geolocator: ^13.0.1 + geolocator: ^14.0.1 table_calendar: ^3.1.2 - flutter_swipe_detector: ^2.0.0 youtube_player_iframe: ^5.2.0 - # simple_barcode_scanner: ^0.3.0 - mobile_scanner: ^6.0.6 - flutter_launcher_icons: ^0.13.1 - # flutter_barcode_scanner: ^2.0.0 + mobile_scanner: ^7.0.1 + flutter_launcher_icons: ^0.14.4 barcode_widget: ^2.0.4 #Generate Barcodes url_launcher: ^6.3.1 fl_downloader: ^2.0.2 @@ -74,9 +40,8 @@ dependencies: uuid: ^4.5.1 flutter_tts: ^4.2.2 flutter_speed_dial: ^7.0.0 - share_plus: ^10.1.4 + share_plus: ^11.0.0 app_settings: ^6.1.1 - animated_button: ^0.3.1 pwa_install: ^0.0.6 dev_dependencies: @@ -86,25 +51,10 @@ dev_dependencies: build_runner: ^2.4.8 build_web_compilers: ^4.1.5 - # 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. - flutter_lints: ^2.0.0 + flutter_lints: ^6.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 packages. 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: - lib/mih_components/mih_package_components/assets/images/ - lib/mih_components/mih_package_components/assets/fonts/ @@ -112,180 +62,18 @@ flutter: - lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/ - lib/mih_components/mih_package_components/assets/images/app_icon/ - lib/mih_components/mih_package_components/assets/images/splash_screen/ - # - 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: MihIcons fonts: - # - asset: lib/mih_components/mih_package_components/assets/fonts/MihIcons.ttf - asset: lib/mih_components/mih_package_components/assets/fonts/Mih_Icons.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 flutter_native_splash: - # This package generates native code to customize Flutter's default white native splash screen - # with background color and splash image. - # Customize the parameters below, and run the following command in the terminal: - # dart run flutter_native_splash:create - # To restore Flutter's default white splash screen, run the following command in the terminal: - # dart run flutter_native_splash:remove - - # IMPORTANT NOTE: These parameter do not affect the configuration of Android 12 and later, which - # handle splash screens differently that prior versions of Android. Android 12 and later must be - # configured specifically in the android_12 section below. - - # color or background_image is the only required parameter. Use color to set the background - # of your splash screen to a solid color. Use background_image to set the background of your - # splash screen to a png image. This is useful for gradients. The image will be stretch to the - # size of the app. Only one parameter can be used, color and background_image cannot both be set. color: "#3A4454" - #background_image: "assets/background.png" - - # Optional parameters are listed below. To enable a parameter, uncomment the line by removing - # the leading # character. - - # The image parameter allows you to specify an image used in the splash screen. It must be a - # png file and should be sized for 4x pixel density. image: lib/mih_components/mih_package_components/assets/images/logo_light.png - - # The branding property allows you to specify an image used as branding in the splash screen. - # It must be a png file. It is supported for Android, iOS and the Web. For Android 12, - # see the Android 12 section below. branding: lib/mih_components/mih_package_components/assets/images/branding_text.png - - # To position the branding image at the bottom of the screen you can use bottom, bottomRight, - # and bottomLeft. The default values is bottom if not specified or specified something else. branding_mode: bottom - - # Set the branding padding from the bottom of the screen. The default value is 0 branding_bottom_padding: 24 - - # The color_dark, background_image_dark, image_dark, branding_dark are parameters that set the background - # and image when the device is in dark mode. If they are not specified, the app will use the - # parameters from above. If the image_dark parameter is specified, color_dark or - # background_image_dark must be specified. color_dark and background_image_dark cannot both be - # set. - #color_dark: "#042a49" - #background_image_dark: "assets/dark-background.png" - #image_dark: assets/splash-invert.png - #branding_dark: assets/dart_dark.png - - # From Android 12 onwards, the splash screen is handled differently than in previous versions. - # Please visit https://developer.android.com/guide/topics/ui/splash-screen - # Following are specific parameters for Android 12+. android_12: - # The image parameter sets the splash screen icon image. If this parameter is not specified, - # the app's launcher icon will be used instead. - # Please note that the splash screen will be clipped to a circle on the center of the screen. - # App icon with an icon background: This should be 960×960 pixels, and fit within a circle - # 640 pixels in diameter. - # App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle - # 768 pixels in diameter. image: lib/mih_components/mih_package_components/assets/images/splash_screen/splash_screen_icon.png - - # Splash screen background color. color: "#3A4454" - - # App icon background color. - #icon_background_color: "#111111" - - # The branding property allows you to specify an image used as branding in the splash screen. - branding: lib/mih_components/mih_package_components/assets/images/branding_text.png - - # The image_dark, color_dark, icon_background_color_dark, and branding_dark set values that - # apply when the device is in dark mode. If they are not specified, the app will use the - # parameters from above. - #image_dark: assets/android12splash-invert.png - #color_dark: "#042a49" - #icon_background_color_dark: "#eeeeee" - - # The android, ios and web parameters can be used to disable generating a splash screen on a given - # platform. - #android: false - #ios: false - #web: false - - # Platform specific images can be specified with the following parameters, which will override - # the respective parameter. You may specify all, selected, or none of these parameters: - #color_android: "#42a5f5" - #color_dark_android: "#042a49" - #color_ios: "#42a5f5" - #color_dark_ios: "#042a49" - #color_web: "#42a5f5" - #color_dark_web: "#042a49" - #image_android: assets/splash-android.png - #image_dark_android: assets/splash-invert-android.png - #image_ios: assets/splash-ios.png - #image_dark_ios: assets/splash-invert-ios.png - #image_web: assets/splash-web.gif - #image_dark_web: assets/splash-invert-web.gif - #background_image_android: "assets/background-android.png" - #background_image_dark_android: "assets/dark-background-android.png" - #background_image_ios: "assets/background-ios.png" - #background_image_dark_ios: "assets/dark-background-ios.png" - #background_image_web: "assets/background-web.png" - #background_image_dark_web: "assets/dark-background-web.png" - #branding_android: assets/brand-android.png - #branding_bottom_padding_android: 24 - #branding_dark_android: assets/dart_dark-android.png - #branding_ios: assets/brand-ios.png - #branding_bottom_padding_ios: 24 - #branding_dark_ios: assets/dart_dark-ios.png - #branding_web: assets/brand-web.gif - #branding_dark_web: assets/dart_dark-web.gif - - # The position of the splash image can be set with android_gravity, ios_content_mode, and - # web_image_mode parameters. All default to center. - # - # android_gravity can be one of the following Android Gravity (see - # https://developer.android.com/reference/android/view/Gravity): bottom, center, - # center_horizontal, center_vertical, clip_horizontal, clip_vertical, end, fill, fill_horizontal, - # fill_vertical, left, right, start, or top. - #android_gravity: center - # - # ios_content_mode can be one of the following iOS UIView.ContentMode (see - # https://developer.apple.com/documentation/uikit/uiview/contentmode): scaleToFill, - # scaleAspectFit, scaleAspectFill, center, top, bottom, left, right, topLeft, topRight, - # bottomLeft, or bottomRight. - #ios_content_mode: center - # - # web_image_mode can be one of the following modes: center, contain, stretch, and cover. - #web_image_mode: center - - # The screen orientation can be set in Android with the android_screen_orientation parameter. - # Valid parameters can be found here: - # https://developer.android.com/guide/topics/manifest/activity-element#screen - #android_screen_orientation: sensorLandscape - - # To hide the notification bar, use the fullscreen parameter. Has no effect in web since web - # has no notification bar. Defaults to false. - # NOTE: Unlike Android, iOS will not automatically show the notification bar when the app loads. - # To show the notification bar, add the following code to your Flutter app: - # WidgetsFlutterBinding.ensureInitialized(); - # SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: [SystemUiOverlay.bottom, SystemUiOverlay.top], ); - #fullscreen: true - - # If you have changed the name(s) of your info.plist file(s), you can specify the filename(s) - # with the info_plist_files parameter. Remove only the # characters in the three lines below, - # do not remove any spaces: - #info_plist_files: - # - 'ios/Runner/Info-Debug.plist' - # - 'ios/Runner/Info-Release.plist' \ No newline at end of file + branding: lib/mih_components/mih_package_components/assets/images/branding_text.png \ No newline at end of file