From dc796612fb09baa7fe015da7615ffab5c90f630a Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 10:54:13 +0200 Subject: [PATCH 01/11] Create new asset folder and add images to it --- .../assets}/images/app_icon/App_Icon_1.png | Bin .../assets}/images/app_icon/App_Icon_2.png | Bin .../assets}/images/app_icon/App_Icon_3.png | Bin .../assets}/images/app_icon/circle_logo.png | Bin .../assets}/images/app_icon/mih_app_icon.png | Bin .../assets}/images/branding_text.png | Bin .../assets}/images/founder.jpg | Bin .../assets}/images/frame_dark.png | Bin .../assets}/images/frame_light.png | Bin .../assets}/images/i-dont-know-2.png | Bin .../assets}/images/loading_dark.gif | Bin .../assets}/images/loading_light.gif | Bin .../assets}/images/logo_dark.png | Bin .../assets}/images/logo_light.png | Bin .../images/loyalty_cards/Clicks_Club.png | Bin .../assets}/images/loyalty_cards/Shell.png | Bin .../images/loyalty_cards/apple_tree.png | Bin .../images/loyalty_cards/best_before.png | Bin .../assets}/images/loyalty_cards/checkers.png | Bin .../images/loyalty_cards/checkers_xtra.png | Bin .../images/loyalty_cards/cotton_on_perks.png | Bin .../images/loyalty_cards/dischem_benefit.png | Bin .../assets}/images/loyalty_cards/edgars.png | Bin .../assets}/images/loyalty_cards/eskom.png | Bin .../images/loyalty_cards/fresh_stop.png | Bin .../assets}/images/loyalty_cards/infinity.png | Bin .../assets}/images/loyalty_cards/jet.png | Bin .../assets}/images/loyalty_cards/makro.png | Bin .../images/loyalty_cards/panarottis.png | Bin .../images/loyalty_cards/pnp_smart.png | Bin .../assets}/images/loyalty_cards/shoprite.png | Bin .../images/loyalty_cards/shoprite_xtra.png | Bin .../images/loyalty_cards/spar_rewards.png | Bin .../assets}/images/loyalty_cards/spur.png | Bin .../assets}/images/loyalty_cards/wrewards.png | Bin .../images/loyalty_cards/xtraSavings.png | Bin .../assets}/images/mzansi_ai-dark.png | Bin .../assets}/images/mzansi_ai-light.png | Bin .../assets}/images/notify_logo.png | Bin .../splash_screen/splash_screen_icon.png | Bin .../about_mih/package_tools/mih_info.dart | 3 +- .../authentication/biometric_check.dart | 3 +- .../mih_packages/authentication/register.dart | 3 +- .../authentication/reset_password.dart | 3 +- .../mih_packages/authentication/signin.dart | 3 +- .../mih_home/mih_profile_getter.dart | 3 +- .../components/mih_card_display.dart | 57 ++++++++++++------ Frontend/lib/mih_theme/mih_theme.dart | 40 ++++++------ Frontend/pubspec.yaml | 16 ++--- 49 files changed, 80 insertions(+), 51 deletions(-) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/app_icon/App_Icon_1.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/app_icon/App_Icon_2.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/app_icon/App_Icon_3.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/app_icon/circle_logo.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/app_icon/mih_app_icon.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/branding_text.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/founder.jpg (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/frame_dark.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/frame_light.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/i-dont-know-2.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loading_dark.gif (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loading_light.gif (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/logo_dark.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/logo_light.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/Clicks_Club.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/Shell.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/apple_tree.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/best_before.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/checkers.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/checkers_xtra.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/cotton_on_perks.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/dischem_benefit.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/edgars.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/eskom.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/fresh_stop.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/infinity.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/jet.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/makro.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/panarottis.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/pnp_smart.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/shoprite.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/shoprite_xtra.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/spar_rewards.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/spur.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/wrewards.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/loyalty_cards/xtraSavings.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/mzansi_ai-dark.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/mzansi_ai-light.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/notify_logo.png (100%) rename Frontend/{ => lib/mih_components/mih_package_components/assets}/images/splash_screen/splash_screen_icon.png (100%) diff --git a/Frontend/images/app_icon/App_Icon_1.png b/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/App_Icon_1.png similarity index 100% rename from Frontend/images/app_icon/App_Icon_1.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/App_Icon_1.png diff --git a/Frontend/images/app_icon/App_Icon_2.png b/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/App_Icon_2.png similarity index 100% rename from Frontend/images/app_icon/App_Icon_2.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/App_Icon_2.png diff --git a/Frontend/images/app_icon/App_Icon_3.png b/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/App_Icon_3.png similarity index 100% rename from Frontend/images/app_icon/App_Icon_3.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/App_Icon_3.png diff --git a/Frontend/images/app_icon/circle_logo.png b/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/circle_logo.png similarity index 100% rename from Frontend/images/app_icon/circle_logo.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/circle_logo.png diff --git a/Frontend/images/app_icon/mih_app_icon.png b/Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_app_icon.png similarity index 100% rename from Frontend/images/app_icon/mih_app_icon.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/app_icon/mih_app_icon.png diff --git a/Frontend/images/branding_text.png b/Frontend/lib/mih_components/mih_package_components/assets/images/branding_text.png similarity index 100% rename from Frontend/images/branding_text.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/branding_text.png diff --git a/Frontend/images/founder.jpg b/Frontend/lib/mih_components/mih_package_components/assets/images/founder.jpg similarity index 100% rename from Frontend/images/founder.jpg rename to Frontend/lib/mih_components/mih_package_components/assets/images/founder.jpg diff --git a/Frontend/images/frame_dark.png b/Frontend/lib/mih_components/mih_package_components/assets/images/frame_dark.png similarity index 100% rename from Frontend/images/frame_dark.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/frame_dark.png diff --git a/Frontend/images/frame_light.png b/Frontend/lib/mih_components/mih_package_components/assets/images/frame_light.png similarity index 100% rename from Frontend/images/frame_light.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/frame_light.png diff --git a/Frontend/images/i-dont-know-2.png b/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-2.png similarity index 100% rename from Frontend/images/i-dont-know-2.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-2.png diff --git a/Frontend/images/loading_dark.gif b/Frontend/lib/mih_components/mih_package_components/assets/images/loading_dark.gif similarity index 100% rename from Frontend/images/loading_dark.gif rename to Frontend/lib/mih_components/mih_package_components/assets/images/loading_dark.gif diff --git a/Frontend/images/loading_light.gif b/Frontend/lib/mih_components/mih_package_components/assets/images/loading_light.gif similarity index 100% rename from Frontend/images/loading_light.gif rename to Frontend/lib/mih_components/mih_package_components/assets/images/loading_light.gif diff --git a/Frontend/images/logo_dark.png b/Frontend/lib/mih_components/mih_package_components/assets/images/logo_dark.png similarity index 100% rename from Frontend/images/logo_dark.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/logo_dark.png diff --git a/Frontend/images/logo_light.png b/Frontend/lib/mih_components/mih_package_components/assets/images/logo_light.png similarity index 100% rename from Frontend/images/logo_light.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/logo_light.png diff --git a/Frontend/images/loyalty_cards/Clicks_Club.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/Clicks_Club.png similarity index 100% rename from Frontend/images/loyalty_cards/Clicks_Club.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/Clicks_Club.png diff --git a/Frontend/images/loyalty_cards/Shell.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/Shell.png similarity index 100% rename from Frontend/images/loyalty_cards/Shell.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/Shell.png diff --git a/Frontend/images/loyalty_cards/apple_tree.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/apple_tree.png similarity index 100% rename from Frontend/images/loyalty_cards/apple_tree.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/apple_tree.png diff --git a/Frontend/images/loyalty_cards/best_before.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/best_before.png similarity index 100% rename from Frontend/images/loyalty_cards/best_before.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/best_before.png diff --git a/Frontend/images/loyalty_cards/checkers.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/checkers.png similarity index 100% rename from Frontend/images/loyalty_cards/checkers.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/checkers.png diff --git a/Frontend/images/loyalty_cards/checkers_xtra.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/checkers_xtra.png similarity index 100% rename from Frontend/images/loyalty_cards/checkers_xtra.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/checkers_xtra.png diff --git a/Frontend/images/loyalty_cards/cotton_on_perks.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/cotton_on_perks.png similarity index 100% rename from Frontend/images/loyalty_cards/cotton_on_perks.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/cotton_on_perks.png diff --git a/Frontend/images/loyalty_cards/dischem_benefit.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/dischem_benefit.png similarity index 100% rename from Frontend/images/loyalty_cards/dischem_benefit.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/dischem_benefit.png diff --git a/Frontend/images/loyalty_cards/edgars.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/edgars.png similarity index 100% rename from Frontend/images/loyalty_cards/edgars.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/edgars.png diff --git a/Frontend/images/loyalty_cards/eskom.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/eskom.png similarity index 100% rename from Frontend/images/loyalty_cards/eskom.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/eskom.png diff --git a/Frontend/images/loyalty_cards/fresh_stop.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/fresh_stop.png similarity index 100% rename from Frontend/images/loyalty_cards/fresh_stop.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/fresh_stop.png diff --git a/Frontend/images/loyalty_cards/infinity.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/infinity.png similarity index 100% rename from Frontend/images/loyalty_cards/infinity.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/infinity.png diff --git a/Frontend/images/loyalty_cards/jet.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/jet.png similarity index 100% rename from Frontend/images/loyalty_cards/jet.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/jet.png diff --git a/Frontend/images/loyalty_cards/makro.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/makro.png similarity index 100% rename from Frontend/images/loyalty_cards/makro.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/makro.png diff --git a/Frontend/images/loyalty_cards/panarottis.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/panarottis.png similarity index 100% rename from Frontend/images/loyalty_cards/panarottis.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/panarottis.png diff --git a/Frontend/images/loyalty_cards/pnp_smart.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/pnp_smart.png similarity index 100% rename from Frontend/images/loyalty_cards/pnp_smart.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/pnp_smart.png diff --git a/Frontend/images/loyalty_cards/shoprite.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/shoprite.png similarity index 100% rename from Frontend/images/loyalty_cards/shoprite.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/shoprite.png diff --git a/Frontend/images/loyalty_cards/shoprite_xtra.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/shoprite_xtra.png similarity index 100% rename from Frontend/images/loyalty_cards/shoprite_xtra.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/shoprite_xtra.png diff --git a/Frontend/images/loyalty_cards/spar_rewards.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/spar_rewards.png similarity index 100% rename from Frontend/images/loyalty_cards/spar_rewards.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/spar_rewards.png diff --git a/Frontend/images/loyalty_cards/spur.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/spur.png similarity index 100% rename from Frontend/images/loyalty_cards/spur.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/spur.png diff --git a/Frontend/images/loyalty_cards/wrewards.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/wrewards.png similarity index 100% rename from Frontend/images/loyalty_cards/wrewards.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/wrewards.png diff --git a/Frontend/images/loyalty_cards/xtraSavings.png b/Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/xtraSavings.png similarity index 100% rename from Frontend/images/loyalty_cards/xtraSavings.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/loyalty_cards/xtraSavings.png diff --git a/Frontend/images/mzansi_ai-dark.png b/Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-dark.png similarity index 100% rename from Frontend/images/mzansi_ai-dark.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-dark.png diff --git a/Frontend/images/mzansi_ai-light.png b/Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-light.png similarity index 100% rename from Frontend/images/mzansi_ai-light.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-light.png diff --git a/Frontend/images/notify_logo.png b/Frontend/lib/mih_components/mih_package_components/assets/images/notify_logo.png similarity index 100% rename from Frontend/images/notify_logo.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/notify_logo.png diff --git a/Frontend/images/splash_screen/splash_screen_icon.png b/Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/splash_screen_icon.png similarity index 100% rename from Frontend/images/splash_screen/splash_screen_icon.png rename to Frontend/lib/mih_components/mih_package_components/assets/images/splash_screen/splash_screen_icon.png diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart index 5fd30006..e6d87cf9 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart @@ -248,7 +248,8 @@ class _MihInfoState extends State { CircleAvatar( backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), - backgroundImage: const AssetImage("images/founder.jpg"), + backgroundImage: const AssetImage( + "lib/mih_components/mih_package_components/assets/images/founder.jpg"), //'https://media.licdn.com/dms/image/D4D03AQGd1-QhjtWWpA/profile-displayphoto-shrink_400_400/0/1671698053061?e=2147483647&v=beta&t=a3dJI5yxs5-KeXjj10LcNCFuC9IOfa8nNn3k_Qyr0CA'), radius: 75, ), diff --git a/Frontend/lib/mih_packages/authentication/biometric_check.dart b/Frontend/lib/mih_packages/authentication/biometric_check.dart index 47bd125c..8be241e4 100644 --- a/Frontend/lib/mih_packages/authentication/biometric_check.dart +++ b/Frontend/lib/mih_packages/authentication/biometric_check.dart @@ -32,7 +32,8 @@ class _BiometricCheckState extends State { padding: const EdgeInsets.all(10.0), child: SizedBox( height: 50, - child: Image.asset('images/logo_light.png'), + child: Image.asset( + 'lib/mih_components/mih_package_components/assets/images/logo_light.png'), ), ), iconSize: 35, diff --git a/Frontend/lib/mih_packages/authentication/register.dart b/Frontend/lib/mih_packages/authentication/register.dart index decc0439..1833b1cc 100644 --- a/Frontend/lib/mih_packages/authentication/register.dart +++ b/Frontend/lib/mih_packages/authentication/register.dart @@ -244,7 +244,8 @@ class _RegisterState extends State { padding: const EdgeInsets.all(10.0), child: SizedBox( height: 50, - child: Image.asset('images/logo_light.png'), + child: Image.asset( + 'lib/mih_components/mih_package_components/assets/images/logo_light.png'), ), ), iconSize: 35, diff --git a/Frontend/lib/mih_packages/authentication/reset_password.dart b/Frontend/lib/mih_packages/authentication/reset_password.dart index 15925de5..9a159f9f 100644 --- a/Frontend/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/lib/mih_packages/authentication/reset_password.dart @@ -262,7 +262,8 @@ class _ResetPasswordState extends State { padding: const EdgeInsets.all(10.0), child: SizedBox( height: 50, - child: Image.asset('images/logo_light.png'), + child: Image.asset( + 'lib/mih_components/mih_package_components/assets/images/logo_light.png'), ), ), iconSize: 35, diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index da15a519..7291380f 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -292,7 +292,8 @@ class _SignInState extends State { padding: const EdgeInsets.all(10.0), child: SizedBox( height: 50, - child: Image.asset('images/logo_light.png'), + child: Image.asset( + 'lib/mih_components/mih_package_components/assets/images/logo_light.png'), ), ), iconSize: 35, diff --git a/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart b/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart index 0a05a8b1..2ed53067 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart @@ -37,7 +37,8 @@ class _MIHProfileGetterState extends State { ImageProvider? isPictureAvailable(String url) { if (url == "") { - return const AssetImage('images/i-dont-know-2.png'); + return const AssetImage( + 'lib/mih_components/mih_package_components/assets/images/i-dont-know-2.png'); } else if (url != "") { return NetworkImage(url); } else { diff --git a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart index 0d7591fe..010c14e3 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart @@ -17,43 +17,62 @@ class _MihCardDisplayState extends State { Widget displayLoyaltyCard() { switch (widget.shopName.toLowerCase()) { case "apple tree": - return Image.asset('images/loyalty_cards/apple_tree.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/apple_tree.png'); case "best before": - return Image.asset('images/loyalty_cards/best_before.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/best_before.png'); case "checkers": - return Image.asset('images/loyalty_cards/checkers.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/checkers.png'); case "clicks": - return Image.asset('images/loyalty_cards/Clicks_Club.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/Clicks_Club.png'); case "cotton:on": - return Image.asset('images/loyalty_cards/cotton_on_perks.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/cotton_on_perks.png'); case "dis-chem": - return Image.asset('images/loyalty_cards/dischem_benefit.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/dischem_benefit.png'); case "pick n pay": - return Image.asset('images/loyalty_cards/pnp_smart.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/pnp_smart.png'); case "shoprite": - return Image.asset('images/loyalty_cards/shoprite.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/shoprite.png'); case "spar": - return Image.asset('images/loyalty_cards/spar_rewards.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/spar_rewards.png'); case "woolworths": - return Image.asset('images/loyalty_cards/wrewards.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/wrewards.png'); case "makro": - return Image.asset('images/loyalty_cards/makro.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/makro.png'); case "fresh stop": - return Image.asset('images/loyalty_cards/fresh_stop.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/fresh_stop.png'); case "panarottis": - return Image.asset('images/loyalty_cards/panarottis.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/panarottis.png'); case "shell": - return Image.asset('images/loyalty_cards/Shell.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/Shell.png'); case "edgars": - return Image.asset('images/loyalty_cards/edgars.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/edgars.png'); case "jet": - return Image.asset('images/loyalty_cards/jet.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/jet.png'); case "spur": - return Image.asset('images/loyalty_cards/spur.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/spur.png'); case "infinity": - return Image.asset('images/loyalty_cards/infinity.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/infinity.png'); case "eskom": - return Image.asset('images/loyalty_cards/eskom.png'); + return Image.asset( + 'lib/mih_components/mih_package_components/assets/images/loyalty_cards/eskom.png'); default: return const Placeholder(); } diff --git a/Frontend/lib/mih_theme/mih_theme.dart b/Frontend/lib/mih_theme/mih_theme.dart index e672128f..18b68801 100644 --- a/Frontend/lib/mih_theme/mih_theme.dart +++ b/Frontend/lib/mih_theme/mih_theme.dart @@ -161,11 +161,11 @@ class MihTheme { AssetImage logoFrame() { if (mode == "Dark") { return const AssetImage( - 'images/frame_dark.png', + 'lib/mih_components/mih_package_components/assets/images/frame_dark.png', ); } else { return const AssetImage( - 'images/frame_light.png', + 'lib/mih_components/mih_package_components/assets/images/frame_light.png', ); } } @@ -173,11 +173,11 @@ class MihTheme { AssetImage altLogoFrame() { if (mode == "Light") { return const AssetImage( - 'images/frame_dark.png', + 'lib/mih_components/mih_package_components/assets/images/frame_dark.png', ); } else { return const AssetImage( - 'images/frame_light.png', + 'lib/mih_components/mih_package_components/assets/images/frame_light.png', ); } } @@ -185,11 +185,11 @@ class MihTheme { AssetImage logoImage() { if (mode == "Dark") { return const AssetImage( - 'images/logo_dark.png', + 'lib/mih_components/mih_package_components/assets/images/logo_dark.png', ); } else { return const AssetImage( - 'images/logo_light.png', + 'lib/mih_components/mih_package_components/assets/images/logo_light.png', ); } } @@ -197,11 +197,11 @@ class MihTheme { AssetImage altLogoImage() { if (mode == "Light") { return const AssetImage( - 'images/logo_dark.png', + 'lib/mih_components/mih_package_components/assets/images/logo_dark.png', ); } else { return const AssetImage( - 'images/logo_light.png', + 'lib/mih_components/mih_package_components/assets/images/logo_light.png', ); } } @@ -209,11 +209,11 @@ class MihTheme { AssetImage loadingImage() { if (mode == "Dark") { loading = const AssetImage( - 'images/loading_light.gif', + 'lib/mih_components/mih_package_components/assets/images/loading_light.gif', ); } else { loading = const AssetImage( - 'images/loading_dark.gif', + 'lib/mih_components/mih_package_components/assets/images/loading_dark.gif', ); } return loading; @@ -222,11 +222,11 @@ class MihTheme { AssetImage altLoadingImage() { if (mode == "Dark") { loading = const AssetImage( - 'images/loading_dark.gif', + 'lib/mih_components/mih_package_components/assets/images/loading_dark.gif', ); } else { loading = const AssetImage( - 'images/loading_light.gif', + 'lib/mih_components/mih_package_components/assets/images/loading_light.gif', ); } return loading; @@ -234,18 +234,22 @@ class MihTheme { String loadingImageLocation() { if (mode == "Dark") { - loadingAssetText = 'images/loading_light.gif'; + loadingAssetText = + 'lib/mih_components/mih_package_components/assets/images/loading_light.gif'; } else { - loadingAssetText = 'images/loading_dark.gif'; + loadingAssetText = + 'lib/mih_components/mih_package_components/assets/images/loading_dark.gif'; } return loadingAssetText; } String altLoadingImageLocation() { if (mode == "Dark") { - loadingAssetText = 'images/loading_dark.gif'; + loadingAssetText = + 'lib/mih_components/mih_package_components/assets/images/loading_dark.gif'; } else { - loadingAssetText = 'images/loading_light.gif'; + loadingAssetText = + 'lib/mih_components/mih_package_components/assets/images/loading_light.gif'; } return loadingAssetText; } @@ -253,11 +257,11 @@ class MihTheme { AssetImage aiLogoImage() { if (mode == "Dark") { return const AssetImage( - 'images/mzansi_ai-dark.png', + 'lib/mih_components/mih_package_components/assets/images/mzansi_ai-dark.png', ); } else { return const AssetImage( - 'images/mzansi_ai-light.png', + 'lib/mih_components/mih_package_components/assets/images/mzansi_ai-light.png', ); } } diff --git a/Frontend/pubspec.yaml b/Frontend/pubspec.yaml index e9ec8ecc..b55256d3 100644 --- a/Frontend/pubspec.yaml +++ b/Frontend/pubspec.yaml @@ -101,10 +101,10 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - - images/ - - images/loyalty_cards/ - - images/app_icon/ - - images/splash_screen/ + - lib/mih_components/mih_package_components/assets/images/ + - lib/mih_components/mih_package_components/assets/images/loyalty_cards/ + - lib/mih_components/mih_package_components/assets/images/app_icon/ + - lib/mih_components/mih_package_components/assets/images/splash_screen/ # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see @@ -156,12 +156,12 @@ flutter_native_splash: # The image parameter allows you to specify an image used in the splash screen. It must be a # png file and should be sized for 4x pixel density. - image: images/logo_light.png + image: lib/mih_components/mih_package_components/assets/images/logo_light.png # The branding property allows you to specify an image used as branding in the splash screen. # It must be a png file. It is supported for Android, iOS and the Web. For Android 12, # see the Android 12 section below. - branding: images/branding_text.png + branding: lib/mih_components/mih_package_components/assets/images/branding_text.png # To position the branding image at the bottom of the screen you can use bottom, bottomRight, # and bottomLeft. The default values is bottom if not specified or specified something else. @@ -191,7 +191,7 @@ flutter_native_splash: # 640 pixels in diameter. # App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle # 768 pixels in diameter. - image: images/splash_screen/splash_screen_icon.png + image: lib/mih_components/mih_package_components/assets/images/splash_screen/splash_screen_icon.png # Splash screen background color. color: "#3A4454" @@ -200,7 +200,7 @@ flutter_native_splash: #icon_background_color: "#111111" # The branding property allows you to specify an image used as branding in the splash screen. - branding: images/branding_text.png + branding: lib/mih_components/mih_package_components/assets/images/branding_text.png # The image_dark, color_dark, icon_background_color_dark, and branding_dark set values that # apply when the device is in dark mode. If they are not specified, the app will use the From 0434a2700140a6896157d15d288137cf69050902 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 12:54:18 +0200 Subject: [PATCH 02/11] Add Custome Icons pack --- .../assets/fonts/MihIcons.ttf | Bin 0 -> 7324 bytes .../assets/fonts/config.json | 52 ++++++++++++++++++ .../mih_package_components/mih_icons.dart | 23 ++++++++ Frontend/pubspec.yaml | 9 +-- 4 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 Frontend/lib/mih_components/mih_package_components/assets/fonts/MihIcons.ttf create mode 100644 Frontend/lib/mih_components/mih_package_components/assets/fonts/config.json create mode 100644 Frontend/lib/mih_components/mih_package_components/mih_icons.dart diff --git a/Frontend/lib/mih_components/mih_package_components/assets/fonts/MihIcons.ttf b/Frontend/lib/mih_components/mih_package_components/assets/fonts/MihIcons.ttf new file mode 100644 index 0000000000000000000000000000000000000000..91ffc360928c30470de2c5ba3cea636266befc13 GIT binary patch literal 7324 zcmeHMTZ|;vSw8nubxz&7ySi%nUehzvy@PjqE}ogSz1FNR>$NSMgsc-Mf{>-XJ2x{k zz09;@ugQZ!;Ry>NL_+ew3!s1y;`V@q#9JPC-~r{0Ab}zgi{SwzB#=O|y?m#p*BE0S zcu0`LR&`bV=Rg1L{B^qO|4tD~2(jc%!pZ8hFMjr^;un|RAcQ^w?q@#r;>!AV@%&x1 z-$MJPTSwzN|FH5Ce~0$JINsjj-Q9z4rr#ojqrd)#`#a;?4{bmFGm!l*j;(z#^cDU& z(0_(wasO!gdi)#r-i7Y>&`u5~x5m+;>O=ocw9V1@^*i(e-$wr&+QsqsXs7$!@BAJi zjmIHF?o3XnpZbG0zd}eGZSqBe*!hinui$)k@18q5&VSiN$pQDvKX>iZH{-|ul~_n& z`(Eqb``3H-?!C^>_%*OS!e;u;lHlv4S+*V5U?&8A%FXo~vP!lIyLSDB&yeVFJUxcA z_(1;$X?l3DH->!-t~^93Nx`8+-RJT%`pZNT!rovmV{e^b>37K*MFfmU4(>;6KeqeK zZSuq!Ib&r$ew^PRUxS$Qgw2iEW$69^7JML~gj~ddDCy^CvNynWS{HG}Xu%g`P|B2< zJYz1;XT+T$=f+177A#RWhX3zdP$pnwmIh?SO|f#CA*W}v!_Ba>*-_pD!e3B*^H&h9 zy+0FUa+Q36e2M%j`F+ahCHf5g9DR+xMgN%o1^o{FM;5Xr_9(I*(Y#CZZ0qvYU^rOl z>xjCa!l_FiUI+W(tt{^{5bLGj#$Y%?e;?Dq8)m9n_k|!ye%(pZH#DNI{iG$ zvmWj8%~ENhKVo3Vw4UmSX_Y}^IN02P61_^dHk5=$mpc`3oSPM#vBwPIumOw=`Yy2S z3eD=y5Ms}iRxV1nBTkw+zu7OUI)P4~??w4?_TEB%(MTpOr&O3$o3jecdP0oYv!WZ- zI?IVRRx!?$ZyP;7_XdUhYpQ)N0wuMrMpF7bu#!qEn4s7M_27&Nk1`>xPqn6kdA*Qo zBc+g(Gpf0yo~O7FTJiUawh>-bMG&=+QqOu9dEF`zvUmQe zu0{8(6LdH(Q}9&yf9EEOdE}MXY@eD1UtIFyO6Nz4tX&O8{BpND-&_jQR^FbUi;aycnArRY)e9dg8mY&8 z9s6Ni&+=*%asIPmX1A=DP$R3V=5fYvS&H|HArrNi;{R6!lJ@_ zSBlZDs8#|@a8(!8Mwkc{NulTk#Uy2>V|n1GQt*J|RaO0{_Y(OI`De=M0)2#j5$~p7 zpx>Z>O219t{&>8V9=t?;=w2f4UVre||Dk&9zwqEm{l9%u6Vm*sXEptK`YZIe=wH&m zr~l3xY?WPOpJ%t(gnfnmF8dbyHhY^(-r;K>lV^AN=yLD@HF4e5&0Pwh;)-7|QCXt` zMlsJ^@xSe0$mTZi#0Coa5d)lXXr%-LsGOa^x?^pllrIZ;04CJ+B?-%}&UQ@(Wa6x+ z*?N|zsIyBT0MjcaY@(aMUu&-6ig6U{4hWP4eA0yy_vnbbP|(qLRtLk)GKk^8Rr(QK z(3cS#^w9!h$%lOho*W#=e(>)qc#K$?kZj!zX~V_R&$|LC>4O9=Ll)N^P(wzxT%0)d zfhz|?mox{VfK+moIt+6k;!ynnL4Cgv)O)WP)Q?OsPD7J$Ar+tqr&0nc0X8WCG$TL@ zPUjtmDP}D|5Yrx@l{AI|M|o?7@iga|ABv&SVM_u=*#@vs1`7ZtLP_Clcp8430R^erL7qD`l&eE?*GT zm$7nSH88^GocqVhr>qfLZe;W~L6T{~{7}=o53u6*6)UEq9a$!xivVWpLVK-dpD8Q{ z$SRAXS{B+G78yh=GJgpmNCezef)>^Q0OYlOBsMF~Dz8U_Fpy?Z)K7xBmwP zQtD|x%GxH$@t+pMMz`&0(P1h~axbtZ^m4DNB<%>_kCoO!2rL9hrXFIEj$%)D6sKG@ zV`_91$@t?9j7gRJ?QG?okn32%JzsHmtNPbxG$WdPaz=CTKRcrZ=%1X?5?^3;X0!tT z&WtwXA@cf+wxmXW)2+@6AAa5EBKJ%;Q!Q&FF@a!(UN5J%^9u0 z|JsZ;KI0qfv+d{~TMo$gOgPKzgs z-NRR>)18xpTa)9_t;x~FVs~;p-8np*xYj2Q_Mb<`>5ZMeR}aT0_nY^xFYTP19!!pl zwbAN**0VduJ167m&TZ%J^hwl4 zOpw33VO=RF*yWhOkRb?e%W)1_7gaE z(c`#N+#@G{3%$o=R9=tprNl`%j_W_fK6$_I6Oi5~&(AbY$qh*C!PX)CoRAOqez^To z>F*Raob`gN!S3pR(|Q(C$ED=BjNmpT&qsHP?+1GruZw)QjPeAQjzC@iP`m{)=K5ZN zom-F|m3f5i14H%!Qo_Ya`WZG@vWb}xmGzk*uS}Z Xg0Fl3$$4XZe0p$md~j(d Date: Wed, 9 Apr 2025 12:54:50 +0200 Subject: [PATCH 03/11] update MIHTile widget --- .../mih_package_components/mih_app_tile.dart | 6 +- .../test/package_test.dart | 128 +++--------------- 2 files changed, 23 insertions(+), 111 deletions(-) diff --git a/Frontend/lib/mih_components/mih_package_components/mih_app_tile.dart b/Frontend/lib/mih_components/mih_package_components/mih_app_tile.dart index 4978e7ea..0651c6de 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_app_tile.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_app_tile.dart @@ -88,7 +88,11 @@ class _MihAppTileState extends State { highlightColor: MzanziInnovationHub.of(context)! .theme .highlightColor(), - child: FittedBox(child: widget.appIcon), + child: FittedBox( + fit: BoxFit.fill, + alignment: Alignment.center, + child: widget.appIcon, + ), ), ), ); diff --git a/Frontend/lib/mih_components/mih_package_components/test/package_test.dart b/Frontend/lib/mih_components/mih_package_components/test/package_test.dart index 6ae02fa3..eb722f8f 100644 --- a/Frontend/lib/mih_components/mih_package_components/test/package_test.dart +++ b/Frontend/lib/mih_components/mih_package_components/test/package_test.dart @@ -1,5 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.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_alert.dart'; @@ -7,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tools.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_window.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart'; +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'; @@ -167,7 +169,7 @@ class _PackageTestState extends State { List toolBodies = [ MihAppToolBody( borderOn: true, - bodyItem: SingleChildScrollView( + bodyItem: MihSingleChildScroll( child: Column( mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.max, @@ -182,116 +184,22 @@ class _PackageTestState extends State { MzanziInnovationHub.of(context)!.theme.secondaryColor(), ), ), - const SizedBox(height: 15), - const Divider(), - const SizedBox(height: 15), - MIHButton( - onTap: () { - showAlert(); - }, - buttonText: "Test MIH Alert", - buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - textColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - const SizedBox(height: 15), - MIHButton( - onTap: () { - showFullScreenWindow(); - }, - buttonText: "Test MIH Window Full Screen", - buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - textColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - const SizedBox(height: 15), - MIHButton( - onTap: () { - showNormalWindow(); - }, - buttonText: "Test MIH Window Normal", - buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - textColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - const SizedBox(height: 15), - MihAppTile( - onTap: () {}, - appName: "Package Tets", - appIcon: Icon( - Icons.warning_amber_rounded, - //size: 250, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + const SizedBox(height: 10), + Container( + color: Colors.black, + width: 200, + height: 200, + padding: EdgeInsets.zero, + alignment: Alignment.center, + child: IconButton.filled( + onPressed: () {}, + icon: Icon( + MihIcons.mihLogo, + color: + MzanziInnovationHub.of(context)!.theme.primaryColor(), + ), ), - iconSize: 200, - primaryColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - const SizedBox(height: 15), - MihAppTile( - onTap: () {}, - appName: "Package Tets", - appIcon: Icon( - Icons.warning_amber_rounded, - //size: 250, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - iconSize: 200, - primaryColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - const SizedBox(height: 15), - MihAppTile( - onTap: () {}, - appName: "Package Tets", - appIcon: Icon( - Icons.warning_amber_rounded, - //size: 250, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - iconSize: 200, - primaryColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - const SizedBox(height: 15), - MihAppTile( - onTap: () {}, - appName: "Package Tets", - appIcon: Icon( - Icons.warning_amber_rounded, - //size: 250, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - iconSize: 200, - primaryColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - const SizedBox(height: 15), - MihAppTile( - onTap: () {}, - appName: "Package Tets", - appIcon: Icon( - Icons.warning_amber_rounded, - //size: 250, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), - iconSize: 200, - primaryColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), + ) ], ), ), From 6ab1d1bc2ff1323bb81df410b5bd26e2bc1c3609 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 12:55:19 +0200 Subject: [PATCH 04/11] remove image and use MihIcons --- .../lib/mih_packages/mih_home/mih_home.dart | 1 + .../package_tools/mih_personal_home.dart | 26 +++++++++++++++++++ .../package_tiles/mzansi_profile_tile.dart | 17 +++++++++--- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index f0ddb1ce..00284679 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -158,6 +158,7 @@ class _MihHomeState extends State { businessUser: widget.businessUser, propicFile: widget.propicFile, isUserNew: widget.isUserNew, + isDevActive: widget.isDevActive, ), ); if (widget.isBusinessUser) { diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart index a43c5681..57e27b88 100644 --- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart +++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart @@ -2,6 +2,8 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tile.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/test/package_test.dart'; import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_objects/business.dart'; @@ -25,6 +27,7 @@ class MihPersonalHome extends StatefulWidget { final BusinessUser? businessUser; final ImageProvider? propicFile; final bool isUserNew; + final bool isDevActive; const MihPersonalHome({ super.key, @@ -34,6 +37,7 @@ class MihPersonalHome extends StatefulWidget { required this.businessUser, required this.propicFile, required this.isUserNew, + required this.isDevActive, }); @override @@ -124,6 +128,28 @@ class _MihPersonalHomeState extends State { }); //=============== About MIH =============== temp.add({"About MIH": AboutMihTile(packageSize: packageSize)}); + //=============== Dev =============== + temp.add({ + "test": MihAppTile( + onTap: () { + Navigator.of(context).pushNamed( + '/package-dev', + //arguments: widget.signedInUser, + ); + }, + appName: "Test", + appIcon: Container( + padding: const EdgeInsets.all(0.5), + child: Icon( + Icons.warning_amber_rounded, + color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + ), + ), + iconSize: packageSize, + primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + ) + }); return temp; } diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart index 4d3ca9c9..8a1cec00 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart @@ -1,5 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tile.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; @@ -23,7 +24,7 @@ class MzansiProfileTile extends StatefulWidget { class _MzansiProfileTileState extends State { @override Widget build(BuildContext context) { - ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage(); + // ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage(); return MihAppTile( onTap: () { Navigator.of(context).pushNamed( @@ -36,8 +37,18 @@ class _MzansiProfileTileState extends State { }, appName: "Mzansi Profile", appIcon: Container( - padding: const EdgeInsets.all(25), - child: Image(image: logo), + padding: const EdgeInsets.all(1), + alignment: Alignment.center, + // color: Colors.black, + child: FittedBox( + fit: BoxFit.contain, + child: Icon( + MihIcons.mihLogo, + color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // size: widget.packageSize, + ), + ), + // child: Image(image: logo), ), iconSize: widget.packageSize, primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), From 31e0125a626b6b0db4c1edc62ff8099aa770235e Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 13:00:04 +0200 Subject: [PATCH 05/11] remove unused import --- .../mih_package_components/test/package_test.dart | 2 -- .../mih_packages/mih_home/package_tools/mih_personal_home.dart | 1 - 2 files changed, 3 deletions(-) diff --git a/Frontend/lib/mih_components/mih_package_components/test/package_test.dart b/Frontend/lib/mih_components/mih_package_components/test/package_test.dart index eb722f8f..4679bf8a 100644 --- a/Frontend/lib/mih_components/mih_package_components/test/package_test.dart +++ b/Frontend/lib/mih_components/mih_package_components/test/package_test.dart @@ -1,10 +1,8 @@ import 'package:mzansi_innovation_hub/main.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.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_alert.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tile.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tools.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_window.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart'; diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart index 57e27b88..b1574e53 100644 --- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart +++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart @@ -3,7 +3,6 @@ import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih-app_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tile.dart'; -import 'package:mzansi_innovation_hub/mih_components/mih_package_components/test/package_test.dart'; import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_objects/business.dart'; From dda8fe6dfeca75d0dc050d614e71824fd18992a4 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 13:10:07 +0200 Subject: [PATCH 06/11] update mzansi ai icon --- .../mzansi_ai/package_tiles/mzansi_ai_tile.dart | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart index 2a364c8e..2d8329a0 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart @@ -1,5 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tile.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; import 'package:flutter/material.dart'; @@ -20,7 +21,6 @@ class MzansiAiTile extends StatefulWidget { class _MzansiAiTileState extends State { @override Widget build(BuildContext context) { - ImageProvider aiLogo = MzanziInnovationHub.of(context)!.theme.aiLogoImage(); return MihAppTile( onTap: () { Navigator.of(context).pushNamed( @@ -30,8 +30,18 @@ class _MzansiAiTileState extends State { }, appName: "Mzansi AI", appIcon: Container( - padding: const EdgeInsets.all(25), - child: Image(image: aiLogo), + padding: const EdgeInsets.all(1), + alignment: Alignment.center, + // color: Colors.black, + child: FittedBox( + fit: BoxFit.contain, + child: Icon( + MihIcons.mzansiAiLogo, + color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // size: widget.packageSize, + ), + ), + // child: Image(image: logo), ), iconSize: widget.packageSize, primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), From 351078fba16c198a4bc8893fa78f8d65e811e7f1 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 13:20:12 +0200 Subject: [PATCH 07/11] change set up profile to use new icons --- .../package_tiles/mzansi_setup_profile_tile.dart | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart index 05642afd..b3d28366 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart @@ -1,5 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_app_tile.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; @@ -23,7 +24,6 @@ class MzansiSetupProfileTile extends StatefulWidget { class _MzansiSetupProfileTileState extends State { @override Widget build(BuildContext context) { - ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage(); return MihAppTile( onTap: () { Navigator.of(context).pushNamed( @@ -36,8 +36,15 @@ class _MzansiSetupProfileTileState extends State { }, appName: "Setup Profile", appIcon: Container( - padding: const EdgeInsets.all(25), - child: Image(image: logo), + padding: const EdgeInsets.all(1), + child: FittedBox( + fit: BoxFit.contain, + child: Icon( + MihIcons.mihLogo, + color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // size: widget.packageSize, + ), + ), ), iconSize: widget.packageSize, primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), From 66a5ca65f0d7adb409f1f30bbd2efd320dfdb109 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 13:20:33 +0200 Subject: [PATCH 08/11] change profile picture to use icons --- .../mih_components/mih_profile_picture.dart | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Frontend/lib/mih_components/mih_profile_picture.dart b/Frontend/lib/mih_components/mih_profile_picture.dart index 26cc6a8d..37ef4a43 100644 --- a/Frontend/lib/mih_components/mih_profile_picture.dart +++ b/Frontend/lib/mih_components/mih_profile_picture.dart @@ -2,6 +2,7 @@ import 'dart:io'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import '../../main.dart'; // ignore: must_be_immutable @@ -33,16 +34,8 @@ class MIHProfilePicture extends StatefulWidget { class _MIHProfilePictureState extends State { late ImageProvider? propicPreview; - //late PlatformFile proPic; Widget displayEditableProPic() { - ImageProvider logoFrame; - if (!widget.drawerMode) { - logoFrame = MzanziInnovationHub.of(context)!.theme.altLogoFrame(); - } else { - logoFrame = MzanziInnovationHub.of(context)!.theme.logoFrame(); - } - if (widget.profilePictureFile != null) { return Stack( alignment: Alignment.center, @@ -57,7 +50,10 @@ class _MIHProfilePictureState extends State { ), SizedBox( width: widget.width, - child: Image(image: logoFrame), + child: Icon( + MihIcons.mihCircleFrame, + color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), ), Visibility( visible: widget.editable, @@ -134,7 +130,10 @@ class _MIHProfilePictureState extends State { } else { return SizedBox( width: widget.width, - child: Image(image: logoFrame), + child: Icon( + MihIcons.mihCircleFrame, + color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), ); } } From a6f370ccf5f0aae13be93097c6ef4262147e73bb Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 13:26:48 +0200 Subject: [PATCH 09/11] use new icons in about MIH --- .../policy_and_terms_text.dart | 17 +++++++++++++---- .../about_mih/package_tools/mih_info.dart | 9 +++++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart b/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart index 076d1760..2d2d4f10 100644 --- a/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart +++ b/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart @@ -1,5 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; class PolicyAndTermsText { List getPrivacyPolicyText(BuildContext context) { @@ -26,8 +27,12 @@ class PolicyAndTermsText { return [ SizedBox( width: 165, - child: - Image(image: MzanziInnovationHub.of(context)!.theme.altLogoImage()), + child: FittedBox( + child: Icon( + MihIcons.mihLogo, + color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), ), const SizedBox(height: 10), const Text( @@ -430,8 +435,12 @@ class PolicyAndTermsText { return [ SizedBox( width: 165, - child: - Image(image: MzanziInnovationHub.of(context)!.theme.altLogoImage()), + child: FittedBox( + child: Icon( + MihIcons.mihLogo, + color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), ), const SizedBox( height: 10, diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart index e6d87cf9..4795ea74 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart @@ -6,6 +6,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih- import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import "package:universal_html/js.dart" as js; import 'package:url_launcher/url_launcher.dart'; @@ -594,8 +595,12 @@ class _MihInfoState extends State { children: [ SizedBox( width: 165, - child: Image( - image: MzanziInnovationHub.of(context)!.theme.altLogoImage()), + child: FittedBox( + child: Icon( + MihIcons.mihLogo, + color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), ), const SizedBox( height: 10, From a6caf4aa6ad6255aa57538430de301343f749361 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 13:38:01 +0200 Subject: [PATCH 10/11] 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; From 9eeac474ce20fc264b5aac2ba6128f72f6ed0172 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 9 Apr 2025 13:59:22 +0200 Subject: [PATCH 11/11] use Icons in auth pckage --- .../authentication/biometric_check.dart | 9 +++- .../mih_packages/authentication/register.dart | 41 +++++++++++++++++-- .../mih_packages/authentication/signin.dart | 32 ++++++++++++++- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/Frontend/lib/mih_packages/authentication/biometric_check.dart b/Frontend/lib/mih_packages/authentication/biometric_check.dart index 8be241e4..de17c637 100644 --- a/Frontend/lib/mih_packages/authentication/biometric_check.dart +++ b/Frontend/lib/mih_packages/authentication/biometric_check.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_action.dart' import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_body.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_header.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_layout_builder.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/mih_profile_getter.dart'; import 'package:flutter/material.dart'; import 'package:local_auth/local_auth.dart'; @@ -32,8 +33,12 @@ class _BiometricCheckState 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/authentication/register.dart b/Frontend/lib/mih_packages/authentication/register.dart index 1833b1cc..a68ce292 100644 --- a/Frontend/lib/mih_packages/authentication/register.dart +++ b/Frontend/lib/mih_packages/authentication/register.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'; @@ -238,14 +239,48 @@ class _RegisterState extends State { }); } + MIHAction getSecondaryActionButton() { + return MIHAction( + icon: Padding( + padding: const EdgeInsets.all(10.0), + child: SizedBox( + width: 150, + child: MIHButton( + onTap: () { + Navigator.of(context).pushNamed( + '/about', + arguments: 0, + ); + }, + buttonText: "Install MIH", + buttonColor: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + ), + ), + ), + iconSize: 35, + onTap: () { + Navigator.of(context).pushNamed( + '/about', + arguments: 0, + ); + }, + ); + } + MIHAction getActionButton() { return MIHAction( icon: Padding( 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, @@ -441,7 +476,7 @@ class _RegisterState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), - secondaryActionButton: null, + secondaryActionButton: getSecondaryActionButton(), body: getBody(), actionDrawer: null, secondaryActionDrawer: null, diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index 08d8a3fb..6cc0080e 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -287,6 +287,36 @@ class _SignInState extends State { ); } + MIHAction getSecondaryActionButton() { + return MIHAction( + icon: Padding( + padding: const EdgeInsets.all(10.0), + child: SizedBox( + width: 150, + child: MIHButton( + onTap: () { + Navigator.of(context).pushNamed( + '/about', + arguments: 0, + ); + }, + buttonText: "Install MIH", + buttonColor: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + ), + ), + ), + iconSize: 35, + onTap: () { + Navigator.of(context).pushNamed( + '/about', + arguments: 0, + ); + }, + ); + } + MIHAction getActionButton() { return MIHAction( icon: Padding( @@ -637,7 +667,7 @@ class _SignInState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), - secondaryActionButton: null, + secondaryActionButton: getSecondaryActionButton(), body: getBody(), actionDrawer: null, secondaryActionDrawer: null,