Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #312

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Vendor/curry"]
path = Vendor/curry
url = git@github.com:devinross/curry.git
url = https://github.com/devinross/curry.git
11 changes: 8 additions & 3 deletions Examples/Assets/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
"scale" : "2x"
},
{
"idiom" : "car",
"size" : "120x120",
"scale" : "1x"
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
},
{
"size" : "24x24",
Expand Down Expand Up @@ -158,6 +158,11 @@
"role" : "quickLook",
"subtype" : "42mm"
},
{
"idiom" : "car",
"size" : "120x120",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "watch",
Expand Down
3 changes: 0 additions & 3 deletions Examples/Classes/AlertsViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
*/

@import UIKit;
@import tapku;

//@import tapku;

@interface AlertsViewController : UIViewController

Expand Down
2 changes: 1 addition & 1 deletion Examples/Classes/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


@import UIKit;
@import tapku;

@class LeftTableViewController, DetailViewController;

@class RootViewController;
Expand Down
1 change: 0 additions & 1 deletion Examples/Classes/CalendarDayViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

*/

@import tapku;
@import UIKit;

@interface CalendarDayViewController : TKCalendarDayViewController
Expand Down
1 change: 0 additions & 1 deletion Examples/Classes/CalendarMonthViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

*/

@import tapku;
@import UIKit;

#pragma mark - CalendarMonthViewController
Expand Down
1 change: 0 additions & 1 deletion Examples/Classes/CoverflowViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

*/
@import UIKit;
@import tapku;

#pragma mark - CoverflowViewController
@interface CoverflowViewController : UIViewController <TKCoverflowViewDataSource,TKCoverflowViewDelegate>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Classes/DetailViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


@import UIKit;
@import tapku;


@interface DetailViewController : UIViewController <UISplitViewControllerDelegate, UITableViewDataSource>

Expand Down
2 changes: 0 additions & 2 deletions Examples/Classes/EmptyViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
*/


@import tapku;

@interface EmptyViewController : UIViewController

@property (nonatomic,strong) TKEmptyView *emptyView;
Expand Down
1 change: 0 additions & 1 deletion Examples/Classes/ImageCenterViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
*/

@import UIKit;
@import tapku;

@interface ImageCenterViewController : TKTableViewController

Expand Down
3 changes: 0 additions & 3 deletions Examples/Classes/IndicatorsViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@

*/


@import tapku;

@interface IndicatorsViewController : UIViewController

@property (nonatomic,strong) TKProgressBarView *progressBar;
Expand Down
3 changes: 0 additions & 3 deletions Examples/Classes/LabelViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@

*/


@import tapku;

@interface LabelViewController : UITableViewController

@property (nonatomic,strong) NSArray *cells;
Expand Down
1 change: 0 additions & 1 deletion Examples/Classes/MoreCellsViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
*/

@import UIKit;
@import tapku;

#pragma mark - MoreCellsViewController
@interface MoreCellsViewController : UITableViewController
Expand Down
1 change: 0 additions & 1 deletion Examples/Classes/NetworkRequestProgressViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
*/

@import UIKit;
@import tapku;

@interface NetworkRequestProgressViewController : TKViewController <TKHTTPRequestProgressDelegate>

Expand Down
2 changes: 1 addition & 1 deletion Examples/Classes/RootViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/

@import UIKit;
@import tapku;

@class DetailViewController;

@interface RootViewController : TKTableViewController
Expand Down