From a6caf4aa6ad6255aa57538430de301343f749361 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 13:38:01 +0200 Subject: [PATCH] usew new icon frame --- Frontend/lib/mih_components/mih_profile_picture.dart | 12 +++++++++--- Frontend/lib/mih_packages/authentication/signin.dart | 9 +++++++-- .../mih_home/components/mih_app_drawer.dart | 10 +++++++--- Frontend/lib/mih_packages/mih_home/mih_home.dart | 2 ++ .../lib/mih_packages/mih_home/mih_home_legacy.dart | 1 + .../package_tools/mih_personal_profile.dart | 1 + 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/Frontend/lib/mih_components/mih_profile_picture.dart b/Frontend/lib/mih_components/mih_profile_picture.dart index 37ef4a43..e23d68d4 100644 --- a/Frontend/lib/mih_components/mih_profile_picture.dart +++ b/Frontend/lib/mih_components/mih_profile_picture.dart @@ -15,7 +15,9 @@ class MIHProfilePicture extends StatefulWidget { final double radius; final bool drawerMode; final bool editable; + final Color frameColor; final onChange; + MIHProfilePicture({ super.key, required this.profilePictureFile, @@ -26,6 +28,7 @@ class MIHProfilePicture extends StatefulWidget { required this.drawerMode, required this.editable, required this.onChange, + required this.frameColor, }); @override @@ -50,9 +53,12 @@ class _MIHProfilePictureState extends State { ), SizedBox( width: widget.width, - child: Icon( - MihIcons.mihCircleFrame, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + child: FittedBox( + fit: BoxFit.fill, + child: Icon( + MihIcons.mihCircleFrame, + color: widget.frameColor, + ), ), ), Visibility( diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index 7291380f..08d8a3fb 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -292,8 +293,12 @@ class _SignInState extends State { padding: const EdgeInsets.all(10.0), child: SizedBox( height: 50, - child: Image.asset( - 'lib/mih_components/mih_package_components/assets/images/logo_light.png'), + child: FittedBox( + child: Icon( + MihIcons.mihLogo, + color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), ), ), iconSize: 35, diff --git a/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart b/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart index 5201457b..df0f1845 100644 --- a/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart +++ b/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import '../../../main.dart'; import '../../../mih_objects/app_user.dart'; import '../../../mih_objects/arguments.dart'; @@ -60,6 +61,7 @@ class _MIHAppDrawerState extends State { radius: 27, drawerMode: true, editable: false, + frameColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), onChange: (newProPic) {}, ), @@ -107,8 +109,6 @@ class _MIHAppDrawerState extends State { Widget build(BuildContext context) { // precacheImage( // MzanziInnovationHub.of(context)!.theme.logoImage().image, context); - ImageProvider logoThemeSwitch = - MzanziInnovationHub.of(context)!.theme.logoImage(); return SafeArea( child: Drawer( //backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), @@ -328,7 +328,11 @@ class _MIHAppDrawerState extends State { // Navigator.of(context).popAndPushNamed('/',); }); }, - child: Image(image: logoThemeSwitch), + child: Icon( + MihIcons.mihLogo, + color: + MzanziInnovationHub.of(context)!.theme.primaryColor(), + ), ), // IconButton( // onPressed: () { diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index 00284679..aeb6e56b 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -1,3 +1,4 @@ +import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_action.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tools.dart'; @@ -108,6 +109,7 @@ class _MihHomeState extends State { radius: 21, drawerMode: false, editable: false, + frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), onChange: (newProPic) {}, ), ), diff --git a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart index 2235995e..9f5c79c4 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart @@ -994,6 +994,7 @@ class _MIHHomeLegacyState extends State { radius: 21, drawerMode: false, editable: false, + frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), onChange: (newProPic) {}, ), ), diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart index 35173d1b..82a8ea2d 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart @@ -266,6 +266,7 @@ class _MihPersonalProfileState extends State { radius: 70, drawerMode: false, editable: true, + frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), onChange: (newProPic) { setState(() { proPic = newProPic;