|
|
|
|
@ -183,7 +183,7 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
|
|
|
|
|
child: SingleChildScrollView(
|
|
|
|
|
child: Column(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
spacing: 8,
|
|
|
|
|
spacing: 12,
|
|
|
|
|
children: [
|
|
|
|
|
// Task Type Dropdown
|
|
|
|
|
SingleItemDropDownMenu<TaskType, NullableLoadingProvider>(
|
|
|
|
|
@ -204,18 +204,17 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
|
|
|
|
|
),
|
|
|
|
|
|
|
|
|
|
// Scan QR Code Button
|
|
|
|
|
8.height,
|
|
|
|
|
GestureDetector(
|
|
|
|
|
onTap: selectedTaskType != null ? _onScanQRCode : null,
|
|
|
|
|
child: Container(
|
|
|
|
|
height: 50,
|
|
|
|
|
alignment: Alignment.center,
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: selectedTaskType != null ? Colors.white : Colors.grey[300],
|
|
|
|
|
borderRadius: BorderRadius.circular(10),
|
|
|
|
|
color: selectedTaskType != null ? AppColor.background(context) : Colors.grey[300],
|
|
|
|
|
borderRadius: BorderRadius.circular(16),
|
|
|
|
|
border: Border.all(
|
|
|
|
|
color: selectedTaskType != null ? AppColor.blueStatus(context) : Colors.grey,
|
|
|
|
|
width: 2,
|
|
|
|
|
color: selectedTaskType != null ? AppColor.borderColor(context) : Colors.grey,
|
|
|
|
|
width: 1,
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight),
|
|
|
|
|
@ -225,16 +224,16 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
|
|
|
|
|
"scan_asset".toSvgAsset(
|
|
|
|
|
height: 22,
|
|
|
|
|
fit: BoxFit.fitHeight,
|
|
|
|
|
color: selectedTaskType != null ? (context.isDark ? AppColor.neutral20 : AppColor.neutral120) : Colors.grey,
|
|
|
|
|
color: selectedTaskType != null ? AppColor.icon2Color(context) : Colors.grey,
|
|
|
|
|
),
|
|
|
|
|
8.width,
|
|
|
|
|
//we can change the implementation when merge with uiux branch
|
|
|
|
|
_scannedLocationData == null
|
|
|
|
|
? "Scan QR Code".bodyText(context).custom(
|
|
|
|
|
color: selectedTaskType != null ? (context.isDark ? AppColor.neutral20 : AppColor.black20) : Colors.grey,
|
|
|
|
|
color: selectedTaskType != null ? AppColor.icon2Color(context) : Colors.grey,
|
|
|
|
|
)
|
|
|
|
|
: 'Re Scan QR Code'.bodyText(context).custom(
|
|
|
|
|
color: selectedTaskType != null ? (context.isDark ? AppColor.neutral20 : AppColor.black20) : Colors.grey,
|
|
|
|
|
color: selectedTaskType != null ? AppColor.icon2Color(context) : Colors.grey,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
|