diff --git a/assets/images/location.svg b/assets/images/location.svg new file mode 100644 index 0000000..f012358 --- /dev/null +++ b/assets/images/location.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/lib/app/configs/colors.dart b/lib/app/configs/colors.dart index 1d5841d..03e2dea 100644 --- a/lib/app/configs/colors.dart +++ b/lib/app/configs/colors.dart @@ -15,6 +15,6 @@ class AppColors { static const Color blackTextColor = Color(0xFF040303); static const Color greyTextColor = Color(0xFF9698A9); - + static const Color greyLightColor = Color.fromARGB(255, 236, 237, 242); static const Color backgroundColorDark = Color(0xFF303030); } diff --git a/lib/ui/pages/home_page.dart b/lib/ui/pages/home_page.dart index 4fab84b..add6cf0 100644 --- a/lib/ui/pages/home_page.dart +++ b/lib/ui/pages/home_page.dart @@ -1,5 +1,6 @@ //import 'dart:js'; +import 'package:card_swiper/card_swiper.dart'; import 'package:event_app/app/configs/colors.dart'; import 'package:event_app/app/resources/constant/named_routes.dart'; import 'package:event_app/bloc/event_cubit.dart'; @@ -7,7 +8,6 @@ import 'package:event_app/controllers/Home%20Page%20controllers/location_control import 'package:event_app/data/event_model.dart'; import 'package:event_app/models/Home%20page%20models/locationModel.dart'; import 'package:event_app/ui/pages/profile_page.dart'; -import 'package:event_app/ui/pages/view_all_page.dart'; import 'package:event_app/ui/widgets/card_event_this_month.dart'; import 'package:event_app/ui/widgets/card_popular_event.dart'; import 'package:event_app/ui/widgets/custom_app_bar.dart'; @@ -15,6 +15,9 @@ import 'package:event_app/ui/widgets/my_navigation_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_svg/svg.dart'; + +import 'view_all_page.dart'; class HomePage extends StatefulWidget { @@ -83,8 +86,8 @@ class _HomePageState extends State { const Text( "Popular Event", style: TextStyle( - fontWeight: FontWeight.w500, - fontSize: 16, + fontWeight: FontWeight.w700, + fontSize: 18, ), ), GestureDetector( @@ -92,21 +95,22 @@ class _HomePageState extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => ViewAllPage(isPopularEvent: true,)), + builder: (context) => const ViewAllPage(isPopularEvent: true,)), ); }, child: const Text( "View All", style: TextStyle( - fontWeight: FontWeight.w400, - fontSize: 12, - color: AppColors.greyTextColor), + fontWeight: FontWeight.w500, + fontSize: 14, + color: AppColors.primaryColor + ), ), ) ], ), ), - const SizedBox(height: 16), + const SizedBox(height: 8), BlocBuilder( builder: (context, state) { if (state is EventError) { @@ -118,23 +122,31 @@ class _HomePageState extends State { } }, ), - const SizedBox(height: 24), + const SizedBox(height: 12), + Divider(height: 1, + endIndent: 16, + indent: 16, + thickness: 0.5, + color: Theme.of(context).disabledColor.withOpacity(0.1), + ), + const SizedBox(height: 8), Padding( - padding: EdgeInsets.symmetric(horizontal: 24), + padding: const EdgeInsets.symmetric(horizontal: 24,vertical: 12), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ const Text( "Event This Month", style: TextStyle( - fontWeight: FontWeight.w500, fontSize: 16), + fontWeight: FontWeight.w600, + fontSize: 18), ), GestureDetector( onTap: () { Navigator.push( context, MaterialPageRoute( - builder: (context) => ViewAllPage(isPopularEvent: false,)), + builder: (context) => const ViewAllPage(isPopularEvent: false,)), ); }, child: const Text( @@ -142,13 +154,14 @@ class _HomePageState extends State { style: TextStyle( fontWeight: FontWeight.w400, fontSize: 12, - color: AppColors.greyTextColor), + color: AppColors.primaryColor + ), ), ) ], ), ), - const SizedBox(height: 16), + const SizedBox(height: 8), BlocBuilder( builder: (context, state) { if (state is EventError) { @@ -173,37 +186,45 @@ class _HomePageState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - address_locality, - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.w600, - ), - ), - SizedBox(height: 8), - Row(children: [ - SizedBox(width: 4), + Expanded( + flex: 3, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row(children: [ + Image.asset( + 'assets/images/location.png', + width: 20, + ), + const SizedBox(width: 8), + Text( + address_country, + style: const TextStyle( + fontSize: 14, + color: AppColors.greyTextColor, + fontWeight: FontWeight.w600, + ), + ), + ]), + const SizedBox(height: 8), Text( - address_country, - style: TextStyle( - fontSize: 12, - color: AppColors.greyTextColor, - fontWeight: FontWeight.w400, + address_locality, + style: const TextStyle( + fontSize: 15, + fontWeight: FontWeight.w600, ), ), - ]), - ], + ], + ), ), + const Spacer(), GestureDetector( onTap: () { // Navigate to the specific page here Navigator.push( context, - MaterialPageRoute(builder: (context) => ProfilePage()), + MaterialPageRoute(builder: (context) => const ProfilePage()), ); }, child: Container( @@ -230,7 +251,7 @@ class _HomePageState extends State { padding: const EdgeInsets.symmetric(horizontal: 16), decoration: const BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(50)), - color: AppColors.whiteColor, + color: AppColors.greyLightColor, ), child: Row( children: [ @@ -239,19 +260,28 @@ class _HomePageState extends State { const Text( "Search event...", style: TextStyle( - color: AppColors.greyTextColor, fontWeight: FontWeight.w400), + color: AppColors.greyTextColor, + fontWeight: FontWeight.w500 + ), ) ], ), ); - _listPopularEvent(List events) => Container( - width: double.infinity, + _listPopularEvent(List events) => SizedBox( + width: MediaQuery.of(context).size.width, height: 270, - padding: const EdgeInsets.only(left: 16), - child: ListView.builder( + child: Swiper( physics: const BouncingScrollPhysics(), scrollDirection: Axis.horizontal, + autoplay: true, + pagination: const SwiperPagination( + alignment: Alignment.bottomCenter + ), + control: const SwiperControl( + size: 0, + padding: EdgeInsets.all(0) + ), itemCount: events.length, itemBuilder: (context, index) => GestureDetector( onTap: () => Navigator.pushNamed( @@ -265,10 +295,10 @@ class _HomePageState extends State { ); _listEventThisMonth(List events) => Container( - height: 300, + height: 320, margin: const EdgeInsets.symmetric(horizontal: 24), child: ListView.builder( - physics: const BouncingScrollPhysics(), + physics: const NeverScrollableScrollPhysics(), itemCount: events.length, reverse: true, itemBuilder: (context, index) => BlocBuilder( diff --git a/lib/ui/widgets/card_event_this_month.dart b/lib/ui/widgets/card_event_this_month.dart index 2e8c8c5..d937a13 100644 --- a/lib/ui/widgets/card_event_this_month.dart +++ b/lib/ui/widgets/card_event_this_month.dart @@ -11,9 +11,9 @@ class CardEventThisMonth extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - height: 90, + height: 95, margin: const EdgeInsets.only(bottom: 12), - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 8), decoration: BoxDecoration( borderRadius: BorderRadius.circular(16), color: AppColors.whiteColor, @@ -26,8 +26,8 @@ class CardEventThisMonth extends StatelessWidget { child: Image.network( eventModel.image, fit: BoxFit.cover, - width: 60, - height: double.infinity, + width: 75, + height: 75, ), ), const SizedBox(width: 12), @@ -36,7 +36,10 @@ class CardEventThisMonth extends StatelessWidget { children: [ Text( eventModel.title, - style: const TextStyle(fontWeight: FontWeight.w500), + style: const TextStyle( + fontSize: 15, + letterSpacing: 0.3, + fontWeight: FontWeight.w700), ), const SizedBox(height: 4), Row( @@ -64,7 +67,7 @@ class CardEventThisMonth extends StatelessWidget { const Spacer(), Container( height: 50, - width: 35, + width: 50, decoration: BoxDecoration( color: AppColors.primaryLightColor, borderRadius: BorderRadius.circular(10), diff --git a/lib/ui/widgets/card_popular_event.dart b/lib/ui/widgets/card_popular_event.dart index fa2320a..cb76f76 100644 --- a/lib/ui/widgets/card_popular_event.dart +++ b/lib/ui/widgets/card_popular_event.dart @@ -1,6 +1,9 @@ +import 'dart:ui'; + import 'package:event_app/app/configs/colors.dart'; import 'package:event_app/data/event_model.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; class CardPopularEvent extends StatelessWidget { final EventModel eventModel; @@ -10,21 +13,21 @@ class CardPopularEvent extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - width: 250, - height: 270, - margin: const EdgeInsets.only(left: 8, right: 8), + width: MediaQuery.of(context).size.width, + height: 240, + margin: const EdgeInsets.only(left: 12, right: 12), child: Stack( children: [ - _buildCardImage(), + _buildCardImage(context), _buildCardDesc(), ], ), ); } - _buildCardImage() => Container( - width: 250, - height: 250, + _buildCardImage(BuildContext context) => Container( + width: MediaQuery.of(context).size.width, + height: 240, padding: const EdgeInsets.all(10), decoration: BoxDecoration( color: AppColors.whiteColor, @@ -40,87 +43,90 @@ class CardPopularEvent extends StatelessWidget { width: double.infinity, height: double.infinity, ), - Positioned( - right: 8, - top: 8, - child: Container( - height: 50, - width: 35, - decoration: BoxDecoration( - color: AppColors.whiteColor, - borderRadius: BorderRadius.circular(10), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - eventModel.date.split(" ")[0], - ), - Text( - eventModel.date.split(" ")[1], - style: const TextStyle( - color: AppColors.primaryColor, - ), - ), - ], - ), - ), - ) ], ), ), ); _buildCardDesc() => Positioned( - bottom: 0, - right: 0, - left: 0, - child: Container( - height: 60, - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), - margin: const EdgeInsets.symmetric(horizontal: 18), - decoration: BoxDecoration( - color: AppColors.whiteColor, - borderRadius: BorderRadius.circular(12)), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - eventModel.title, - style: const TextStyle(fontWeight: FontWeight.w500), - ), - const SizedBox(height: 6), - Row( - children: [ - - const SizedBox(width: 4), - Text( - eventModel.location, - style: const TextStyle( - fontSize: 12, - color: AppColors.greyTextColor, + bottom: 40, + right: 9, + left: 9, + child: ClipRRect( + borderRadius:const BorderRadius.only( + bottomLeft: Radius.circular(12), + bottomRight:Radius.circular(12), + ), + child: BackdropFilter( + filter: ImageFilter.blur(sigmaX: 4.0, sigmaY: 4.0), + child: Container( + height: 70, + color: Colors.black.withOpacity(0.25), + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + eventModel.title, + style: const TextStyle( + color: Colors.white, + fontSize: 16, + fontWeight: FontWeight.w600 + ), + ), + const SizedBox(height: 4), + Row( + children: [ + SvgPicture.asset('assets/images/location.svg', + width: 20, ), - ) - ], - ) - ], - ), - Container( - width: 30, - height: 30, - alignment: Alignment.center, + const SizedBox(width: 6), + Text( + eventModel.location, + style: const TextStyle( + fontSize: 13, + color: AppColors.whiteColor, + ), + ) + ], + ) + ], + ), + Container( + height: 50, + width: 50, decoration: BoxDecoration( - color: AppColors.primaryLightColor, + color: AppColors.whiteColor, borderRadius: BorderRadius.circular(8), ), - child: Image.asset('assets/images/poly.png', width: 18), - ) - ], + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + eventModel.date.split(" ")[0], + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.w600 + ), + ), + Text( + eventModel.date.split(" ")[1], + style: const TextStyle( + color: AppColors.primaryColor, + fontWeight: FontWeight.w600 + ), + ), + ], + ), + ) + ], + ), ), ), + ) ); } diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig index c2efd0b..4b81f9b 100644 --- a/macos/Flutter/Flutter-Debug.xcconfig +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig index c2efd0b..5caa9d1 100644 --- a/macos/Flutter/Flutter-Release.xcconfig +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 32aadf6..f8476c9 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -4,7 +4,6 @@ import FlutterMacOS import Foundation - import geolocator_apple import path_provider_foundation diff --git a/macos/Podfile b/macos/Podfile new file mode 100644 index 0000000..c795730 --- /dev/null +++ b/macos/Podfile @@ -0,0 +1,43 @@ +platform :osx, '10.14' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/pubspec.lock b/pubspec.lock index e788e35..8c6427e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,14 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" async: dependency: transitive description: @@ -25,6 +33,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + card_swiper: + dependency: "direct main" + description: + name: card_swiper + sha256: "21e52a144decbf0054e7cfed8bbe46fc89635e6c86b767eaccfe7d5aeba32528" + url: "https://pub.dev" + source: hosted + version: "3.0.1" characters: dependency: transitive description: @@ -45,10 +61,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" crypto: dependency: transitive description: @@ -89,6 +105,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.0" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -110,6 +134,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c + url: "https://pub.dev" + source: hosted + version: "2.0.9" flutter_test: dependency: "direct dev" description: flutter @@ -156,42 +188,50 @@ packages: dependency: "direct main" description: name: geolocator - sha256: b8f520252c5c66851295bcc263bc8ae7555501938427f72216ba7688702e261d + sha256: e946395fc608842bb2f6c914807e9183f86f3cb787f6b8f832753e5251036f02 url: "https://pub.dev" source: hosted - version: "7.7.1" + version: "10.1.0" geolocator_android: dependency: transitive description: name: geolocator_android - sha256: "2f84d6d68b97a3774f2c4111ac95ec5898cd9b98f12193fc3ea7fa21d7a8b46c" + sha256: afe2393715372e3901f789422a8a527fd78cfd423783e721c7e9ae826b081ece url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "4.5.1" geolocator_apple: dependency: transitive description: name: geolocator_apple - sha256: "1e8e398cc92151d946a4bbd34e2075885333e42d35ca33e418e7ce7b0a29991e" + sha256: "79babf44b692ec5e789d322dc736ef71586056e8e6828f747c9e005456b248bf" url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "2.3.5" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface - sha256: "9d6f34a8a4b704d504f34acc5e52d880a7d2caedd99739902d6319179b0336d4" + sha256: "3b95ecdc36462c47dbc535dcfedea774d03ccd1f3c9864e0a02ad088eeff4508" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "4.2.1" geolocator_web: dependency: transitive description: name: geolocator_web - sha256: "0b9e0ec13ce2211085cae0055b3516c975bd6cfe2878a20c8f13611f1a259855" + sha256: "102e7da05b48ca6bf0a5bda0010f886b171d1a08059f01bfe02addd0175ebece" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + geolocator_windows: + dependency: transitive + description: + name: geolocator_windows + sha256: a92fae29779d5c6dc60e8411302f5221ade464968fe80a36d330e80a71f087af url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "0.2.2" google_fonts: dependency: "direct main" description: @@ -204,10 +244,10 @@ packages: dependency: transitive description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" http_parser: dependency: transitive description: @@ -252,10 +292,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" nested: dependency: transitive description: @@ -272,6 +312,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.8.3" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" path_provider: dependency: transitive description: @@ -320,6 +368,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.1" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" platform: dependency: transitive description: @@ -365,22 +421,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -409,10 +473,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -421,6 +485,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + uuid: + dependency: transitive + description: + name: uuid + sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + url: "https://pub.dev" + source: hosted + version: "4.3.3" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "18f6690295af52d081f6808f2f7c69f0eed6d7e23a71539d75f4aeb8f0062172" + url: "https://pub.dev" + source: hosted + version: "1.1.9+2" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "531d20465c10dfac7f5cd90b60bbe4dd9921f1ec4ca54c83ebb176dbacb7bb2d" + url: "https://pub.dev" + source: hosted + version: "1.1.9+2" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "03012b0a33775c5530576b70240308080e1d5050f0faf000118c20e6463bc0ad" + url: "https://pub.dev" + source: hosted + version: "1.1.9+2" vector_math: dependency: transitive description: @@ -433,18 +529,18 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: name: win32 - sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 + sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "5.2.0" xdg_directories: dependency: transitive description: @@ -453,6 +549,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.2 <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index e068774..4ea52b3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=2.17.5 <3.0.0" + sdk: ">=3.2.2 <4.0.0" dependencies: flutter: @@ -12,10 +12,12 @@ dependencies: cupertino_icons: ^1.0.6 google_fonts: ^6.1.0 flutter_bloc: ^8.1.3 + flutter_svg: curved_navigation_bar: ^1.0.3 - geolocator: ^7.6.2 - table_calendar: ^3.0.1 - geocoding: ^2.0.0 + table_calendar: ^3.0.9 + geolocator: ^10.1.0 + card_swiper: ^3.0.1 + geocoding: ^2.1.1 dev_dependencies: flutter_test: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 8b6d468..1ece8f2 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,6 +6,9 @@ #include "generated_plugin_registrant.h" +#include void RegisterPlugins(flutter::PluginRegistry* registry) { + GeolocatorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("GeolocatorWindows")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index b93c4c3..7f101a7 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + geolocator_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST