update

7wilightxdev · 7wilightxdev · commit ee89e1344c4c · 2021-05-06T22:55:52.000+07:00
diff --git a/lib/configs/router.dart b/lib/configs/router.dart
@@ -1,7 +1,7 @@
 import 'package:e_commerce_app/bottom_navigation.dart';
 import 'package:e_commerce_app/presentation/screens/detail_image/detail_image_screen.dart';
 import 'package:e_commerce_app/presentation/screens/message/message_screen.dart';
-import 'package:e_commerce_app/presentation/screens/detail_order_screen.dart/detail_order_screen.dart';
+import 'package:e_commerce_app/presentation/screens/detail_order/detail_order_screen.dart';
 import 'package:e_commerce_app/presentation/screens/map/map_screen.dart';
 import 'package:e_commerce_app/presentation/screens/my_orders/my_orders_screen.dart';
 import 'package:e_commerce_app/presentation/screens/search/search_screen.dart';
@@ -75,7 +75,7 @@ class AppRouter {
       case DETAIL_IMAGE:
         var imageUrl = settings.arguments as String;
         return MaterialPageRoute(
-          builder: (_) => DetailImageScreen( imageUrl: imageUrl),
+          builder: (_) => DetailImageScreen(imageUrl: imageUrl),
         );
       case FEEDBACK:
         var product = settings.arguments as Product;
diff --git a/lib/presentation/screens/cart/widgets/list_cart_item.dart b/lib/presentation/screens/cart/widgets/list_cart_item.dart
@@ -26,6 +26,7 @@ class ListCartItem extends StatelessWidget {
           return SafeArea(
             child: cart.length > 0
                 ? ListView.builder(
+                    physics: BouncingScrollPhysics(),
                     itemCount: cart.length + 1,
                     itemBuilder: (context, index) {
                       if (index == cart.length) {
diff --git a/lib/presentation/screens/categories/widgets/grid_products.dart b/lib/presentation/screens/categories/widgets/grid_products.dart
@@ -21,6 +21,7 @@ class GridProducts extends StatelessWidget {
       );
     }
     return GridView.builder(
+      physics: BouncingScrollPhysics(),
       shrinkWrap: true,
       gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
         crossAxisCount: 2,
diff --git a/lib/presentation/screens/delivery_address/delivery_address_screen.dart b/lib/presentation/screens/delivery_address/delivery_address_screen.dart
@@ -51,6 +51,7 @@ class DeliveryAddressScreen extends StatelessWidget {
 
   _buildContent(List<DeliveryAddress> addressList) {
     return ListView.builder(
+      physics: BouncingScrollPhysics(),
       itemCount: addressList.length,
       itemBuilder: (context, index) {
         return DeliveryAddressCard(
diff --git a/lib/presentation/screens/detail_order/detail_order_screen.dart b/lib/presentation/screens/detail_order/detail_order_screen.dart
diff --git a/lib/presentation/screens/detail_product/detail_product_screen.dart b/lib/presentation/screens/detail_product/detail_product_screen.dart
@@ -23,6 +23,7 @@ class DetailProductScreen extends StatelessWidget {
             DetailProductAppBar(),
             Expanded(
               child: ListView(
+                physics: BouncingScrollPhysics(),
                 children: [
                   ProductImagesWidget(product: product),
                   ProductInfoWidget(product: product),
diff --git a/lib/presentation/screens/feedbacks/widgets/list_feedbacks.dart b/lib/presentation/screens/feedbacks/widgets/list_feedbacks.dart
@@ -14,6 +14,7 @@ class ListFeedbacks extends StatelessWidget {
           var feedbacks = state.feedbacks;
           return feedbacks.length > 0
               ? ListView.builder(
+                  physics: BouncingScrollPhysics(),
                   itemCount: feedbacks.length,
                   itemBuilder: (context, index) {
                     return FeedbackCard(feedBack: feedbacks[index]);
diff --git a/lib/presentation/screens/home_page/home_screen.dart b/lib/presentation/screens/home_page/home_screen.dart
@@ -12,6 +12,7 @@ class HomeScreen extends StatelessWidget {
       child: Scaffold(
         body: SafeArea(
           child: CustomScrollView(
+            physics: BouncingScrollPhysics(),
             slivers: [
               SliverPersistentHeader(
                 delegate: HomePersistentHeader(),
diff --git a/lib/presentation/screens/initialize_info/initialize_info_screen.dart b/lib/presentation/screens/initialize_info/initialize_info_screen.dart
@@ -6,11 +6,13 @@ class InitializeInfoScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: ListView(
-        children: [
-          InitializeInfoHeader(),
-          InitializeInfoForm(),
-        ],
+      body: SingleChildScrollView(
+        child: Column(
+          children: [
+            InitializeInfoHeader(),
+            InitializeInfoForm(),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/presentation/screens/login/login_screen.dart b/lib/presentation/screens/login/login_screen.dart
@@ -10,11 +10,13 @@ class LoginScreen extends StatelessWidget {
     return BlocProvider(
       create: (context) => LoginBloc(),
       child: Scaffold(
-        body: ListView(
-          children: [
-            LoginHeader(),
-            LoginForm(),
-          ],
+        body: SingleChildScrollView(
+          child: Column(
+            children: [
+              LoginHeader(),
+              LoginForm(),
+            ],
+          ),
         ),
       ),
     );
diff --git a/lib/presentation/screens/login/widgets/login_form.dart b/lib/presentation/screens/login/widgets/login_form.dart
@@ -98,10 +98,7 @@ class _LoginFormState extends State<LoginForm> {
                   SizedBox(height: SizeConfig.defaultSize * 2),
                   _buildTextOr(),
                   SizedBox(height: SizeConfig.defaultSize * 2),
-                  ElevatedButton(
-                    onPressed: () {},
-                    child: _buildNoAccountText(),
-                  ),
+                  _buildNoAccountText(),
                 ],
               ),
             ),
diff --git a/lib/presentation/screens/message/widgets/list_messages.dart b/lib/presentation/screens/message/widgets/list_messages.dart
@@ -56,6 +56,7 @@ class _ListMessagesState extends State<ListMessages> {
               messages = state.messages!;
             }
             return ListView.builder(
+                physics: BouncingScrollPhysics(),
                 controller: scrollController,
                 shrinkWrap: true,
                 reverse: true,
diff --git a/lib/presentation/screens/my_orders/my_orders_screen.dart b/lib/presentation/screens/my_orders/my_orders_screen.dart
@@ -98,6 +98,7 @@ class _MyOrdersScreenState extends State<MyOrdersScreen>
             child: Image.asset(IMAGE_CONST.NO_RECORD),
           )
         : ListView.builder(
+            physics: BouncingScrollPhysics(),
             itemCount: orders.length,
             itemBuilder: (context, index) {
               return OrderCard(order: orders[index]);
diff --git a/lib/presentation/screens/profile/profile_header.dart b/lib/presentation/screens/profile/profile_header.dart
@@ -30,7 +30,7 @@ class ProfileHeader extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      height: SizeConfig.screenHeight * 0.3,
+      height: SizeConfig.defaultSize * 30,
       color: COLOR_CONST.primaryColor,
       child: BlocBuilder<ProfileBloc, ProfileState>(
         builder: (context, state) {
diff --git a/lib/presentation/screens/register/register_screen.dart b/lib/presentation/screens/register/register_screen.dart
@@ -15,11 +15,13 @@ class RegisterScreen extends StatelessWidget {
     return BlocProvider(
       create: (context) => RegisterBloc(),
       child: Scaffold(
-        body: ListView(
-          children: [
-            RegisterHeader(),
-            RegisterForm(intialUser: initialUser),
-          ],
+        body: SingleChildScrollView(
+          child: Column(
+            children: [
+              RegisterHeader(),
+              RegisterForm(intialUser: initialUser),
+            ],
+          ),
         ),
       ),
     );
diff --git a/lib/presentation/screens/search/search_screen.dart b/lib/presentation/screens/search/search_screen.dart
@@ -114,6 +114,7 @@ class _SearchScreenState extends State<SearchScreen> {
     var results = state.results;
     if (results.isNotEmpty) {
       return ListView.builder(
+        physics: BouncingScrollPhysics(),
         itemCount: results.length,
         itemBuilder: (context, index) {
           return CustomListTile(
diff --git a/lib/presentation/widgets/others/promo_widget.dart b/lib/presentation/widgets/others/promo_widget.dart
@@ -21,6 +21,7 @@ class PromoWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SingleChildScrollView(
+      physics: BouncingScrollPhysics(),
       scrollDirection: Axis.horizontal,
       child: Padding(
         padding: EdgeInsets.symmetric(
diff --git a/lib/presentation/widgets/others/section_widget.dart b/lib/presentation/widgets/others/section_widget.dart
@@ -37,6 +37,7 @@ class SectionWidget extends StatelessWidget {
             child: children.length == 0
                 ? CircularProgressIndicator()
                 : SingleChildScrollView(
+                    physics: BouncingScrollPhysics(),
                     scrollDirection: Axis.horizontal,
                     child: Padding(
                       padding: EdgeInsets.symmetric(

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ class GridProducts extends StatelessWidget {`
`21`	`21`	`);`
`22`	`22`	`}`
`23`	`23`	`return GridView.builder(`
	`24`	`+ physics: BouncingScrollPhysics(),`
`24`	`25`	`shrinkWrap: true,`
`25`	`26`	`gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(`
`26`	`27`	`crossAxisCount: 2,`