diff --git a/Frontend/images/mzansi_ai-dark.png b/Frontend/images/mzansi_ai-dark.png new file mode 100644 index 00000000..d99581d4 Binary files /dev/null and b/Frontend/images/mzansi_ai-dark.png differ diff --git a/Frontend/images/mzansi_ai-light.png b/Frontend/images/mzansi_ai-light.png new file mode 100644 index 00000000..30658141 Binary files /dev/null and b/Frontend/images/mzansi_ai-light.png differ diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index a4c2ca09..fe9158e1 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -43,6 +43,10 @@ class _MzanziInnovationHubState extends State { setState(() { theme.mode = "Light"; }); + } else if (_themeMode == ThemeMode.dark) { + setState(() { + theme.mode = "Dark"; + }); } else { setState(() { theme.mode = "Dark"; diff --git a/Frontend/lib/mih_packages/calculator/tip_calc.dart b/Frontend/lib/mih_packages/calculator/tip_calc.dart index 8bb6efa8..23ca8f99 100644 --- a/Frontend/lib/mih_packages/calculator/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/tip_calc.dart @@ -191,6 +191,15 @@ class _TipCalcState extends State { color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), ), ), + Text( + "~ ${double.parse(total).ceil()}.00", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 30, + fontWeight: FontWeight.bold, + color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), const Divider(), if (splitBillController.text == "Yes") Row( @@ -226,6 +235,16 @@ class _TipCalcState extends State { color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), ), ), + if (splitBillController.text == "Yes") + Text( + "~ ${double.parse(amountPerPerson).ceil()}.00", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 30, + fontWeight: FontWeight.bold, + color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), // if (splitBillController.text == "Yes") const Divider(), ], ), diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index 8b6e79d1..802ba16f 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -134,6 +134,7 @@ class _MIHHomeState extends State { void setAppsPersonal(List tileList) { ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage(); + ImageProvider aiLogo = MzanziInnovationHub.of(context)!.theme.aiLogoImage(); tileList.add(MIHTile( videoID: "P2bM9eosJ_A", onTap: () { @@ -233,10 +234,9 @@ class _MIHHomeState extends State { }, tileName: "Mzansi AI", tileIcon: Center( - child: FaIcon( - FontAwesomeIcons.robot, - color: getSec(), - size: 180, + child: SizedBox( + width: 225, + child: Image(image: aiLogo), ), ), // Icon( diff --git a/Frontend/lib/mih_theme/mih_theme.dart b/Frontend/lib/mih_theme/mih_theme.dart index 52115d0f..77ae9f85 100644 --- a/Frontend/lib/mih_theme/mih_theme.dart +++ b/Frontend/lib/mih_theme/mih_theme.dart @@ -227,6 +227,18 @@ class MyTheme { return loading; } + AssetImage aiLogoImage() { + if (mode == "Dark") { + return const AssetImage( + 'images/mzansi_ai-dark.png', + ); + } else { + return const AssetImage( + 'images/mzansi_ai-light.png', + ); + } + } + void setScreenType(double width) { if (width <= 800) { screenType = "mobile"; diff --git a/Frontend/pubspec.yaml b/Frontend/pubspec.yaml index 039f75ef..cafd7e0f 100644 --- a/Frontend/pubspec.yaml +++ b/Frontend/pubspec.yaml @@ -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 # 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. -version: 1.0.3+15 +version: 1.0.3+16 environment: sdk: '>=3.5.3 <4.0.0'