From ab83963c65b4685324444bbd51b031ca3e954824 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Mon, 13 Nov 2023 14:11:27 +0300
Subject: [PATCH] improvements

---
 .../device_transfer/device_transfer_details.dart | 16 ++++++----------
 lib/views/pages/user/visits/visit_details.dart   |  1 -
 .../widgets/equipment/asset_item_listview.dart   |  9 +++++----
 .../widgets/equipment/single_device_picker.dart  |  2 --
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart
index 73c2be5a..81636434 100644
--- a/lib/views/pages/device_transfer/device_transfer_details.dart
+++ b/lib/views/pages/device_transfer/device_transfer_details.dart
@@ -30,35 +30,31 @@ class DeviceTransferDetails extends StatefulWidget {
 }
 
 class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
-  AssetTransfer _model;
   UserProvider _userProvider;
+  AssetTransfer _model;
   bool _isLoading = false;
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
 
   @override
   void initState() {
-    _model = widget.model;
     super.initState();
   }
 
-  Future<void> _getDeviceTransfer() async {
-    _model = await Provider.of<AssetTransferProvider>(context).getRequestById(assetTransferId: widget.model.id);
-  }
-
   @override
   Widget build(BuildContext context) {
+    _userProvider ??= Provider.of<UserProvider>(context);
     return Scaffold(
       appBar: DefaultAppBar(title: context.translation.deviceTransferDetails),
       key: _scaffoldKey,
       body: SafeArea(
         child: FutureBuilder(
-          future: _getDeviceTransfer(),
+          future: Provider.of<AssetTransferProvider>(context).getRequestById(assetTransferId: widget.model.id),
           builder: (context, snapshot) {
             if (snapshot.connectionState == ConnectionState.waiting) {
               return const ALoading();
             } else {
-              _userProvider = Provider.of<UserProvider>(context);
+              _model = snapshot.data;
               return Form(
                 key: _formKey,
                 child: LoadingManager(
@@ -108,8 +104,8 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                                 //   ],
                                 // ),
                                 1.width,
-                                Text(widget.model.createdOn != null ? widget.model.createdOn.toServiceRequestCardFormat : "",
-                                    textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color:context.isDark? AppColor.neutral10: Color(0xFF3B3D4A))),
+                                Text(_model.createdOn != null ? _model.createdOn.toServiceRequestCardFormat : "",
+                                    textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF3B3D4A))),
                               ],
                             ),
                           ],
diff --git a/lib/views/pages/user/visits/visit_details.dart b/lib/views/pages/user/visits/visit_details.dart
index dfc846b7..3065f7f1 100644
--- a/lib/views/pages/user/visits/visit_details.dart
+++ b/lib/views/pages/user/visits/visit_details.dart
@@ -44,7 +44,6 @@ class VisitDetailsPage extends StatelessWidget {
                 return Column(children: [
                   SingleChildScrollView(
                     child: Column(
-                      //mainAxisSize: MainAxisSize.min,
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Row(
diff --git a/lib/views/widgets/equipment/asset_item_listview.dart b/lib/views/widgets/equipment/asset_item_listview.dart
index 6fd6890e..27654035 100644
--- a/lib/views/widgets/equipment/asset_item_listview.dart
+++ b/lib/views/widgets/equipment/asset_item_listview.dart
@@ -15,6 +15,7 @@ class AssetItemListView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Container(
           width: 95,
@@ -38,15 +39,15 @@ class AssetItemListView extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               mainAxisSize: MainAxisSize.min,
               children: [
-                  device.modelDefinition.assetName.heading5(context),
-                  "${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context),
-                  "${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText(context),
+                device.modelDefinition.assetName.heading6(context),
+                "${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context),
+                "${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText(context),
               ],
             ),
             Row(
               crossAxisAlignment: CrossAxisAlignment.end,
               children: [
-                  "${context.translation.serialNo} : ${device.assetSerialNo}".bodyText(context).expanded,
+                "${context.translation.serialNo} : ${device.assetSerialNo}".bodyText(context).expanded,
                 Row(
                   mainAxisSize: MainAxisSize.min,
                   children: [
diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart
index c6a3069d..dbff8e47 100644
--- a/lib/views/widgets/equipment/single_device_picker.dart
+++ b/lib/views/widgets/equipment/single_device_picker.dart
@@ -186,8 +186,6 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
                                         device: _searchableList[index],
                                         onPressed: (device) {
                                           Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id);
-                                          return;
-                                          Navigator.of(context).pop(device);
                                         },
                                       );
                                     },