Compare commits

..

No commits in common. 'da680fb210f5d0760627be6e76f35b33bb619632' and '7f4a06b0db8693a668a2f3e8e514bbba126d4e84' have entirely different histories.

@ -215,8 +215,6 @@ class AppColor {
return redStatusTextColor; return redStatusTextColor;
case "request completed": case "request completed":
return greenStatusTextColor; return greenStatusTextColor;
case "complete":
return greenStatusTextColor;
case "low priority": case "low priority":
return greenStatusTextColor; return greenStatusTextColor;
case "low": case "low":

@ -263,9 +263,9 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
isExpanded: true, isExpanded: true,
hint: Text( hint: Text(
isEmpty || widget.enabled == false ? context.translation.noDataFound : context.translation.select, isEmpty || widget.enabled == false ? context.translation.noDataFound : context.translation.select,
style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context)), style: AppTextStyles.heading5.copyWith(color: AppColor.textStyleColor(context)),
), ),
// style: TextStyle(color: Theme.of(context).primaryColor, fontSize: 12), style: TextStyle(color: Theme.of(context).primaryColor, fontSize: 12),
underline: const SizedBox.shrink(), underline: const SizedBox.shrink(),
onChanged: (widget.enabled == false || widget.showAsBottomSheet || widget.showAsFullScreenDialog) onChanged: (widget.enabled == false || widget.showAsBottomSheet || widget.showAsFullScreenDialog)
? null ? null
@ -284,7 +284,7 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
child: Text(value.name ?? "", // Null-aware operator for value.name child: Text(value.name ?? "", // Null-aware operator for value.name
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context)) style: AppTextStyles.heading5.copyWith(color: AppColor.textStyleColor(context))
// Theme.of(context).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.white10 : AppColor.black10), // Theme.of(context).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.white10 : AppColor.black10),
), ),
); );

@ -140,9 +140,10 @@ class _ProfilePageState extends State<ProfilePage> {
}), }),
8.height, 8.height,
Text( Text(
(_user.username ?? ""), "Work Order Status".addTranslation,
style: AppTextStyles.heading3.copyWith(fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context)), style: AppTextStyles.heading3.copyWith(color: AppColor.headingTextColor(context)),
), ),
(_user.username ?? "").heading3(context).custom(fontWeight: FontWeight.w600, color: context.isDark ? AppColor.neutral10 : AppColor.neutral50),
], ],
), ),
), ),

Loading…
Cancel
Save