Merge branch 'master' of http://gitea.a7.kz/dev/aman-kassa-flutter

ios/Runner.xcodeproj/project.pbxproj

@@ -404,7 +404,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -544,7 +544,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -575,7 +575,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1,80 @@
 {
   "images" : [
     {
-      "size" : "20x20",
+      "filename" : "40.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "60.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "29.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "58.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "87.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "80.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "120.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "57.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "57x57"
     },
     {
-      "size" : "60x60",
+      "filename" : "114.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "57x57"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
+      "filename" : "1024.png",
       "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

ios/Runner/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>aman_kassa_flutter</string>
+	<string>Аман Касса</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

lib/widgets/components/ProductListItem.dart

@@ -14,7 +14,7 @@ class ProductListItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: index % 2 == 1 ? fillColor : whiteColor,
+      //color: index % 2 == 1 ? fillColor : whiteColor,
       child: Padding(
         padding: EdgeInsets.symmetric(vertical: 4, horizontal: 4),
         child: Column(
@@ -23,15 +23,21 @@ class ProductListItem extends StatelessWidget {
               children: <Widget>[
                 Expanded(
                   child: Container(
-                      padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4),
-                      child: Text(item.name ?? 'name', style: productTextStyle,)),
+                      padding: const EdgeInsets.symmetric(
+                          vertical: 8, horizontal: 4),
+                      child: Text(
+                        item.name ?? 'name',
+                        style: productTextStyle,
+                      )),
                 ),
                 Expanded(
                   child: Container(
-                      padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4),
+                      padding: const EdgeInsets.symmetric(
+                          vertical: 8, horizontal: 4),
                       child: Text(
                           '${item.price?.toString()} x ${item.count?.toString()} = ${item.total?.toString()}',
-                          textAlign: TextAlign.right, style: productTextStyle)),
+                          textAlign: TextAlign.right,
+                          style: productTextStyle)),
                 )
               ],
             ),
@@ -49,18 +55,20 @@ class ProductListItem extends StatelessWidget {
                         //margin: const EdgeInsets.symmetric(horizontal: 4),
                         child: Row(
                       children: <Widget>[
-                        buildClipRect(primaryColor,Icons.remove, () {
-                          Redux.store.dispatch(counterProductFromKassaItems(index, -1));
+                        buildClipRect(primaryColor, Icons.remove, () {
+                          Redux.store.dispatch(
+                              counterProductFromKassaItems(index, -1));
                         }),
-                        buildClipRect(primaryColor,Icons.add, () {
-                          Redux.store.dispatch(counterProductFromKassaItems(index, 1));
+                        buildClipRect(primaryColor, Icons.add, () {
+                          Redux.store
+                              .dispatch(counterProductFromKassaItems(index, 1));
                         }),
                         Expanded(
-                          child: Container(
-                          ),
+                          child: Container(),
                         ),
-                        buildClipRect(redColor,Icons.close, () {
-                          Redux.store.dispatch(removeProductFromKassaItems(index));
+                        buildClipRect(redColor, Icons.close, () {
+                          Redux.store
+                              .dispatch(removeProductFromKassaItems(index));
                         }),
                       ],
                     )),
@@ -83,18 +91,16 @@ class ProductListItem extends StatelessWidget {
 
   ClipRect buildClipRect(Color color, IconData icon, VoidCallback onPress) {
     return ClipRect(
-                      child: Container(
-                        margin: const EdgeInsets.all(5),
-                        decoration: BoxDecoration(
-                            color: color
-                        ),
-                        height: 35,
-                        width: 35,
-                        child: IconButton(
-                          icon: Icon(icon, color: whiteColor, size: 20),
-                          onPressed: onPress,
-                        ),
-                      ),
-                    );
+      child: Container(
+        margin: const EdgeInsets.all(5),
+        decoration: BoxDecoration(color: color),
+        height: 35,
+        width: 35,
+        child: IconButton(
+          icon: Icon(icon, color: whiteColor, size: 20),
+          onPressed: onPress,
+        ),
+      ),
+    );
   }
 }