From 9e414c9945cdac0b44df6d157e491afd32bc3b02 Mon Sep 17 00:00:00 2001 From: Kyle Fang Date: Thu, 17 Sep 2015 17:45:17 +0800 Subject: [PATCH] Default stop at 2 seconds --- pick.xcodeproj/project.pbxproj | 4 ---- pick/DataHolder.swift | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pick.xcodeproj/project.pbxproj b/pick.xcodeproj/project.pbxproj index 8847b4b..a33d483 100644 --- a/pick.xcodeproj/project.pbxproj +++ b/pick.xcodeproj/project.pbxproj @@ -19,7 +19,6 @@ 0440B2BA1BA8FC5700923EA3 /* RxTableViewSectionedDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0440B2AD1BA8FC5700923EA3 /* RxTableViewSectionedDataSource.swift */; settings = {ASSET_TAGS = (); }; }; 0440B2BB1BA8FC5700923EA3 /* RxTableViewSectionedReloadDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0440B2AE1BA8FC5700923EA3 /* RxTableViewSectionedReloadDataSource.swift */; settings = {ASSET_TAGS = (); }; }; 0440B2BC1BA8FC5700923EA3 /* Differentiator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0440B2AF1BA8FC5700923EA3 /* Differentiator.swift */; settings = {ASSET_TAGS = (); }; }; - 0440B2BD1BA8FC5700923EA3 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 0440B2B01BA8FC5700923EA3 /* README.md */; settings = {ASSET_TAGS = (); }; }; 0440B2BE1BA8FC5700923EA3 /* RxDataSourceStarterKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0440B2B11BA8FC5700923EA3 /* RxDataSourceStarterKit.swift */; settings = {ASSET_TAGS = (); }; }; 0440B2BF1BA8FC5700923EA3 /* SectionedViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0440B2B21BA8FC5700923EA3 /* SectionedViewType.swift */; settings = {ASSET_TAGS = (); }; }; 0440B2C01BA8FC5700923EA3 /* SectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0440B2B31BA8FC5700923EA3 /* SectionModel.swift */; settings = {ASSET_TAGS = (); }; }; @@ -47,7 +46,6 @@ 0440B2AD1BA8FC5700923EA3 /* RxTableViewSectionedDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTableViewSectionedDataSource.swift; sourceTree = ""; }; 0440B2AE1BA8FC5700923EA3 /* RxTableViewSectionedReloadDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTableViewSectionedReloadDataSource.swift; sourceTree = ""; }; 0440B2AF1BA8FC5700923EA3 /* Differentiator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Differentiator.swift; sourceTree = ""; }; - 0440B2B01BA8FC5700923EA3 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 0440B2B11BA8FC5700923EA3 /* RxDataSourceStarterKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxDataSourceStarterKit.swift; sourceTree = ""; }; 0440B2B21BA8FC5700923EA3 /* SectionedViewType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionedViewType.swift; sourceTree = ""; }; 0440B2B31BA8FC5700923EA3 /* SectionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionModel.swift; sourceTree = ""; }; @@ -84,7 +82,6 @@ 0440B2A71BA8FC5700923EA3 /* Changeset.swift */, 0440B2A81BA8FC5700923EA3 /* DataSources */, 0440B2AF1BA8FC5700923EA3 /* Differentiator.swift */, - 0440B2B01BA8FC5700923EA3 /* README.md */, 0440B2B11BA8FC5700923EA3 /* RxDataSourceStarterKit.swift */, 0440B2B21BA8FC5700923EA3 /* SectionedViewType.swift */, 0440B2B31BA8FC5700923EA3 /* SectionModel.swift */, @@ -291,7 +288,6 @@ 0440B2BA1BA8FC5700923EA3 /* RxTableViewSectionedDataSource.swift in Sources */, 049EB1561BA7D33B001C8113 /* MainStoryboard.swift in Sources */, 0440B2C01BA8FC5700923EA3 /* SectionModel.swift in Sources */, - 0440B2BD1BA8FC5700923EA3 /* README.md in Sources */, 0440B2C11BA8FC5700923EA3 /* SectionModelType.swift in Sources */, 0440B2A51BA8F7DF00923EA3 /* PresetViewController.swift in Sources */, 04F93F2A1BA434A0004377C8 /* ViewController.swift in Sources */, diff --git a/pick/DataHolder.swift b/pick/DataHolder.swift index 8257eb9..9c926c1 100644 --- a/pick/DataHolder.swift +++ b/pick/DataHolder.swift @@ -108,7 +108,7 @@ class DataHolder { skip_winner_key: true, auto_restart_key: true, animation_speed_key: AnimationSpeed.normal.rawValue, - animation_duration_key: 0, + animation_duration_key: 2, font_size_key: 60.0 ])