edit arabic version

merge-update-with-lab-changes
Fatimah Alshammari 5 years ago
parent 8baad999c5
commit ac63f09633

@ -334,15 +334,13 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
width: 10.0, width: 10.0,
), ),
Texts( Texts(
<<<<<<< HEAD
TranslationBase.of(context).refine, TranslationBase.of(context).refine,
// 'Refine', // 'Refine',
fontWeight: FontWeight.w600,
=======
'Refine',
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
>>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f
), ),
SizedBox( SizedBox(
width: 250.0, width: 250.0,
@ -371,14 +369,10 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Column( Column(
children: [ children: [
ExpansionTile( ExpansionTile(
<<<<<<< HEAD
title: Texts( TranslationBase.of( title: Texts( TranslationBase.of(
context) context)
.categorise), .categorise),
=======
title:
Texts('Categorise'),
>>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f
children: [ children: [
ProcedureListWidget( ProcedureListWidget(
model: model, model: model,
@ -550,16 +544,14 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Container( Container(
width: 100, width: 100,
child: Button( child: Button(
<<<<<<< HEAD
label: TranslationBase.of( label: TranslationBase.of(
context) context)
.reset, .reset,
backgroundColor: Colors.red, backgroundColor: Colors.red,
=======
label: 'Reset',
backgroundColor:
Colors.red,
>>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f
), ),
), ),
SizedBox( SizedBox(
@ -623,17 +615,13 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
Navigator.pop( Navigator.pop(
context); context);
}, },
<<<<<<< HEAD
label: TranslationBase.of( label: TranslationBase.of(
context) context)
.apply, .apply,
backgroundColor: Colors.green, backgroundColor: Colors.green,
=======
label: 'Apply',
backgroundColor:
Colors
.green,
>>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f
), ),
), ),
], ],

Loading…
Cancel
Save