From 3412345a4aca954442b45c0e2a8697d3346d54a1 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 17 Aug 2026 15:50:56 +0300 Subject: [PATCH] improvements --- .../widgets/equipment/asset_detail_page.dart | 6 +-- .../asset_document_history_view.dart | 4 +- lib/views/widgets/images/files_list.dart | 38 ++++++++++--------- .../widgets/images/multi_image_picker.dart | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/views/widgets/equipment/asset_detail_page.dart b/lib/views/widgets/equipment/asset_detail_page.dart index a2759caf..2d0e25b1 100644 --- a/lib/views/widgets/equipment/asset_detail_page.dart +++ b/lib/views/widgets/equipment/asset_detail_page.dart @@ -31,7 +31,6 @@ class _AssetDetailPageState extends State { AssetProvider? _assetProvider; AssetByIdModel? assetModel; - @override Widget build(BuildContext context) { assetId ??= ModalRoute.of(context)?.settings.arguments as int; @@ -93,10 +92,7 @@ class _AssetDetailPageState extends State { 12.height, TabBarView( children: [ - AssetDetailsView( - assetModel: assetModel!, - onUpload: _upload, - ), + AssetDetailsView(assetModel: assetModel!, onUpload: _upload), const AssetDocumentHistoryView(), ], ).expanded, diff --git a/lib/views/widgets/equipment/asset_document_history_view.dart b/lib/views/widgets/equipment/asset_document_history_view.dart index 986dafb9..68cc3b02 100644 --- a/lib/views/widgets/equipment/asset_document_history_view.dart +++ b/lib/views/widgets/equipment/asset_document_history_view.dart @@ -17,12 +17,12 @@ class AssetDocumentHistoryView extends StatelessWidget { ]; return SingleChildScrollView( - padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth), + padding: const EdgeInsets.symmetric(horizontal: 16), child: FilesList( showAsListView: true, - // itemGap: 12.toScreenHeight, showDownloadButton: true, images: dummyDocuments, + separator: const Divider().defaultStyle(context), ).toShadowContainer(context), ); } diff --git a/lib/views/widgets/images/files_list.dart b/lib/views/widgets/images/files_list.dart index 892e0709..b2625ab3 100644 --- a/lib/views/widgets/images/files_list.dart +++ b/lib/views/widgets/images/files_list.dart @@ -22,8 +22,9 @@ class FilesList extends StatelessWidget { final bool showAsListView; final bool showDownloadButton; final double? itemGap; + final Widget? separator; - const FilesList({Key? key, this.images = const [], this.types = const [], this.padding, this.showAsListView = false, this.showDownloadButton = false, this.itemGap}) + const FilesList({Key? key, this.separator, this.images = const [], this.types = const [], this.padding, this.showAsListView = false, this.showDownloadButton = false, this.itemGap}) : super(key: key); @override @@ -31,7 +32,7 @@ class FilesList extends StatelessWidget { return showAsListView ? ListView.separated( shrinkWrap: true, - padding: padding ?? const EdgeInsets.only(top: 8), + padding: padding ?? const EdgeInsets.only(top: 0), physics: const NeverScrollableScrollPhysics(), itemBuilder: (cxt, itemIndex) { if (!images[itemIndex].contains(".")) { @@ -74,14 +75,14 @@ class FilesList extends StatelessWidget { children: [ EllipsizedText( images[itemIndex].split("/").last, - style: AppTextStyles.heading6.copyWith(color: AppColor.black10), + style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context)), type: EllipsisType.start, // or EllipsisType.middle ), - 4.height, + 2.height, RichText( text: TextSpan( text: '${types.isEmpty ? "Asset Guide" : types[itemIndex]} | ', - style: AppTextStyles.bodyText.copyWith(color: AppColor.neutral120), + style: AppTextStyles.tinyFont.copyWith(color: AppColor.labelTextStyleColor(context)), children: [ TextSpan( text: 'View', @@ -109,21 +110,24 @@ class FilesList extends StatelessWidget { ), ], ).expanded, - showDownloadButton - ? 'download'.toSvgAsset().onPress(() async { - if (Utils.isLocalFile(images[itemIndex])) { - await OpenFile.open(images[itemIndex]); - } else { - await Utils.downloadFile(images[itemIndex], autoOpen: true, showToast: true); - } - }) - : const SizedBox.shrink() + if (showDownloadButton) + IconButton( + icon: "download".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)), + padding: EdgeInsets.zero, + visualDensity: VisualDensity.compact, + tooltip: "Download", + onPressed: () async { + if (Utils.isLocalFile(images[itemIndex])) { + await OpenFile.open(images[itemIndex]); + } else { + await Utils.downloadFile(images[itemIndex], autoOpen: true, showToast: true); + } + }, + ), ], ); }, - separatorBuilder: (cxt, index) => SizedBox( - height: itemGap ?? 8.toScreenHeight, - ), + separatorBuilder: (cxt, index) => separator ?? SizedBox(height: itemGap ?? 8.toScreenHeight), itemCount: images.length) : GridView.builder( padding: padding ?? const EdgeInsets.only(top: 8, bottom: 8), diff --git a/lib/views/widgets/images/multi_image_picker.dart b/lib/views/widgets/images/multi_image_picker.dart index 762e00e2..f6bffcbf 100644 --- a/lib/views/widgets/images/multi_image_picker.dart +++ b/lib/views/widgets/images/multi_image_picker.dart @@ -139,7 +139,7 @@ class _AttachmentPickerState extends State with SingleTickerPr }, ); }, - separatorBuilder: (cxt, index) => 8.height, + separatorBuilder: (cxt, index) => const Divider().defaultStyle(context), itemCount: widget.attachment.length) : Wrap( spacing: 8.toScreenWidth,