Use MihColor Across MIH

This commit is contained in:
2025-08-14 15:26:26 +02:00
parent 726c6f5213
commit 96d913629a
119 changed files with 4018 additions and 2968 deletions

View File

@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
import '../../../main.dart';
import 'package:supertokens_flutter/supertokens.dart';
@@ -57,9 +58,10 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
fileNameController: proPicController,
onChange: (_) {},
userSelectedfile: null,
frameColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
backgroundColor:
MzansiInnovationHub.of(context)!.theme.secondaryColor(),
frameColor: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
backgroundColor: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
),
);
}
@@ -84,7 +86,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
// MzansiInnovationHub.of(context)!.theme.logoImage().image, context);
return SafeArea(
child: Drawer(
//backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
//backgroundColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
return Stack(
@@ -97,9 +99,9 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
children: [
DrawerHeader(
decoration: BoxDecoration(
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
),
child: SizedBox(
height: 400,
@@ -113,9 +115,11 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
"${widget.signedInUser.fname} ${widget.signedInUser.lname}",
style: TextStyle(
fontWeight: FontWeight.bold,
color: MzansiInnovationHub.of(context)!
.theme
.primaryColor(),
color: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
),
Text(
@@ -123,9 +127,11 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.bold,
color: MzansiInnovationHub.of(context)!
.theme
.primaryColor(),
color: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
),
Text(
@@ -133,9 +139,11 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
style: TextStyle(
fontSize: 10,
fontWeight: FontWeight.bold,
color: MzansiInnovationHub.of(context)!
.theme
.primaryColor(),
color: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
),
],
@@ -149,7 +157,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
// Icon(
// Icons.home_outlined,
// color:
// MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// ),
// const SizedBox(width: 25.0),
// Text(
@@ -179,18 +187,22 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
children: [
Icon(
Icons.policy,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
const SizedBox(width: 25.0),
Text(
"Privacy Policy",
style: TextStyle(
//fontWeight: FontWeight.bold,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
),
],
@@ -208,18 +220,22 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
children: [
Icon(
Icons.design_services_rounded,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
const SizedBox(width: 25.0),
Text(
"Terms of Service",
style: TextStyle(
//fontWeight: FontWeight.bold,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
),
],
@@ -237,18 +253,22 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
children: [
Icon(
Icons.logout,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
const SizedBox(width: 25.0),
Text(
"Sign Out",
style: TextStyle(
//fontWeight: FontWeight.bold,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!
.theme
.mode ==
"Dark"),
),
),
],
@@ -303,8 +323,9 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
},
child: Icon(
MihIcons.mihLogo,
color:
MzansiInnovationHub.of(context)!.theme.primaryColor(),
color: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
),
),
// IconButton(
@@ -324,7 +345,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
// },
// icon: Icon(
// Icons.light_mode,
// color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
// color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// size: 35,
// ),
// ),

View File

@@ -8,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/notification.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart';
import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_business_home.dart';
import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_personal_home.dart';
@@ -117,9 +118,10 @@ class _MihHomeState extends State<MihHome> {
fileNameController: proPicController,
userSelectedfile: null,
// frameColor: frameColor,
frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
backgroundColor:
MzansiInnovationHub.of(context)!.theme.primaryColor(),
frameColor: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
backgroundColor: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
onChange: (_) {},
),
// MIHProfilePicture(
@@ -130,7 +132,7 @@ class _MihHomeState extends State<MihHome> {
// radius: 21,
// drawerMode: false,
// editable: false,
// frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// frameColor: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// onChange: (newProPic) {},
// ),
),

View File

@@ -863,17 +863,21 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
SpeedDialChild(
child: Icon(
Icons.delete,
color:
MzansiInnovationHub.of(context)!.theme.primaryColor(),
color: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
),
label: "Delete File",
labelBackgroundColor: MihColors.getGreenColor(context),
labelBackgroundColor: MihColors.getGreenColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
labelStyle: TextStyle(
color:
MzansiInnovationHub.of(context)!.theme.primaryColor(),
color: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
fontWeight: FontWeight.bold,
),
backgroundColor: MihColors.getGreenColor(context),
backgroundColor: MihColors.getGreenColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
onTap: () {},
),
],
@@ -950,11 +954,13 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
}
Color getPrim() {
return MzansiInnovationHub.of(context)!.theme.secondaryColor();
return MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark");
}
Color getSec() {
return MzansiInnovationHub.of(context)!.theme.primaryColor();
return MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark");
}
bool isBusinessUser(AppUser signedInUser) {
@@ -991,7 +997,7 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
// radius: 21,
// drawerMode: false,
// editable: false,
// frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// frameColor: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// onChange: (newProPic) {},
// ),
),
@@ -1021,7 +1027,8 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
child: Icon(
Icons.circle,
size: 10,
color: MihColors.getRedColor(context),
color: MihColors.getRedColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
),
)
],
@@ -1088,10 +1095,10 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
hintText: "Ask Mzansi",
prefixIcon: Icons.search,
prefixAltIcon: MihIcons.mzansiAi,
fillColor:
MzansiInnovationHub.of(context)!.theme.secondaryColor(),
hintColor:
MzansiInnovationHub.of(context)!.theme.primaryColor(),
fillColor: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
hintColor: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
onPrefixIconTap: () {
print("Search Text: ${searchController.text}");
setState(() {
@@ -1166,11 +1173,11 @@ class _MIHHomeLegacyState extends State<MIHHomeLegacy> {
child: Placeholder(),
// GNav(
// //hoverColor: Colors.lightBlueAccent,
// color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// iconSize: 35.0,
// activeColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
// activeColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// tabBackgroundColor:
// MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// //gap: 20,
// //padding: EdgeInsets.all(15),
// tabs: [

View File

@@ -93,7 +93,8 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
"Connection Error",
textAlign: TextAlign.center,
style: TextStyle(
color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
fontSize: 35,
fontWeight: FontWeight.bold,
),
@@ -101,7 +102,8 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
Icon(
Icons.power_off_outlined,
size: 150,
color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
),
SizedBox(
width: 500,
@@ -109,8 +111,8 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
"Looks like we ran into an issue getting your data.\nPlease check you internet connection and try again.",
textAlign: TextAlign.center,
style: TextStyle(
color:
MzansiInnovationHub.of(context)!.theme.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
fontSize: 20,
fontWeight: FontWeight.bold,
),
@@ -121,12 +123,14 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
onPressed: () {
Navigator.of(context).popAndPushNamed("/");
},
buttonColor: MihColors.getGreenColor(context),
buttonColor: MihColors.getGreenColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
width: 300,
child: Text(
"Refresh",
style: TextStyle(
color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
color: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
fontSize: 20,
fontWeight: FontWeight.bold,
),
@@ -142,7 +146,9 @@ class _MIHProfileGetterState extends State<MIHProfileGetter> {
"Error: $error",
textAlign: TextAlign.left,
style: TextStyle(
color: MihColors.getRedColor(context),
color: MihColors.getRedColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
fontSize: 15,
fontWeight: FontWeight.bold,
),

View File

@@ -7,6 +7,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart';
import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tiles/mih_calculator_tile.dart';
import 'package:mzansi_innovation_hub/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart';
@@ -215,7 +216,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
// Icon(
// MihIcons.mihLogo,
// size: width / 2,
// color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// ),
// const SizedBox(height: 10),
// Text(
@@ -225,7 +226,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
// style: TextStyle(
// fontSize: 30,
// fontWeight: FontWeight.bold,
// color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// ),
// ),
// const SizedBox(height: 20),
@@ -238,10 +239,10 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
hintText: "Ask Mzansi",
prefixIcon: Icons.search,
prefixAltIcon: MihIcons.mzansiAi,
fillColor:
MzansiInnovationHub.of(context)!.theme.secondaryColor(),
hintColor:
MzansiInnovationHub.of(context)!.theme.primaryColor(),
fillColor: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
hintColor: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
onPrefixIconTap: () {
Navigator.of(context).pushNamed(
'/mzansi-ai',
@@ -292,9 +293,9 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
Icon(
MihIcons.mzansiAi,
size: 165,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
),
const SizedBox(height: 10),
Text(
@@ -304,9 +305,9 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
style: TextStyle(
fontSize: 25,
fontWeight: FontWeight.bold,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
),
),
],

View File

@@ -8,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart';
import 'package:mzansi_innovation_hub/mih_packages/access_review/package_tile/mih_access_tile.dart';
import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tiles/mih_calculator_tile.dart';
@@ -171,11 +172,14 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
appName: "Test",
appIcon: Icon(
Icons.warning_amber_rounded,
color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
),
iconSize: packageSize,
primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
primaryColor: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
secondaryColor: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
)
});
}
@@ -267,7 +271,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
// Icon(
// MihIcons.mihLogo,
// size: 200,
// color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// ),
// const SizedBox(height: 10),
// Text(
@@ -277,7 +281,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
// style: TextStyle(
// fontSize: 30,
// fontWeight: FontWeight.bold,
// color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
// color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// ),
// ),
// const SizedBox(height: 20),
@@ -290,10 +294,10 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
hintText: "Ask Mzansi",
prefixIcon: Icons.search,
prefixAltIcon: MihIcons.mzansiAi,
fillColor:
MzansiInnovationHub.of(context)!.theme.secondaryColor(),
hintColor:
MzansiInnovationHub.of(context)!.theme.primaryColor(),
fillColor: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
hintColor: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
onPrefixIconTap: () {
Navigator.of(context).pushNamed(
'/mzansi-ai',
@@ -345,9 +349,9 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
Icon(
MihIcons.mzansiAi,
size: 165,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
),
const SizedBox(height: 10),
Text(
@@ -357,9 +361,9 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
style: TextStyle(
fontSize: 25,
fontWeight: FontWeight.bold,
color: MzansiInnovationHub.of(context)!
.theme
.secondaryColor(),
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
),
),
],