Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

# Conflicts:
#	assets/translations/ar.json
#	lib/views/widgets/equipment/pick_asset.dart
main_design2.0
Sikander Saleem 2 years ago
commit eaa9bb62ee

@ -42,5 +42,7 @@
"assetNo" : "رقم الجهاز",
"manufacture" : "صناعة",
"model" : "الطراز",
"serialNumber": "الرقم التسلسلي"
"serialNumber" : "الرقم التسلسلي",
"device" : "الجهاز",
"pickAsset" : "إختر جهاز"
}

@ -42,5 +42,7 @@
"assetNo" : "Asset No.",
"manufacture" : "Manufacture",
"model" : "Model",
"serialNumber" : "Serial Number"
"serialNumber" : "Serial Number",
"device" : "Device",
"pickAsset" : "Pick Asset"
}

@ -44,4 +44,5 @@ enum TranslationKeys {
model,
serialNumber,
device,
pickAsset,
}

@ -48,65 +48,5 @@ class PickAsset extends StatelessWidget {
),
],
);
// return ElevatedButton(
// style: ElevatedButton.styleFrom(
// elevation: 0,
// padding: EdgeInsets.symmetric(horizontal: 16, vertical: device == null ? 12 : 8),
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(AppStyle.borderRadius * AppStyle.getScaleFactor(context)),
// ),
// foregroundColor: AColors.primaryColor,
// backgroundColor: AColors.inputFieldBackgroundColor,
// ),
// child: Row(
// children: [
// Expanded(
// child: ListTile(
// contentPadding: const EdgeInsets.all(0),
// title: Text(
// "${"context"} : ${device.serialNumber}",
// style: Theme.of(context).textTheme.subtitle1,
// ),
// subtitle: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Divider(
// color: Theme.of(context).textTheme.subtitle1.color,
// ),
// Text(
// "${_subtitle.assetNumber} : ${device.number}",
// style: Theme.of(context).textTheme.subtitle2,
// ),
// Divider(
// color: Theme.of(context).textTheme.subtitle1.color,
// ),
// Text(
// "${_subtitle.assetName} : ${device.modelDefinition.assetName}",
// style: Theme.of(context).textTheme.subtitle2,
// ),
// Divider(
// color: Theme.of(context).textTheme.subtitle1.color,
// ),
// Text(
// "${_subtitle.brand} : ${device.modelDefinition.manufacturerName}",
// style: Theme.of(context).textTheme.subtitle2,
// ),
// Divider(
// color: Theme.of(context).textTheme.subtitle1.color,
// ),
// Text(
// "${_subtitle.model} : ${device.modelDefinition.modelName}",
// style: Theme.of(context).textTheme.subtitle2,
// ),
// ],
// ),
// )),
// const Icon(Icons.keyboard_arrow_down, size: 28, color: AColors.grey3A),
// ],
// ),
// onPressed: () async {
// Device _device = await Navigator.of(context).pushNamed(SingleDevicePicker.id) as Device;
// onDevicePick(_device);
// });
}
}

Loading…
Cancel
Save