Minor changes

dscnitrourkela · Apr 29, 2020 · 531f95c · 531f95c
1 parent 8033776
commit 531f95c
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 42 deletions.
diff --git a/gogrocy/lib/ui/shared/constants.dart b/gogrocy/lib/ui/shared/constants.dart
@@ -6,7 +6,7 @@ double scaleRatio = mediaQueryData.devicePixelRatio/2.002;
 double screenHeight = mediaQueryData.size.height;
 double screenWidth = mediaQueryData.size.width;
 
-final String imageBaseUrl="https://res.cloudinary.com/gogrocy/image/upload/c_scale,w_120/v1";
+final String imageBaseUrl="https://res.cloudinary.com/gogrocy/image/upload/c_scale,w_120/v1/";
 
 
 class LoginConfig {

diff --git a/gogrocy/lib/ui/views/cart/cart.dart b/gogrocy/lib/ui/views/cart/cart.dart
@@ -29,7 +29,7 @@ class Cart extends StatelessWidget {
           if (model.state == ViewState.Busy)
             return Center(child: CircularProgressIndicator());
           else if (model.state == ViewState.Intermediate) {
-            if (model.cartList.sum == 0) {
+            if (model.cartList.sum != 0) {
               return ListView(
                 shrinkWrap: true,
                 controller: scrollController,

diff --git a/gogrocy/lib/ui/views/cart/cart_list.dart b/gogrocy/lib/ui/views/cart/cart_list.dart
@@ -52,7 +52,7 @@ class CartList extends StatelessWidget {
                         padding: const EdgeInsets.all(8.0),
                         child: Image(
                           image: NetworkImage(
-                              'https://res.cloudinary.com/gogrocy/image/upload/v1/' +
+                              constants.imageBaseUrl +
                                   usableCartList.cart[index].image),
                           fit: BoxFit.fitWidth,
                         ),

diff --git a/gogrocy/lib/ui/views/product_detail_view.dart b/gogrocy/lib/ui/views/product_detail_view.dart
@@ -32,49 +32,60 @@ class ProductDetailView extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: <Widget>[
-                    Row(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: <Widget>[
-                        GestureDetector(
-                          onTap: () {
-                            Navigator.pop(context);
-                          },
-                          child: Padding(
-                            padding: const EdgeInsets.only(right: 8, top: 4),
-                            child: Icon(
-                              Icons.arrow_back_ios,
-                              size: 14,
+                    Flexible(
+                      flex: 9,
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: <Widget>[
+                          GestureDetector(
+                            onTap: () {
+                              Navigator.pop(context);
+                            },
+                            child: Padding(
+                              padding: const EdgeInsets.only(right: 8, top: 4),
+                              child: Icon(
+                                Icons.arrow_back_ios,
+                                size: 14,
+                              ),
                             ),
                           ),
-                        ),
-                        Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: <Widget>[
-                            Text(
-                              product.name,
-                              style: TextStyle(
-                                  fontWeight: FontWeight.w500, fontSize: 24),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              mainAxisSize: MainAxisSize.min,
+                              children: <Widget>[
+                                Text(
+                                  product.name,
+                                  overflow: TextOverflow.ellipsis,
+                                  maxLines: 2,
+                                  style: TextStyle(
+                                      fontWeight: FontWeight.w500, fontSize: 24),
+                                ),
+                                Text(
+                                  ((product.quantity != "2") ||
+                                          (product.quantity != null)
+                                      ? "In Stock"
+                                      : "Not in stock"),
+                                  style: TextStyle(
+                                      color: colors.PRIMARY_COLOR,
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold),
+                                )
+                              ],
                             ),
-                            Text(
-                              ((product.quantity != "2") ||
-                                      (product.quantity != null)
-                                  ? "In Stock"
-                                  : "Not in stock"),
-                              style: TextStyle(
-                                  color: colors.PRIMARY_COLOR,
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold),
-                            )
-                          ],
-                        ),
-                      ],
+                          ),
+                        ],
+                      ),
                     ),
-                    Text(
-                      '₹ ' + product.price,
-                      style: TextStyle(
-                          color: colors.PRIMARY_COLOR,
-                          fontSize: 20,
-                          fontWeight: FontWeight.bold),
+                    Flexible(
+                      flex: 2,
+                      child: Text(
+                        '₹ ' + product.price,
+                        style: TextStyle(
+                            color: colors.PRIMARY_COLOR,
+                            fontSize: 20,
+                            fontWeight: FontWeight.bold),
+                      ),
                     )
                   ],
                 ),