Merge pull request #11 from molon/dev

Bumping the version to 0.2.3

.gitignore

@@ -34,8 +34,8 @@ xcuserdata/
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-#Pods/
-#Example/Pods/
+Pods/
+Example/Pods/
 
 # Carthage
 #

Classes/Measurer/UIImageView+MLLayout.m

@@ -31,8 +31,19 @@ - (CGSize)measureWithMLLayout:(MLLayout*)layout width:(CGFloat)width widthMode:(
     CGSize fitSize = [self sizeThatFits:size];
 
     //maybe the fit result is bigger than measure size
-    fitSize.width = fmin(size.width, fitSize.width);
-    fitSize.height = fmin(size.height, fitSize.height);
+    CGFloat ratio = fitSize.width/fitSize.height;
+
+    if (fitSize.width>size.width) {
+        fitSize.width = size.width;
+
+        fitSize.height = fitSize.width/ratio;
+    }
+
+    if (fitSize.height>size.height) {
+        fitSize.height = size.height;
+
+        fitSize.width = fitSize.height*ratio;
+    }
 
     //TODO: maybe the size will be narrowed because of `roundPixelValue`, is it will cannot fit size after narrowed?
     //    size.width = ceil(size.width);

Example/MLLayoutDemo/Assets.xcassets/flex.imageset/Contents.json

@@ -1,9 +1,17 @@
 {
   "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "flex@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/MLLayoutDemo/SimpleViewController.m

@@ -134,6 +134,7 @@ - (void)viewDidLoad {
                          [MLLayout layoutWithTagView:_imageView block:^(MLLayout * _Nonnull l) {
                              //test MLLayoutPositionRelative
                              l.position = MLLayoutPositionRelative;
+                             l.height = 50.0f; //test auto fit width
                              l.bottom = 10.0f;
                          }],
                          bkgViewLayout

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - MLLayout (0.2.1)
+  - MLLayout (0.2.2)
   - SDWebImage (3.8.1):
     - SDWebImage/Core (= 3.8.1)
   - SDWebImage/Core (3.8.1)
@@ -13,7 +13,7 @@ EXTERNAL SOURCES:
     :path: ../MLLayout.podspec
 
 SPEC CHECKSUMS:
-  MLLayout: 6f90f4515bdb29128e43891c4d9585e707dc81f9
+  MLLayout: c260fbc7e77f9ac31ac225b63a4ca0db5c0a62d9
   SDWebImage: 35f9627a3e44b4f292a8a8ce6a531fa488239b91
 
 PODFILE CHECKSUM: 50a97fa6b7a7509873f351bc285fc0a3d99a9826