Skip to content

Commit 394f7c6

Browse files
committed
UI changes
1 parent f0caebb commit 394f7c6

File tree

4 files changed

+49
-16
lines changed

4 files changed

+49
-16
lines changed

lib/screens/tab_screens/homeScreen_pages/cart2.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class _Cart2State extends State<Cart2> {
5353
color: MColors.textDark,
5454
),
5555
onPressed: () {
56-
Navigator.of(context).pop();
56+
Navigator.pop(context, true);
5757
},
5858
),
5959
Text(

lib/screens/tab_screens/homeScreen_pages/productDetailsScreen.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ class _ProductDetailsState extends State<ProductDetails> {
7676
size: 22.0,
7777
),
7878
onPressed: () {
79-
Navigator.of(context).pop(prod);
79+
Navigator.pop(
80+
context,
81+
_isProductadded,
82+
);
8083
},
8184
),
8285
expandedHeight: (MediaQuery.of(context).size.height) / 2.3,

lib/screens/tab_screens/settings.dart

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,18 +169,42 @@ class _SettingsScreenState extends State<SettingsScreen> {
169169
crossAxisAlignment: CrossAxisAlignment.center,
170170
children: <Widget>[
171171
Center(
172-
child: Padding(
173-
padding: const EdgeInsets.all(10.0),
174-
child: Hero(
175-
tag: "profileAvatar",
176-
child: Container(
177-
child: SvgPicture.asset(
178-
"assets/images/femaleAvatar.svg",
179-
height: 90,
172+
child: GestureDetector(
173+
onTap: () async {
174+
UserDataProfileNotifier profileNotifier =
175+
Provider.of<UserDataProfileNotifier>(context,
176+
listen: false);
177+
var navigationResult =
178+
await Navigator.of(context).push(
179+
MaterialPageRoute(
180+
builder: (context) => EditProfile(user),
180181
),
181-
decoration: BoxDecoration(
182-
shape: BoxShape.circle,
183-
color: MColors.dashPurple,
182+
);
183+
if (navigationResult == true) {
184+
setState(() {
185+
getProfile(profileNotifier);
186+
});
187+
showSimpleSnack(
188+
"Profile has been updated",
189+
Icons.check_circle_outline,
190+
Colors.green,
191+
_scaffoldKey,
192+
);
193+
}
194+
},
195+
child: Padding(
196+
padding: const EdgeInsets.all(10.0),
197+
child: Hero(
198+
tag: "profileAvatar",
199+
child: Container(
200+
child: SvgPicture.asset(
201+
"assets/images/femaleAvatar.svg",
202+
height: 90,
203+
),
204+
decoration: BoxDecoration(
205+
shape: BoxShape.circle,
206+
color: MColors.dashPurple,
207+
),
184208
),
185209
),
186210
),

lib/widgets/tabsLayout.dart

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_svg/svg.dart';
33
import 'package:mollet/model/services/Product_service.dart';
44
import 'package:mollet/model/notifiers/cart_notifier.dart';
5-
// import 'package:mollet/screens/tab_screens/cart1.dart';
65
import 'package:mollet/screens/tab_screens/history.dart';
76
import 'package:mollet/screens/tab_screens/home.dart';
87
import 'package:mollet/screens/tab_screens/homeScreen_pages/cart2.dart';
@@ -110,12 +109,19 @@ class _TabsLayoutState extends State<TabsLayout> {
110109
),
111110
),
112111
GestureDetector(
113-
onTap: () {
114-
Navigator.of(context).push(
112+
onTap: () async {
113+
CartNotifier cartNotifier =
114+
Provider.of<CartNotifier>(context, listen: false);
115+
var navigationResult = await Navigator.of(context).push(
115116
MaterialPageRoute(
116117
builder: (context) => Cart1(),
117118
),
118119
);
120+
if (navigationResult == true) {
121+
setState(() {
122+
getCart(cartNotifier);
123+
});
124+
}
119125
},
120126
child: Container(
121127
padding: const EdgeInsets.only(left: 10.0),

0 commit comments

Comments
 (0)