Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

ATOMS-1025, ATOMS-937 and some color fixes for dark mode

Browse Source
design_3.0_TM_Module_snagsFix
WaseemAbbasi22 2 months ago
parent 0604dd6d69
commit e40d9a1138
3 changed files with 99 additions and 106 deletions
Show Stats Download Patch File Download Diff File

31
lib/modules/tm_module/tasks_wo/update_task_request_view.dart
Unescape Escape View File

@ -230,38 +230,18 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
TaskJobActivityEngineerTimer( TaskJobActivityEngineerTimer(
id: 0, id: 0,
startDate: timer.startAt!.toIso8601String(), startDate: timer.startAt!.toIso8601String(),
// Handle potential null
endDate: timer.endAt?.toIso8601String(), endDate: timer.endAt?.toIso8601String(),
// Handle potential null
totalWorkingHour: ((durationInSecond) / 60 / 60), totalWorkingHour: ((durationInSecond) / 60 / 60),
// comment: timer.comments,
comment: timer.comments ?? comments), comment: timer.comments ?? comments),
); );
}); });
// TODO need to test this when task is enabled ... await taskRequestProvider.updateTaskByEngineer().then((success) async {
// await taskRequestProvider.updateTaskByEngineer().then((success) { if (success) {
// Navigator.pop(context);
// if (success) {
// if (status == 1) {
// AllRequestsProvider allRequestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
// allRequestsProvider.reset();
// allRequestsProvider.getAllRequests(context, typeTransaction: 6);
// } else {
// taskRequestProvider.getTaskById(id: widget.taskId, showLoading: false);
//
// }
// Navigator.pop(context);
// Navigator.pop(context);
// }
// });
await taskRequestProvider.updateTaskByEngineer().whenComplete(() async {
if (taskRequestProvider.stateCode == 200) {
if (status == 1) { if (status == 1) {
AllRequestsProvider allRequestsProvider = Provider.of<AllRequestsProvider>(context, listen: false); AllRequestsProvider allRequestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
allRequestsProvider.reset(); allRequestsProvider.reset();
await allRequestsProvider.getAllRequests(context, typeTransaction: 6); await allRequestsProvider.getAllRequests(context, typeTransaction: taskRequestProvider.taskRequestModel?.taskType?.id);
Navigator.pop(context); Navigator.pop(context);
Navigator.pop(context); Navigator.pop(context);
Navigator.pop(context); Navigator.pop(context);
@ -469,7 +449,8 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
setState(() {}); setState(() {});
} }
}, },
) ),
8.height,
], ],
], ],
); );
@ -528,6 +509,7 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
AppTimer( AppTimer(
label: context.translation.timer, label: context.translation.timer,
timer: taskProvider.taskRequestModel?.taskTimerModel, timer: taskProvider.taskRequestModel?.taskTimerModel,
pickerFromDate: DateTime.tryParse(widget.createdDate ?? ''),
width: double.infinity, width: double.infinity,
enabled: isTimerEnable, enabled: isTimerEnable,
decoration: BoxDecoration( decoration: BoxDecoration(
@ -538,7 +520,6 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
onPick: (time) { onPick: (time) {
taskProvider.taskRequestModel?.taskTimePicker = time; taskProvider.taskRequestModel?.taskTimePicker = time;
}, },
timerProgress: (isRunning) {},
onChange: (timer) async { onChange: (timer) async {
taskProvider.updateTaskTimer(timer: timer); taskProvider.updateTaskTimer(timer: timer);
return true; return true;

29
lib/new_views/app_style/app_color.dart
Unescape Escape View File

@ -96,11 +96,16 @@ class AppColor {
static Color yellowIcon(BuildContext context) => context.isDark ? const Color(0xffFFC945) : orange70; static Color yellowIcon(BuildContext context) => context.isDark ? const Color(0xffFFC945) : orange70;
static Color background(BuildContext context) => context.isDark ? neutral60 : Colors.white; static Color background(BuildContext context) => context.isDark ? neutral60 : Colors.white;
static Color textColor(BuildContext context) =>context.isDark ? AppColor.neutral30 : AppColor.neutral50;
static Color headingTextColor(BuildContext context) =>context.isDark ? AppColor.neutral30 : AppColor.black10; static Color textColor(BuildContext context) => context.isDark ? neutral30 : neutral50;
static Color lightTextColor(BuildContext context) =>AppColor.neutral120;
static Color iconColor(BuildContext context) =>context.isDark ? AppColor.neutral30 : AppColor.neutral50; static Color headingTextColor(BuildContext context) => context.isDark ? neutral30 : black10;
static Color fieldBgColor(BuildContext context) => context.isDark ? AppColor.neutral20 : AppColor.neutral100;
static Color lightTextColor(BuildContext context) => neutral120;
static Color iconColor(BuildContext context) => context.isDark ? neutral30 : neutral50;
static Color fieldBgColor(BuildContext context) => context.isDark ? neutral20 : neutral100;
static Color selectedButtonColor(BuildContext context) => context.isDark ? neutral60 : neutral30; static Color selectedButtonColor(BuildContext context) => context.isDark ? neutral60 : neutral30;
@ -143,18 +148,19 @@ class AppColor {
return Colors.white; return Colors.white;
} }
} }
static Color getActivityTypeBgColor(String type) { static Color getActivityTypeBgColor(String type) {
switch (type) { switch (type) {
case "Internal": case "Internal":
return neutral50; return neutral50;
case "External": case "External":
return white90; return white90;
default: default:
return primary10; return primary10;
} }
} }
static Color getActivityTypeTextColor(String type) {
static Color getActivityTypeTextColor(String type) {
switch (type) { switch (type) {
case "Internal": case "Internal":
return white10; return white10;
@ -280,16 +286,17 @@ static Color getActivityTypeTextColor(String type) {
return blueStatus(context); return blueStatus(context);
} }
} }
static Color getEquipmentStatusColor(BuildContext context, int id) { static Color getEquipmentStatusColor(BuildContext context, int id) {
switch (id) { switch (id) {
case 368: case 368:
//partially Down //partially Down
return greenStatus(context); return greenStatus(context);
case 369: case 369:
// Completely Down // Completely Down
return redStatus(context); return redStatus(context);
case 790: case 790:
//UP //UP
return blueStatus(context); return blueStatus(context);
default: default:
return blueStatus(context); return blueStatus(context);

145
lib/views/widgets/images/multi_image_picker.dart
Unescape Escape View File

@ -487,7 +487,8 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
return Container( return Container(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: AppColor.background(context),
// color: Colors.white,
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
border: Border.all(color: const Color(0xffF1F1F1), width: 1), border: Border.all(color: const Color(0xffF1F1F1), width: 1),
), ),
@ -495,7 +496,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
icon.toSvgAsset(color: const Color(0xff7D859A), width: 36, height: 36), icon.toSvgAsset(color: AppColor.iconColor(context), width: 36, height: 36),
// Icon(iconData, color: const Color(0xff7D859A), size: 36), // Icon(iconData, color: const Color(0xff7D859A), size: 36),
Text( Text(
label, label,
@ -508,74 +509,78 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
return SafeArea( return SafeArea(
top: false, top: false,
child: Column( child: Container(
mainAxisSize: MainAxisSize.min, width: double.infinity,
crossAxisAlignment: CrossAxisAlignment.start, color: AppColor.background(context),
children: [ child: Column(
"Attach File".heading4(context), mainAxisSize: MainAxisSize.min,
12.height, crossAxisAlignment: CrossAxisAlignment.start,
GridView( children: [
padding: const EdgeInsets.all(0), "Attach File".heading4(context),
shrinkWrap: true, 12.height,
physics: const NeverScrollableScrollPhysics(), GridView(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 12, mainAxisSpacing: 12), padding: const EdgeInsets.all(0),
children: <Widget>[ shrinkWrap: true,
listCard( physics: const NeverScrollableScrollPhysics(),
icon: 'camera_icon', gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 12, mainAxisSpacing: 12),
label: '${context.translation.open}\n${context.translation.camera}', children: <Widget>[
onTap: () { listCard(
Navigator.of(context).pop(ImageSource.camera); icon: 'camera_icon',
}, label: '${context.translation.open}\n${context.translation.camera}',
), onTap: () {
listCard( Navigator.of(context).pop(ImageSource.camera);
icon: 'gallery_icon', },
label: '${context.translation.open}\n${context.translation.gallery}', ),
onTap: () { listCard(
Navigator.of(context).pop(ImageSource.gallery); icon: 'gallery_icon',
}, label: '${context.translation.open}\n${context.translation.gallery}',
), onTap: () {
listCard( Navigator.of(context).pop(ImageSource.gallery);
icon: 'file_icon', },
label: '${context.translation.open}\n${context.translation.files}', ),
onTap: () async { listCard(
await fromFilePicker(); icon: 'file_icon',
Navigator.pop(context); label: '${context.translation.open}\n${context.translation.files}',
}, onTap: () async {
), await fromFilePicker();
], Navigator.pop(context);
), },
// Container( ),
// padding: const EdgeInsets.all(16.0), ],
// child: Row( ),
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // Container(
// children: <Widget>[ // padding: const EdgeInsets.all(16.0),
// listCard( // child: Row(
// icon: 'camera_icon', // mainAxisAlignment: MainAxisAlignment.spaceBetween,
// label: '${context.translation.open}\n${context.translation.camera}', // children: <Widget>[
// onTap: () { // listCard(
// Navigator.of(context).pop(ImageSource.camera); // icon: 'camera_icon',
// }, // label: '${context.translation.open}\n${context.translation.camera}',
// ), // onTap: () {
// listCard( // Navigator.of(context).pop(ImageSource.camera);
// icon: 'gallery_icon', // },
// label: '${context.translation.open}\n${context.translation.gallery}', // ),
// onTap: () { // listCard(
// Navigator.of(context).pop(ImageSource.gallery); // icon: 'gallery_icon',
// }, // label: '${context.translation.open}\n${context.translation.gallery}',
// ), // onTap: () {
// listCard( // Navigator.of(context).pop(ImageSource.gallery);
// icon: 'file_icon', // },
// label: '${context.translation.open}\n${context.translation.files}', // ),
// onTap: () async { // listCard(
// await fromFilePicker(); // icon: 'file_icon',
// Navigator.pop(context); // label: '${context.translation.open}\n${context.translation.files}',
// }, // onTap: () async {
// ), // await fromFilePicker();
// ], // Navigator.pop(context);
// ), // },
// ), // ),
], // ],
).paddingAll(16), // ),
// ),
],
).paddingAll(16),
),
); );
}, },
); );

Write Preview
Loading…
Cancel
Save