From 883e66492c0ba2c144c4feb955098c1853c00ac6 Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 31 Jan 2025 09:48:51 +0200 Subject: [PATCH 1/4] remove theme link at auth check --- .../authentication/auth_check.dart | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Frontend/lib/mih_packages/authentication/auth_check.dart b/Frontend/lib/mih_packages/authentication/auth_check.dart index 4d4519b2..73b9f7bb 100644 --- a/Frontend/lib/mih_packages/authentication/auth_check.dart +++ b/Frontend/lib/mih_packages/authentication/auth_check.dart @@ -1,8 +1,6 @@ -import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/authentication/biometric_check.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/scheduler.dart'; import 'package:supertokens_flutter/supertokens.dart'; import 'package:no_screenshot/no_screenshot.dart'; @@ -44,14 +42,14 @@ class _AuthCheckState extends State { void initState() { //signedIn = doesSessionExist(); disableScreenshot(); - var brightness = - SchedulerBinding.instance.platformDispatcher.platformBrightness; - bool isDarkMode = brightness == Brightness.dark; - if (isDarkMode) { - MzanziInnovationHub.of(context)!.theme.mode = "Dark"; - } else { - MzanziInnovationHub.of(context)!.theme.mode = "Light"; - } + // var brightness = + // SchedulerBinding.instance.platformDispatcher.platformBrightness; + // bool isDarkMode = brightness == Brightness.dark; + // if (isDarkMode) { + // MzanziInnovationHub.of(context)!.theme.mode = "Dark"; + // } else { + // MzanziInnovationHub.of(context)!.theme.mode = "Light"; + // } super.initState(); } From ef1d86ef24e1c533f66cd6aa738ae53fce541461 Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 31 Jan 2025 09:49:31 +0200 Subject: [PATCH 2/4] change myTheme to MIHTheme & add a getThemedata function --- Frontend/lib/mih_theme/mih_theme.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Frontend/lib/mih_theme/mih_theme.dart b/Frontend/lib/mih_theme/mih_theme.dart index 5df7458e..e672128f 100644 --- a/Frontend/lib/mih_theme/mih_theme.dart +++ b/Frontend/lib/mih_theme/mih_theme.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import "package:universal_html/html.dart" as html; -class MyTheme { +class MihTheme { late int _mainColor; late int _secondColor; //late int _errColor; @@ -24,7 +24,7 @@ class MyTheme { // a63446 = red //747474 - MyTheme() { + MihTheme() { mode = "Dark"; //_errColor = 0xffD87E8B; //_succColor = 0xffB0F2B4; @@ -104,6 +104,10 @@ class MyTheme { mode; } + ThemeData getThemeData() { + return getData(); + } + ThemeData darkMode() { return getData(); } From 3f325fda663d8896de957bd82b2a46ed7d9d64bb Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 31 Jan 2025 09:50:05 +0200 Subject: [PATCH 3/4] add theme link pn main init --- Frontend/lib/main.dart | 61 +++++++++++------------------------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index 2836a38e..28ebb19d 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter/scheduler.dart'; import '../mih_env/env.dart'; import '../mih_router/routeGenerator.dart'; import '../mih_theme/mih_theme.dart'; @@ -18,7 +19,7 @@ class MzanziInnovationHub extends StatefulWidget { class _MzanziInnovationHubState extends State { late ThemeMode _themeMode; - late MyTheme theme; + late MihTheme theme; Color getPrimany() { return theme.primaryColor(); @@ -51,58 +52,26 @@ class _MzanziInnovationHubState extends State { }); } - // void doInit() async { - // print( - // "FpjsProPlugin.initFpjs Token: ${AppEnviroment.fingerPrintPluginKey}"); - // await FpjsProPlugin.initFpjs( - // AppEnviroment.fingerPrintPluginKey, // insert your actual API key here - // endpoint: "https://mzansi-innovation-hub.co.za", - // scriptUrlPattern: - // 'https://mzansi-innovation-hub.co.za/web/v//loader_v.js', - // ); - // identify(); - // } - - // void identify() async { - // try { - // var visitorId = await FpjsProPlugin.getVisitorId() ?? 'Unknown'; - // print(visitorId); - // // use the visitor id - // } on FingerprintProError catch (e) { - // print("Error on Init: $e"); - // // process an error somehow - // // check lib/error.dart to get more info about error types - // } - // } - @override void initState() { - _themeMode = ThemeMode.dark; - theme = MyTheme(); + var systemTheme = + SchedulerBinding.instance.platformDispatcher.platformBrightness; + bool isDarkMode = systemTheme == Brightness.dark; + if (isDarkMode) { + theme.mode = "Dark"; + _themeMode = ThemeMode.dark; + } else { + theme.mode = "Light"; + _themeMode = ThemeMode.light; + } + theme = MihTheme(); theme.platform = Theme.of(context).platform; - // var brightness = - // SchedulerBinding.instance.platformDispatcher.platformBrightness; - // bool isDarkMode = brightness == Brightness.dark; - // if (isDarkMode) { - // theme.mode = "Dark"; - // } else { - // theme.mode = "Light"; - // } - super.initState(); //doInit(); } @override Widget build(BuildContext context) { - // var brightness = - // SchedulerBinding.instance.platformDispatcher.platformBrightness; - // bool isDarkMode = brightness == Brightness.dark; - // if (isDarkMode) { - // theme.mode = "Dark"; - // } else { - // theme.mode = "Light"; - // } double width = MediaQuery.sizeOf(context).width; theme.setScreenType(width); precacheImage(theme.loadingImage(), context); @@ -111,8 +80,8 @@ class _MzanziInnovationHubState extends State { return MaterialApp( title: getTitle(), themeMode: _themeMode, - theme: theme.darkMode(), - darkTheme: theme.lightMode(), + theme: theme.getThemeData(), + darkTheme: theme.getThemeData(), debugShowCheckedModeBanner: false, initialRoute: '/', onGenerateRoute: RouteGenerator.generateRoute, From 021f056c14ecf3f0ce5807c818c64485e75732ba Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 31 Jan 2025 10:00:00 +0200 Subject: [PATCH 4/4] set MIHTheme at start of init --- Frontend/lib/main.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index 28ebb19d..e9c7db51 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -54,6 +54,7 @@ class _MzanziInnovationHubState extends State { @override void initState() { + theme = MihTheme(); var systemTheme = SchedulerBinding.instance.platformDispatcher.platformBrightness; bool isDarkMode = systemTheme == Brightness.dark; @@ -64,7 +65,7 @@ class _MzanziInnovationHubState extends State { theme.mode = "Light"; _themeMode = ThemeMode.light; } - theme = MihTheme(); + theme.platform = Theme.of(context).platform; super.initState(); //doInit();