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

Merge pull request #105 from yaso-meth/BUG--Border-Around-Calc-tools

Browse Source 
BUG--Border-Around-Calc-tools
This commit is contained in:
yaso-meth
2025-03-12 10:21:30 +02:00
committed by GitHub
parent 4ecb0bffa5 8eccbf4479
commit c79dd73181
3 changed files with 282 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MihAppToolBody( return MihAppToolBody(
borderOn: false, borderOn: true,
bodyItem: getBody(), bodyItem: getBody(),
); );
} }
@@ -73,9 +73,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
calcWidth = 300; calcWidth = 300;
} }
} }
return Padding( return Column(
padding: const EdgeInsets.all(10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
@@ -88,8 +86,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), 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),
Container( Container(
//color: Colors.white, //color: Colors.white,
@@ -112,8 +109,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
answer, answer,
style: TextStyle( style: TextStyle(
fontSize: 30, fontSize: 30,
color: color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
), ),
@@ -152,9 +148,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
buttonColor: MzanziInnovationHub.of(context)! buttonColor: MzanziInnovationHub.of(context)!
.theme .theme
.messageTextColor(), .messageTextColor(),
textColor: MzanziInnovationHub.of(context)! textColor:
.theme MzanziInnovationHub.of(context)!.theme.primaryColor(),
.primaryColor(),
), ),
); );
} }
@@ -173,9 +168,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
buttonColor: MzanziInnovationHub.of(context)! buttonColor: MzanziInnovationHub.of(context)!
.theme .theme
.messageTextColor(), .messageTextColor(),
textColor: MzanziInnovationHub.of(context)! textColor:
.theme MzanziInnovationHub.of(context)!.theme.primaryColor(),
.primaryColor(),
), ),
); );
} }
@@ -193,9 +187,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
buttonColor: MzanziInnovationHub.of(context)! buttonColor: MzanziInnovationHub.of(context)!
.theme .theme
.messageTextColor(), .messageTextColor(),
textColor: MzanziInnovationHub.of(context)! textColor:
.theme MzanziInnovationHub.of(context)!.theme.primaryColor(),
.primaryColor(),
), ),
); );
} }
@@ -213,9 +206,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
buttonText: buttons[index], buttonText: buttons[index],
buttonColor: buttonColor:
MzanziInnovationHub.of(context)!.theme.errorColor(), MzanziInnovationHub.of(context)!.theme.errorColor(),
textColor: MzanziInnovationHub.of(context)! textColor:
.theme MzanziInnovationHub.of(context)!.theme.primaryColor(),
.primaryColor(),
), ),
); );
} }
@@ -230,12 +222,10 @@ class _SimpleCalcState extends State<SimpleCalc> {
}); });
}, },
buttonText: buttons[index], buttonText: buttons[index],
buttonColor: MzanziInnovationHub.of(context)! buttonColor:
.theme MzanziInnovationHub.of(context)!.theme.successColor(),
.successColor(), textColor:
textColor: MzanziInnovationHub.of(context)! MzanziInnovationHub.of(context)!.theme.primaryColor(),
.theme
.primaryColor(),
), ),
); );
} }
@@ -267,9 +257,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
buttonColor: MzanziInnovationHub.of(context)! buttonColor: MzanziInnovationHub.of(context)!
.theme .theme
.messageTextColor(), .messageTextColor(),
textColor: MzanziInnovationHub.of(context)! textColor:
.theme MzanziInnovationHub.of(context)!.theme.primaryColor(),
.primaryColor(),
), ),
); );
} }
@@ -287,9 +276,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
buttonColor: MzanziInnovationHub.of(context)! buttonColor: MzanziInnovationHub.of(context)!
.theme .theme
.secondaryColor(), .secondaryColor(),
textColor: MzanziInnovationHub.of(context)! textColor:
.theme MzanziInnovationHub.of(context)!.theme.primaryColor(),
.primaryColor(),
), ),
); );
} }
@@ -298,7 +286,6 @@ class _SimpleCalcState extends State<SimpleCalc> {
), ),
), ),
], ],
),
); );
} }
} }

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

@@ -262,15 +262,13 @@ class _TipCalcState extends State<TipCalc> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MihAppToolBody( return MihAppToolBody(
borderOn: false, borderOn: true,
bodyItem: getBody(), bodyItem: getBody(),
); );
} }
Widget getBody() { Widget getBody() {
return Padding( return Column(
padding: const EdgeInsets.all(10.0),
child: Column(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
Text( Text(
@@ -282,8 +280,7 @@ class _TipCalcState extends State<TipCalc> {
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), 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,
@@ -338,8 +335,7 @@ class _TipCalcState extends State<TipCalc> {
validateInput(); validateInput();
}, },
buttonText: "Calculate", buttonText: "Calculate",
buttonColor: buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
MzanziInnovationHub.of(context)!.theme.successColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), ),
@@ -357,7 +353,6 @@ class _TipCalcState extends State<TipCalc> {
), ),
), ),
], ],
),
); );
} }
} }

2
Frontend/pubspec.yaml
View File

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.8+32 version: 1.0.9+34
environment: environment:
sdk: '>=3.5.3 <4.0.0' sdk: '>=3.5.3 <4.0.0'