diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index 4f641b32..70a86c1b 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -71,8 +71,6 @@ class _MzansiInnovationHubState extends State { double width = MediaQuery.sizeOf(context).width; theme.setScreenType(width); precacheImage(theme.loadingImage(), context); - precacheImage(theme.logoImage(), context); - precacheImage(theme.logoFrame(), context); return MaterialApp( title: getTitle(), themeMode: ThemeMode.dark, diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/frame_dark.png b/Frontend/lib/mih_components/mih_package_components/assets/images/frame_dark.png deleted file mode 100644 index 05756dbb..00000000 Binary files a/Frontend/lib/mih_components/mih_package_components/assets/images/frame_dark.png and /dev/null differ diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/frame_light.png b/Frontend/lib/mih_components/mih_package_components/assets/images/frame_light.png deleted file mode 100644 index 00b0a359..00000000 Binary files a/Frontend/lib/mih_components/mih_package_components/assets/images/frame_light.png and /dev/null differ diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png b/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png deleted file mode 100644 index a9e5cff9..00000000 Binary files a/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png and /dev/null differ diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-light.png b/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-light.png deleted file mode 100644 index 69e2ea5b..00000000 Binary files a/Frontend/lib/mih_components/mih_package_components/assets/images/i-dont-know-light.png and /dev/null differ diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/logo_dark.png b/Frontend/lib/mih_components/mih_package_components/assets/images/logo_dark.png deleted file mode 100644 index 1efb415d..00000000 Binary files a/Frontend/lib/mih_components/mih_package_components/assets/images/logo_dark.png and /dev/null differ diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-dark.png b/Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-dark.png deleted file mode 100644 index d99581d4..00000000 Binary files a/Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-dark.png and /dev/null differ diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-light.png b/Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-light.png deleted file mode 100644 index 30658141..00000000 Binary files a/Frontend/lib/mih_components/mih_package_components/assets/images/mzansi_ai-light.png and /dev/null differ diff --git a/Frontend/lib/mih_components/mih_package_components/assets/images/notify_logo.png b/Frontend/lib/mih_components/mih_package_components/assets/images/notify_logo.png deleted file mode 100644 index 1041552c..00000000 Binary files a/Frontend/lib/mih_components/mih_package_components/assets/images/notify_logo.png and /dev/null differ diff --git a/Frontend/lib/mih_config/mih_theme.dart b/Frontend/lib/mih_config/mih_theme.dart index b378d0cc..c241935a 100644 --- a/Frontend/lib/mih_config/mih_theme.dart +++ b/Frontend/lib/mih_config/mih_theme.dart @@ -163,54 +163,6 @@ class MihTheme { } } - AssetImage logoFrame() { - if (mode == "Dark") { - return const AssetImage( - 'lib/mih_components/mih_package_components/assets/images/frame_dark.png', - ); - } else { - return const AssetImage( - 'lib/mih_components/mih_package_components/assets/images/frame_light.png', - ); - } - } - - AssetImage altLogoFrame() { - if (mode == "Light") { - return const AssetImage( - 'lib/mih_components/mih_package_components/assets/images/frame_dark.png', - ); - } else { - return const AssetImage( - 'lib/mih_components/mih_package_components/assets/images/frame_light.png', - ); - } - } - - AssetImage logoImage() { - if (mode == "Dark") { - return const AssetImage( - 'lib/mih_components/mih_package_components/assets/images/logo_dark.png', - ); - } else { - return const AssetImage( - 'lib/mih_components/mih_package_components/assets/images/logo_light.png', - ); - } - } - - AssetImage altLogoImage() { - if (mode == "Light") { - return const AssetImage( - 'lib/mih_components/mih_package_components/assets/images/logo_dark.png', - ); - } else { - return const AssetImage( - 'lib/mih_components/mih_package_components/assets/images/logo_light.png', - ); - } - } - AssetImage loadingImage() { if (mode == "Dark") { loading = const AssetImage( 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 ed4f9dd8..ebe8eba4 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 @@ -47,8 +47,6 @@ class _MihInfoState extends State { bio += "(University of the Western Cape)\n"; bio += "6 Year of banking experience with one of the big 5 banks of South Africa."; - ImageProvider logoFrame = - MzansiInnovationHub.of(context)!.theme.altLogoFrame(); return Wrap( alignment: WrapAlignment.center, crossAxisAlignment: WrapCrossAlignment.center, @@ -61,18 +59,22 @@ class _MihInfoState extends State { alignment: Alignment.center, fit: StackFit.loose, children: [ - CircleAvatar( - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), - 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, + Padding( + padding: const EdgeInsets.only(left: 4.0), + child: CircleAvatar( + backgroundColor: + MzansiInnovationHub.of(context)!.theme.primaryColor(), + 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, + ), + ), + Icon( + MihIcons.mihRing, + size: 165, + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), - SizedBox( - width: 165, - child: Image(image: logoFrame), - ) ], ), ), 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 a30d3c0f..5081a062 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 @@ -61,35 +61,6 @@ class _MIHAppDrawerState extends State { backgroundColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), - // MIHProfilePicture( - // profilePictureFile: widget.propicFile, - // proPicController: proPicController, - // proPic: null, - // width: 60, - // radius: 27, - // drawerMode: true, - // editable: false, - // frameColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), - // onChange: (newProPic) {}, - // ), - - // Stack( - // alignment: Alignment.center, - // fit: StackFit.loose, - // children: [ - // CircleAvatar( - // backgroundColor: - // MzansiInnovationHub.of(context)!.theme.primaryColor(), - // backgroundImage: widget.propicFile, - // //'https://media.licdn.com/dms/image/D4D03AQGd1-QhjtWWpA/profile-displayphoto-shrink_400_400/0/1671698053061?e=2147483647&v=beta&t=a3dJI5yxs5-KeXjj10LcNCFuC9IOfa8nNn3k_Qyr0CA'), - // radius: 27, - // ), - // SizedBox( - // width: 60, - // child: Image(image: logoFrame), - // ) - // ], - // ), ); } 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 d6639fcb..e15c58c2 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart @@ -86,24 +86,22 @@ class _MIHHomeLegacyState extends State { // ); void setAppsNewPersonal(List tileList) { - ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage(); - if (widget.signedInUser.fname == "") { - tileList.add(MIHTile( - videoID: "jFV3NN65DtQ", - onTap: () { - Navigator.of(context).pushNamed('/mzansi-profile', - arguments: AppProfileUpdateArguments( - widget.signedInUser, widget.propicFile)); - }, - tileName: "Setup Profie", - tileIcon: Padding( - padding: const EdgeInsets.all(15.0), - child: Image(image: logo), - ), - p: getPrim(), - s: getSec(), - )); + // tileList.add(MIHTile( + // videoID: "jFV3NN65DtQ", + // onTap: () { + // Navigator.of(context).pushNamed('/mzansi-profile', + // arguments: AppProfileUpdateArguments( + // widget.signedInUser, widget.propicFile)); + // }, + // tileName: "Setup Profie", + // tileIcon: Padding( + // padding: const EdgeInsets.all(15.0), + // child: Image(image: logo), + // ), + // p: getPrim(), + // s: getSec(), + // )); } } @@ -128,27 +126,26 @@ class _MIHHomeLegacyState extends State { } void setAppsPersonal(List tileList) { - ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage(); ImageProvider aiLogo = MzansiInnovationHub.of(context)!.theme.aiLogoImage(); - tileList.add(MIHTile( - videoID: "P2bM9eosJ_A", - onTap: () { - Navigator.of(context).pushNamed( - '/mzansi-profile', - arguments: AppProfileUpdateArguments( - widget.signedInUser, - widget.propicFile, - ), - ); - }, - tileName: "Mzansi Profile", - tileIcon: Padding( - padding: const EdgeInsets.all(15.0), - child: Image(image: logo), - ), - p: getPrim(), - s: getSec(), - )); + // tileList.add(MIHTile( + // videoID: "P2bM9eosJ_A", + // onTap: () { + // Navigator.of(context).pushNamed( + // '/mzansi-profile', + // arguments: AppProfileUpdateArguments( + // widget.signedInUser, + // widget.propicFile, + // ), + // ); + // }, + // tileName: "Mzansi Profile", + // tileIcon: Padding( + // padding: const EdgeInsets.all(15.0), + // child: Image(image: logo), + // ), + // p: getPrim(), + // s: getSec(), + // )); tileList.add(MIHTile( videoID: "6l8h0sjt08k", onTap: () {