QOL: MIH Home Package performance improvements

This commit is contained in:
2025-11-28 12:15:12 +02:00
parent d64193d1f8
commit 004c2397c5
6 changed files with 89 additions and 184 deletions

View File

@@ -1,20 +1,13 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.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';
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
class TestPackageTile extends StatefulWidget { class TestPackageTile extends StatefulWidget {
final AppUser signedInUser;
final Business? business;
final double packageSize; final double packageSize;
const TestPackageTile({ const TestPackageTile({
super.key, super.key,
required this.signedInUser,
required this.business,
required this.packageSize, required this.packageSize,
}); });
@@ -29,10 +22,6 @@ class _TestPackageTileState extends State<TestPackageTile> {
onTap: () { onTap: () {
context.goNamed( context.goNamed(
'testPackage', 'testPackage',
extra: TestArguments(
widget.signedInUser,
widget.business,
),
); );
// Navigator.of(context).pushNamed( // Navigator.of(context).pushNamed(
// '/package-dev', // '/package-dev',

View File

@@ -1,22 +1,18 @@
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:ken_logger/ken_logger.dart'; import 'package:ken_logger/ken_logger.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.dart';
import 'package:mzansi_innovation_hub/mih_objects/business.dart';
import 'package:mzansi_innovation_hub/mih_objects/business_user.dart';
import 'package:mzansi_innovation_hub/mih_objects/user_consent.dart'; import 'package:mzansi_innovation_hub/mih_objects/user_consent.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
import 'package:mzansi_innovation_hub/mih_objects/app_user.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_scack_bar.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_scack_bar.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
import 'package:mzansi_innovation_hub/mih_providers/about_mih_provider.dart'; import 'package:mzansi_innovation_hub/mih_providers/about_mih_provider.dart';
import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart'; import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart';
import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_business_home.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_business_home.dart';
import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_personal_home.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_personal_home.dart';
@@ -38,6 +34,8 @@ class _MihHomeState extends State<MihHome> {
DateTime latestPrivacyPolicyDate = DateTime.parse("2024-12-01"); DateTime latestPrivacyPolicyDate = DateTime.parse("2024-12-01");
DateTime latestTermOfServiceDate = DateTime.parse("2024-12-01"); DateTime latestTermOfServiceDate = DateTime.parse("2024-12-01");
bool _isLoadingInitialData = true; bool _isLoadingInitialData = true;
late final MihPersonalHome _personalHome;
late final MihBusinessHome _businessHome;
Future<void> _loadInitialData() async { Future<void> _loadInitialData() async {
setState(() { setState(() {
@@ -48,9 +46,11 @@ class _MihHomeState extends State<MihHome> {
await MihDataHelperServices().loadUserDataWithBusinessesData( await MihDataHelperServices().loadUserDataWithBusinessesData(
mzansiProfileProvider, mzansiProfileProvider,
); );
setState(() { if (mounted) {
_isLoadingInitialData = false; setState(() {
}); _isLoadingInitialData = false;
});
}
} }
bool showPolicyWindow(UserConsent? userConsent) { bool showPolicyWindow(UserConsent? userConsent) {
@@ -79,6 +79,7 @@ class _MihHomeState extends State<MihHome> {
context, context,
) )
.then((value) { .then((value) {
if (!mounted) return;
if (value == 200) { if (value == 200) {
context.goNamed("mihHome"); context.goNamed("mihHome");
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
@@ -262,6 +263,8 @@ class _MihHomeState extends State<MihHome> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_personalHome = const MihPersonalHome();
_businessHome = MihBusinessHome(isLoading: _isLoadingInitialData);
_loadInitialData(); _loadInitialData();
} }
@@ -375,15 +378,11 @@ class _MihHomeState extends State<MihHome> {
MzansiProfileProvider mzansiProfileProvider, bool isBusinessUser) { MzansiProfileProvider mzansiProfileProvider, bool isBusinessUser) {
Map<Widget, void Function()?> temp = {}; Map<Widget, void Function()?> temp = {};
temp[const Icon(Icons.person)] = () { temp[const Icon(Icons.person)] = () {
setState(() { mzansiProfileProvider.setPersonalHome(true);
mzansiProfileProvider.setPersonalHome(true);
});
}; };
if (isBusinessUser) { if (isBusinessUser) {
temp[const Icon(Icons.business_center)] = () { temp[const Icon(Icons.business_center)] = () {
setState(() { mzansiProfileProvider.setPersonalHome(false);
mzansiProfileProvider.setPersonalHome(false);
});
}; };
} }
return MihPackageTools( return MihPackageTools(
@@ -393,32 +392,9 @@ class _MihHomeState extends State<MihHome> {
} }
List<Widget> getToolBody(MzansiProfileProvider mzansiProfileProvider) { List<Widget> getToolBody(MzansiProfileProvider mzansiProfileProvider) {
List<Widget> toolBodies = []; return [
AppUser? user = mzansiProfileProvider.user; _personalHome,
Business? business = mzansiProfileProvider.business; _businessHome,
BusinessUser? businessUser = mzansiProfileProvider.businessUser; ];
String userProfilePictureUrl =
mzansiProfileProvider.userProfilePicUrl ?? "";
toolBodies.add(
MihPersonalHome(
signedInUser: user!,
personalSelected: mzansiProfileProvider.personalHome,
business: business,
businessUser: businessUser,
propicFile: userProfilePictureUrl != ""
? NetworkImage(userProfilePictureUrl)
: null,
isDevActive: AppEnviroment.getEnv() == "Dev",
isUserNew: user.username == "",
),
);
if (user.type != "personal") {
toolBodies.add(
MihBusinessHome(
isLoading: _isLoadingInitialData,
),
);
}
return toolBodies;
} }
} }

View File

@@ -1,6 +1,5 @@
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart';
@@ -203,44 +202,37 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
MzansiProfileProvider mzansiProfileProvider, MzansiProfileProvider mzansiProfileProvider,
MzansiAiProvider mzansiAiProvider, MzansiAiProvider mzansiAiProvider,
Widget? child) { Widget? child) {
// if (mzansiProfileProvider.user == null || return Column(
// mzansiProfileProvider.business == null || children: [
// mzansiProfileProvider.businessUser == null) { Padding(
// return Center( padding: EdgeInsets.symmetric(horizontal: width / 20),
// child: Mihloadingcircle(), child: Visibility(
// ); visible: mzansiProfileProvider.business != null,
// } child: MihSearchBar(
return MihSingleChildScroll( controller: searchController,
child: Column( hintText: "Ask Mzansi",
children: [ prefixIcon: Icons.search,
Padding( prefixAltIcon: MihIcons.mzansiAi,
padding: EdgeInsets.symmetric(horizontal: width / 20), fillColor: MihColors.getSecondaryColor(
child: Visibility( MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
visible: mzansiProfileProvider.business != null, hintColor: MihColors.getPrimaryColor(
child: MihSearchBar( MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
controller: searchController, onPrefixIconTap: () {
hintText: "Ask Mzansi", mzansiAiProvider.ollamaProvider.resetChat();
prefixIcon: Icons.search, if (searchController.text.isNotEmpty) {
prefixAltIcon: MihIcons.mzansiAi, mzansiAiProvider
fillColor: MihColors.getSecondaryColor( .setStartUpQuestion(searchController.text);
MzansiInnovationHub.of(context)!.theme.mode == "Dark"), }
hintColor: MihColors.getPrimaryColor( context.goNamed("mzansiAi");
MzansiInnovationHub.of(context)!.theme.mode == "Dark"), searchController.clear();
onPrefixIconTap: () { },
mzansiAiProvider.ollamaProvider.resetChat(); searchFocusNode: _searchFocusNode,
if (searchController.text.isNotEmpty) {
mzansiAiProvider
.setStartUpQuestion(searchController.text);
}
context.goNamed("mzansiAi");
searchController.clear();
},
searchFocusNode: _searchFocusNode,
),
), ),
), ),
const SizedBox(height: 20), ),
ValueListenableBuilder( const SizedBox(height: 20),
Expanded(
child: ValueListenableBuilder(
valueListenable: searchPackageName, valueListenable: searchPackageName,
builder: (context, value, child) { builder: (context, value, child) {
List<Widget> filteredPackages = value List<Widget> filteredPackages = value
@@ -295,8 +287,8 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
} }
}, },
), ),
], ),
), ],
); );
}, },
); );

View File

@@ -1,14 +1,10 @@
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
import 'package:mzansi_innovation_hub/mih_package_components/Example/package_tiles/test_package_tile.dart'; import 'package:mzansi_innovation_hub/mih_package_components/Example/package_tiles/test_package_tile.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.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';
import 'package:mzansi_innovation_hub/mih_objects/business_user.dart';
import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart'; import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart'; import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart';
@@ -23,26 +19,12 @@ import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profi
import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart';
import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart'; import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class MihPersonalHome extends StatefulWidget { class MihPersonalHome extends StatefulWidget {
final AppUser signedInUser;
final bool personalSelected;
final Business? business;
final BusinessUser? businessUser;
final ImageProvider<Object>? propicFile;
final bool isUserNew;
final bool isDevActive;
const MihPersonalHome({ const MihPersonalHome({
super.key, super.key,
required this.signedInUser,
required this.personalSelected,
required this.business,
required this.businessUser,
required this.propicFile,
required this.isUserNew,
required this.isDevActive,
}); });
@override @override
@@ -104,13 +86,6 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
//=============== Patient Profile =============== //=============== Patient Profile ===============
temp.add({ temp.add({
"Patient Profile": PatientProfileTile( "Patient Profile": PatientProfileTile(
arguments: PatientViewArguments(
widget.signedInUser,
null,
null,
null,
"personal",
),
packageSize: packageSize, packageSize: packageSize,
) )
}); });
@@ -141,7 +116,6 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
//=============== Mine Sweeper =============== //=============== Mine Sweeper ===============
temp.add({ temp.add({
"Mine Sweeper": MihMineSweeperTile( "Mine Sweeper": MihMineSweeperTile(
personalSelected: widget.personalSelected,
packageSize: packageSize, packageSize: packageSize,
) )
}); });
@@ -158,11 +132,9 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
) )
}); });
//=============== Dev =============== //=============== Dev ===============
if (widget.isDevActive) { if (AppEnviroment.getEnv() == "Dev") {
temp.add({ temp.add({
"test": TestPackageTile( "test": TestPackageTile(
signedInUser: widget.signedInUser,
business: widget.business,
packageSize: packageSize, packageSize: packageSize,
) )
}); });
@@ -205,10 +177,6 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
context.goNamed( context.goNamed(
'mzansiProfileManage', 'mzansiProfileManage',
extra: AppProfileUpdateArguments(
widget.signedInUser,
widget.propicFile,
),
); );
}); });
} }
@@ -227,7 +195,9 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
void initState() { void initState() {
super.initState(); super.initState();
searchController.addListener(searchPackage); searchController.addListener(searchPackage);
if (widget.isUserNew) { MzansiProfileProvider profileProvider =
context.read<MzansiProfileProvider>();
if (profileProvider.user!.username == "") {
personalPackagesMap = setNerUserPersonalPackage(); personalPackagesMap = setNerUserPersonalPackage();
autoNavToProfile(); autoNavToProfile();
} else { } else {
@@ -249,57 +219,40 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
} }
Widget getBody(double width, double height) { Widget getBody(double width, double height) {
return Consumer<MzansiAiProvider>( return Consumer2<MzansiProfileProvider, MzansiAiProvider>(
builder: (BuildContext context, MzansiAiProvider mzansiAiProvider, builder: (BuildContext context, MzansiProfileProvider profileProvider,
Widget? child) { MzansiAiProvider mzansiAiProvider, Widget? child) {
return MihSingleChildScroll( return Column(
child: Column( children: [
children: [ Visibility(
// Icon( visible: profileProvider.user!.username != "",
// MihIcons.mihLogo, child: Padding(
// size: 200, padding: EdgeInsets.symmetric(horizontal: width / 20),
// color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: MihSearchBar(
// ), controller: searchController,
// const SizedBox(height: 10), hintText: "Ask Mzansi",
// Text( prefixIcon: Icons.search,
// // "Welcome, ${widget.signedInUser.fname}!", prefixAltIcon: MihIcons.mzansiAi,
// "Mzansi Innovation Hub", fillColor: MihColors.getSecondaryColor(
// textAlign: TextAlign.center, MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// style: TextStyle( hintColor: MihColors.getPrimaryColor(
// fontSize: 30, MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
// fontWeight: FontWeight.bold, onPrefixIconTap: () {
// color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), mzansiAiProvider.ollamaProvider.resetChat();
// ), if (searchController.text.isNotEmpty) {
// ), mzansiAiProvider
// const SizedBox(height: 20), .setStartUpQuestion(searchController.text);
Visibility( }
visible: !widget.isUserNew, context.goNamed("mzansiAi");
child: Padding( searchController.clear();
padding: EdgeInsets.symmetric(horizontal: width / 20), },
child: MihSearchBar( searchFocusNode: _searchFocusNode,
controller: searchController,
hintText: "Ask Mzansi",
prefixIcon: Icons.search,
prefixAltIcon: MihIcons.mzansiAi,
fillColor: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
hintColor: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
onPrefixIconTap: () {
mzansiAiProvider.ollamaProvider.resetChat();
if (searchController.text.isNotEmpty) {
mzansiAiProvider
.setStartUpQuestion(searchController.text);
}
context.goNamed("mzansiAi");
searchController.clear();
},
searchFocusNode: _searchFocusNode,
),
), ),
), ),
const SizedBox(height: 20), ),
ValueListenableBuilder( const SizedBox(height: 20),
Expanded(
child: ValueListenableBuilder(
valueListenable: searchPackageName, valueListenable: searchPackageName,
builder: (context, value, child) { builder: (context, value, child) {
List<Widget> filteredPackages = value List<Widget> filteredPackages = value
@@ -310,8 +263,8 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
.toList(); .toList();
if (filteredPackages.isNotEmpty) { if (filteredPackages.isNotEmpty) {
return GridView.builder( return GridView.builder(
physics: const NeverScrollableScrollPhysics(), // physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true, // shrinkWrap: true,
padding: getPadding(width, height), padding: getPadding(width, height),
// shrinkWrap: true, // shrinkWrap: true,
itemCount: filteredPackages.length, itemCount: filteredPackages.length,
@@ -355,8 +308,8 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
} }
}, },
), ),
], ),
), ],
); );
}, },
); );

View File

@@ -6,11 +6,9 @@ import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.da
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
class MihMineSweeperTile extends StatefulWidget { class MihMineSweeperTile extends StatefulWidget {
final bool personalSelected;
final double packageSize; final double packageSize;
const MihMineSweeperTile({ const MihMineSweeperTile({
super.key, super.key,
required this.personalSelected,
required this.packageSize, required this.packageSize,
}); });

View File

@@ -2,17 +2,14 @@ import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart';
import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
import 'package:mzansi_innovation_hub/mih_objects/arguments.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
class PatientProfileTile extends StatefulWidget { class PatientProfileTile extends StatefulWidget {
final PatientViewArguments arguments;
final double packageSize; final double packageSize;
const PatientProfileTile({ const PatientProfileTile({
super.key, super.key,
required this.arguments,
required this.packageSize, required this.packageSize,
}); });