Skip to content

Commit db72fa0

Browse files
committed
add order pages
1 parent 48cbfdc commit db72fa0

File tree

18 files changed

+551
-48
lines changed

18 files changed

+551
-48
lines changed

lib/config/routes/routes.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_ecommerce_furniture/features/authentication/presentation/forgot_password_page.dart';
33
import 'package:flutter_ecommerce_furniture/features/authentication/presentation/login_page.dart';
44
import 'package:flutter_ecommerce_furniture/features/authentication/presentation/register_page.dart';
5-
import 'package:flutter_ecommerce_furniture/features/home/presentation/home_page.dart';
65
import 'package:flutter_ecommerce_furniture/features/main/presentation/pages/main_page.dart';
76
import 'package:flutter_ecommerce_furniture/features/welcome/presentation/onboarding_page.dart';
87
import 'package:flutter_ecommerce_furniture/features/welcome/presentation/welcome_page.dart';

lib/config/theme/styles.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import 'dart:ui';
21

32
import 'package:flutter/material.dart';
43

lib/core/wigets/action_button.dart

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import 'package:flutter/material.dart';
22

3+
const double buttonHeightDefault = 50.0;
4+
35
class ActionButton extends StatelessWidget {
46
final String text;
57
final VoidCallback onPressed;
68
final Color? backgroundColor;
79
final Color? textColor;
810
final bool matchParentWidth;
11+
final double height;
912

1013
const ActionButton({
1114
super.key,
@@ -14,6 +17,7 @@ class ActionButton extends StatelessWidget {
1417
this.backgroundColor,
1518
this.textColor,
1619
this.matchParentWidth = false,
20+
this.height = buttonHeightDefault,
1721
});
1822

1923
@override
@@ -23,21 +27,21 @@ class ActionButton extends StatelessWidget {
2327
backgroundColor ?? (darkModeEnabled ? Colors.white : Colors.black);
2428

2529
final textC = textColor ?? (darkModeEnabled ? Colors.black : Colors.white);
26-
return SizedBox(
27-
width: matchParentWidth ? double.infinity : null,
28-
height: 50,
29-
child: ElevatedButton(
30-
onPressed: onPressed,
31-
style: ElevatedButton.styleFrom(
32-
backgroundColor: backgroundC,
33-
shape: const RoundedRectangleBorder(
34-
borderRadius: BorderRadius.all(Radius.circular(50)),
30+
return InkWell(
31+
onTap: onPressed,
32+
child: Container(
33+
padding: const EdgeInsets.symmetric(horizontal: 8),
34+
width: matchParentWidth ? double.infinity : null,
35+
height: height,
36+
decoration: BoxDecoration(
37+
color: backgroundC,
38+
borderRadius: BorderRadius.all(Radius.circular(height / 2))),
39+
child: Center(
40+
child: Text(
41+
text,
42+
style: TextStyle(color: textC, fontWeight: FontWeight.bold),
3543
),
3644
),
37-
child: Text(
38-
text,
39-
style: TextStyle(color: textC, fontWeight: FontWeight.bold),
40-
),
4145
),
4246
);
4347
}

lib/core/wigets/expandable_text.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class _DescriptionTextWidgetState extends State<DescriptionTextWidget> {
3838
? Text(firstHalf)
3939
: Column(
4040
children: <Widget>[
41-
Text(flag ? (firstHalf + "...") : (firstHalf + secondHalf)),
41+
Text(flag ? ("$firstHalf...") : (firstHalf + secondHalf)),
4242
InkWell(
4343
child: Row(
4444
mainAxisAlignment: MainAxisAlignment.end,

lib/core/wigets/product_image.dart

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,33 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_ecommerce_furniture/config/theme/styles.dart';
33
import 'package:flutter_ecommerce_furniture/core/ext/buildcontext_ext.dart';
44

5+
const _imageSize = 150.0;
6+
const _borderRadius = 20.0;
7+
58
class ProductImage extends StatelessWidget {
69
final double size;
10+
final double borderRadius;
711
final String path;
812

9-
const ProductImage({super.key, this.size = 100, required this.path});
13+
const ProductImage({
14+
super.key,
15+
this.size = _imageSize,
16+
this.borderRadius = _borderRadius,
17+
required this.path,
18+
});
1019

1120
@override
1221
Widget build(BuildContext context) {
1322
final isDark = context.isDarkModeEnabled;
14-
return Container(
15-
width: size,
16-
height: size,
17-
decoration: BoxDecoration(
18-
color: isDark ? Styles.itemColorBgDark : Styles.itemColorBgLight,
19-
borderRadius: BorderRadius.circular(20),
20-
),
21-
child: ClipRRect(
23+
return ClipRRect(
2224
borderRadius: BorderRadius.circular(20),
23-
child: Image.asset(
24-
path,
25-
),
26-
),
27-
);
25+
child: Container(
26+
color: isDark ? Styles.itemColorBgDark : Styles.itemColorBgLight,
27+
width: size,
28+
height: size,
29+
child: Image.asset(
30+
path,
31+
),
32+
));
2833
}
2934
}

lib/features/authentication/presentation/login_page.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/foundation.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_ecommerce_furniture/config/routes/routes.dart';
4-
import 'package:flutter_ecommerce_furniture/config/theme/styles.dart';
54
import 'package:flutter_ecommerce_furniture/core/ext/buildcontext_ext.dart';
65
import 'package:flutter_ecommerce_furniture/core/wigets/action_button.dart';
76
import 'package:flutter_ecommerce_furniture/features/authentication/widgets/auth_button.dart';

lib/features/authentication/widgets/auth_button.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_ecommerce_furniture/core/ext/buildcontext_ext.dart';
33

4-
import '../../../config/theme/styles.dart';
54

65
const _height = 50.0;
76

lib/features/home/widgets/filter_multi_selection.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_ecommerce_furniture/core/ext/buildcontext_ext.dart';
33

44
import '../../../config/theme/styles.dart';
5-
import '../data/mock_home_filters.dart';
65

76
class HomeFilterSelection extends StatefulWidget {
87
final ValueChanged<List<String>>? onValueChanged;

lib/features/main/presentation/pages/main_page.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
55
import '../../../../config/theme/styles.dart';
66
import '../../../cart/presentation/cart_page.dart';
77
import '../../../home/presentation/home_page.dart';
8+
import '../../../order/presentation/order_page.dart';
89
import '../../../profile/presentation/profile_page.dart';
910
import 'example_page.dart';
1011

@@ -41,12 +42,12 @@ class _MainPageState extends State<MainPage> {
4142
_currentIndex = index;
4243
});
4344
},
44-
children: const [
45-
HomePage(),
46-
CartPage(),
47-
ExamplePage(titlePage: 'Orders', isNested: true),
48-
ExamplePage(titlePage: 'Wallet', isNested: true),
49-
ProfilePage(),
45+
children: [
46+
const HomePage(),
47+
const CartPage(),
48+
OrderPage(),
49+
const ExamplePage(titlePage: 'Wallet', isNested: true),
50+
const ProfilePage(),
5051
],
5152
),
5253
),

lib/features/offer/presentation/special_offers_page.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,5 @@ class SpecialOfferItem extends StatelessWidget {
100100
child: OfferBanner(item: item),
101101
),
102102
);
103-
;
104103
}
105104
}

0 commit comments

Comments
 (0)