Use MihColor Across MIH

2025-08-14 15:26:26 +02:00
parent 726c6f5213
commit 96d913629a
119 changed files with 4018 additions and 2968 deletions
--- a/Frontend/lib/mih_components/mih_layout/mih_body.dart
+++ b/Frontend/lib/mih_components/mih_layout/mih_body.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import '../../main.dart';

 class MIHBody extends StatefulWidget {
@@ -46,10 +47,12 @@ class _MIHBodyState extends State<MIHBody> {
  Decoration? getBoader() {
    if (widget.borderOn) {
      return BoxDecoration(
-        color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+        color: MihColors.getPrimaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        borderRadius: BorderRadius.circular(25.0),
        border: Border.all(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            width: 3.0),
      );
    } else {
--- a/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart
+++ b/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart
@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/main.dart';
 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/notification.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../main.dart';
 import 'package:supertokens_flutter/http.dart' as http;
-
 import '../../mih_config/mih_env.dart';
 import '../mih_pop_up_messages/mih_error_message.dart';

@@ -79,13 +78,15 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
      title: Text(
        title,
        style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      ),
      subtitle: Text(
        subtitle,
        style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      ),
      onTap: () {},
@@ -102,7 +103,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
        children: [
          Icon(
            Icons.circle_notifications,
-            color: MihColors.getRedColor(context),
+            color: MihColors.getRedColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
          ),
          const SizedBox(
            width: 5,
@@ -111,7 +113,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
            child: Text(
              title,
              style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              ),
            ),
          ),
@@ -125,7 +128,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
            child: Text(
              title,
              style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              ),
            ),
          ),
@@ -137,7 +141,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
      subtitle: Text(
        subtitle,
        style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      ),
      onTap: () {
@@ -160,7 +165,8 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
        physics: const NeverScrollableScrollPhysics(),
        separatorBuilder: (BuildContext context, index) {
          return Divider(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
          );
        },
        itemCount: widget.notifications.length,
@@ -199,14 +205,15 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
  Widget build(BuildContext context) {
    return SafeArea(
      child: Drawer(
-          //backgroundColor:  MzansiInnovationHub.of(context)!.theme.primaryColor(),
+          //backgroundColor:  MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
          child: SingleChildScrollView(
        child: Column(
          mainAxisSize: MainAxisSize.max,
          mainAxisAlignment: MainAxisAlignment.start,
          children: [
            Container(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              child: Row(
                mainAxisAlignment: MainAxisAlignment.center,
                crossAxisAlignment: CrossAxisAlignment.center,
@@ -216,9 +223,9 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
                    child: Text(
                      "Notifications",
                      style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
-                            .theme
-                            .primaryColor(),
+                        color: MihColors.getPrimaryColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                        fontWeight: FontWeight.bold,
                        fontSize: 20,
                      ),
@@ -233,7 +240,7 @@ class _MIHNotificationDrawerState extends State<MIHNotificationDrawer> {
            //   physics: const NeverScrollableScrollPhysics(),
            //   separatorBuilder: (BuildContext context, index) {
            //     return Divider(
-            //       color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            //       color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            //     );
            //   },
            //   itemCount: widget.notifications.length,
--- a/Frontend/lib/mih_components/mih_layout/mih_tile.dart
+++ b/Frontend/lib/mih_components/mih_layout/mih_tile.dart
@@ -2,6 +2,7 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_yt_video_player.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';

 class MIHTile extends StatefulWidget {
  final String tileName;
@@ -83,7 +84,7 @@ class _MIHTileState extends State<MIHTile> {
            child: Material(
              color: mainC,
              // shadowColor:
-              //     MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              // elevation: 5,
              borderRadius: BorderRadius.circular(80),
              child: InkWell(
@@ -94,10 +95,10 @@ class _MIHTileState extends State<MIHTile> {
                  displayHint();
                },
                // hoverDuration: ,
-                splashColor:
-                    MzansiInnovationHub.of(context)!.theme.highlightColor(),
-                highlightColor:
-                    MzansiInnovationHub.of(context)!.theme.highlightColor(),
+                splashColor: MihColors.getHighlightColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                highlightColor: MihColors.getHighlightColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                child: widget.tileIcon,
              ),
            ),
@@ -111,7 +112,8 @@ class _MIHTileState extends State<MIHTile> {
              softWrap: true,
              overflow: TextOverflow.visible,
              style: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                fontSize: 40.0,
                fontWeight: FontWeight.bold,
              ),