improvements

main_production_RSG
Sikander Saleem 2 months ago
parent 569fbe4df7
commit 68625dd963

@ -30,10 +30,10 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
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,
Container(
color: context.isDark?null: Colors.white10,
color: context.isDark ? null : Colors.white10,
child: Column(
children: widget.inspectionModel!.planRecurrentMedicalTaskRoomTabAttributes?.asMap().entries.map<Widget>((entry) {
final model = entry.value;
@ -68,9 +68,9 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
model.attribute?.name ?? '',
overflow: TextOverflow.ellipsis,
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,
GestureDetector(
@ -85,8 +85,9 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
height: 30.toScreenHeight,
padding: EdgeInsetsDirectional.all(4.toScreenHeight),
decoration: BoxDecoration(
color: AppColor.fieldBgColor(context),
borderRadius: BorderRadius.circular(5),
color: AppColor.background(context),
borderRadius: BorderRadius.circular(6),
border: Border.all(color: AppColor.border2Color(context)),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -94,16 +95,24 @@ class _RoomInspectionCardState extends State<RoomInspectionCard> {
buildToggleOption(
label: "PASS",
isActive: status,
activeColor: AppColor.green20,
activeColor: AppColor.green70.withValues(alpha: .25),
inactiveColor: Colors.transparent,
textColor: status ? AppColor.green50 : context.isDark?Colors.white: AppColor.black20,
textColor: status
? AppColor.green70
: context.isDark
? Colors.white
: AppColor.black20,
),
buildToggleOption(
label: "FAIL",
isActive: !status,
activeColor: AppColor.red20,
activeColor: AppColor.red30.withValues(alpha: .25),
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,
crossAxisAlignment: CrossAxisAlignment.center,
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(
keyboardType: TextInputType.number,
initialValue: model.attributeValue ?? '',

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

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

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

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

Loading…
Cancel
Save