Merge pull request #29 from Karumi/remana-directory-to-sources-and-pr…

…epare-code-for-the-first-release

Rename sources directory and prepare code for the first release.

BothamUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'BothamUI'
-    s.version = '0.0.1'
+    s.version = '1.0.0'
     s.license = 'Apache V2'
     s.summary = 'Model View Presenter Framework written in Swift'
     s.homepage = 'https://github.com/Karumi/BothamUI'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
 
     s.ios.deployment_target = '8.0'
 
-    s.source_files = 'BothamUI/*.swift'
-	s.resources = ['BothamUI/*.xib']
+    s.source_files = 'Sources/*.swift'
+	s.resources = ['Sources/*.xib']
     s.requires_arc = true
-end
+end

BothamUI.xcodeproj/xcshareddata/xcschemes/BothamUIProject.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

BothamUI.xcodeproj/xcshareddata/xcschemes/BothamUIUnitTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Example.xcodeproj/project.pbxproj

@@ -196,14 +196,14 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		491AFB011C241BDE00F8574D /* Resources */ = {
+		491AFB011C241BDE00F8574D /* Fonts */ = {
 			isa = PBXGroup;
 			children = (
 				EB2DA1C11C299A1D00783B32 /* Gidole-Regular.ttf */,
 				491AFB021C241C1700F8574D /* ManifoldCF-Light.otf */,
 				491AFB031C241C1700F8574D /* ManifoldCF-Regular.otf */,
 			);
-			name = Resources;
+			name = Fonts;
 			sourceTree = "<group>";
 		};
 		6B0737021BFDCE42000E0E7D /* Characters */ = {
@@ -279,7 +279,8 @@
 		6B6B09271BDD1A830013891D /* Example */ = {
 			isa = PBXGroup;
 			children = (
-				491AFB011C241BDE00F8574D /* Resources */,
+				491AFB011C241BDE00F8574D /* Fonts */,
+				6BDE3E181C0392970030EB8B /* Utils */,
 				EB7B641D1C2422D700422325 /* Extensions */,
 				6BDE3DF51BFE0D1A0030EB8B /* Series */,
 				6B0737021BFDCE42000E0E7D /* Characters */,
@@ -290,7 +291,6 @@
 				6BDE3E1E1C04A3290030EB8B /* ExampleViewController.swift */,
 				6B6B092C1BDD1A830013891D /* Main.storyboard */,
 				491AFAFF1C24000B00F8574D /* LaunchScreen.storyboard */,
-				6BDE3E181C0392970030EB8B /* Utils */,
 				6B6B092F1BDD1A830013891D /* Assets.xcassets */,
 				6B6B09341BDD1A830013891D /* Info.plist */,
 			);
@@ -301,14 +301,14 @@
 			isa = PBXGroup;
 			children = (
 				6B8E733E1C11B57C0006F9E1 /* Extensions */,
-				6B82AD421C0743DF009247FB /* Fake */,
+				6B82AD421C0743DF009247FB /* TestDoubles */,
 				6B82AD381C062497009247FB /* ExampleTests.swift */,
 				6B82AD3A1C062497009247FB /* Info.plist */,
 			);
 			path = ExampleTests;
 			sourceTree = "<group>";
 		};
-		6B82AD421C0743DF009247FB /* Fake */ = {
+		6B82AD421C0743DF009247FB /* TestDoubles */ = {
 			isa = PBXGroup;
 			children = (
 				6B82AD401C074322009247FB /* FakeSeriesUI.swift */,
@@ -317,7 +317,7 @@
 				6B82AD501C08B511009247FB /* FakeBothamPullToResfreshUI.swift */,
 				6B8E73381C11AA3F0006F9E1 /* FakeSeriesWireframe.swift */,
 			);
-			name = Fake;
+			name = TestDoubles;
 			sourceTree = "<group>";
 		};
 		6B8E733E1C11B57C0006F9E1 /* Extensions */ = {
@@ -416,13 +416,13 @@
 		EB9A49231C07529200BF4D55 /* ExampleAcceptanceTests */ = {
 			isa = PBXGroup;
 			children = (
+				EB9A49431C076B1600BF4D55 /* AcceptanceTestCase.swift */,
 				EB9A49351C07544B00BF4D55 /* MainViewControllerTests.swift */,
 				EB9A49371C07579100BF4D55 /* Characters */,
 				EB9A493A1C075A5500BF4D55 /* Series */,
 				EB9A492C1C07535E00BF4D55 /* Extensions */,
 				EB9A49261C07529200BF4D55 /* Info.plist */,
 				EB9A49421C07631E00BF4D55 /* ExampleAcceptanceTests-Bridging-Header.h */,
-				EB9A49431C076B1600BF4D55 /* AcceptanceTestCase.swift */,
 			);
 			path = ExampleAcceptanceTests;
 			sourceTree = "<group>";
@@ -864,6 +864,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = BothamUI;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -902,6 +903,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_NAME = BothamUI;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -915,7 +917,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Example/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.karumi.Example;
+				PRODUCT_BUNDLE_IDENTIFIER = com.karumi.bothamui.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -928,7 +930,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Example/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.karumi.Example;
+				PRODUCT_BUNDLE_IDENTIFIER = com.karumi.bothamui.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
 			};

Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Example.xcodeproj/xcshareddata/xcschemes/ExampleAcceptanceTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Example.xcodeproj/xcshareddata/xcschemes/ExampleTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Example.xcodeproj/xcshareddata/xcschemes/ExampleUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -11,23 +11,27 @@
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-40@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-40@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@3x.png",
       "scale" : "3x"
     },
     {

Example/Example/Base.lproj/Main.storyboard

@@ -95,7 +95,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="600" height="374.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3dN-ix-dIs" userLabel="Series Name Label">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3dN-ix-dIs" userLabel="Series Name Label">
                                             <rect key="frame" x="23" y="177.5" width="34.5" height="19.5"/>
                                             <fontDescription key="fontDescription" name="ManifoldCF-Light" family="Manifold CF" pointSize="16"/>
                                             <color key="textColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="calibratedRGB"/>
@@ -194,13 +194,13 @@
                                                 <constraint firstAttribute="height" constant="305" id="qXd-2G-mOk"/>
                                             </constraints>
                                         </imageView>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rating:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xBF-ue-gFw" userLabel="Rating">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Rating:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xBF-ue-gFw" userLabel="Rating">
                                             <rect key="frame" x="20" y="325" width="42" height="17"/>
                                             <fontDescription key="fontDescription" name="Gidole-Regular" family="Gidole" pointSize="15"/>
                                             <color key="textColor" red="0.70196078431372544" green="0.70196078431372544" blue="0.70196078431372544" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="T" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0j3-WL-IHg" userLabel="Rating Label">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="T" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0j3-WL-IHg" userLabel="Rating Label">
                                             <rect key="frame" x="67" y="325" width="7.5" height="17"/>
                                             <accessibility key="accessibilityConfiguration" label="RatingLabel"/>
                                             <fontDescription key="fontDescription" name="Gidole-Regular" family="Gidole" pointSize="15"/>

Example/Example/CharactersPresenter.swift

@@ -49,7 +49,7 @@ class CharactersPresenter: BothamPresenter, BothamPullToRefreshPresenter {
             Character(name: "BlackPanther", thumbnail: NSURL(string: "https://i.annihil.us/u/prod/marvel/i/mg/9/03/537ba26276348.jpg")!),
             ])
 
-        self.ui?.wilEndRefreshing()
+        self.ui?.stopRefreshing()
     }
 
     private func loadItems(items: [Character]) {

Example/Example/ExampleViewController.swift

@@ -11,8 +11,8 @@ import BothamUI
 
 class ExampleViewController: BothamViewController, BothamLoadingViewController, BothamPullToRefresh {
 
-    let currentLoadingView: UIView = {
-        let loadingView = LoadingView()
+    let loadingView: UIView = {
+        let loadingView = BothamLoadingView()
         loadingView.color = UIColor.loadingColor
         return loadingView
     }()

Example/Example/Info.plist

@@ -2,13 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-	<key>UIAppFonts</key>
-	<array>
-		<string>ManifoldCF-Light.otf</string>
-		<string>ManifoldCF-Regular.otf</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,6 +22,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>ManifoldCF-Light.otf</string>
+		<string>ManifoldCF-Regular.otf</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -50,5 +48,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>

Example/ExampleTests/FakeBothamPullToResfreshUI.swift

@@ -14,7 +14,7 @@ protocol FakeBothamPullToResfreshUI: BothamPullToResfreshUI {
 }
 
 extension FakeBothamPullToResfreshUI {
-    func wilEndRefreshing() {
+    func stopRefreshing() {
         didRefresh = true
     }
 }