merger two demo

qcxl · Mar 25, 2016 · 5efc2e9 · 5efc2e9
1 parent cc7dc5b
commit 5efc2e9
Show file tree

Hide file tree

Showing 50 changed files with 17 additions and 12 deletions.
diff --git a/Images/11.gif b/Images/11.gif
diff --git a/Images/11.mov b/Images/11.mov
diff --git a/LPSolarSystemDemo b/LPSolarSystemDemo
diff --git a/README.md b/README.md
@@ -5,47 +5,51 @@
 [![SUPPORT](https://img.shields.io/badge/support-iOS%207%2B%20-blue.svg?style=flat)](https://en.wikipedia.org/wiki/IOS_7)&nbsp;
 [![BLOG](https://img.shields.io/badge/blog-xuyafei.cn-orange.svg?style=flat)](http://xuyafei.cn)&nbsp;
 
-学习UIKitDynamics时做的Demo，把UIKitDynamics的所有Behavior都实践了下，还有三个实际场景的应用。（部分图片由于GIF帧数过低，动效没有显示）
+学习UIKitDynamics时做的Demo，把UIKitDynamics的所有Behavior都进行了实践，还有三个实际场景的应用，和一个独立项目。
 
-同时还用Dynamics模拟太阳系做了个随机数生成器[LPSolarSystem](https://github.com/xiaofei86/LPSolarSystem)。
+#独立项目（LPSolarSystem）
 
-#重力行为（UIGravityBehavior）
+独立项目使用UIKitDynamics模拟太阳系制作随机数生成器。图片由于GIF帧数过低，效果很差，可以在[这里](https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/11.mov)下载视频或者运行Demo观看。
+
+<img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/11.gif">
+
+##重力行为（UIGravityBehavior）
 [图片备用链接](http://g.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=9090b90bc81b9d168ec79969c3e5c5b2/a8773912b31bb0511e4f98fc307adab44bede0ff.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/1.gif">
-#碰撞行为（UICollisionBehavior）
+##碰撞行为（UICollisionBehavior）
 [图片备用链接](http://d.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=8902b8faaed3fd1f3209a13200755422/63d0f703918fa0ec03734fd9209759ee3c6ddba9.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/2.gif">
-#连接行为（UIAttachmentBehavior）
+##连接行为（UIAttachmentBehavior）
 [图片备用链接](http://g.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=9ed898fc307adab439d0184bbbefc221/8435e5dde71190ef1007b90bc81b9d16fcfa6061.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/3.gif">
-#吸附行为（UISnapBehavior）
+##吸附行为（UISnapBehavior）
 [图片备用链接](http://g.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=627e8a0af61f3a295ec8d6c6a91ecd0c/4bed2e738bd4b31c692bbf6f81d6277f9f2ff8cb.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/4.gif">
-#推动行为（UIPushBehavior）
+##推动行为（UIPushBehavior）
 [图片备用链接](http://a.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=82d0f7b4332ac65c6305657bcbc9c32c/80cb39dbb6fd5266684117c0ad18972bd50736ff.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/5.gif">
-#仿真行为（UIDynamicItemBehavior）
+##仿真行为（UIDynamicItemBehavior）
 [图片备用链接](http://g.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=62de8a0af61f3a295ec8d6c6a91ecd0c/4bed2e738bd4b31c698bbf6f81d6277f9f2ff8ab.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/6.gif">
-#综合应用（UIPendulumViewController）
+##综合应用（UIPendulumViewController）
 [图片备用链接](http://h.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=65edcef20f24ab18e416e23f05c197f0/14ce36d3d539b6000d782463ef50352ac75cb7ab.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/7.gif">
-#场景应用（UIPhotoWallViewController）
+##场景应用（UIPhotoWallViewController）
 [图片备用链接](http://b.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=35cd70e21b950a7b71354dcc3aea13e4/bd315c6034a85edff474d5f74f540923dc54756d.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/8.gif">
-#场景应用（UITransformViewController）
+##场景应用（UITransformViewController）
 [图片备用链接](http://g.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=d07917139652982201333acbe7f10af6/241f95cad1c8a7865f4d61da6109c93d71cf50fa.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/9.gif">
-#场景应用（UIAlertViewController）
+##场景应用（UIAlertViewController）
 [图片备用链接](http://g.picphotos.baidu.com/album/s%3D680%3Bq%3D90/sign=9e4298fc307adab439d0184bbbefc221/8435e5dde71190ef109db90bc81b9d16fcfa60fb.jpg)
 
 <img src = "https://github.com/xiaofei86/UIKit-Dynamics/raw/master/Images/10.gif">

diff --git a/UIKit Dynamics.xcodeproj/project.pbxproj → .../UIKit Dynamics.xcodeproj/project.pbxproj b/UIKit Dynamics.xcodeproj/project.pbxproj → .../UIKit Dynamics.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/UIKit Dynamics/AppDelegate.h → ...tDynamicDemo/UIKit Dynamics/AppDelegate.h b/UIKit Dynamics/AppDelegate.h → ...tDynamicDemo/UIKit Dynamics/AppDelegate.h
diff --git a/UIKit Dynamics/AppDelegate.m → ...tDynamicDemo/UIKit Dynamics/AppDelegate.m b/UIKit Dynamics/AppDelegate.m → ...tDynamicDemo/UIKit Dynamics/AppDelegate.m
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...cassets/AppIcon.appiconset/[email protected] → ...cassets/AppIcon.appiconset/[email protected] b/...cassets/AppIcon.appiconset/[email protected] → ...cassets/AppIcon.appiconset/[email protected]
diff --git a/...cassets/AppIcon.appiconset/[email protected] → ...cassets/AppIcon.appiconset/[email protected] b/...cassets/AppIcon.appiconset/[email protected] → ...cassets/AppIcon.appiconset/[email protected]
diff --git a/...cassets/AppIcon.appiconset/[email protected] → ...cassets/AppIcon.appiconset/[email protected] b/...cassets/AppIcon.appiconset/[email protected] → ...cassets/AppIcon.appiconset/[email protected]
diff --git a/...cassets/AppIcon.appiconset/[email protected] → ...cassets/AppIcon.appiconset/[email protected] b/...cassets/AppIcon.appiconset/[email protected] → ...cassets/AppIcon.appiconset/[email protected]
diff --git a/...sets/AppIcon.appiconset/[email protected] → ...sets/AppIcon.appiconset/[email protected] b/...sets/AppIcon.appiconset/[email protected] → ...sets/AppIcon.appiconset/[email protected]
diff --git a/...sets/AppIcon.appiconset/[email protected] → ...sets/AppIcon.appiconset/[email protected] b/...sets/AppIcon.appiconset/[email protected] → ...sets/AppIcon.appiconset/[email protected]
diff --git a/...sets/BrandAsset.launchimage/Contents.json → ...sets/BrandAsset.launchimage/Contents.json b/...sets/BrandAsset.launchimage/Contents.json → ...sets/BrandAsset.launchimage/Contents.json
diff --git a/...sset.launchimage/LaunchImage1240x2208.png → ...sset.launchimage/LaunchImage1240x2208.png b/...sset.launchimage/LaunchImage1240x2208.png → ...sset.launchimage/LaunchImage1240x2208.png
diff --git a/...Asset.launchimage/LaunchImage640x1136.png → ...Asset.launchimage/LaunchImage640x1136.png b/...Asset.launchimage/LaunchImage640x1136.png → ...Asset.launchimage/LaunchImage640x1136.png
diff --git a/...dAsset.launchimage/LaunchImage640x960.png → ...dAsset.launchimage/LaunchImage640x960.png b/...dAsset.launchimage/LaunchImage640x960.png → ...dAsset.launchimage/LaunchImage640x960.png
diff --git a/...Asset.launchimage/LaunchImage750x1334.png → ...Asset.launchimage/LaunchImage750x1334.png b/...Asset.launchimage/LaunchImage750x1334.png → ...Asset.launchimage/LaunchImage750x1334.png
diff --git a/UIKit Dynamics/Info.plist → UIKitDynamicDemo/UIKit Dynamics/Info.plist b/UIKit Dynamics/Info.plist → UIKitDynamicDemo/UIKit Dynamics/Info.plist
diff --git a/...UIDynamicBehavior/UIAlertViewController.h → ...UIDynamicBehavior/UIAlertViewController.h b/...UIDynamicBehavior/UIAlertViewController.h → ...UIDynamicBehavior/UIAlertViewController.h
diff --git a/...UIDynamicBehavior/UIAlertViewController.m → ...UIDynamicBehavior/UIAlertViewController.m b/...UIDynamicBehavior/UIAlertViewController.m → ...UIDynamicBehavior/UIAlertViewController.m
diff --git a/...vior/UIAttachmentBehaviorViewController.h → ...vior/UIAttachmentBehaviorViewController.h b/...vior/UIAttachmentBehaviorViewController.h → ...vior/UIAttachmentBehaviorViewController.h
diff --git a/...vior/UIAttachmentBehaviorViewController.m → ...vior/UIAttachmentBehaviorViewController.m b/...vior/UIAttachmentBehaviorViewController.m → ...vior/UIAttachmentBehaviorViewController.m
diff --git a/...cBehavior/UICollectionViewDynamicLayout.h → ...cBehavior/UICollectionViewDynamicLayout.h b/...cBehavior/UICollectionViewDynamicLayout.h → ...cBehavior/UICollectionViewDynamicLayout.h
diff --git a/...cBehavior/UICollectionViewDynamicLayout.m → ...cBehavior/UICollectionViewDynamicLayout.m b/...cBehavior/UICollectionViewDynamicLayout.m → ...cBehavior/UICollectionViewDynamicLayout.m
diff --git a/...avior/UICollisionBehaviorViewController.h → ...avior/UICollisionBehaviorViewController.h b/...avior/UICollisionBehaviorViewController.h → ...avior/UICollisionBehaviorViewController.h
diff --git a/...avior/UICollisionBehaviorViewController.m → ...avior/UICollisionBehaviorViewController.m b/...avior/UICollisionBehaviorViewController.m → ...avior/UICollisionBehaviorViewController.m
diff --git a/...ior/UIDynamicItemBehaviorViewController.h → ...ior/UIDynamicItemBehaviorViewController.h b/...ior/UIDynamicItemBehaviorViewController.h → ...ior/UIDynamicItemBehaviorViewController.h
diff --git a/...ior/UIDynamicItemBehaviorViewController.m → ...ior/UIDynamicItemBehaviorViewController.m b/...ior/UIDynamicItemBehaviorViewController.m → ...ior/UIDynamicItemBehaviorViewController.m
diff --git a/...ehavior/UIGravityBehaviorViewController.h → ...ehavior/UIGravityBehaviorViewController.h b/...ehavior/UIGravityBehaviorViewController.h → ...ehavior/UIGravityBehaviorViewController.h
diff --git a/...ehavior/UIGravityBehaviorViewController.m → ...ehavior/UIGravityBehaviorViewController.m b/...ehavior/UIGravityBehaviorViewController.m → ...ehavior/UIGravityBehaviorViewController.m
diff --git a/...ynamicBehavior/UIPendulumViewController.h → ...ynamicBehavior/UIPendulumViewController.h b/...ynamicBehavior/UIPendulumViewController.h → ...ynamicBehavior/UIPendulumViewController.h
diff --git a/...ynamicBehavior/UIPendulumViewController.m → ...ynamicBehavior/UIPendulumViewController.m b/...ynamicBehavior/UIPendulumViewController.m → ...ynamicBehavior/UIPendulumViewController.m
diff --git a/...namicBehavior/UIPhotoWallViewController.h → ...namicBehavior/UIPhotoWallViewController.h b/...namicBehavior/UIPhotoWallViewController.h → ...namicBehavior/UIPhotoWallViewController.h
diff --git a/...namicBehavior/UIPhotoWallViewController.m → ...namicBehavior/UIPhotoWallViewController.m b/...namicBehavior/UIPhotoWallViewController.m → ...namicBehavior/UIPhotoWallViewController.m
diff --git a/...icBehavior/UIPushBehaviorViewController.h → ...icBehavior/UIPushBehaviorViewController.h b/...icBehavior/UIPushBehaviorViewController.h → ...icBehavior/UIPushBehaviorViewController.h
diff --git a/...icBehavior/UIPushBehaviorViewController.m → ...icBehavior/UIPushBehaviorViewController.m b/...icBehavior/UIPushBehaviorViewController.m → ...icBehavior/UIPushBehaviorViewController.m
diff --git a/...icBehavior/UISnapBehaviorViewController.h → ...icBehavior/UISnapBehaviorViewController.h b/...icBehavior/UISnapBehaviorViewController.h → ...icBehavior/UISnapBehaviorViewController.h
diff --git a/...icBehavior/UISnapBehaviorViewController.m → ...icBehavior/UISnapBehaviorViewController.m b/...icBehavior/UISnapBehaviorViewController.m → ...icBehavior/UISnapBehaviorViewController.m
diff --git a/...namicBehavior/UITransformViewController.h → ...namicBehavior/UITransformViewController.h b/...namicBehavior/UITransformViewController.h → ...namicBehavior/UITransformViewController.h
diff --git a/...namicBehavior/UITransformViewController.m → ...namicBehavior/UITransformViewController.m b/...namicBehavior/UITransformViewController.m → ...namicBehavior/UITransformViewController.m
diff --git a/UIKit Dynamics/ViewController.h → ...namicDemo/UIKit Dynamics/ViewController.h b/UIKit Dynamics/ViewController.h → ...namicDemo/UIKit Dynamics/ViewController.h
diff --git a/UIKit Dynamics/ViewController.m → ...namicDemo/UIKit Dynamics/ViewController.m b/UIKit Dynamics/ViewController.m → ...namicDemo/UIKit Dynamics/ViewController.m
diff --git a/UIKit Dynamics/main.m → UIKitDynamicDemo/UIKit Dynamics/main.m b/UIKit Dynamics/main.m → UIKitDynamicDemo/UIKit Dynamics/main.m
diff --git a/UIKit DynamicsTests/Info.plist → ...ynamicDemo/UIKit DynamicsTests/Info.plist b/UIKit DynamicsTests/Info.plist → ...ynamicDemo/UIKit DynamicsTests/Info.plist
diff --git a/UIKit DynamicsTests/UIKit_DynamicsTests.m → ...UIKit DynamicsTests/UIKit_DynamicsTests.m b/UIKit DynamicsTests/UIKit_DynamicsTests.m → ...UIKit DynamicsTests/UIKit_DynamicsTests.m
diff --git a/UIKit DynamicsUITests/Info.plist → ...amicDemo/UIKit DynamicsUITests/Info.plist b/UIKit DynamicsUITests/Info.plist → ...amicDemo/UIKit DynamicsUITests/Info.plist
diff --git a/...t DynamicsUITests/UIKit_DynamicsUITests.m → ...t DynamicsUITests/UIKit_DynamicsUITests.m b/...t DynamicsUITests/UIKit_DynamicsUITests.m → ...t DynamicsUITests/UIKit_DynamicsUITests.m