diff --git a/Tablet.xcworkspace/contents.xcworkspacedata b/Tablet.xcworkspace/contents.xcworkspacedata index 64eb7dc..8a2fad4 100644 --- a/Tablet.xcworkspace/contents.xcworkspacedata +++ b/Tablet.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate index ecbfcfa..1fef06b 100644 Binary files a/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate and b/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Tablet/TableDirector.swift b/Tablet/TableDirector.swift index d3a356b..1c5013d 100644 --- a/Tablet/TableDirector.swift +++ b/Tablet/TableDirector.swift @@ -85,7 +85,7 @@ public class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate } public extension TableDirector { - + // MARK: UITableViewDataSource - configuration func numberOfSectionsInTableView(tableView: UITableView) -> Int { diff --git a/Tablet/Tablet.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/Tablet/Tablet.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate index 7e3b132..fbea635 100644 Binary files a/Tablet/Tablet.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate and b/Tablet/Tablet.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TabletDemo/Classes/Presentation/Main/ViewControllers/MainViewController.swift b/TabletDemo/Classes/Presentation/Main/ViewControllers/MainViewController.swift index 6677dd7..3831c57 100644 --- a/TabletDemo/Classes/Presentation/Main/ViewControllers/MainViewController.swift +++ b/TabletDemo/Classes/Presentation/Main/ViewControllers/MainViewController.swift @@ -8,6 +8,7 @@ import Foundation import UIKit +import Tablet class MainViewController : UITableViewController { diff --git a/TabletDemo/TabletDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/TabletDemo/Resources/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from TabletDemo/TabletDemo/Assets.xcassets/AppIcon.appiconset/Contents.json rename to TabletDemo/Resources/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/TabletDemo/TabletDemo/Info.plist b/TabletDemo/Resources/Info.plist similarity index 100% rename from TabletDemo/TabletDemo/Info.plist rename to TabletDemo/Resources/Info.plist diff --git a/TabletDemo/Resources/Storyboards/LaunchScreen.storyboard b/TabletDemo/Resources/Storyboards/LaunchScreen.storyboard index ffacbd6..c9b7564 100644 --- a/TabletDemo/Resources/Storyboards/LaunchScreen.storyboard +++ b/TabletDemo/Resources/Storyboards/LaunchScreen.storyboard @@ -1,8 +1,8 @@ - + - + @@ -16,7 +16,6 @@ - diff --git a/TabletDemo/Resources/Storyboards/Main.storyboard b/TabletDemo/Resources/Storyboards/Main.storyboard index d299801..2cf7895 100644 --- a/TabletDemo/Resources/Storyboards/Main.storyboard +++ b/TabletDemo/Resources/Storyboards/Main.storyboard @@ -5,99 +5,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -107,7 +14,7 @@ - + @@ -125,25 +32,7 @@ - - - - - - - - - - - - - - - - - - - + @@ -161,7 +50,7 @@ - + diff --git a/TabletDemo/TabletDemo.xcodeproj/project.pbxproj b/TabletDemo/TabletDemo.xcodeproj/project.pbxproj index 4d8e6af..4d330c4 100644 --- a/TabletDemo/TabletDemo.xcodeproj/project.pbxproj +++ b/TabletDemo/TabletDemo.xcodeproj/project.pbxproj @@ -7,54 +7,21 @@ objects = { /* Begin PBXBuildFile section */ - 508B71841BF48DD300272920 /* TableSectionBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508B71831BF48DD300272920 /* TableSectionBuilder.swift */; }; - 508B71861BF48E0D00272920 /* TableRowBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508B71851BF48E0D00272920 /* TableRowBuilder.swift */; }; - DA1BCD0F1BF5472C00CC0479 /* TableDirector.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA1BCD0E1BF5472C00CC0479 /* TableDirector.swift */; }; - DA1BCD111BF7388C00CC0479 /* CustomTableActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA1BCD101BF7388C00CC0479 /* CustomTableActions.swift */; }; - DAB7EB2D1BEF787300D2AD5E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB7EB2C1BEF787300D2AD5E /* ViewController.swift */; }; - DAB7EB321BEF787300D2AD5E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DAB7EB311BEF787300D2AD5E /* Assets.xcassets */; }; - DAB7EB3E1BEF78A400D2AD5E /* Tablet.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB7EB3D1BEF78A400D2AD5E /* Tablet.swift */; }; - DAB7EB401BEFD07E00D2AD5E /* ConfigurableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB7EB3F1BEFD07E00D2AD5E /* ConfigurableTableViewCell.swift */; }; DAC2D5CA1C9D303E009E9C19 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAC2D5C91C9D303E009E9C19 /* AppDelegate.swift */; }; DAC2D5CF1C9D30A7009E9C19 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DAC2D5CD1C9D30A7009E9C19 /* Main.storyboard */; }; DAC2D5D01C9D30A7009E9C19 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DAC2D5CE1C9D30A7009E9C19 /* LaunchScreen.storyboard */; }; DAC2D5D41C9D3118009E9C19 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAC2D5D31C9D3118009E9C19 /* MainViewController.swift */; }; - DAC2D5E61C9D6493009E9C19 /* TabletTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAC2D5D61C9D638F009E9C19 /* TabletTests.swift */; }; - DAED08F11C14DE7E006C04D8 /* MyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAED08F01C14DE7E006C04D8 /* MyTableViewCell.swift */; }; - DAF003961C14DC0C0028C3D6 /* MyNibTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAF003951C14DC0C0028C3D6 /* MyNibTableViewCell.swift */; }; - DAF003981C14DC250028C3D6 /* MyNibTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAF003971C14DC250028C3D6 /* MyNibTableViewCell.xib */; }; + DAC2D69C1C9E75E3009E9C19 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DAC2D69B1C9E75E3009E9C19 /* Assets.xcassets */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - DAC2D5E11C9D6433009E9C19 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DAB7EB1F1BEF787300D2AD5E /* Project object */; - proxyType = 1; - remoteGlobalIDString = DAB7EB261BEF787300D2AD5E; - remoteInfo = TabletDemo; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ - 508B71831BF48DD300272920 /* TableSectionBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableSectionBuilder.swift; sourceTree = ""; }; - 508B71851BF48E0D00272920 /* TableRowBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableRowBuilder.swift; sourceTree = ""; }; - DA1BCD0E1BF5472C00CC0479 /* TableDirector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableDirector.swift; sourceTree = ""; }; - DA1BCD101BF7388C00CC0479 /* CustomTableActions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTableActions.swift; sourceTree = ""; }; DAB7EB271BEF787300D2AD5E /* TabletDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TabletDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; - DAB7EB2C1BEF787300D2AD5E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - DAB7EB311BEF787300D2AD5E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - DAB7EB361BEF787300D2AD5E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - DAB7EB3D1BEF78A400D2AD5E /* Tablet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tablet.swift; sourceTree = ""; }; - DAB7EB3F1BEFD07E00D2AD5E /* ConfigurableTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurableTableViewCell.swift; sourceTree = ""; }; DAC2D5C91C9D303E009E9C19 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; DAC2D5CD1C9D30A7009E9C19 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; DAC2D5CE1C9D30A7009E9C19 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; DAC2D5D31C9D3118009E9C19 /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; - DAC2D5D61C9D638F009E9C19 /* TabletTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabletTests.swift; sourceTree = ""; }; - DAC2D5DC1C9D6433009E9C19 /* TabletTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TabletTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - DAED08F01C14DE7E006C04D8 /* MyTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyTableViewCell.swift; sourceTree = ""; }; - DAF003951C14DC0C0028C3D6 /* MyNibTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyNibTableViewCell.swift; sourceTree = ""; }; - DAF003971C14DC250028C3D6 /* MyNibTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyNibTableViewCell.xib; sourceTree = ""; }; + DAC2D69B1C9E75E3009E9C19 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + DAC2D69D1C9E78B5009E9C19 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -65,24 +32,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DAC2D5D91C9D6433009E9C19 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ DAB7EB1E1BEF787300D2AD5E = { isa = PBXGroup; children = ( - DAB7EB3C1BEF789500D2AD5E /* Tablet */, DAC2D5C61C9D2FE5009E9C19 /* Classes */, DAC2D5CB1C9D3058009E9C19 /* Resources */, - DAC2D5D51C9D635F009E9C19 /* Tests */, - DAB7EB291BEF787300D2AD5E /* TabletDemo */, DAB7EB281BEF787300D2AD5E /* Products */, ); sourceTree = ""; @@ -91,46 +48,10 @@ isa = PBXGroup; children = ( DAB7EB271BEF787300D2AD5E /* TabletDemo.app */, - DAC2D5DC1C9D6433009E9C19 /* TabletTests.xctest */, ); name = Products; sourceTree = ""; }; - DAB7EB291BEF787300D2AD5E /* TabletDemo */ = { - isa = PBXGroup; - children = ( - DAC2D5C41C9D2F5C009E9C19 /* Presentation */, - DAB7EB2C1BEF787300D2AD5E /* ViewController.swift */, - DAB7EB3F1BEFD07E00D2AD5E /* ConfigurableTableViewCell.swift */, - DA1BCD101BF7388C00CC0479 /* CustomTableActions.swift */, - DAF003951C14DC0C0028C3D6 /* MyNibTableViewCell.swift */, - DAF003971C14DC250028C3D6 /* MyNibTableViewCell.xib */, - DAED08F01C14DE7E006C04D8 /* MyTableViewCell.swift */, - DAB7EB311BEF787300D2AD5E /* Assets.xcassets */, - DAB7EB361BEF787300D2AD5E /* Info.plist */, - ); - path = TabletDemo; - sourceTree = ""; - }; - DAB7EB3C1BEF789500D2AD5E /* Tablet */ = { - isa = PBXGroup; - children = ( - DAB7EB3D1BEF78A400D2AD5E /* Tablet.swift */, - DA1BCD0E1BF5472C00CC0479 /* TableDirector.swift */, - 508B71851BF48E0D00272920 /* TableRowBuilder.swift */, - 508B71831BF48DD300272920 /* TableSectionBuilder.swift */, - ); - name = Tablet; - path = ../Tablet; - sourceTree = ""; - }; - DAC2D5C41C9D2F5C009E9C19 /* Presentation */ = { - isa = PBXGroup; - children = ( - ); - name = Presentation; - sourceTree = ""; - }; DAC2D5C61C9D2FE5009E9C19 /* Classes */ = { isa = PBXGroup; children = ( @@ -159,6 +80,8 @@ DAC2D5CB1C9D3058009E9C19 /* Resources */ = { isa = PBXGroup; children = ( + DAC2D69D1C9E78B5009E9C19 /* Info.plist */, + DAC2D69A1C9E75BE009E9C19 /* Assets */, DAC2D5CC1C9D306C009E9C19 /* Storyboards */, ); path = Resources; @@ -189,13 +112,12 @@ path = ViewControllers; sourceTree = ""; }; - DAC2D5D51C9D635F009E9C19 /* Tests */ = { + DAC2D69A1C9E75BE009E9C19 /* Assets */ = { isa = PBXGroup; children = ( - DAC2D5D61C9D638F009E9C19 /* TabletTests.swift */, + DAC2D69B1C9E75E3009E9C19 /* Assets.xcassets */, ); - name = Tests; - path = ../Tests; + path = Assets; sourceTree = ""; }; /* End PBXGroup section */ @@ -218,24 +140,6 @@ productReference = DAB7EB271BEF787300D2AD5E /* TabletDemo.app */; productType = "com.apple.product-type.application"; }; - DAC2D5DB1C9D6433009E9C19 /* TabletTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = DAC2D5E31C9D6433009E9C19 /* Build configuration list for PBXNativeTarget "TabletTests" */; - buildPhases = ( - DAC2D5D81C9D6433009E9C19 /* Sources */, - DAC2D5D91C9D6433009E9C19 /* Frameworks */, - DAC2D5DA1C9D6433009E9C19 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - DAC2D5E21C9D6433009E9C19 /* PBXTargetDependency */, - ); - name = TabletTests; - productName = TabletTests; - productReference = DAC2D5DC1C9D6433009E9C19 /* TabletTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -250,10 +154,6 @@ CreatedOnToolsVersion = 7.0.1; DevelopmentTeam = Z48R734SJX; }; - DAC2D5DB1C9D6433009E9C19 = { - CreatedOnToolsVersion = 7.2; - TestTargetID = DAB7EB261BEF787300D2AD5E; - }; }; }; buildConfigurationList = DAB7EB221BEF787300D2AD5E /* Build configuration list for PBXProject "TabletDemo" */; @@ -270,7 +170,6 @@ projectRoot = ""; targets = ( DAB7EB261BEF787300D2AD5E /* TabletDemo */, - DAC2D5DB1C9D6433009E9C19 /* TabletTests */, ); }; /* End PBXProject section */ @@ -282,15 +181,7 @@ files = ( DAC2D5CF1C9D30A7009E9C19 /* Main.storyboard in Resources */, DAC2D5D01C9D30A7009E9C19 /* LaunchScreen.storyboard in Resources */, - DAF003981C14DC250028C3D6 /* MyNibTableViewCell.xib in Resources */, - DAB7EB321BEF787300D2AD5E /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DAC2D5DA1C9D6433009E9C19 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( + DAC2D69C1C9E75E3009E9C19 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -301,38 +192,13 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 508B71841BF48DD300272920 /* TableSectionBuilder.swift in Sources */, DAC2D5D41C9D3118009E9C19 /* MainViewController.swift in Sources */, - DAB7EB2D1BEF787300D2AD5E /* ViewController.swift in Sources */, - DAB7EB3E1BEF78A400D2AD5E /* Tablet.swift in Sources */, - DAED08F11C14DE7E006C04D8 /* MyTableViewCell.swift in Sources */, - DAF003961C14DC0C0028C3D6 /* MyNibTableViewCell.swift in Sources */, - 508B71861BF48E0D00272920 /* TableRowBuilder.swift in Sources */, - DA1BCD0F1BF5472C00CC0479 /* TableDirector.swift in Sources */, - DAB7EB401BEFD07E00D2AD5E /* ConfigurableTableViewCell.swift in Sources */, DAC2D5CA1C9D303E009E9C19 /* AppDelegate.swift in Sources */, - DA1BCD111BF7388C00CC0479 /* CustomTableActions.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - DAC2D5D81C9D6433009E9C19 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DAC2D5E61C9D6493009E9C19 /* TabletTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - DAC2D5E21C9D6433009E9C19 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DAB7EB261BEF787300D2AD5E /* TabletDemo */; - targetProxy = DAC2D5E11C9D6433009E9C19 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ DAB7EB371BEF787300D2AD5E /* Debug */ = { isa = XCBuildConfiguration; @@ -421,7 +287,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - INFOPLIST_FILE = TabletDemo/Info.plist; + INFOPLIST_FILE = Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.tablet.tablet; @@ -436,7 +302,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - INFOPLIST_FILE = TabletDemo/Info.plist; + INFOPLIST_FILE = Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.tablet.tablet; @@ -445,32 +311,6 @@ }; name = Release; }; - DAC2D5E41C9D6433009E9C19 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = TabletTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.tablet.TabletTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TabletDemo.app/TabletDemo"; - }; - name = Debug; - }; - DAC2D5E51C9D6433009E9C19 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = TabletTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.tablet.TabletTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TabletDemo.app/TabletDemo"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -492,14 +332,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DAC2D5E31C9D6433009E9C19 /* Build configuration list for PBXNativeTarget "TabletTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DAC2D5E41C9D6433009E9C19 /* Debug */, - DAC2D5E51C9D6433009E9C19 /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; /* End XCConfigurationList section */ }; rootObject = DAB7EB1F1BEF787300D2AD5E /* Project object */; diff --git a/TabletDemo/TabletDemo.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/TabletDemo/TabletDemo.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate index 7f71110..6fe6130 100644 Binary files a/TabletDemo/TabletDemo.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate and b/TabletDemo/TabletDemo.xcodeproj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TabletDemo/TabletDemo/ConfigurableTableViewCell.swift b/TabletDemo/TabletDemo/ConfigurableTableViewCell.swift deleted file mode 100644 index 4887c0e..0000000 --- a/TabletDemo/TabletDemo/ConfigurableTableViewCell.swift +++ /dev/null @@ -1,39 +0,0 @@ -// -// ConfigurableTableViewCell.swift -// TabletDemo -// -// Created by Max Sokolov on 08/11/15. -// Copyright © 2015 Tablet. All rights reserved. -// - -import UIKit - -let kConfigurableTableViewCellButtonClickedAction = "button_clicked" - -class ConfigurableTableViewCell: UITableViewCell, ConfigurableCell { - - typealias Item = String - - @IBOutlet weak var button: UIButton! - @IBOutlet weak var contentLabel: UILabel! - - static func reusableIdentifier() -> String { - - return "ConfigurableTableViewCell" - } - - static func estimatedHeight() -> Float { - return 300 - } - - func configureWithItem(item: Item) { - - accessoryType = .DisclosureIndicator - button.setTitle("Button \(item)", forState: .Normal) - } - - @IBAction func buttonClicked(sender: UIButton) { - - Action(key: kConfigurableTableViewCellButtonClickedAction, sender: self).invoke() - } -} \ No newline at end of file diff --git a/TabletDemo/TabletDemo/CustomTableActions.swift b/TabletDemo/TabletDemo/CustomTableActions.swift deleted file mode 100644 index 5466099..0000000 --- a/TabletDemo/TabletDemo/CustomTableActions.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// CustomTableActions.swift -// TabletDemo -// -// Created by Max Sokolov on 14/11/15. -// Copyright © 2015 Tablet. All rights reserved. -// - -import UIKit -import Foundation - -let kTableDirectorDidEndDisplayingCell = "enddisplaycell" - -extension TableDirector { - - public func tableView(tableView: UITableView, didEndDisplayingCell cell: UITableViewCell, forRowAtIndexPath indexPath: NSIndexPath) { - - invokeAction(.custom(kTableDirectorDidEndDisplayingCell), cell: cell, indexPath: indexPath) - } -} \ No newline at end of file diff --git a/TabletDemo/TabletDemo/MyNibTableViewCell.swift b/TabletDemo/TabletDemo/MyNibTableViewCell.swift deleted file mode 100644 index 4888fb9..0000000 --- a/TabletDemo/TabletDemo/MyNibTableViewCell.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// MyNibTableViewCell.swift -// TabletDemo -// -// Created by Max Sokolov on 07/12/15. -// Copyright © 2015 Tablet. All rights reserved. -// - -import Foundation -import UIKit - -class MyNibTableViewCell : UITableViewCell { - - -} \ No newline at end of file diff --git a/TabletDemo/TabletDemo/MyNibTableViewCell.xib b/TabletDemo/TabletDemo/MyNibTableViewCell.xib deleted file mode 100644 index 02401db..0000000 --- a/TabletDemo/TabletDemo/MyNibTableViewCell.xib +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/TabletDemo/TabletDemo/MyTableViewCell.swift b/TabletDemo/TabletDemo/MyTableViewCell.swift deleted file mode 100644 index 9f03cea..0000000 --- a/TabletDemo/TabletDemo/MyTableViewCell.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// MyTableViewCell.swift -// TabletDemo -// -// Created by Max Sokolov on 07/12/15. -// Copyright © 2015 Tablet. All rights reserved. -// - -import Foundation -import UIKit - -class MyTableViewCell : UITableViewCell { - - override func layoutSubviews() { - super.layoutSubviews() - - backgroundColor = UIColor.redColor() - } -} \ No newline at end of file diff --git a/TabletDemo/TabletDemo/ViewController.swift b/TabletDemo/TabletDemo/ViewController.swift deleted file mode 100644 index 388260c..0000000 --- a/TabletDemo/TabletDemo/ViewController.swift +++ /dev/null @@ -1,72 +0,0 @@ -// -// ViewController.swift -// TabletDemo -// -// Created by Max Sokolov on 08/11/15. -// Copyright © 2015 Tablet. All rights reserved. -// - -import UIKit - -class ViewController: UIViewController, UIScrollViewDelegate { - - @IBOutlet weak var tableView: UITableView! { - didSet { - tableDirector = TableDirector(tableView: tableView) - } - } - var tableDirector: TableDirector! - - override func viewDidLoad() { - super.viewDidLoad() - - tableDirector.scrollDelegate = self - - let rowBuilder = TableRowBuilder(items: [1, 2, 3, 4], id: "cell") - .action(.configure) { data in - - data.cell?.textLabel?.text = "\(data.item)" - } - .action(.shouldHighlight) { data in - - return false - } - .action(kTableDirectorDidEndDisplayingCell) { data -> Void in - - print("end display: \(data.indexPath)") - } - - let configurableRowBuilder = TableConfigurableRowBuilder(items: ["5", "6", "7", "8"]) - .action(.click) { data -> Void in - - print("click action indexPath: \(data.indexPath), item: \(data.item)") - } - .action(kConfigurableTableViewCellButtonClickedAction) { data -> Void in - - print("custom action indexPath: \(data.indexPath), item: \(data.item)") - } - .action(.height) { data -> ReturnValue in - - if data.item == "5" { - return 70 - } - return nil - } - .action(.configure) { data -> Void in - - data.cell!.contentLabel.text = "Tablet is a super lightweight yet powerful generic library that handles a complexity of UITableView's datasource and delegate methods in a Swift environment. Tablet's goal is to provide an easiest way to create complex table views. With Tablet you don't have to write a messy code of switch or if statements when you deal with bunch of different cells in different sections." - } - - let myRowBuilder = TableRowBuilder(item: 0, id: "cellll") - - let sectionBuilder = TableSectionBuilder(headerTitle: "Tablet", footerTitle: "Deal with table view like a boss.", rows: [rowBuilder, configurableRowBuilder, myRowBuilder]) - - tableDirector += sectionBuilder - - sectionBuilder.appendRow(TableRowBuilder(item: 0)) - } - - func scrollViewWillBeginDragging(scrollView: UIScrollView) { - print("begin dragging") - } -} \ No newline at end of file