From 577801423d83860afc614584e3034cda9fca7fdc Mon Sep 17 00:00:00 2001 From: drake Date: Wed, 26 Jun 2024 20:33:05 -0500 Subject: [PATCH] more fixes --- fbla_ui/lib/main.dart | 3 --- fbla_ui/lib/pages/business_detail.dart | 3 +-- fbla_ui/lib/pages/businesses_overview.dart | 2 +- fbla_ui/lib/pages/create_edit_business.dart | 1 + fbla_ui/lib/pages/listing_detail.dart | 2 +- fbla_ui/lib/pages/listings_overview.dart | 6 +++--- fbla_ui/lib/pages/signin_page.dart | 17 ++++++++++------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fbla_ui/lib/main.dart b/fbla_ui/lib/main.dart index bd503e7..945a69c 100644 --- a/fbla_ui/lib/main.dart +++ b/fbla_ui/lib/main.dart @@ -86,7 +86,6 @@ class _MainAppState extends State { filled: true, fillColor: Colors.grey.withOpacity(0.1), labelStyle: const TextStyle(color: Colors.grey), - outlineBorder: BorderSide(color: Colors.grey.shade700), floatingLabelStyle: WidgetStateTextStyle.resolveWith((states) { if (states.contains(WidgetState.focused) && !states.contains(WidgetState.hovered)) { @@ -119,8 +118,6 @@ class _MainAppState extends State { filled: true, fillColor: Colors.grey.withOpacity(0.25), labelStyle: TextStyle(color: Colors.grey.shade700), - border: OutlineInputBorder( - borderSide: BorderSide(color: Colors.grey.shade700)), floatingLabelStyle: WidgetStateTextStyle.resolveWith((states) { if (states.contains(WidgetState.focused) && !states.contains(WidgetState.hovered)) { diff --git a/fbla_ui/lib/pages/business_detail.dart b/fbla_ui/lib/pages/business_detail.dart index 45db76e..84c74ee 100644 --- a/fbla_ui/lib/pages/business_detail.dart +++ b/fbla_ui/lib/pages/business_detail.dart @@ -166,8 +166,7 @@ class _CreateBusinessDetailState extends State { .replaceAll('www.', ''), style: const TextStyle(color: Colors.blue)), onTap: () { - launchUrl( - Uri.parse('https://${business.website}')); + launchUrl(Uri.parse(business.website!)); }, ), ], diff --git a/fbla_ui/lib/pages/businesses_overview.dart b/fbla_ui/lib/pages/businesses_overview.dart index e485930..f06ddad 100644 --- a/fbla_ui/lib/pages/businesses_overview.dart +++ b/fbla_ui/lib/pages/businesses_overview.dart @@ -513,7 +513,7 @@ class _BusinessHeaderState extends State<_BusinessHeader> { IconButton( icon: const Icon(Icons.link), onPressed: () { - launchUrl(Uri.parse('https://${business.website}')); + launchUrl(Uri.parse(business.website!)); }, ), IconButton( diff --git a/fbla_ui/lib/pages/create_edit_business.dart b/fbla_ui/lib/pages/create_edit_business.dart index 1b44aac..9847f35 100644 --- a/fbla_ui/lib/pages/create_edit_business.dart +++ b/fbla_ui/lib/pages/create_edit_business.dart @@ -247,6 +247,7 @@ class _CreateEditBusinessState extends State { ), validator: (value) { if (value != null && + value.isNotEmpty && !RegExp(r'(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(?:/[^/\s]*)*') .hasMatch(value)) { return 'Enter a valid Website'; diff --git a/fbla_ui/lib/pages/listing_detail.dart b/fbla_ui/lib/pages/listing_detail.dart index 84b40eb..c2e8a4c 100644 --- a/fbla_ui/lib/pages/listing_detail.dart +++ b/fbla_ui/lib/pages/listing_detail.dart @@ -123,7 +123,7 @@ class _CreateBusinessDetailState extends State { .replaceAll('www.', ''), style: const TextStyle(color: Colors.blue)), onTap: () { - launchUrl(Uri.parse('https://${listing.link!}')); + launchUrl(Uri.parse(listing.link!)); }, ), ], diff --git a/fbla_ui/lib/pages/listings_overview.dart b/fbla_ui/lib/pages/listings_overview.dart index e254a97..c388246 100644 --- a/fbla_ui/lib/pages/listings_overview.dart +++ b/fbla_ui/lib/pages/listings_overview.dart @@ -151,7 +151,8 @@ class _JobsOverviewState extends State { setState(() { _isRetrying = true; }); - await widget.updateBusinessesCallback(null, null); + await widget.updateBusinessesCallback( + null, null); } }, ), @@ -592,8 +593,7 @@ class _JobHeaderState extends State<_JobHeader> { IconButton( icon: const Icon(Icons.link), onPressed: () { - launchUrl(Uri.parse( - 'https://${business.listings![0].link!}')); + launchUrl(Uri.parse(business.listings![0].link!)); }, ), IconButton( diff --git a/fbla_ui/lib/pages/signin_page.dart b/fbla_ui/lib/pages/signin_page.dart index e76c925..3c5cd31 100644 --- a/fbla_ui/lib/pages/signin_page.dart +++ b/fbla_ui/lib/pages/signin_page.dart @@ -151,13 +151,16 @@ class _SignInPageState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ _isloading - ? const SizedBox( - width: 20, - height: 20, - child: CircularProgressIndicator( - color: Colors.white, - strokeWidth: 3, - )) + ? Padding( + padding: EdgeInsets.only(right: 8.0), + child: const SizedBox( + width: 20, + height: 20, + child: CircularProgressIndicator( + color: Colors.white, + strokeWidth: 3, + )), + ) : const Padding( padding: EdgeInsets.only(right: 8.0), child: Icon(Icons.done,