Merge pull request #2 from hryk224/feature/refact

Refact, Updated example
hryk224 · May 10, 2016 · 1661dd3 · 1661dd3
2 parents b6f32b6 + 221ab73
commit 1661dd3
Show file tree

Hide file tree

Showing 44 changed files with 541 additions and 414 deletions.
diff --git a/Bottomsheet/Bottomsheet.swift b/Bottomsheet/Bottomsheet.swift
diff --git a/Example/Example/Assets.xcassets/0.imageset/0.jpg b/Example/Example/Assets.xcassets/0.imageset/0.jpg
diff --git a/Example/Example/Assets.xcassets/0.imageset/0@2x.jpg b/Example/Example/Assets.xcassets/0.imageset/0@2x.jpg
diff --git a/Example/Example/Assets.xcassets/0.imageset/0@3x.jpg b/Example/Example/Assets.xcassets/0.imageset/0@3x.jpg
diff --git a/Example/Example/Assets.xcassets/0.imageset/Contents.json b/Example/Example/Assets.xcassets/0.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "0.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "0@2x.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "0@3x.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/1.imageset/1.jpg b/Example/Example/Assets.xcassets/1.imageset/1.jpg
diff --git a/Example/Example/Assets.xcassets/1.imageset/1@2x-1.jpg b/Example/Example/Assets.xcassets/1.imageset/1@2x-1.jpg
diff --git a/Example/Example/Assets.xcassets/1.imageset/1@3x-1.jpg b/Example/Example/Assets.xcassets/1.imageset/1@3x-1.jpg
diff --git a/Example/Example/Assets.xcassets/1.imageset/Contents.json b/Example/Example/Assets.xcassets/1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "1.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "1@2x-1.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "1@3x-1.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/2.imageset/2-1.jpg b/Example/Example/Assets.xcassets/2.imageset/2-1.jpg
diff --git a/Example/Example/Assets.xcassets/2.imageset/2-2.jpg b/Example/Example/Assets.xcassets/2.imageset/2-2.jpg
diff --git a/Example/Example/Assets.xcassets/2.imageset/2.jpg b/Example/Example/Assets.xcassets/2.imageset/2.jpg
diff --git a/Example/Example/Assets.xcassets/2.imageset/Contents.json b/Example/Example/Assets.xcassets/2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "2.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "2-1.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "2-2.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/3.imageset/3-1.jpg b/Example/Example/Assets.xcassets/3.imageset/3-1.jpg
diff --git a/Example/Example/Assets.xcassets/3.imageset/3-2.jpg b/Example/Example/Assets.xcassets/3.imageset/3-2.jpg
diff --git a/Example/Example/Assets.xcassets/3.imageset/3.jpg b/Example/Example/Assets.xcassets/3.imageset/3.jpg
diff --git a/Example/Example/Assets.xcassets/3.imageset/Contents.json b/Example/Example/Assets.xcassets/3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "3-1.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "3-2.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "3.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/4.imageset/4-1.jpg b/Example/Example/Assets.xcassets/4.imageset/4-1.jpg
diff --git a/Example/Example/Assets.xcassets/4.imageset/4-2.jpg b/Example/Example/Assets.xcassets/4.imageset/4-2.jpg
diff --git a/Example/Example/Assets.xcassets/4.imageset/4.jpg b/Example/Example/Assets.xcassets/4.imageset/4.jpg
diff --git a/Example/Example/Assets.xcassets/4.imageset/Contents.json b/Example/Example/Assets.xcassets/4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "4-1.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "4-2.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "4.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/5.imageset/5-1.jpg b/Example/Example/Assets.xcassets/5.imageset/5-1.jpg
diff --git a/Example/Example/Assets.xcassets/5.imageset/5-2.jpg b/Example/Example/Assets.xcassets/5.imageset/5-2.jpg
diff --git a/Example/Example/Assets.xcassets/5.imageset/5.jpg b/Example/Example/Assets.xcassets/5.imageset/5.jpg
diff --git a/Example/Example/Assets.xcassets/5.imageset/Contents.json b/Example/Example/Assets.xcassets/5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "5-2.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "5-1.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "5.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/6.imageset/6-1.jpg b/Example/Example/Assets.xcassets/6.imageset/6-1.jpg
diff --git a/Example/Example/Assets.xcassets/6.imageset/6-2.jpg b/Example/Example/Assets.xcassets/6.imageset/6-2.jpg
diff --git a/Example/Example/Assets.xcassets/6.imageset/6-3.jpg b/Example/Example/Assets.xcassets/6.imageset/6-3.jpg
diff --git a/Example/Example/Assets.xcassets/6.imageset/Contents.json b/Example/Example/Assets.xcassets/6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "6-3.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "6-1.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "6-2.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/7.imageset/7-1.jpg b/Example/Example/Assets.xcassets/7.imageset/7-1.jpg
diff --git a/Example/Example/Assets.xcassets/7.imageset/7-2.jpg b/Example/Example/Assets.xcassets/7.imageset/7-2.jpg
diff --git a/Example/Example/Assets.xcassets/7.imageset/7.jpg b/Example/Example/Assets.xcassets/7.imageset/7.jpg
diff --git a/Example/Example/Assets.xcassets/7.imageset/Contents.json b/Example/Example/Assets.xcassets/7.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "7-2.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "7-1.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "7.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/8.imageset/8-1.jpg b/Example/Example/Assets.xcassets/8.imageset/8-1.jpg
diff --git a/Example/Example/Assets.xcassets/8.imageset/8-2.jpg b/Example/Example/Assets.xcassets/8.imageset/8-2.jpg
diff --git a/Example/Example/Assets.xcassets/8.imageset/8.jpg b/Example/Example/Assets.xcassets/8.imageset/8.jpg
diff --git a/Example/Example/Assets.xcassets/8.imageset/Contents.json b/Example/Example/Assets.xcassets/8.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "8-2.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "8-1.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "8.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Assets.xcassets/9.imageset/9-1.jpg b/Example/Example/Assets.xcassets/9.imageset/9-1.jpg
diff --git a/Example/Example/Assets.xcassets/9.imageset/9-2.jpg b/Example/Example/Assets.xcassets/9.imageset/9-2.jpg
diff --git a/Example/Example/Assets.xcassets/9.imageset/9.jpg b/Example/Example/Assets.xcassets/9.imageset/9.jpg
diff --git a/Example/Example/Assets.xcassets/9.imageset/Contents.json b/Example/Example/Assets.xcassets/9.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "9-2.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "9-1.jpg",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "9.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="K90-SU-uSn">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="K90-SU-uSn">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->