From e79179e28d5ca91aaaedb2cc8e000088e85a774c Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 29 May 2025 15:28:06 +0200 Subject: [PATCH] add title to Calculator --- .../mih_packages/calculator/mih_calculator.dart | 9 +++++++++ .../calculator/package_tools/simple_calc.dart | 14 +------------- .../calculator/package_tools/tip_calc.dart | 14 +------------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/Frontend/lib/mih_packages/calculator/mih_calculator.dart b/Frontend/lib/mih_packages/calculator/mih_calculator.dart index 35211842..e64d05f5 100644 --- a/Frontend/lib/mih_packages/calculator/mih_calculator.dart +++ b/Frontend/lib/mih_packages/calculator/mih_calculator.dart @@ -25,6 +25,7 @@ class _MIHCalculatorState extends State { appActionButton: getAction(), appTools: getTools(), appBody: getToolBody(), + appToolTitles: getToolTitle(), selectedbodyIndex: _selectedIndex, onIndexChange: (newValue) { setState(() { @@ -71,4 +72,12 @@ class _MIHCalculatorState extends State { ]; return toolBodies; } + + List getToolTitle() { + List toolTitles = [ + "Simple Calculator", + "Tip Calculator", + ]; + return toolTitles; + } } diff --git a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart index cbf667c2..2872f61d 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart @@ -72,7 +72,7 @@ class _SimpleCalcState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -96,18 +96,6 @@ class _SimpleCalcState extends State { mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - Text( - "Simple Calculator", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - ), - ), - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), - const SizedBox(height: 10), Container( padding: const EdgeInsets.all(20), alignment: Alignment.centerRight, diff --git a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart index a15aacf5..8f32e1d8 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart @@ -263,7 +263,7 @@ class _TipCalcState extends State { @override Widget build(BuildContext context) { return MihPackageToolBody( - borderOn: true, + borderOn: false, bodyItem: getBody(), ); } @@ -273,18 +273,6 @@ class _TipCalcState extends State { child: Column( mainAxisSize: MainAxisSize.max, children: [ - Text( - "Tip Calculator", - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - ), - ), - Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), - const SizedBox(height: 10), MIHNumberField( controller: billAmountController, hintText: "Bill Amount",