diff --git a/.DS_Store b/.DS_Store index 4ab43351..66a473f6 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/laundry_app_ui/.idea/libraries/Dart_SDK.xml b/laundry_app_ui/.idea/libraries/Dart_SDK.xml index 0172f529..6a297e15 100644 --- a/laundry_app_ui/.idea/libraries/Dart_SDK.xml +++ b/laundry_app_ui/.idea/libraries/Dart_SDK.xml @@ -1,17 +1,27 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/laundry_app_ui/.idea/workspace.xml b/laundry_app_ui/.idea/workspace.xml index 5b3388cc..84423342 100644 --- a/laundry_app_ui/.idea/workspace.xml +++ b/laundry_app_ui/.idea/workspace.xml @@ -1,5 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13,24 +59,57 @@ - - - - - + + + + + { + "associatedIndex": 2 +} + - - + - - - - + + + { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.cidr.known.project.marker": "true", + "cf.first.check.clang-format": "false", + "cidr.known.project.marker": "true", + "dart.analysis.tool.window.visible": "false", + "git-widget-placeholder": "main", + "last_opened_file_path": "/Users/user/Documents/GitHub/flutter-ui-kits/laundry_app_ui", + "settings.editor.selected.configurable": "dart.settings", + "show.migrate.to.gradle.popup": "false" + } +} + + + + + 1728487540248 + + + + + + + + - + \ No newline at end of file diff --git a/laundry_app_ui/.packages b/laundry_app_ui/.packages deleted file mode 100644 index e157f60e..00000000 --- a/laundry_app_ui/.packages +++ /dev/null @@ -1,51 +0,0 @@ -# This file is deprecated. Tools should instead consume -# `.dart_tools/package_config.json`. -# -# For more info see: https://dart.dev/go/dot-packages-deprecation -# -# Generated by pub on 2021-06-22 10:34:14.558229. -animated_bottom_navigation_bar:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/animated_bottom_navigation_bar-0.3.2/lib/ -async:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.6.1/lib/ -boolean_selector:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ -characters:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ -clock:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ -collection:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ -crypto:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-3.0.1/lib/ -cupertino_icons:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.2/lib/ -curved_navigation_bar:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/curved_navigation_bar-1.0.1/lib/ -fake_async:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ -ffi:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.1.2/lib/ -file:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/file-6.1.2/lib/ -flutter:file:///Users/olayemii/flutter/packages/flutter/lib/ -flutter_icons:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_icons-1.1.0/lib/ -flutter_screenutil:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_screenutil-5.0.0+2/lib/ -flutter_test:file:///Users/olayemii/flutter/packages/flutter_test/lib/ -google_fonts:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.1.0/lib/ -http:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.3/lib/ -http_parser:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-4.0.0/lib/ -intl:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.17.0/lib/ -matcher:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ -meta:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ -path:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ -path_provider:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-2.0.2/lib/ -path_provider_linux:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-2.0.0/lib/ -path_provider_macos:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-2.0.0/lib/ -path_provider_platform_interface:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.1/lib/ -path_provider_windows:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-2.0.1/lib/ -pedantic:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.11.1/lib/ -platform:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/platform-3.0.0/lib/ -plugin_platform_interface:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/plugin_platform_interface-2.0.0/lib/ -process:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/process-4.2.1/lib/ -sky_engine:file:///Users/olayemii/flutter/bin/cache/pkg/sky_engine/lib/ -source_span:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.1/lib/ -stack_trace:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ -stream_channel:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ -string_scanner:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ -term_glyph:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ -test_api:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.3.0/lib/ -typed_data:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ -vector_math:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ -win32:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/win32-2.2.2/lib/ -xdg_directories:file:///Users/olayemii/flutter/.pub-cache/hosted/pub.dartlang.org/xdg_directories-0.2.0/lib/ -laundry_app_ui:lib/ diff --git a/laundry_app_ui/android/app/build.gradle b/laundry_app_ui/android/app/build.gradle index b1fdd4b0..2b7f2b63 100644 --- a/laundry_app_ui/android/app/build.gradle +++ b/laundry_app_ui/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 29 + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -39,8 +39,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.laundry_app_ui" - minSdkVersion 16 - targetSdkVersion 29 + minSdkVersion flutter.minSdkVersion + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -59,5 +59,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10" } diff --git a/laundry_app_ui/android/app/src/main/AndroidManifest.xml b/laundry_app_ui/android/app/src/main/AndroidManifest.xml index 1a86a9d9..ac854a05 100644 --- a/laundry_app_ui/android/app/src/main/AndroidManifest.xml +++ b/laundry_app_ui/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,12 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> 'MIT' } - s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } - s.ios.deployment_target = '8.0' - s.vendored_frameworks = 'Flutter.framework' -end diff --git a/laundry_app_ui/ios/Runner/GeneratedPluginRegistrant.h b/laundry_app_ui/ios/Runner/GeneratedPluginRegistrant.h index ed9a5c61..7a890927 100644 --- a/laundry_app_ui/ios/Runner/GeneratedPluginRegistrant.h +++ b/laundry_app_ui/ios/Runner/GeneratedPluginRegistrant.h @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #ifndef GeneratedPluginRegistrant_h #define GeneratedPluginRegistrant_h diff --git a/laundry_app_ui/ios/Runner/GeneratedPluginRegistrant.m b/laundry_app_ui/ios/Runner/GeneratedPluginRegistrant.m index 3f125c25..c0d0cbad 100644 --- a/laundry_app_ui/ios/Runner/GeneratedPluginRegistrant.m +++ b/laundry_app_ui/ios/Runner/GeneratedPluginRegistrant.m @@ -2,18 +2,20 @@ // Generated file. Do not edit. // +// clang-format off + #import "GeneratedPluginRegistrant.h" -#if __has_include() -#import +#if __has_include() +#import #else -@import path_provider; +@import path_provider_foundation; #endif @implementation GeneratedPluginRegistrant + (void)registerWithRegistry:(NSObject*)registry { - [FLTPathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTPathProviderPlugin"]]; + [PathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"PathProviderPlugin"]]; } @end diff --git a/laundry_app_ui/laundry_app_ui.iml b/laundry_app_ui/laundry_app_ui.iml index e5c83719..52135f9c 100644 --- a/laundry_app_ui/laundry_app_ui.iml +++ b/laundry_app_ui/laundry_app_ui.iml @@ -11,8 +11,8 @@ - + \ No newline at end of file diff --git a/laundry_app_ui/lib/main.dart b/laundry_app_ui/lib/main.dart index 648dd672..f00828e5 100644 --- a/laundry_app_ui/lib/main.dart +++ b/laundry_app_ui/lib/main.dart @@ -16,7 +16,7 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return ScreenUtilInit( designSize: Size(375, 812), - builder: () => MaterialApp( + builder: (context, child) => MaterialApp( debugShowCheckedModeBanner: false, title: "Flutter Laundry UI", theme: ThemeData( diff --git a/laundry_app_ui/lib/models/location.dart b/laundry_app_ui/lib/models/location.dart index 6cf7957d..2cd2f573 100644 --- a/laundry_app_ui/lib/models/location.dart +++ b/laundry_app_ui/lib/models/location.dart @@ -1,15 +1,15 @@ import 'dart:ui'; class Location { - final String address; - final String state; - final Color color; - final String imagePath; + final String? address; // Nullable + final String? state; // Nullable + final Color? color; // Nullable + final String? imagePath; // Nullable Location({ this.address, + this.state, this.color, this.imagePath, - this.state, }); } diff --git a/laundry_app_ui/lib/models/order.dart b/laundry_app_ui/lib/models/order.dart index 1af82dc7..82f3b01d 100644 --- a/laundry_app_ui/lib/models/order.dart +++ b/laundry_app_ui/lib/models/order.dart @@ -1,15 +1,15 @@ enum OrderStatus { PICKING_UP, DELIVERING } class Order { - final int id; - final OrderStatus status; - final DateTime arrivalDate; - final DateTime placedDate; - final String deliveryAddress; + final int? id; // Nullable + final OrderStatus status; // Non-nullable + final DateTime? arrivalDate; // Nullable + final DateTime? placedDate; // Nullable + final String? deliveryAddress; // Nullable Order({ this.id, - this.status, + required this.status, // Required parameter, non-nullable this.arrivalDate, this.placedDate, this.deliveryAddress, diff --git a/laundry_app_ui/lib/pages/dashboard.dart b/laundry_app_ui/lib/pages/dashboard.dart index e0e50418..d0591c61 100644 --- a/laundry_app_ui/lib/pages/dashboard.dart +++ b/laundry_app_ui/lib/pages/dashboard.dart @@ -1,6 +1,6 @@ import 'package:curved_navigation_bar/curved_navigation_bar.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_icons/flutter_icons.dart'; +import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:laundry_app_ui/utils/constants.dart'; import 'package:laundry_app_ui/widgets/latest_orders.dart'; @@ -103,7 +103,7 @@ class _DashboardState extends State { text: "Welcome Back,\n", style: Theme.of(context) .textTheme - .headline6 + .titleLarge! .copyWith( color: Colors.white, ), @@ -112,7 +112,7 @@ class _DashboardState extends State { text: "FlutterPanda!", style: Theme.of(context) .textTheme - .headline6 + .titleLarge! .copyWith( color: Colors.white, fontWeight: FontWeight.w600, diff --git a/laundry_app_ui/lib/pages/home.dart b/laundry_app_ui/lib/pages/home.dart index ae36fad3..53dd330d 100644 --- a/laundry_app_ui/lib/pages/home.dart +++ b/laundry_app_ui/lib/pages/home.dart @@ -63,7 +63,7 @@ class Home extends StatelessWidget { SizedBox(height: 20.0), Text( "Welcome to Laundree!", - style: Theme.of(context).textTheme.headline6.copyWith( + style: Theme.of(context).textTheme.titleLarge!.copyWith( fontWeight: FontWeight.w600, color: Color.fromRGBO(19, 22, 33, 1), ), @@ -95,6 +95,7 @@ class Home extends StatelessWidget { AppButton( text: "Create an Account", type: ButtonType.PRIMARY, + onPressed: ()=>{}, ) ], ), diff --git a/laundry_app_ui/lib/pages/login.dart b/laundry_app_ui/lib/pages/login.dart index cc10e105..4bd2d64a 100644 --- a/laundry_app_ui/lib/pages/login.dart +++ b/laundry_app_ui/lib/pages/login.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_icons/flutter_icons.dart'; +import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart'; import 'package:laundry_app_ui/utils/constants.dart'; import 'package:laundry_app_ui/utils/helper.dart'; import 'package:laundry_app_ui/widgets/app_button.dart'; @@ -56,7 +56,7 @@ class Login extends StatelessWidget { "Log in to your account", style: Theme.of(context) .textTheme - .headline6 + .titleLarge! .copyWith( fontWeight: FontWeight.w600, color: Colors.white, diff --git a/laundry_app_ui/lib/pages/single_order.dart b/laundry_app_ui/lib/pages/single_order.dart index 0bb09e10..709bf47c 100644 --- a/laundry_app_ui/lib/pages/single_order.dart +++ b/laundry_app_ui/lib/pages/single_order.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_icons/flutter_icons.dart'; +import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:laundry_app_ui/utils/constants.dart'; @@ -54,14 +54,14 @@ class _SingleOrderState extends State { TextSpan( text: "Details About\n", style: - Theme.of(context).textTheme.headline6.copyWith( + Theme.of(context).textTheme.titleLarge!.copyWith( color: Colors.white, ), ), TextSpan( text: "Order #521", style: - Theme.of(context).textTheme.headline6.copyWith( + Theme.of(context).textTheme.titleLarge!.copyWith( color: Colors.white, fontWeight: FontWeight.w600, ), @@ -89,7 +89,7 @@ class _SingleOrderState extends State { Text( "Order Details", style: - Theme.of(context).textTheme.headline6.copyWith( + Theme.of(context).textTheme.titleLarge!.copyWith( color: Color.fromRGBO(74, 77, 84, 1), fontSize: 16.0, fontWeight: FontWeight.w800, @@ -150,7 +150,7 @@ class _SingleOrderState extends State { Text( "Your clothes are now washing.", style: - Theme.of(context).textTheme.headline6.copyWith( + Theme.of(context).textTheme.titleLarge!.copyWith( color: Color.fromRGBO(74, 77, 84, 1), fontSize: 16.0, fontWeight: FontWeight.w800, diff --git a/laundry_app_ui/lib/widgets/app_button.dart b/laundry_app_ui/lib/widgets/app_button.dart index fd0f2580..9326c462 100644 --- a/laundry_app_ui/lib/widgets/app_button.dart +++ b/laundry_app_ui/lib/widgets/app_button.dart @@ -10,7 +10,7 @@ class AppButton extends StatelessWidget { final VoidCallback onPressed; final String text; - AppButton({this.type, this.onPressed, this.text}); + AppButton({required this.type, required this.onPressed, required this.text}); @override Widget build(BuildContext context) { diff --git a/laundry_app_ui/lib/widgets/input_widget.dart b/laundry_app_ui/lib/widgets/input_widget.dart index 29206f46..45d7f3a9 100644 --- a/laundry_app_ui/lib/widgets/input_widget.dart +++ b/laundry_app_ui/lib/widgets/input_widget.dart @@ -3,8 +3,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:laundry_app_ui/utils/constants.dart'; class InputWidget extends StatelessWidget { - final String hintText; - final IconData prefixIcon; + final String? hintText; + final IconData? prefixIcon; final double height; final String topLabel; final bool obscureText; @@ -32,12 +32,18 @@ class InputWidget extends StatelessWidget { child: TextFormField( obscureText: this.obscureText, decoration: InputDecoration( - prefixIcon: this.prefixIcon == null - ? this.prefixIcon - : Icon( - this.prefixIcon, - color: Color.fromRGBO(105, 108, 121, 1), - ), + prefixIcon: Icon(this.prefixIcon, + color: Color.fromRGBO(105, 108, 121, 1), + + ), + + + // this.prefixIcon == null + // ? this.prefixIcon! + // : Icon( + // this.prefixIcon!, + // color: Color.fromRGBO(105, 108, 121, 1), + // ), enabledBorder: OutlineInputBorder( borderSide: BorderSide( color: Color.fromRGBO(74, 77, 84, 0.2), diff --git a/laundry_app_ui/lib/widgets/location_slider.dart b/laundry_app_ui/lib/widgets/location_slider.dart index 4736a0ff..41a5a014 100644 --- a/laundry_app_ui/lib/widgets/location_slider.dart +++ b/laundry_app_ui/lib/widgets/location_slider.dart @@ -58,7 +58,7 @@ class LocationSlider extends StatelessWidget { child: Opacity( opacity: 0.69, child: Image.asset( - locations[index].imagePath, + locations[index]!.imagePath!, ), ), ), diff --git a/laundry_app_ui/lib/widgets/order_card.dart b/laundry_app_ui/lib/widgets/order_card.dart index f253fbfd..3cee3dad 100644 --- a/laundry_app_ui/lib/widgets/order_card.dart +++ b/laundry_app_ui/lib/widgets/order_card.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:flutter_icons/flutter_icons.dart'; +import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:intl/intl.dart'; import 'package:laundry_app_ui/models/order.dart'; import 'package:laundry_app_ui/utils/helper.dart'; class OrderCard extends StatelessWidget { - final Order order; + final Order? order; OrderCard({this.order}); @@ -32,7 +32,7 @@ class OrderCard extends StatelessWidget { child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - getOrderIconWidget(order.status), + getOrderIconWidget(order!.status), SizedBox( width: 25.0, ), @@ -41,7 +41,7 @@ class OrderCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - getOrderStatusText(order.status), + getOrderStatusText(order!.status), style: TextStyle( color: Color.fromRGBO(19, 22, 33, 1), fontSize: 16.0, @@ -50,11 +50,11 @@ class OrderCard extends StatelessWidget { SizedBox( height: 10.0, ), - textRow("Placed On", formatter.format(order.placedDate)), + textRow("Placed On", formatter.format(order!.placedDate!)), SizedBox( height: 5.0, ), - textRow("Delivery On", formatter.format(order.arrivalDate)) + textRow("Delivery On", formatter.format(order!.arrivalDate!)) ], ), ), diff --git a/laundry_app_ui/pubspec.lock b/laundry_app_ui/pubspec.lock index a8e5ce87..91d3f7eb 100644 --- a/laundry_app_ui/pubspec.lock +++ b/laundry_app_ui/pubspec.lock @@ -5,112 +5,111 @@ packages: dependency: "direct main" description: name: animated_bottom_navigation_bar - url: "https://pub.dartlang.org" + sha256: "2bedd1236d96f4305e6299f68d9f95a923f05ce8e47c2e70d7ed94d709d5f6d6" + url: "https://pub.dev" source: hosted - version: "0.3.2" + version: "0.3.3" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.6.1" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.18.0" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.5" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.8" curved_navigation_bar: dependency: "direct main" description: name: curved_navigation_bar - url: "https://pub.dartlang.org" + sha256: bb4ab128fcb6f4a9f0f1f72d227db531818b20218984789777f049fcbf919279 + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.6" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" source: hosted - version: "1.1.2" - file: - dependency: transitive - description: - name: file - url: "https://pub.dartlang.org" - source: hosted - version: "6.1.2" + version: "2.1.3" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_icons: + flutter_icons_null_safety: dependency: "direct main" description: - name: flutter_icons - url: "https://pub.dartlang.org" + name: flutter_icons_null_safety + sha256: "60fd2594b08cba99d74c9c75e0fb7856b33377a538563713dca21bb71fcc1eec" + url: "https://pub.dev" source: hosted version: "1.1.0" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - url: "https://pub.dartlang.org" + sha256: "8239210dd68bee6b0577aa4a090890342d04a136ce1c81f98ee513fc0ce891de" + url: "https://pub.dev" source: hosted - version: "5.0.0+2" + version: "5.9.3" flutter_test: dependency: "direct dev" description: flutter @@ -120,114 +119,154 @@ packages: dependency: "direct main" description: name: google_fonts - url: "https://pub.dartlang.org" + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "6.2.1" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" source: hosted - version: "0.13.3" + version: "1.2.2" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" + source: hosted + version: "0.12.16+1" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.8.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.12.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.0" path_provider: - dependency: transitive + dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + url: "https://pub.dev" source: hosted - version: "2.0.2" - path_provider_linux: + version: "2.1.4" + path_provider_android: dependency: transitive description: - name: path_provider_linux - url: "https://pub.dartlang.org" + name: path_provider_android + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" + url: "https://pub.dev" source: hosted - version: "2.0.0" - path_provider_macos: + version: "2.2.10" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 + url: "https://pub.dev" + source: hosted + version: "2.4.0" + path_provider_linux: dependency: transitive description: - name: path_provider_macos - url: "https://pub.dartlang.org" + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "2.3.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.5" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" source: hosted - version: "2.0.0" - process: - dependency: transitive - description: - name: process - url: "https://pub.dartlang.org" - source: hosted - version: "4.2.1" + version: "2.1.8" sky_engine: dependency: transitive description: flutter @@ -237,72 +276,90 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.7.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.2" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" source: hosted - version: "2.1.0" - win32: + version: "14.2.1" + web: dependency: transitive description: - name: win32 - url: "https://pub.dartlang.org" + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "1.1.0" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "1.1.0" sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=1.20.0" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/laundry_app_ui/pubspec.yaml b/laundry_app_ui/pubspec.yaml index 69ae7c15..d619c471 100644 --- a/laundry_app_ui/pubspec.yaml +++ b/laundry_app_ui/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=2.7.0 <3.0.0" + sdk: '>=3.1.0 <4.0.0' dependencies: flutter: @@ -26,10 +26,11 @@ dependencies: animated_bottom_navigation_bar: ^0.3.2 cupertino_icons: ^1.0.0 curved_navigation_bar: ^1.0.1 - flutter_icons: ^1.1.0 + flutter_icons_null_safety: ^1.1.0 flutter_screenutil: ^5.0.0+2 - google_fonts: ^2.1.0 + google_fonts: ^6.2.1 intl: ^0.17.0 + path_provider: ^2.0.11 # Or the latest version dev_dependencies: flutter_test: