yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update calculator to use MihSignlewScroll

Browse Source
This commit is contained in:
Yasien Mac Mini
2025-03-17 10:44:45 +02:00
parent aa0472afe5
commit 20e02169d4
2 changed files with 304 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

423
Frontend/lib/mih_packages/calculator/app_tools/simple_calc.dart
View File

@@ -1,5 +1,6 @@
import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:math_expressions/math_expressions.dart'; import 'package:math_expressions/math_expressions.dart';
@@ -73,219 +74,231 @@ class _SimpleCalcState extends State<SimpleCalc> {
calcWidth = 300; calcWidth = 300;
} }
} }
return Column( return MihSingleChildScroll(
mainAxisAlignment: MainAxisAlignment.start, child: Column(
mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ mainAxisSize: MainAxisSize.min,
Text( children: <Widget>[
"Simple Calculator", Text(
textAlign: TextAlign.center, "Simple Calculator",
style: TextStyle( textAlign: TextAlign.center,
fontSize: 25,
fontWeight: FontWeight.bold,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
),
),
Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
const SizedBox(height: 10),
Container(
//color: Colors.white,
padding: const EdgeInsets.all(20),
alignment: Alignment.centerRight,
child: Text(
userInput,
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 25,
fontWeight: FontWeight.bold,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
), Divider(
Container( color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
width: double.infinity, const SizedBox(height: 10),
//color: Colors.white, Container(
padding: const EdgeInsets.all(15), //color: Colors.white,
alignment: Alignment.centerRight, padding: const EdgeInsets.all(20),
child: Text( alignment: Alignment.centerRight,
answer, child: Text(
style: TextStyle( userInput,
fontSize: 30, style: TextStyle(
fontSize: 18,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontWeight: FontWeight.bold),
),
),
Container(
alignment: Alignment.centerRight,
child: SizedBox(
width: calcWidth,
child: GridView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
// padding: EdgeInsets.only(
// left: width / 10,
// right: width / 10,
// bottom: height / 15,
// //top: 20,
// ),
// shrinkWrap: true,
itemCount: buttons.length,
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
//mainAxisExtent: 150,
), ),
itemBuilder: (context, index) {
// Clear Button
if (index == 0) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput = '';
answer = '0';
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// +/- button
else if (index == 1) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// % Button
else if (index == 2) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// Delete Button
else if (index == 3) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput =
userInput.substring(0, userInput.length - 1);
});
},
buttonText: buttons[index],
buttonColor:
MzanziInnovationHub.of(context)!.theme.errorColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// Equal_to Button
else if (index == 18) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
equalPressed();
});
},
buttonText: buttons[index],
buttonColor:
MzanziInnovationHub.of(context)!.theme.successColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// +, -, / x buttons
else if (index == 7 ||
index == 11 ||
index == 15 ||
index == 19) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
if (answer == "0") {
setState(() {
userInput += buttons[index];
});
} else {
setState(() {
userInput = answer;
answer = "0";
userInput += buttons[index];
});
}
// setState(() {
// userInput += buttons[index];
// });
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
// other buttons
else {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
);
}
},
), ),
), ),
), Container(
], width: double.infinity,
//color: Colors.white,
padding: const EdgeInsets.all(15),
alignment: Alignment.centerRight,
child: Text(
answer,
style: TextStyle(
fontSize: 30,
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontWeight: FontWeight.bold),
),
),
Container(
alignment: Alignment.centerRight,
child: SizedBox(
width: calcWidth,
child: GridView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
// padding: EdgeInsets.only(
// left: width / 10,
// right: width / 10,
// bottom: height / 15,
// //top: 20,
// ),
// shrinkWrap: true,
itemCount: buttons.length,
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
//mainAxisExtent: 150,
),
itemBuilder: (context, index) {
// Clear Button
if (index == 0) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput = '';
answer = '0';
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// +/- button
else if (index == 1) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// % Button
else if (index == 2) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// Delete Button
else if (index == 3) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput =
userInput.substring(0, userInput.length - 1);
});
},
buttonText: buttons[index],
buttonColor:
MzanziInnovationHub.of(context)!.theme.errorColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// Equal_to Button
else if (index == 18) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
equalPressed();
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.successColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// +, -, / x buttons
else if (index == 7 ||
index == 11 ||
index == 15 ||
index == 19) {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
if (answer == "0") {
setState(() {
userInput += buttons[index];
});
} else {
setState(() {
userInput = answer;
answer = "0";
userInput += buttons[index];
});
}
// setState(() {
// userInput += buttons[index];
// });
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.messageTextColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
// other buttons
else {
return Padding(
padding: const EdgeInsets.all(4.0),
child: MIHButton(
onTap: () {
setState(() {
userInput += buttons[index];
});
},
buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
),
);
}
},
),
),
),
],
),
); );
} }
} }

167
Frontend/lib/mih_packages/calculator/app_tools/tip_calc.dart
View File

@@ -2,6 +2,7 @@ import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -268,91 +269,95 @@ class _TipCalcState extends State<TipCalc> {
} }
Widget getBody() { Widget getBody() {
return Column( return MihSingleChildScroll(
mainAxisSize: MainAxisSize.max, child: Column(
children: <Widget>[ mainAxisSize: MainAxisSize.max,
Text( children: <Widget>[
"Tip Calculator", Text(
textAlign: TextAlign.center, "Tip Calculator",
style: TextStyle( textAlign: TextAlign.center,
fontSize: 25, style: TextStyle(
fontWeight: FontWeight.bold, fontSize: 25,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), fontWeight: FontWeight.bold,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
),
), ),
), Divider(
Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
const SizedBox(height: 10), const SizedBox(height: 10),
MIHNumberField( MIHNumberField(
controller: billAmountController, controller: billAmountController,
hintText: "Bill Amount", hintText: "Bill Amount",
editable: true, editable: true,
required: true, required: true,
enableDecimal: true, enableDecimal: true,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
MIHNumberField( MIHNumberField(
controller: tipPercentageController, controller: tipPercentageController,
hintText: "Tip %", hintText: "Tip %",
editable: true, editable: true,
required: true, required: true,
enableDecimal: false, enableDecimal: false,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
MIHDropdownField( MIHDropdownField(
controller: splitBillController, controller: splitBillController,
hintText: "Split Bill", hintText: "Split Bill",
dropdownOptions: const ["Yes", "No"], dropdownOptions: const ["Yes", "No"],
required: true, required: true,
editable: true, editable: true,
enableSearch: false, enableSearch: false,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
ValueListenableBuilder( ValueListenableBuilder(
valueListenable: splitValue, valueListenable: splitValue,
builder: (BuildContext context, String value, Widget? child) { builder: (BuildContext context, String value, Widget? child) {
return Visibility( return Visibility(
visible: value == "Yes", visible: value == "Yes",
child: Column( child: Column(
children: [ children: [
MIHNumberField( MIHNumberField(
controller: noPeopleController, controller: noPeopleController,
hintText: "No. of People", hintText: "No. of People",
editable: true, editable: true,
required: true, required: true,
enableDecimal: false, enableDecimal: false,
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
], ],
), ),
); );
},
),
SizedBox(
width: double.infinity,
height: 50,
child: MIHButton(
onTap: () {
validateInput();
}, },
buttonText: "Calculate",
buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), SizedBox(
const SizedBox(height: 10), width: double.infinity,
SizedBox( height: 50,
width: double.infinity, child: MIHButton(
height: 50, onTap: () {
child: MIHButton( validateInput();
onTap: () { },
clearInput(); buttonText: "Calculate",
}, buttonColor:
buttonText: "Clear", MzanziInnovationHub.of(context)!.theme.successColor(),
buttonColor: MzanziInnovationHub.of(context)!.theme.errorColor(), textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), ),
), ),
), const SizedBox(height: 10),
], SizedBox(
width: double.infinity,
height: 50,
child: MIHButton(
onTap: () {
clearInput();
},
buttonText: "Clear",
buttonColor: MzanziInnovationHub.of(context)!.theme.errorColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
),
],
),
); );
} }
} }