kotlin upgrade 5

fbla-api/lib/fbla_api.dart

@@ -168,6 +168,15 @@ void main() async {
 
   final app = Router();
 
+  // CORS preflight acceptor
+  app.options('/<ignored|.*>', (Request request) {
+    return Response.ok(null, headers: {
+      'Access-Control-Allow-Origin': '*',
+      'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
+      'Access-Control-Allow-Headers': '*',
+    });
+  });
+
   // routes
   app.get('/fbla-api/hello', (Request request) async {
     print('Hello received');
@@ -820,6 +829,31 @@ void main() async {
       },
     );
   });
+  app.get('/fbla-api/clearbit/<website>',
+      (Request request, String website) async {
+    print('clearbit logo request received');
+
+    website = Uri.decodeComponent(website);
+
+    var response =
+        await http.get(Uri.parse('https://logo.clearbit.com/$website'));
+    if (response.statusCode == 200) {
+      return Response.ok(
+        response.bodyBytes,
+        headers: {
+          'Access-Control-Allow-Origin': '*',
+          'Content-Type': 'image/png'
+        },
+      );
+    } else {
+      return Response.notFound(
+        'logo not found',
+        headers: {
+          'Access-Control-Allow-Origin': '*',
+        },
+      );
+    }
+  });
 
   // get ip address for hosting
   for (var interface in await NetworkInterface.list()) {

fbla_ui/Jenkinsfile

@@ -3,7 +3,7 @@ pipeline {
     stages {
         stage('Flutter Cleanup') {
             steps {
-        sh '''flutter upgrade --force
+                sh '''flutter upgrade
 flutter pub upgrade
 flutter --version
 flutter doctor

fbla_ui/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
     namespace "com.marinodev.fbla_ui"
     compileSdkVersion flutter.compileSdkVersion
@@ -69,5 +66,4 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

fbla_ui/android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -22,6 +9,7 @@ rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
+
 subprojects {
     project.evaluationDependsOn(':app')
 }

fbla_ui/android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
-
+    def flutterSdkPath = {
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
         def properties = new Properties()
-
+        file("local.properties").withInputStream { properties.load(it) }
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+        return flutterSdkPath
+    }()
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.24" apply false
+}
+
+include ":app"

fbla_ui/lib/pages/business_detail.dart

@@ -4,12 +4,12 @@ import 'package:fbla_ui/pages/create_edit_listing.dart';
 import 'package:fbla_ui/pages/listing_detail.dart';
 import 'package:fbla_ui/shared/api_logic.dart';
 import 'package:fbla_ui/shared/global_vars.dart';
+import 'package:fbla_ui/shared/utils.dart';
+import 'package:fbla_ui/shared/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:rive/rive.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../shared/utils.dart';
-
 class BusinessDetail extends StatefulWidget {
   final int id;
   final String name;
@@ -181,7 +181,7 @@ class _CreateBusinessDetailState extends State<BusinessDetail> {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           Padding(
-                              padding: const EdgeInsets.only(left: 16, top: 4),
+                              padding: const EdgeInsets.only(left: 16, top: 8),
                               child: _GetListingsTitle(business)),
                           if (business.listings != null)
                             _JobList(business: business)
@@ -212,71 +212,7 @@ class _CreateBusinessDetailState extends State<BusinessDetail> {
                         ]),
                   ),
                 // Contact info
-                Card(
+                ContactInformationCard(business: business),
-                  clipBehavior: Clip.antiAlias,
-                  child: Column(
-                    children: [
-                      Row(
-                        children: [
-                          Padding(
-                            padding:
-                                const EdgeInsets.only(left: 16.0, top: 8.0),
-                            child: Text(
-                              business.contactName!,
-                              textAlign: TextAlign.left,
-                              style: const TextStyle(
-                                  fontSize: 20, fontWeight: FontWeight.bold),
-                            ),
-                          ),
-                        ],
-                      ),
-                      if (business.contactPhone != null)
-                        ListTile(
-                          leading: const Icon(Icons.phone),
-                          title: Text(business.contactPhone!),
-                          onTap: () {
-                            showDialog(
-                                context: context,
-                                builder: (BuildContext context) {
-                                  return AlertDialog(
-                                    backgroundColor:
-                                        Theme.of(context).colorScheme.surface,
-                                    title:
-                                        Text('Contact ${business.contactName}'),
-                                    content: Text(
-                                        'Would you like to call or text ${business.contactName}?'),
-                                    actions: [
-                                      TextButton(
-                                          child: const Text('Text'),
-                                          onPressed: () {
-                                            launchUrl(Uri.parse(
-                                                'sms:${business.contactPhone}'));
-                                            Navigator.of(context).pop();
-                                          }),
-                                      TextButton(
-                                          child: const Text('Call'),
-                                          onPressed: () async {
-                                            launchUrl(Uri.parse(
-                                                'tel:${business.contactPhone}'));
-                                            Navigator.of(context).pop();
-                                          }),
-                                    ],
-                                  );
-                                });
-                          },
-                        ),
-                      if (business.contactEmail != null)
-                        ListTile(
-                          leading: const Icon(Icons.email),
-                          title: Text(business.contactEmail!),
-                          onTap: () {
-                            launchUrl(
-                                Uri.parse('mailto:${business.contactEmail}'));
-                          },
-                        ),
-                    ],
-                  ),
-                ),
                 // Location
                 Card(
                   clipBehavior: Clip.antiAlias,
@@ -404,6 +340,7 @@ class _JobListItem extends StatelessWidget {
       subtitle: Text(
         jobListing.description,
         style: const TextStyle(overflow: TextOverflow.ellipsis),
+        maxLines: 2,
       ),
       trailing: _getEditIcon(context, fromBusiness, jobListing),
       onTap: () {

fbla_ui/lib/pages/create_edit_business.dart

@@ -1,11 +1,10 @@
 import 'package:fbla_ui/main.dart';
 import 'package:fbla_ui/shared/api_logic.dart';
+import 'package:fbla_ui/shared/global_vars.dart';
 import 'package:fbla_ui/shared/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-import '../shared/global_vars.dart';
-
 class CreateEditBusiness extends StatefulWidget {
   final Business? inputBusiness;
 
@@ -145,7 +144,7 @@ class _CreateEditBusinessState extends State<CreateEditBusiness> {
                                 leading: ClipRRect(
                                   borderRadius: BorderRadius.circular(6.0),
                                   child: Image.network(
-                                      'https://logo.clearbit.com/${business.website}',
+                                      '$apiAddress/clearbit/${Uri.encodeComponent(business.website ?? '')}',
                                       width: 48,
                                       height: 48, errorBuilder:
                                           (BuildContext context,
@@ -226,7 +225,10 @@ class _CreateEditBusinessState extends State<CreateEditBusiness> {
                                   controller: _websiteController,
                                   keyboardType: TextInputType.url,
                                   onChanged: (inputUrl) {
-                                    business.website = Uri.encodeFull(inputUrl);
+                                    setState(() {
+                                      business.website =
+                                          Uri.encodeFull(inputUrl);
+                                    });
                                     if (inputUrl.trim().isEmpty) {
                                       business.website = null;
                                     } else {
@@ -234,8 +236,10 @@ class _CreateEditBusinessState extends State<CreateEditBusiness> {
                                               .contains('http://') &&
                                           !business.website!
                                               .contains('https://')) {
+                                        setState(() {
                                           business.website =
                                               'https://${business.website!.trim()}';
+                                        });
                                       }
                                     }
                                   },

fbla_ui/lib/pages/create_edit_listing.dart

@@ -32,7 +32,7 @@ class _CreateEditJobListingState extends State<CreateEditJobListing> {
       id: null,
       businessId: null,
       name: 'Job Listing',
-      description: 'Add details about the business below.',
+      description: 'Add details about the job below.',
       type: null,
       wage: null,
       link: null,
@@ -60,6 +60,9 @@ class _CreateEditJobListingState extends State<CreateEditJobListing> {
             .replaceAll('www.', ''));
     getBusinessNameMapping = fetchBusinessNames();
     businessName = widget.inputBusiness?.name ?? 'Offering business';
+    if (widget.inputBusiness != null) {
+      listing.businessId = widget.inputBusiness!.id;
+    }
   }
 
   final formKey = GlobalKey<FormState>();
@@ -67,9 +70,6 @@ class _CreateEditJobListingState extends State<CreateEditJobListing> {
   @override
   Widget build(BuildContext context) {
     widescreen = MediaQuery.sizeOf(context).width >= widescreenWidth;
-    if (widget.inputBusiness != null) {
-      listing.businessId = widget.inputBusiness!.id;
-    }
     return PopScope(
       canPop: !_isLoading,
       onPopInvoked: _handlePop,

fbla_ui/lib/pages/listing_detail.dart

@@ -4,9 +4,11 @@ import 'package:fbla_ui/pages/create_edit_listing.dart';
 import 'package:fbla_ui/shared/api_logic.dart';
 import 'package:fbla_ui/shared/global_vars.dart';
 import 'package:fbla_ui/shared/utils.dart';
+import 'package:fbla_ui/shared/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+/// A page to view all specific details about a single job listing (with its businesses contact info)
 class JobListingDetail extends StatefulWidget {
   final JobListing listing;
   final Business fromBusiness;
@@ -30,18 +32,41 @@ class _CreateBusinessDetailState extends State<JobListingDetail> {
     );
   }
 
+  /// body of the JobListingDetail
   Widget _detailBody(JobListing listing) {
     return ListView(
       children: [
-        // Title, logo, desc, website
         Center(
           child: SizedBox(
             width: 800,
             child: Column(
               children: [
+                // Top summary card
                 Padding(
                     padding: const EdgeInsets.only(top: 4.0),
-                  child: Card(
+                    child: _summaryCard(listing)),
+                // Wage card
+                if (listing.wage != null && listing.wage != '')
+                  Card(
+                    child: ListTile(
+                      leading: const Icon(Icons.attach_money),
+                      subtitle: Text(listing.wage!),
+                      title: const Text('Wage Information'),
+                    ),
+                  ),
+                // Contact information for the business contact
+                ContactInformationCard(business: widget.fromBusiness)
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// Top card including title, logo, description, and business name
+  Widget _summaryCard(JobListing listing) {
+    return Card(
       clipBehavior: Clip.antiAlias,
       child: Column(
         children: [
@@ -55,8 +80,7 @@ class _CreateBusinessDetailState extends State<JobListingDetail> {
                 child: Text(
                     '${listing.name} (${getNameFromOfferType(listing.offerType!)})',
                     style: const TextStyle(
-                                      fontSize: 24,
+                        fontSize: 24, fontWeight: FontWeight.bold)),
-                                      fontWeight: FontWeight.bold)),
               ),
               subtitle: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -78,13 +102,10 @@ class _CreateBusinessDetailState extends State<JobListingDetail> {
                       ),
                     ),
                   ),
-                                Text(
+                  Text(listing.description),
-                                  listing.description,
-                                ),
                 ],
               ),
-                            contentPadding:
+              contentPadding: const EdgeInsets.only(bottom: 8, left: 16),
-                                const EdgeInsets.only(bottom: 8, left: 16),
               leading: Badge(
                 label: Text(
                   getLetterFromOfferType(listing.offerType!),
@@ -93,19 +114,16 @@ class _CreateBusinessDetailState extends State<JobListingDetail> {
                 largeSize: 24,
                 offset: const Offset(12, -3),
                 textColor: Colors.white,
-                              backgroundColor:
+                backgroundColor: getColorFromOfferType(listing.offerType!),
-                                  getColorFromOfferType(listing.offerType!),
                 child: ClipRRect(
                   borderRadius: BorderRadius.circular(6.0),
                   child: Image.network(
                       '$apiAddress/logos/${widget.fromBusiness.id}',
                       width: 48,
-                                    height: 48, errorBuilder:
+                      height: 48, errorBuilder: (BuildContext context,
-                                        (BuildContext context, Object exception,
+                          Object exception, StackTrace? stackTrace) {
-                                            StackTrace? stackTrace) {
                     return Icon(
-                                      getIconFromJobType(
+                        getIconFromJobType(listing.type ?? JobType.other),
-                                          listing.type ?? JobType.other),
                         size: 48);
                   }),
                 ),
@@ -128,91 +146,10 @@ class _CreateBusinessDetailState extends State<JobListingDetail> {
             ),
         ],
       ),
-                  ),
-                ),
-                // Wage
-                if (listing.wage != null && listing.wage != '')
-                  Card(
-                    child: ListTile(
-                      leading: const Icon(Icons.attach_money),
-                      subtitle: Text(listing.wage!),
-                      title: const Text('Wage Information'),
-                    ),
-                  ),
-                Card(
-                  clipBehavior: Clip.antiAlias,
-                  child: Column(
-                    children: [
-                      Row(
-                        children: [
-                          Padding(
-                            padding:
-                                const EdgeInsets.only(left: 16.0, top: 8.0),
-                            child: Text(
-                              widget.fromBusiness.contactName!,
-                              textAlign: TextAlign.left,
-                              style: const TextStyle(
-                                  fontSize: 20, fontWeight: FontWeight.bold),
-                            ),
-                          ),
-                        ],
-                      ),
-                      if (widget.fromBusiness.contactPhone != null)
-                        ListTile(
-                          leading: const Icon(Icons.phone),
-                          title: Text(widget.fromBusiness.contactPhone!),
-                          // maybe replace ! with ?? ''. same is true for below
-                          onTap: () {
-                            showDialog(
-                                context: context,
-                                builder: (BuildContext context) {
-                                  return AlertDialog(
-                                    backgroundColor:
-                                        Theme.of(context).colorScheme.surface,
-                                    title: Text(
-                                        'Contact ${widget.fromBusiness.contactName}'),
-                                    content: Text(
-                                        'Would you like to call or text ${widget.fromBusiness.contactName}?'),
-                                    actions: [
-                                      TextButton(
-                                          child: const Text('Text'),
-                                          onPressed: () {
-                                            launchUrl(Uri.parse(
-                                                'sms:${widget.fromBusiness.contactPhone}'));
-                                            Navigator.of(context).pop();
-                                          }),
-                                      TextButton(
-                                          child: const Text('Call'),
-                                          onPressed: () async {
-                                            launchUrl(Uri.parse(
-                                                'tel:${widget.fromBusiness.contactPhone}'));
-                                            Navigator.of(context).pop();
-                                          }),
-                                    ],
-                                  );
-                                });
-                          },
-                        ),
-                      if (widget.fromBusiness.contactEmail != null)
-                        ListTile(
-                          leading: const Icon(Icons.email),
-                          title: Text(widget.fromBusiness.contactEmail!),
-                          onTap: () {
-                            launchUrl(Uri.parse(
-                                'mailto:${widget.fromBusiness.contactEmail}'));
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ],
     );
   }
 
+  /// Edit / delete actions if the user is logged in
   List<Widget>? _getActions(JobListing listing, Business fromBusiness) {
     if (loggedIn) {
       return [

fbla_ui/lib/pages/signin_page.dart

@@ -137,7 +137,8 @@ class _SignInPageState extends State<SignInPage> {
                           style: const TextStyle(color: Colors.red),
                         ),
                       Padding(
-                        padding: const EdgeInsets.only(top: 8.0),
+                        padding: const EdgeInsets.only(
+                            top: 8.0, left: 8.0, right: 8.0),
                         child: FilledButton(
                           style: FilledButton.styleFrom(
                               shape: const RoundedRectangleBorder(
@@ -151,9 +152,9 @@ class _SignInPageState extends State<SignInPage> {
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: [
                                 _isloading
-                                    ? Padding(
+                                    ? const Padding(
                                         padding: EdgeInsets.only(right: 8.0),
-                                        child: const SizedBox(
+                                        child: SizedBox(
                                             width: 20,
                                             height: 20,
                                             child: CircularProgressIndicator(

fbla_ui/lib/shared/api_logic.dart

@@ -7,7 +7,7 @@ import 'package:fbla_ui/shared/utils.dart';
 import 'package:http/http.dart' as http;
 
 var apiAddress = 'https://homelab.marinodev.com/fbla-api';
-// var apiAddress = 'http://192.168.0.114:8000/fbla-api';
+// var apiAddress = 'http://192.168.0.114:8000/fbla-api'; // TODO
 
 var client = http.Client();
 
@@ -58,8 +58,11 @@ Future fetchBusinessDataOverviewJobs(
     if (typeFilters != null && typeFilters.isNotEmpty) {
       uriString +=
           '?typeFilters=${typeFilters.map((jobType) => jobType.name).join(',')}';
-    }
       if (offerFilters != null && offerFilters.isNotEmpty) {
+        uriString +=
+            '&offerFilters=${offerFilters.map((offerType) => offerType.name).join(',')}';
+      }
+    } else if (offerFilters != null && offerFilters.isNotEmpty) {
       uriString +=
           '?offerFilters=${offerFilters.map((offerType) => offerType.name).join(',')}';
     }

fbla_ui/lib/shared/utils.dart

@@ -36,8 +36,6 @@ enum JobType {
   retail,
   customerService,
   foodService,
-  finance,
-  healthcare,
   education,
   maintenance,
   manufacturing,
@@ -185,10 +183,6 @@ IconData getIconFromJobType(JobType type) {
       return Icons.support_agent;
     case JobType.foodService:
       return Icons.restaurant;
-    case JobType.finance:
-      return Icons.paid;
-    case JobType.healthcare:
-      return Icons.medical_services;
     case JobType.education:
       return Icons.school;
     case JobType.maintenance:
@@ -225,10 +219,6 @@ pw.IconData getPwIconFromJobType(JobType type) {
       return const pw.IconData(0xf0e2);
     case JobType.foodService:
       return const pw.IconData(0xe56c);
-    case JobType.finance:
-      return const pw.IconData(0xf041);
-    case JobType.healthcare:
-      return const pw.IconData(0xf109);
     case JobType.education:
       return const pw.IconData(0xe80c);
     case JobType.maintenance:
@@ -265,10 +255,6 @@ String getNameFromJobType(JobType type) {
       return 'Customer Service';
     case JobType.foodService:
       return 'Food Service';
-    case JobType.finance:
-      return 'Finance';
-    case JobType.healthcare:
-      return 'Healthcare';
     case JobType.education:
       return 'Education';
     case JobType.maintenance:

fbla_ui/lib/shared/widgets.dart

@@ -6,488 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-// class BusinessDisplayPanel extends StatefulWidget {
-//   final Map<JobType, List<Business>>? jobGroupedBusinesses;
-//   final Map<BusinessType, List<Business>>? businessGroupedBusinesses;
-//   final bool widescreen;
-//   final Set<Business>? selectedBusinesses;
-//
-//   const BusinessDisplayPanel(
-//       {super.key,
-//       this.jobGroupedBusinesses,
-//       this.businessGroupedBusinesses,
-//       required this.widescreen,
-//       this.selectedBusinesses});
-//
-//   @override
-//   State<BusinessDisplayPanel> createState() => _BusinessDisplayPanelState();
-// }
-//
-// class _BusinessDisplayPanelState extends State<BusinessDisplayPanel> {
-//   @override
-//   Widget build(BuildContext context) {
-//     if ((widget.businessGroupedBusinesses?.keys ?? <BusinessType>[]).isEmpty &&
-//         (widget.jobGroupedBusinesses?.keys ?? <JobType>[]).isEmpty) {
-//       return const SliverToBoxAdapter(
-//         child: Center(
-//           child: Padding(
-//             padding: EdgeInsets.all(16.0),
-//             child: Text(
-//               'No results found!\nPlease change your search filters.',
-//               textAlign: TextAlign.center,
-//               style: TextStyle(fontSize: 18),
-//             ),
-//           ),
-//         ),
-//       );
-//     }
-//
-//     List<BusinessHeader> headers = [];
-//     if (widget.jobGroupedBusinesses != null) {
-//       for (JobType jobType in widget.jobGroupedBusinesses!.keys) {
-//         headers.add(BusinessHeader(
-//             jobType: jobType,
-//             widescreen: widget.widescreen,
-//             // selectable: widget.selectable,
-//             selectedBusinesses: widget.selectedBusinesses,
-//             // updateSelectedBusinessesCallback:
-//             //     widget.updateSelectedBusinessesCallback,
-//             businesses: widget.jobGroupedBusinesses![jobType]!));
-//       }
-//       headers.sort((a, b) => a.jobType!.index.compareTo(b.jobType!.index));
-//       return MultiSliver(children: headers);
-//     } else if (widget.businessGroupedBusinesses != null) {
-//       for (BusinessType businessType
-//           in widget.businessGroupedBusinesses!.keys) {
-//         headers.add(BusinessHeader(
-//             businessType: businessType,
-//             widescreen: widget.widescreen,
-//             selectedBusinesses: widget.selectedBusinesses,
-//             businesses: widget.businessGroupedBusinesses![businessType]!));
-//       }
-//       headers.sort(
-//           (a, b) => a.businessType!.index.compareTo(b.businessType!.index));
-//       return MultiSliver(children: headers);
-//     }
-//     return const Text('Error with input data!');
-//   }
-// }
-//
-// class BusinessHeader extends StatefulWidget {
-//   final JobType? jobType;
-//   final BusinessType? businessType;
-//   final List<Business> businesses;
-//   final Set<Business>? selectedBusinesses;
-//   final bool widescreen;
-//   final void Function()? updateSelectedBusinessesCallback;
-//
-//   const BusinessHeader({
-//     super.key,
-//     this.jobType,
-//     this.businessType,
-//     required this.businesses,
-//     required this.widescreen,
-//     this.updateSelectedBusinessesCallback,
-//     this.selectedBusinesses,
-//   });
-//
-//   @override
-//   State<BusinessHeader> createState() => _BusinessHeaderState();
-// }
-//
-// class _BusinessHeaderState extends State<BusinessHeader> {
-//   refresh() {
-//     setState(() {});
-//   }
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     return SliverStickyHeader(
-//       header: Container(
-//         height: 55.0,
-//         color: Theme.of(context).colorScheme.primary,
-//         padding: const EdgeInsets.symmetric(horizontal: 16.0),
-//         alignment: Alignment.centerLeft,
-//         child: _getHeaderRow(widget.selectedBusinesses),
-//       ),
-//       sliver: _getChildSliver(
-//           widget.businesses, widget.widescreen, widget.selectedBusinesses),
-//     );
-//   }
-//
-//   Widget _getHeaderRow(Set<Business>? selectedBusinesses) {
-//     if (selectedBusinesses != null) {
-//       return Row(
-//         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-//         children: [
-//           Row(
-//             children: [
-//               Padding(
-//                   padding: const EdgeInsets.only(left: 4.0, right: 12.0),
-//                   child: Icon(
-//                     widget.jobType != null
-//                         ? getIconFromJobType(widget.jobType!)
-//                         : getIconFromBusinessType(widget.businessType!),
-//                     color: Theme.of(context).colorScheme.onPrimary,
-//                   )),
-//               Text(widget.jobType != null
-//                   ? getNameFromJobType(widget.jobType!)
-//                   : getNameFromBusinessType(widget.businessType!)),
-//             ],
-//           ),
-//           Padding(
-//             padding: const EdgeInsets.only(right: 12.0),
-//             child: Checkbox(
-//               checkColor: Theme.of(context).colorScheme.primary,
-//               activeColor: Theme.of(context).colorScheme.onPrimary,
-//               value: widget.selectedBusinesses!.containsAll(widget.businesses),
-//               onChanged: (value) {
-//                 if (value!) {
-//                   setState(() {
-//                     widget.selectedBusinesses!.addAll(widget.businesses);
-//                   });
-//                 } else {
-//                   setState(() {
-//                     widget.selectedBusinesses!.removeAll(widget.businesses);
-//                   });
-//                 }
-//               },
-//             ),
-//           ),
-//         ],
-//       );
-//     } else {
-//       return Row(
-//         children: [
-//           Padding(
-//             padding: const EdgeInsets.only(left: 4.0, right: 12.0),
-//             child: Icon(
-//               widget.jobType != null
-//                   ? getIconFromJobType(widget.jobType!)
-//                   : getIconFromBusinessType(widget.businessType!),
-//               color: Theme.of(context).colorScheme.onPrimary,
-//             ),
-//           ),
-//           Text(
-//             widget.jobType != null
-//                 ? getNameFromJobType(widget.jobType!)
-//                 : getNameFromBusinessType(widget.businessType!),
-//             style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),
-//           ),
-//         ],
-//       );
-//     }
-//   }
-//
-//   Widget _getChildSliver(List<Business> businesses, bool widescreen,
-//       Set<Business>? selectedBusinesses) {
-//     if (widescreen) {
-//       return SliverPadding(
-//         padding: const EdgeInsets.all(4),
-//         sliver: SliverGrid(
-//           gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-//             mainAxisExtent: 250.0,
-//             maxCrossAxisExtent: 400.0,
-//             mainAxisSpacing: 4.0,
-//             crossAxisSpacing: 4.0,
-//           ),
-//           delegate: SliverChildBuilderDelegate(
-//             childCount: businesses.length,
-//             (BuildContext context, int index) {
-//               return BusinessCard(
-//                 business: businesses[index],
-//                 selectedBusinesses: selectedBusinesses,
-//                 widescreen: widescreen,
-//                 callback: refresh,
-//                 jobType: widget.jobType,
-//               );
-//             },
-//           ),
-//         ),
-//       );
-//     } else {
-//       return SliverList(
-//         delegate: SliverChildBuilderDelegate(
-//           childCount: businesses.length,
-//           (BuildContext context, int index) {
-//             return BusinessCard(
-//               business: businesses[index],
-//               selectedBusinesses: selectedBusinesses,
-//               widescreen: widescreen,
-//               callback: refresh,
-//               jobType: widget.jobType,
-//             );
-//           },
-//         ),
-//       );
-//     }
-//   }
-// }
-//
-// class BusinessCard extends StatefulWidget {
-//   final Business business;
-//   final bool widescreen;
-//   final Set<Business>? selectedBusinesses;
-//   final Function callback;
-//   final JobType? jobType;
-//   final BusinessType? businessType;
-//
-//   const BusinessCard({
-//     super.key,
-//     required this.business,
-//     required this.widescreen,
-//     required this.callback,
-//     this.jobType,
-//     this.businessType,
-//     this.selectedBusinesses,
-//   });
-//
-//   @override
-//   State<BusinessCard> createState() => _BusinessCardState();
-// }
-//
-// class _BusinessCardState extends State<BusinessCard> {
-//   @override
-//   Widget build(BuildContext context) {
-//     if (widget.widescreen) {
-//       return _businessTile(widget.business, widget.selectedBusinesses,
-//           widget.jobType, widget.businessType);
-//     } else {
-//       return _businessListItem(widget.business, widget.selectedBusinesses,
-//           widget.callback, widget.jobType, widget.businessType);
-//     }
-//   }
-//
-//   Widget _businessTile(Business business, Set<Business>? selectedBusinesses,
-//       JobType? jobType, BusinessType? businessType) {
-//     return MouseRegion(
-//       cursor: SystemMouseCursors.click,
-//       child: GestureDetector(
-//         onTap: () {
-//           Navigator.of(context).push(MaterialPageRoute(
-//               builder: (context) => BusinessDetail(
-//                     id: business.id,
-//                     name: business.name!,
-//                   )));
-//         },
-//         child: Card(
-//           clipBehavior: Clip.antiAlias,
-//           child: Column(
-//             crossAxisAlignment: CrossAxisAlignment.center,
-//             children: [
-//               _getTileRow(business, selectedBusinesses, widget.callback),
-//               Padding(
-//                 padding: const EdgeInsets.all(8.0),
-//                 child: Text(
-//                   business.description!,
-//                   maxLines: selectedBusinesses != null ? 7 : 5,
-//                   overflow: TextOverflow.ellipsis,
-//                 ),
-//               ),
-//               const Spacer(),
-//               Padding(
-//                   padding: const EdgeInsets.all(8.0),
-//                   child: selectedBusinesses == null
-//                       ? Row(
-//                           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-//                           children: [
-//                             IconButton(
-//                               icon: const Icon(Icons.link),
-//                               onPressed: () {
-//                                 launchUrl(
-//                                     Uri.parse('https://${business.website}'));
-//                               },
-//                             ),
-//                             if (business.locationName != '')
-//                               IconButton(
-//                                 icon: const Icon(Icons.location_on),
-//                                 onPressed: () {
-//                                   launchUrl(Uri.parse(Uri.encodeFull(
-//                                       'https://www.google.com/maps/search/?api=1&query=${business.locationName}')));
-//                                 },
-//                               ),
-//                             if ((business.contactPhone != null) &&
-//                                 (business.contactPhone != ''))
-//                               IconButton(
-//                                 icon: const Icon(Icons.phone),
-//                                 onPressed: () {
-//                                   showDialog(
-//                                       context: context,
-//                                       builder: (BuildContext context) {
-//                                         return AlertDialog(
-//                                           backgroundColor: Theme.of(context)
-//                                               .colorScheme
-//                                               .surface,
-//                                           title: Text((business.contactName ==
-//                                                       null ||
-//                                                   business.contactName == '')
-//                                               ? 'Contact ${business.name}?'
-//                                               : 'Contact ${business.contactName}'),
-//                                           content: Text((business.contactName ==
-//                                                       null ||
-//                                                   business.contactName == '')
-//                                               ? 'Would you like to call or text ${business.name}?'
-//                                               : 'Would you like to call or text ${business.contactName}?'),
-//                                           actions: [
-//                                             TextButton(
-//                                                 child: const Text('Text'),
-//                                                 onPressed: () {
-//                                                   launchUrl(Uri.parse(
-//                                                       'sms:${business.contactPhone}'));
-//                                                   Navigator.of(context).pop();
-//                                                 }),
-//                                             TextButton(
-//                                                 child: const Text('Call'),
-//                                                 onPressed: () async {
-//                                                   launchUrl(Uri.parse(
-//                                                       'tel:${business.contactPhone}'));
-//                                                   Navigator.of(context).pop();
-//                                                 }),
-//                                           ],
-//                                         );
-//                                       });
-//                                 },
-//                               ),
-//                             if (business.contactEmail != '')
-//                               IconButton(
-//                                 icon: const Icon(Icons.email),
-//                                 onPressed: () {
-//                                   launchUrl(Uri.parse(
-//                                       'mailto:${business.contactEmail}'));
-//                                 },
-//                               ),
-//                           ],
-//                         )
-//                       : null),
-//             ],
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-//
-//   Widget _getTileRow(
-//       Business business, Set<Business>? selectedBusinesses, Function callback) {
-//     if (selectedBusinesses != null) {
-//       return Row(
-//         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-//         children: [
-//           Padding(
-//             padding: const EdgeInsets.all(8.0),
-//             child: ClipRRect(
-//               borderRadius: BorderRadius.circular(6.0),
-//               child: Image.network('$apiAddress/logos/${business.id}',
-//                   height: 48, width: 48, errorBuilder: (BuildContext context,
-//                       Object exception, StackTrace? stackTrace) {
-//                 return Icon(
-//                   getIconFromBusinessType(business.type!),
-//                   size: 48,
-//                 );
-//               }),
-//             ),
-//           ),
-//           Flexible(
-//             child: Padding(
-//               padding: const EdgeInsets.all(8.0),
-//               child: Text(
-//                 business.name!,
-//                 style:
-//                     const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-//                 maxLines: 2,
-//                 overflow: TextOverflow.ellipsis,
-//               ),
-//             ),
-//           ),
-//           Padding(
-//             padding: const EdgeInsets.only(right: 24.0),
-//             child: _checkbox(callback, selectedBusinesses),
-//           )
-//         ],
-//       );
-//     } else {
-//       return Row(
-//         children: [
-//           Padding(
-//               padding: const EdgeInsets.all(8.0),
-//               child: ClipRRect(
-//                 borderRadius: BorderRadius.circular(6.0),
-//                 child: Image.network('$apiAddress/logos/${business.id}',
-//                     height: 48, width: 48, errorBuilder: (BuildContext context,
-//                         Object exception, StackTrace? stackTrace) {
-//                   return Icon(getIconFromBusinessType(business.type!),
-//                       size: 48);
-//                 }),
-//               )),
-//           Flexible(
-//             child: Padding(
-//               padding: const EdgeInsets.all(8.0),
-//               child: Text(
-//                 business.name!,
-//                 style:
-//                     const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-//                 maxLines: 2,
-//                 overflow: TextOverflow.ellipsis,
-//               ),
-//             ),
-//           ),
-//         ],
-//       );
-//     }
-//   }
-//
-//   Widget _businessListItem(Business business, Set<Business>? selectedBusinesses,
-//       Function callback, JobType? jobType, BusinessType? businessType) {
-//     return Card(
-//       child: ListTile(
-//         leading: ClipRRect(
-//             borderRadius: BorderRadius.circular(3.0),
-//             child: Image.network('$apiAddress/logos/${business.id}',
-//                 height: 24, width: 24, errorBuilder: (BuildContext context,
-//                     Object exception, StackTrace? stackTrace) {
-//               return Icon(getIconFromBusinessType(business.type!));
-//             })),
-//         title: Text(business.name!),
-//         subtitle: Text(business.description!,
-//             maxLines: 1, overflow: TextOverflow.ellipsis),
-//         trailing: _getCheckbox(selectedBusinesses, callback),
-//         onTap: () {
-//           Navigator.of(context).push(MaterialPageRoute(
-//               builder: (context) => BusinessDetail(
-//                     id: business.id,
-//                     name: business.name!,
-//                   )));
-//         },
-//       ),
-//     );
-//   }
-//
-//   Widget _checkbox(Function callback, Set<Business> selectedBusinesses) {
-//     return Checkbox(
-//       value: selectedBusinesses.contains(widget.business),
-//       onChanged: (value) {
-//         if (value!) {
-//           setState(() {
-//             selectedBusinesses.add(widget.business);
-//           });
-//         } else {
-//           setState(() {
-//             selectedBusinesses.remove(widget.business);
-//           });
-//         }
-//         callback();
-//       },
-//     );
-//   }
-//
-//   Widget? _getCheckbox(Set<Business>? selectedBusinesses, Function callback) {
-//     if (selectedBusinesses != null) {
-//       return _checkbox(callback, selectedBusinesses);
-//     } else {
-//       return null;
-//     }
-//   }
-// }
-
 class BusinessSearchBar extends StatefulWidget {
   final String searchTextHint;
   final Widget filterIconButton;
@@ -745,29 +263,6 @@ class _MainSliverAppBarState extends State<MainSliverAppBar> {
                 });
           },
         ),
-// IconButton(
-//   icon: const Icon(Icons.picture_as_pdf),
-//   onPressed: () async {
-//     if (!_isPreviousData) {
-//       ScaffoldMessenger.of(context).clearSnackBars();
-//       ScaffoldMessenger.of(context).showSnackBar(
-//         const SnackBar(
-//           width: 300,
-//           behavior: SnackBarBehavior.floating,
-//           content: Text('There is no data!'),
-//           duration: Duration(seconds: 2),
-//         ),
-//       );
-//     } else {
-//       selectedDataTypesBusiness = <DataTypeBusiness>{};
-//       Navigator.push(
-//           context,
-//           MaterialPageRoute(
-//               builder: (context) => ExportData(
-//                   groupedBusinesses: overviewBusinesses)));
-//     }
-//   },
-// ),
         Padding(
           padding: const EdgeInsets.only(right: 8.0),
           child: IconButton(
@@ -841,3 +336,74 @@ class _MainSliverAppBarState extends State<MainSliverAppBar> {
     return null;
   }
 }
+
+class ContactInformationCard extends StatelessWidget {
+  final Business business;
+
+  ContactInformationCard({super.key, required this.business});
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: Column(
+        children: [
+          Row(
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(left: 16.0, top: 8.0),
+                child: Text(
+                  business.contactName!,
+                  textAlign: TextAlign.left,
+                  style: const TextStyle(
+                      fontSize: 20, fontWeight: FontWeight.bold),
+                ),
+              ),
+            ],
+          ),
+          if (business.contactPhone != null)
+            ListTile(
+              leading: const Icon(Icons.phone),
+              title: Text(business.contactPhone!),
+              onTap: () {
+                showDialog(
+                    context: context,
+                    builder: (BuildContext context) {
+                      return AlertDialog(
+                        backgroundColor: Theme.of(context).colorScheme.surface,
+                        title: Text('Contact ${business.contactName}'),
+                        content: Text(
+                            'Would you like to call or text ${business.contactName}?'),
+                        actions: [
+                          TextButton(
+                              child: const Text('Text'),
+                              onPressed: () {
+                                launchUrl(
+                                    Uri.parse('sms:${business.contactPhone}'));
+                                Navigator.of(context).pop();
+                              }),
+                          TextButton(
+                              child: const Text('Call'),
+                              onPressed: () async {
+                                launchUrl(
+                                    Uri.parse('tel:${business.contactPhone}'));
+                                Navigator.of(context).pop();
+                              }),
+                        ],
+                      );
+                    });
+              },
+            ),
+          if (business.contactEmail != null)
+            ListTile(
+              leading: const Icon(Icons.email),
+              title: Text(business.contactEmail!),
+              onTap: () {
+                launchUrl(Uri.parse('mailto:${business.contactEmail}'));
+              },
+            ),
+        ],
+      ),
+    );
+  }
+}

fbla_ui/pubspec.lock

@@ -308,10 +308,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
+      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.5"
+    version: "2.2.6"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -348,10 +348,10 @@ packages:
     dependency: "direct main"
     description:
       name: pdf
-      sha256: "243f05342fc0bdf140eba5b069398985cdbdd3dbb1d776cf43d5ea29cc570ba6"
+      sha256: "81d5522bddc1ef5c28e8f0ee40b71708761753c163e0c93a40df56fd515ea0f0"
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.8"
+    version: "3.11.0"
   pdf_widget_wrapper:
     dependency: transitive
     description:
@@ -372,10 +372,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -396,10 +396,10 @@ packages:
     dependency: "direct main"
     description:
       name: printing
-      sha256: "1c99cab90ebcc1fff65831d264627d5b529359d563e53f33ab9b8117f2d280bc"
+      sha256: cc4b256a5a89d5345488e3318897b595867f5181b8c5ed6fc63bfa5f2044aec3
       url: "https://pub.dev"
     source: hosted
-    version: "5.12.0"
+    version: "5.13.1"
   qr:
     dependency: transitive
     description:
@@ -412,10 +412,10 @@ packages:
     dependency: "direct main"
     description:
       name: rive
-      sha256: "03bae056e67a5c98f9523c34f8ea63c15b323426a7e8d76d7ebb93066d4df6dc"
+      sha256: "0342c9cd3c83ceeee4ad9246b98d628a2e9abd9d615acf69fa81fbbcf84a36ae"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.5"
+    version: "0.13.8"
   rive_common:
     dependency: transitive
     description: