From ac63f0963356b143901c027810601971d91320f6 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Thu, 7 Oct 2021 15:40:34 +0300 Subject: [PATCH] edit arabic version --- lib/pages/parent_categorise_page.dart | 34 +++++++++------------------ 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/lib/pages/parent_categorise_page.dart b/lib/pages/parent_categorise_page.dart index 6862bcd7..ff1fc5b7 100644 --- a/lib/pages/parent_categorise_page.dart +++ b/lib/pages/parent_categorise_page.dart @@ -334,15 +334,13 @@ class _ParentCategorisePageState extends State { width: 10.0, ), Texts( -<<<<<<< HEAD + TranslationBase.of(context).refine, // 'Refine', - fontWeight: FontWeight.w600, -======= - 'Refine', + fontWeight: FontWeight.w600, ->>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f + ), SizedBox( width: 250.0, @@ -371,14 +369,10 @@ class _ParentCategorisePageState extends State { Column( children: [ ExpansionTile( -<<<<<<< HEAD + title: Texts( TranslationBase.of( context) .categorise), -======= - title: - Texts('Categorise'), ->>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f children: [ ProcedureListWidget( model: model, @@ -550,16 +544,14 @@ class _ParentCategorisePageState extends State { Container( width: 100, child: Button( -<<<<<<< HEAD + label: TranslationBase.of( context) .reset, backgroundColor: Colors.red, -======= - label: 'Reset', - backgroundColor: - Colors.red, ->>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f + + + ), ), SizedBox( @@ -623,17 +615,13 @@ class _ParentCategorisePageState extends State { Navigator.pop( context); }, -<<<<<<< HEAD + label: TranslationBase.of( context) .apply, backgroundColor: Colors.green, -======= - label: 'Apply', - backgroundColor: - Colors - .green, ->>>>>>> bcd99555e3e980ea8ec5f30a74c9e167c8520d9f + + ), ), ],