From 6867538edf117264465382e6f0d8d90f326b7b79 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Tue, 29 Apr 2025 10:46:56 +0200 Subject: [PATCH] remove future getting --- .../package_tools/mih_business_details.dart | 80 ++------- .../package_tools/mih_my_business_user.dart | 157 +++--------------- 2 files changed, 41 insertions(+), 196 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart index 211bd1d8..8219ca9d 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart @@ -10,16 +10,17 @@ import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_alert.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; class MihBusinessDetails extends StatefulWidget { final BusinessArguments arguments; + final ImageProvider? logoImage; const MihBusinessDetails({ super.key, required this.arguments, + required this.logoImage, }); @override @@ -27,7 +28,6 @@ class MihBusinessDetails extends StatefulWidget { } class _MihBusinessDetailsState extends State { - late Future fileUrlFuture; PlatformFile? imageFile; final fileNameController = TextEditingController(); final regController = TextEditingController(); @@ -220,10 +220,6 @@ class _MihBusinessDetailsState extends State { emailController.text = widget.arguments.business!.bus_email; locationController.text = widget.arguments.business!.gps_location; }); - fileUrlFuture = MihFileApi.getMinioFileUrl( - widget.arguments.business!.logo_path, - context, - ); } @override @@ -247,65 +243,19 @@ class _MihBusinessDetailsState extends State { ), Divider(color: MzanziInnovationHub.of(context)?.theme.secondaryColor()), const SizedBox(height: 10), - FutureBuilder( - future: fileUrlFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.waiting) { - return Container( - // alignment: Alignment.center, - width: 150, - height: 150, - child: FittedBox( - alignment: Alignment.center, - fit: BoxFit.fill, - child: Icon( - MihIcons.mihCircleFrame, - color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - ), - ), - ); - } else if (snapshot.connectionState == ConnectionState.done && - snapshot.hasData && - snapshot.data != null && - snapshot.data.toString().isNotEmpty) { - return MihCircleAvatar( - imageFile: NetworkImage(snapshot.data.toString()), - width: 150, - editable: true, - fileNameController: fileNameController, - userSelectedfile: imageFile, - frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - onChange: (selectedfile) { - setState(() { - imageFile = selectedfile; - }); - }, - ); - } else if (snapshot.hasError) { - return Text("Error: ${snapshot.error}"); - } else { - return MihCircleAvatar( - imageFile: null, - width: 150, - editable: true, - fileNameController: fileNameController, - userSelectedfile: imageFile, - frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - onChange: (selectedfile) { - setState(() { - imageFile = selectedfile; - }); - }, - ); - // return const Text("Error loading image"); - } + MihCircleAvatar( + imageFile: widget.logoImage, + width: 150, + editable: true, + fileNameController: fileNameController, + userSelectedfile: imageFile, + frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + backgroundColor: + MzanziInnovationHub.of(context)!.theme.primaryColor(), + onChange: (selectedfile) { + setState(() { + imageFile = selectedfile; + }); }, ), Visibility( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart index 20780511..3ac35497 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart @@ -10,7 +10,6 @@ import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_alert.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_image_display.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; @@ -18,9 +17,14 @@ import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; class MihMyBusinessUser extends StatefulWidget { final BusinessArguments arguments; + final ImageProvider? userProPicImage; + final ImageProvider? userSignatureImage; + const MihMyBusinessUser({ super.key, required this.arguments, + required this.userProPicImage, + required this.userSignatureImage, }); @override @@ -28,8 +32,6 @@ class MihMyBusinessUser extends StatefulWidget { } class _MihMyBusinessUserState extends State { - late Future userPicUrlFuture; - late Future userSignatureUrlFuture; PlatformFile? userPicFile; PlatformFile? userSignatureFile; final fileNameController = TextEditingController(); @@ -190,14 +192,6 @@ class _MihMyBusinessUserState extends State { lnameController.text = widget.arguments.signedInUser.lname; accessController.text = widget.arguments.businessUser!.access; }); - userPicUrlFuture = MihFileApi.getMinioFileUrl( - widget.arguments.signedInUser.pro_pic_path, - context, - ); - userSignatureUrlFuture = MihFileApi.getMinioFileUrl( - widget.arguments.businessUser!.sig_path, - context, - ); } @override @@ -222,59 +216,16 @@ class _MihMyBusinessUserState extends State { Divider( color: MzanziInnovationHub.of(context)?.theme.secondaryColor()), const SizedBox(height: 10), - FutureBuilder( - future: userPicUrlFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.waiting) { - return Container( - // alignment: Alignment.center, - width: 150, - height: 150, - child: FittedBox( - alignment: Alignment.center, - fit: BoxFit.fill, - child: Icon( - MihIcons.mihCircleFrame, - color: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - ), - ), - ); - } else if (snapshot.connectionState == ConnectionState.done && - snapshot.hasData && - snapshot.data != null && - snapshot.data.toString().isNotEmpty) { - return MihCircleAvatar( - imageFile: NetworkImage(snapshot.data.toString()), - width: 150, - editable: false, - fileNameController: fileNameController, - userSelectedfile: userPicFile, - frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - onChange: (_) {}, - ); - } else if (snapshot.hasError) { - return Text("Error: ${snapshot.error}"); - } else { - return MihCircleAvatar( - imageFile: null, - width: 150, - editable: false, - fileNameController: fileNameController, - userSelectedfile: userPicFile, - frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - onChange: (_) {}, - ); - // return const Text("Error loading image"); - } - }, + MihCircleAvatar( + imageFile: widget.userProPicImage, + width: 150, + editable: false, + fileNameController: fileNameController, + userSelectedfile: userPicFile, + frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + backgroundColor: + MzanziInnovationHub.of(context)!.theme.primaryColor(), + onChange: (_) {}, ), Visibility( visible: false, @@ -334,73 +285,17 @@ class _MihMyBusinessUserState extends State { ), ), ), - FutureBuilder( - future: userSignatureUrlFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.waiting) { - return MihImageDisplay( - imageFile: null, - width: 300, - height: 200, - editable: true, - fileNameController: signtureController, - userSelectedfile: userSignatureFile, - onChange: (selectedFile) { - setState(() { - userSignatureFile = selectedFile; - }); - }, - ); - // return Container( - // // alignment: Alignment.center, - // width: 300, - // height: 200, - // child: FittedBox( - // alignment: Alignment.center, - // fit: BoxFit.fill, - // child: Icon( - // MihIcons.mihCircleFrame, - // color: MzanziInnovationHub.of(context)! - // .theme - // .secondaryColor(), - // ), - // ), - // ); - } else if (snapshot.connectionState == ConnectionState.done && - snapshot.hasData && - snapshot.data != null && - snapshot.data.toString().isNotEmpty) { - return MihImageDisplay( - imageFile: NetworkImage(snapshot.data.toString()), - width: 300, - height: 200, - editable: true, - fileNameController: signtureController, - userSelectedfile: userSignatureFile, - onChange: (selectedFile) { - setState(() { - userSignatureFile = selectedFile; - }); - }, - ); - } else if (snapshot.hasError) { - return Text("Error: ${snapshot.error}"); - } else { - return MihImageDisplay( - imageFile: null, - width: 300, - height: 200, - editable: true, - fileNameController: signtureController, - userSelectedfile: userSignatureFile, - onChange: (selectedFile) { - setState(() { - userSignatureFile = selectedFile; - }); - }, - ); - // return const Text("Error loading image"); - } + MihImageDisplay( + imageFile: widget.userSignatureImage, + width: 300, + height: 200, + editable: true, + fileNameController: signtureController, + userSelectedfile: userSignatureFile, + onChange: (selectedFile) { + setState(() { + userSignatureFile = selectedFile; + }); }, ), const SizedBox(height: 10),