MarinoDev/FBLA24
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

more fixes

Browse Source
This commit is contained in:
Drake Marino 2024-06-26 20:33:05 -05:00
parent a97ec0411d
commit 577801423d
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fbla_ui/lib/main.dart
View File

@ -86,7 +86,6 @@ class _MainAppState extends State<MainApp> {
filled: true, filled: true,
fillColor: Colors.grey.withOpacity(0.1), fillColor: Colors.grey.withOpacity(0.1),
labelStyle: const TextStyle(color: Colors.grey), labelStyle: const TextStyle(color: Colors.grey),
outlineBorder: BorderSide(color: Colors.grey.shade700),
floatingLabelStyle: WidgetStateTextStyle.resolveWith((states) { floatingLabelStyle: WidgetStateTextStyle.resolveWith((states) {
if (states.contains(WidgetState.focused) && if (states.contains(WidgetState.focused) &&
!states.contains(WidgetState.hovered)) { !states.contains(WidgetState.hovered)) {
@ -119,8 +118,6 @@ class _MainAppState extends State<MainApp> {
filled: true, filled: true,
fillColor: Colors.grey.withOpacity(0.25), fillColor: Colors.grey.withOpacity(0.25),
labelStyle: TextStyle(color: Colors.grey.shade700), labelStyle: TextStyle(color: Colors.grey.shade700),
border: OutlineInputBorder(
borderSide: BorderSide(color: Colors.grey.shade700)),
floatingLabelStyle: WidgetStateTextStyle.resolveWith((states) { floatingLabelStyle: WidgetStateTextStyle.resolveWith((states) {
if (states.contains(WidgetState.focused) && if (states.contains(WidgetState.focused) &&
!states.contains(WidgetState.hovered)) { !states.contains(WidgetState.hovered)) {

3
fbla_ui/lib/pages/business_detail.dart
View File

@ -166,8 +166,7 @@ class _CreateBusinessDetailState extends State<BusinessDetail> {
.replaceAll('www.', ''), .replaceAll('www.', ''),
style: const TextStyle(color: Colors.blue)), style: const TextStyle(color: Colors.blue)),
onTap: () { onTap: () {
launchUrl( launchUrl(Uri.parse(business.website!));
Uri.parse('https://${business.website}'));
}, },
), ),
], ],

2
fbla_ui/lib/pages/businesses_overview.dart
View File

@ -513,7 +513,7 @@ class _BusinessHeaderState extends State<_BusinessHeader> {
IconButton( IconButton(
icon: const Icon(Icons.link), icon: const Icon(Icons.link),
onPressed: () { onPressed: () {
launchUrl(Uri.parse('https://${business.website}')); launchUrl(Uri.parse(business.website!));
}, },
), ),
IconButton( IconButton(

1
fbla_ui/lib/pages/create_edit_business.dart
View File

@ -247,6 +247,7 @@ class _CreateEditBusinessState extends State<CreateEditBusiness> {
), ),
validator: (value) { validator: (value) {
if (value != null && 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]*)*') !RegExp(r'(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(?:/[^/\s]*)*')
.hasMatch(value)) { .hasMatch(value)) {
return 'Enter a valid Website'; return 'Enter a valid Website';

2
fbla_ui/lib/pages/listing_detail.dart
View File

@ -123,7 +123,7 @@ class _CreateBusinessDetailState extends State<JobListingDetail> {
.replaceAll('www.', ''), .replaceAll('www.', ''),
style: const TextStyle(color: Colors.blue)), style: const TextStyle(color: Colors.blue)),
onTap: () { onTap: () {
launchUrl(Uri.parse('https://${listing.link!}')); launchUrl(Uri.parse(listing.link!));
}, },
), ),
], ],

6
fbla_ui/lib/pages/listings_overview.dart
View File

@ -151,7 +151,8 @@ class _JobsOverviewState extends State<JobsOverview> {
setState(() { setState(() {
_isRetrying = true; _isRetrying = true;
}); });
await widget.updateBusinessesCallback(null, null); await widget.updateBusinessesCallback(
null, null);
} }
}, },
), ),
@ -592,8 +593,7 @@ class _JobHeaderState extends State<_JobHeader> {
IconButton( IconButton(
icon: const Icon(Icons.link), icon: const Icon(Icons.link),
onPressed: () { onPressed: () {
launchUrl(Uri.parse( launchUrl(Uri.parse(business.listings![0].link!));
'https://${business.listings![0].link!}'));
}, },
), ),
IconButton( IconButton(

7
fbla_ui/lib/pages/signin_page.dart
View File

@ -151,13 +151,16 @@ class _SignInPageState extends State<SignInPage> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
_isloading _isloading
? const SizedBox( ? Padding(
padding: EdgeInsets.only(right: 8.0),
child: const SizedBox(
width: 20, width: 20,
height: 20, height: 20,
child: CircularProgressIndicator( child: CircularProgressIndicator(
color: Colors.white, color: Colors.white,
strokeWidth: 3, strokeWidth: 3,
)) )),
)
: const Padding( : const Padding(
padding: EdgeInsets.only(right: 8.0), padding: EdgeInsets.only(right: 8.0),
child: Icon(Icons.done, child: Icon(Icons.done,