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

improvements

Browse Source
main_production_RSG
Sikander Saleem 2 months ago
parent 569fbe4df7
commit 68625dd963
5 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File

31
lib/modules/pm_module/recurrent_wo/components/room_inspection_card.dart
Unescape Escape View File

@ -30,10 +30,10 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
widget.inspectionModel!.tabName!.bodyText(context).custom(color:AppColor.textColor(context), fontWeight: FontWeight.w600), widget.inspectionModel!.tabName!.bodyText(context).custom(color: AppColor.textColor(context), fontWeight: FontWeight.w600),
8.height, 8.height,
Container( Container(
color: context.isDark?null: Colors.white10, color: context.isDark ? null : Colors.white10,
child: Column( child: Column(
children: widget.inspectionModel!.planRecurrentMedicalTaskRoomTabAttributes?.asMap().entries.map<Widget>((entry) { children: widget.inspectionModel!.planRecurrentMedicalTaskRoomTabAttributes?.asMap().entries.map<Widget>((entry) {
final model = entry.value; final model = entry.value;
@ -68,9 +68,9 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
model.attribute?.name ?? '', model.attribute?.name ?? '',
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 1, maxLines: 1,
style: AppTextStyles.bodyText2.copyWith(color: context.isDark?Colors.white:AppColor.white936), style: AppTextStyles.bodyText2.copyWith(color: AppColor.labelTextStyleColor(context)),
), ),
(status ? 'Pass' : 'Fail').bodyText2(context).custom(color: AppColor.neutral120, fontWeight: FontWeight.w500), (status ? 'Pass' : 'Fail').bodyText2(context).custom(color: AppColor.lightTextColor(context), fontWeight: FontWeight.w500),
], ],
).expanded, ).expanded,
GestureDetector( GestureDetector(
@ -85,8 +85,9 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
height: 30.toScreenHeight, height: 30.toScreenHeight,
padding: EdgeInsetsDirectional.all(4.toScreenHeight), padding: EdgeInsetsDirectional.all(4.toScreenHeight),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColor.fieldBgColor(context), color: AppColor.background(context),
borderRadius: BorderRadius.circular(5), borderRadius: BorderRadius.circular(6),
border: Border.all(color: AppColor.border2Color(context)),
), ),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -94,16 +95,24 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
buildToggleOption( buildToggleOption(
label: "PASS", label: "PASS",
isActive: status, isActive: status,
activeColor: AppColor.green20, activeColor: AppColor.green70.withValues(alpha: .25),
inactiveColor: Colors.transparent, inactiveColor: Colors.transparent,
textColor: status ? AppColor.green50 : context.isDark?Colors.white: AppColor.black20, textColor: status
? AppColor.green70
: context.isDark
? Colors.white
: AppColor.black20,
), ),
buildToggleOption( buildToggleOption(
label: "FAIL", label: "FAIL",
isActive: !status, isActive: !status,
activeColor: AppColor.red20, activeColor: AppColor.red30.withValues(alpha: .25),
inactiveColor: Colors.transparent, inactiveColor: Colors.transparent,
textColor: status ? context.isDark?Colors.white: AppColor.black20 : AppColor.red30, textColor: status
? context.isDark
? Colors.white
: AppColor.black20
: AppColor.red30,
), ),
], ],
), ),
@ -190,7 +199,7 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
model.attribute!.name!.bodyText2(context).custom(color: context.isDark?Colors.white:AppColor.white936, fontWeight: FontWeight.w500), model.attribute!.name!.bodyText2(context).custom(color: context.isDark ? Colors.white : AppColor.white936, fontWeight: FontWeight.w500),
TextFormField( TextFormField(
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
initialValue: model.attributeValue ?? '', initialValue: model.attributeValue ?? '',

17
lib/modules/pm_module/recurrent_wo/components/room_tabs_widget.dart
Unescape Escape View File

@ -33,8 +33,9 @@ class _RoomTabsWidgetState extends State<RoomTabsWidget> {
height: 57.toScreenHeight, height: 57.toScreenHeight,
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.isDark ? AppColor.neutral50 : AppColor.white10, color: AppColor.tabBarBackground(context),
borderRadius: BorderRadius.circular(10), border: Border.all(color: AppColor.tabBarBorder(context)),
borderRadius: BorderRadius.circular(16),
), ),
child: ListView( child: ListView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
@ -59,16 +60,14 @@ class _RoomTabsWidgetState extends State<RoomTabsWidget> {
child: Container( child: Container(
// margin: EdgeInsets.only(right: 8.toScreenWidth), // margin: EdgeInsets.only(right: 8.toScreenWidth),
height: 49.toScreenHeight, height: 49.toScreenHeight,
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(horizontal: 30.toScreenWidth),
// vertical: 20.toScreenHeight,
horizontal: 30.toScreenWidth,
),
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
color: selectedIndex == index ? (context.isDark ? AppColor.neutral60 : AppColor.neutral110) : Colors.transparent, color: selectedIndex == index ? AppColor.background(context) : Colors.transparent,
borderRadius: BorderRadius.circular(7), border: selectedIndex == index ? Border.all(color: AppColor.border2Color(context)) : null,
borderRadius: BorderRadius.circular(15),
), ),
child: label.bodyText(context).custom(color:context.isDark?Colors.white: AppColor.white936), child: label.bodyText(context).custom(color: context.isDark ? Colors.white : AppColor.white936),
), ),
); );
}).toList(), }).toList(),

8
lib/modules/pm_module/recurrent_wo/components/task_info_widget.dart
Unescape Escape View File

@ -122,10 +122,10 @@ class _RecurrentTaskInfoWidgetState extends State<RecurrentTaskInfoWidget> {
timer: snapshot.recurrentWoData?.recurrentWoTimerModel, timer: snapshot.recurrentWoData?.recurrentWoTimerModel,
width: double.infinity, width: double.infinity,
enabled: snapshot.recurrentWoData?.status?.value != 1, enabled: snapshot.recurrentWoData?.status?.value != 1,
decoration: BoxDecoration( // decoration: BoxDecoration(
color: AppColor.fieldBgColor(context), // color: AppColor.fieldBgColor(context),
borderRadius: BorderRadius.circular(10), // borderRadius: BorderRadius.circular(10),
), // ),
pickerTimer: widget.model?.recurrentWoTimePicker, pickerTimer: widget.model?.recurrentWoTimePicker,
pickerFromDate: DateTime.tryParse(widget.model?.scheduleDate ?? ''), pickerFromDate: DateTime.tryParse(widget.model?.scheduleDate ?? ''),
onPick: (time) { onPick: (time) {

2
lib/modules/pm_module/recurrent_wo/recurrent_work_order_view.dart
Unescape Escape View File

@ -77,7 +77,7 @@ class _RecurrentWorkOrderViewState extends State<RecurrentWorkOrderView> {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
RecurrentTaskInfoWidget(isClosed: isClosed,model: requestProvider.recurrentWoData), RecurrentTaskInfoWidget(isClosed: isClosed, model: requestProvider.recurrentWoData),
IgnorePointer( IgnorePointer(
ignoring: isClosed, ignoring: isClosed,
child: requestProvider.recurrentWoData!.planRecurrentMedicalTaskRooms != null && requestProvider.recurrentWoData!.planRecurrentMedicalTaskRooms!.isNotEmpty child: requestProvider.recurrentWoData!.planRecurrentMedicalTaskRooms != null && requestProvider.recurrentWoData!.planRecurrentMedicalTaskRooms!.isNotEmpty

14
lib/views/widgets/timer/app_timer.dart
Unescape Escape View File

@ -297,9 +297,10 @@ class _AppTimerState extends State<AppTimer> {
? AppColor.neutral60 ? AppColor.neutral60
: !widget.enabled : !widget.enabled
// backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90, // backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90,
? AppColor.neutral40 ? AppColor.disableDark
: AppColor.fieldBgColor(context), : AppColor.dropDownBackground(context),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(16),
border: Border.all(color: AppColor.border2Color(context), width: 1),
boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10)], boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10)],
), ),
child: _loading child: _loading
@ -314,7 +315,10 @@ class _AppTimerState extends State<AppTimer> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
(widget.label ?? "Timer").tinyFont(context), Text(
widget.label ?? "Timer",
style: AppTextStyles.tinyFont.copyWith(color: AppColor.labelTextStyleColor(context)),
),
value.bodyText(context).custom( value.bodyText(context).custom(
color: widget.enabled color: widget.enabled
? context.isDark ? context.isDark
@ -327,7 +331,7 @@ class _AppTimerState extends State<AppTimer> {
}, },
), ),
), ),
if (widget.enabled) Icon(_running ? Icons.pause : Icons.play_arrow), if (widget.enabled) Icon(_running ? Icons.pause : Icons.play_arrow,color: AppColor.icon2Color(context),),
], ],
), ),
).onPress(_loading || !widget.enabled ? null : _onPressed), ).onPress(_loading || !widget.enabled ? null : _onPressed),

Write Preview
Loading…
Cancel
Save