From 67953598ac5414ea084675d4fa3b785894dd73f2 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 29 Jan 2024 10:53:13 +0300 Subject: [PATCH] gas refill update & ppm attachment fix --- lib/views/pages/user/gas_refill/request_gas_refill.dart | 2 +- lib/views/widgets/images/multi_image_picker_item.dart | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/views/pages/user/gas_refill/request_gas_refill.dart b/lib/views/pages/user/gas_refill/request_gas_refill.dart index 29a27243..5b3451ae 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -228,7 +228,7 @@ class _RequestGasRefillState extends State { title: context.translation.reportStatus, initialValue: _formModel.status, onSelect: (value) { - if (value.value == 0) { + if (value?.value == 0) { "Status cannot be change to ${value.name}.".addTranslation.showToast; setState(() {}); return; diff --git a/lib/views/widgets/images/multi_image_picker_item.dart b/lib/views/widgets/images/multi_image_picker_item.dart index 7499669a..f0fcb693 100644 --- a/lib/views/widgets/images/multi_image_picker_item.dart +++ b/lib/views/widgets/images/multi_image_picker_item.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:open_file/open_file.dart'; +import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; @@ -24,6 +25,7 @@ class MultiFilesPickerItem extends StatelessWidget { var isImage = file.path.split(".").last.toLowerCase() == "png" || file.path.split(".").last.toLowerCase() == "jpg" || file.path.split(".").last.toLowerCase() == "jpeg"; var isPdf = file.path.split(".").last.toLowerCase() == "pdf"; var isExcel = file.path.split(".").last.toLowerCase() == "xlsx"; + return SizedBox( width: 54.toScreenWidth, height: 51.toScreenWidth, @@ -36,7 +38,7 @@ class MultiFilesPickerItem extends StatelessWidget { border: Border.all(width: 1, color: context.isDark ? AppColor.neutral30 : AppColor.neutral30), image: DecorationImage( image: isImage - ? (_isLocalUrl(file.path) ? FileImage(file) : NetworkImage(file.path)) + ? (_isLocalUrl(file.path) ? FileImage(file) : NetworkImage( URLs.getFileUrl(file.path))) : AssetImage("assets/images/${isPdf ? "pdf" : isExcel ? "excel" : "doc"}.png"), fit: BoxFit.cover, ), @@ -55,7 +57,7 @@ class MultiFilesPickerItem extends StatelessWidget { child: _isLocalUrl(file.path) ? Image.file(file) : ImageLoader( - url: file.path, + url: URLs.getFileUrl(file.path), boxFit: BoxFit.cover, ), ).center,