zhutao/food_health_flutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zhutao
2025-09-01 16:24:34 +08:00
parent b110d1439c
commit bdfd051a47
8 changed files with 284 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/layout/layout_page.dart
View File

@@ -1,9 +1,14 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';
import 'package:remixicon/remixicon.dart';
import '../page/home/home_page.dart';
import '../page/profile/my/my_page.dart';
import '../page/record/list/record_list_page.dart';
import '../providers/user_store.dart';
import '../router/config/route_paths.dart';
import 'tabbar.dart';
class LayoutPage extends StatefulWidget {
@@ -41,6 +46,44 @@ class _LayoutPageState extends State<LayoutPage> {
),
];
@override
void initState() {
super.initState();
_init();
}
void _init() async {
UserStore userStore = context.read<UserStore>();
await userStore.init();
print(userStore.profile.toString());
if (userStore.profile.qStatus != 1) {
showCupertinoDialog(
context: context,
builder: (_) => CupertinoAlertDialog(
title: Text("Complete Your Profile"),
content: Text("Let’s get to know you better! Please take a quick survey to personalize your experience."),
actions: [
CupertinoDialogAction(
child: Text("Take Survey"),
onPressed: () {
context.pop();
_goEditProfile();
},
),
],
),
);
}
}
void _goEditProfile() async {
var isUpload = await context.push(RoutePaths.myEdit);
if (isUpload == true) {
UserStore userStore = context.read<UserStore>();
userStore.init();
}
}
@override
Widget build(BuildContext context) {
return Scaffold(

2
lib/main.dart
View File

@@ -1,3 +1,4 @@
import 'package:food_health/providers/user_store.dart';
import 'package:food_health/router/routes.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
@@ -12,6 +13,7 @@ void main() {
MultiProvider(
providers: [
ChangeNotifierProvider(create: (context) => AppStore()),
ChangeNotifierProvider(create: (context) => UserStore()),
],
child: MyApp(),
),

31
lib/page/profile/edit/my_edit_page.dart
View File

@@ -1,12 +1,13 @@
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:food_health/api/dto/profile_options_dto.dart';
import 'package:food_health/api/dto/user_profile_dto.dart';
import 'package:food_health/api/endpoints/profile_api.dart';
import 'package:food_health/config/theme/custom_colors.dart';
import 'package:food_health/page/profile/edit/widget/food_allergies.dart';
import 'package:food_health/providers/user_store.dart';
import 'package:food_health/widgets/common/app_backend.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';
import 'package:remixicon/remixicon.dart';
import 'data/state.dart';
@@ -14,9 +15,7 @@ import 'widget/dietary_preferences.dart';
import 'widget/health_profile.dart';
class MyEditPage extends StatefulWidget {
final UserProfileDto userProfile;
const MyEditPage({super.key, required this.userProfile});
const MyEditPage({super.key});
@override
State<MyEditPage> createState() => _MyEditPageState();
@@ -57,7 +56,8 @@ class _MyEditPageState extends State<MyEditPage> {
}
void _init() async {
selectionState = SelectionState(widget.userProfile);
UserStore userStore = context.read<UserStore>();
selectionState = SelectionState(userStore.profile);
var res = await getProfileOptionsApi();
setState(() {
_options = res;
@@ -91,10 +91,21 @@ class _MyEditPageState extends State<MyEditPage> {
if (_loading) {
return Center(child: CircularProgressIndicator());
}
return Scaffold(
return PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, __) async {
if (didPop) return;
if (selectionState.userProfile.qStatus == 1) {
context.pop();
}
},
child: Scaffold(
body: AppBackend(
child: Column(
children: [
Expanded(
child: ListView(
padding: EdgeInsets.only(top: 30),
padding: EdgeInsets.only(top: 20),
children: [
buildHeader(),
buildStep(),
@@ -120,8 +131,11 @@ class _MyEditPageState extends State<MyEditPage> {
},
),
),
],
),
),
Container(
margin: EdgeInsets.only(top: 30),
margin: EdgeInsets.only(top: 20),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@@ -161,6 +175,7 @@ class _MyEditPageState extends State<MyEditPage> {
],
),
),
),
);
}

111
lib/page/profile/my/my_page.dart
View File

@@ -1,12 +1,9 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:food_health/api/dto/user_profile_dto.dart';
import 'package:food_health/api/endpoints/profile_api.dart';
import 'package:food_health/config/theme/custom_colors.dart';
import 'package:go_router/go_router.dart';
import 'package:food_health/providers/user_store.dart';
import 'package:provider/provider.dart';
import 'package:remixicon/remixicon.dart';
import '../../../router/config/route_paths.dart';
import 'widget/title_card.dart';
import 'widget/user_card.dart';
@@ -18,56 +15,6 @@ class MyPage extends StatefulWidget {
}
class _MyPageState extends State<MyPage> with AutomaticKeepAliveClientMixin {
UserProfileDto _userProfile = UserProfileDto();
@override
void initState() {
super.initState();
_init();
}
void _init() async {
var res = await getUserProfileApi();
setState(() {
_userProfile = res;
});
_showEditProfile();
}
void _goEdit() async {
var isUpload = await context.push(RoutePaths.myEdit, extra: _userProfile);
if (isUpload == true) {
_init();
}
}
void _showEditProfile() {
if (_userProfile.qStatus != 1) {
showCupertinoDialog(
context: context,
builder: (_) => CupertinoAlertDialog(
title: Text("Complete Your Profile"),
content: Text("Let’s get to know you better! Please take a quick survey to personalize your experience."),
actions: [
CupertinoDialogAction(
child: Text("Not Now"),
onPressed: () {
context.pop();
},
),
CupertinoDialogAction(
child: Text("Take Survey"),
onPressed: () {
context.pop();
_goEdit();
},
),
],
),
);
}
}
@override
Widget build(BuildContext context) {
super.build(context);
@@ -75,41 +22,55 @@ class _MyPageState extends State<MyPage> with AutomaticKeepAliveClientMixin {
child: ListView(
padding: EdgeInsets.all(15),
children: [
UserCard(
detail: _userProfile,
onEdit: _goEdit,
),
Column(
UserCard(),
Consumer<UserStore>(
builder: (context, store, _) {
return Column(
children: [
TitleCard(
title: "Food Allergies",
icon: Icon(
RemixIcons.shield_line,
color: Theme.of(context).colorScheme.danger,
color: Theme
.of(context)
.colorScheme
.danger,
),
child: buildTagList(
emptyText: "No allergies reported",
tags: _userProfile.foodAllergiesList,
color: Theme.of(context).colorScheme.danger,
tags: store.profile.foodAllergiesList,
color: Theme
.of(context)
.colorScheme
.danger,
),
),
TitleCard(
title: "No preferences",
icon: Icon(
RemixIcons.heart_line,
color: Theme.of(context).colorScheme.success,
color: Theme
.of(context)
.colorScheme
.success,
),
child: buildTagList(
emptyText: "No dietary preferences reported",
tags: _userProfile.dietaryPreferencesList,
color: Theme.of(context).colorScheme.success,
tags: store.profile.dietaryPreferencesList,
color: Theme
.of(context)
.colorScheme
.success,
),
),
TitleCard(
title: "Medical Information",
icon: Icon(
RemixIcons.user_line,
color: Theme.of(context).colorScheme.primary,
color: Theme
.of(context)
.colorScheme
.primary,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -122,8 +83,11 @@ class _MyPageState extends State<MyPage> with AutomaticKeepAliveClientMixin {
margin: EdgeInsets.only(bottom: 10),
child: buildTagList(
emptyText: "No medical conditions reported",
tags: _userProfile.medicalInformationList,
color: Theme.of(context).colorScheme.primary,
tags: store.profile.medicalInformationList,
color: Theme
.of(context)
.colorScheme
.primary,
),
),
Container(
@@ -132,13 +96,18 @@ class _MyPageState extends State<MyPage> with AutomaticKeepAliveClientMixin {
),
buildTagList(
emptyText: "No medications reported",
tags: _userProfile.currentMedicationsList,
color: Theme.of(context).colorScheme.primary,
tags: store.profile.currentMedicationsList,
color: Theme
.of(context)
.colorScheme
.primary,
),
],
),
),
],
);
}
),
],
),

34
lib/page/profile/my/widget/user_card.dart
View File

@@ -5,6 +5,7 @@ import 'package:food_health/api/dto/user_profile_dto.dart';
import 'package:food_health/api/endpoints/user_api.dart';
import 'package:food_health/config/theme/custom_colors.dart';
import 'package:food_health/providers/app_store.dart';
import 'package:food_health/providers/user_store.dart';
import 'package:food_health/router/config/route_paths.dart';
import 'package:food_health/utils/common.dart';
import 'package:go_router/go_router.dart';
@@ -12,22 +13,19 @@ import 'package:provider/provider.dart';
import 'package:remixicon/remixicon.dart';
class UserCard extends StatefulWidget {
final UserProfileDto detail;
final Function() onEdit;
const UserCard({
super.key,
required this.detail,
required this.onEdit,
});
const UserCard({super.key});
@override
State<UserCard> createState() => _UserCardState();
}
class _UserCardState extends State<UserCard> {
void _goEdit() {
widget.onEdit();
void _goEditProfile() async {
var isUpload = await context.push(RoutePaths.myEdit);
if (isUpload == true && mounted) {
UserStore userStore = context.read<UserStore>();
userStore.init();
}
}
///退出登陆
@@ -105,24 +103,26 @@ class _UserCardState extends State<UserCard> {
),
],
),
child: Column(
child: Consumer<UserStore>(
builder: (context, store, _) {
return Column(
children: [
avatarWidget(),
Container(
margin: const EdgeInsets.only(top: 12),
child: Text(getNotEmpty(widget.detail.name) ?? "user", style: Theme.of(context).textTheme.titleMedium),
child: Text(getNotEmpty(store.profile.name) ?? "user", style: Theme.of(context).textTheme.titleMedium),
),
Container(
margin: const EdgeInsets.only(top: 5),
child: Text(widget.detail.email ?? "", style: Theme.of(context).textTheme.labelMedium),
child: Text(store.profile.email ?? "", style: Theme.of(context).textTheme.labelMedium),
),
buildTitledTags(
title: "Age Range",
tag: getNotEmpty(widget.detail.ageRange),
tag: getNotEmpty(store.profile.ageRange),
),
buildTitledTags(
title: "Activity Level",
tag: getNotEmpty(widget.detail.activityLevel),
tag: getNotEmpty(store.profile.activityLevel),
),
SizedBox(height: 20),
btnItem(
@@ -137,7 +137,7 @@ class _UserCardState extends State<UserCard> {
],
),
),
onTap: _goEdit,
onTap: _goEditProfile,
),
btnItem(
title: "Logout",
@@ -156,6 +156,8 @@ class _UserCardState extends State<UserCard> {
),
),
],
);
},
),
);
}

1
lib/page/system/splash/splash_page.dart
View File

@@ -1,6 +1,7 @@
import 'package:food_health/providers/app_store.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:food_health/providers/user_store.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';

14
lib/providers/user_store.dart Normal file
View File

@@ -0,0 +1,14 @@
import 'package:flutter/cupertino.dart';
import 'package:food_health/api/dto/user_profile_dto.dart';
import 'package:food_health/api/endpoints/profile_api.dart';
class UserStore with ChangeNotifier {
UserProfileDto profile = UserProfileDto();
//初始化数据
Future<void> init() async {
var res = await getUserProfileApi();
profile = res;
notifyListeners();
}
}

5
lib/router/modules/serve.dart
View File

@@ -8,10 +8,7 @@ List<RouteType> serverRoutes = [
RouteType(
path: RoutePaths.myEdit,
child: (state) {
var extra = state.extra as dynamic;
return MyEditPage(
userProfile: extra,
);
return MyEditPage();
},
),