Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/TapkuLibrary.xcodeproj/project.pbxproj
	src/TapkuLibrary/TKCalendarMonthTableViewController.h
	src/TapkuLibrary/TKCalendarMonthTableViewController.m
	src/TapkuLibrary/TKMapPlace.h
  • Loading branch information...
2 parents 36610b7 + dcca483 commit 08ee8ba161d2c81aaaca49e47a542e36a682cadc @msanders msanders committed May 23, 2012
Showing with 20,922 additions and 391 deletions.
  1. +6 −32 README.mdown
  2. +32 −0 com.tapku.tapku.docset/Contents/Info.plist
  3. +365 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/NSArray+TKCategory.html
  4. +378 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/NSDate+TKCategory.html
  5. +222 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/NSString+TKCategory.html
  6. +335 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/UIBarButtonItem+TKCategory.html
  7. +690 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/UIButton+TKCategory.html
  8. +445 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/UIColor+TKCategory.html
  9. +222 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/UIImage+TKCategory.html
  10. +385 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/UIImageView+TKCategory.html
  11. +305 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/UIScrollView+TKCategory.html
  12. +353 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/UIView+TKCategory.html
  13. +620 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Categories/UIViewController+TKCategory.html
  14. +313 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKAlertCenter.html
  15. +321 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKAppDelegate.html
  16. +225 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKButtonCell.html
  17. +384 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKCalendarMonthTableViewController.html
  18. +656 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKCalendarMonthView.html
  19. +527 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKCalendarMonthViewController.html
  20. +408 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKCoverflowCoverView.html
  21. +804 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKCoverflowView.html
  22. +732 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKEmptyView.html
  23. +512 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKGradientView.html
  24. +1,691 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKHTTPRequest.html
  25. +1,198 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKImageCache.html
  26. +310 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKLabelCell.html
  27. +308 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKLabelFieldCell.html
  28. +308 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKLabelSwitchCell.html
  29. +311 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKLabelTextFieldCell.html
  30. +308 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKLabelTextViewCell.html
  31. +431 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKNetworkQueue.html
  32. +471 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKProgressAlertView.html
  33. +451 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKProgressBarView.html
  34. +486 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKProgressCircleView.html
  35. +308 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKSwitchCell.html
  36. +331 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKTableViewController.html
  37. +507 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKViewController.html
  38. +225 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Classes/TKWindow.html
  39. +333 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Protocols/TKCalendarMonthViewDataSource.html
  40. +538 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Protocols/TKCalendarMonthViewDelegate.html
  41. +328 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Protocols/TKCoverflowViewDataSource.html
  42. +388 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Protocols/TKCoverflowViewDelegate.html
  43. +328 −0 com.tapku.tapku.docset/Contents/Resources/Documents/Protocols/TKHTTPRequestProgressDelegate.html
  44. +584 −0 com.tapku.tapku.docset/Contents/Resources/Documents/css/styles.css
  45. +22 −0 com.tapku.tapku.docset/Contents/Resources/Documents/css/stylesPrint.css
  46. +235 −0 com.tapku.tapku.docset/Contents/Resources/Documents/hierarchy.html
  47. BIN com.tapku.tapku.docset/Contents/Resources/Documents/img/button_bar_background.png
  48. BIN com.tapku.tapku.docset/Contents/Resources/Documents/img/disclosure.png
  49. BIN com.tapku.tapku.docset/Contents/Resources/Documents/img/disclosure_open.png
  50. BIN com.tapku.tapku.docset/Contents/Resources/Documents/img/library_background.png
  51. BIN com.tapku.tapku.docset/Contents/Resources/Documents/img/title_background.png
  52. +161 −0 com.tapku.tapku.docset/Contents/Resources/Documents/index.html
  53. BIN com.tapku.tapku.docset/Contents/Resources/docSet.dsidx
  54. BIN com.tapku.tapku.docset/Contents/Resources/docSet.mom
  55. BIN com.tapku.tapku.docset/Contents/Resources/docSet.skidx
  56. BIN com.tapku.tapku.docset/Contents/Resources/docSet.toc
  57. +3 −6 demo/iPhone/DemoCalendarMonth.m
  58. +1 −1 demo/iPhone/ImageCenterViewController.m
  59. +2 −8 demo/iPhone/RootViewController.m
  60. +3 −1 src/TapkuLibrary.xcodeproj/project.pbxproj
  61. BIN ...y.xcodeproj/project.xcworkspace/xcuserdata/devinross14.xcuserdatad/UserInterfaceState.xcuserstate
  62. +3 −1 src/TapkuLibrary.xcodeproj/xcuserdata/devinross14.xcuserdatad/xcschemes/TapkuLibrary.xcscheme
  63. +1 −1 src/TapkuLibrary.xcodeproj/xcuserdata/devinross14.xcuserdatad/xcschemes/xcschememanagement.plist
  64. +7 −0 src/TapkuLibrary/NSArray+TKCategory.h
  65. +3 −0 src/TapkuLibrary/NSArray+TKCategory.m
  66. +17 −2 src/TapkuLibrary/NSDate+TKCategory.h
  67. +5 −5 src/TapkuLibrary/NSDate+TKCategory.m
  68. +26 −3 src/TapkuLibrary/NSDictionary+TKCategory.h
  69. +26 −0 src/TapkuLibrary/NSMutableURLRequest+TKCategory.h
  70. +33 −0 src/TapkuLibrary/NSString+TKCategory.h
  71. +28 −2 src/TapkuLibrary/NSString+TKCategory.m
  72. +14 −0 src/TapkuLibrary/TKAlertCenter.h
  73. +1 −1 src/TapkuLibrary/TKAlertCenter.m
  74. +6 −4 src/TapkuLibrary/TKAppDelegate.h
  75. +0 −3 src/TapkuLibrary/TKAppDelegate.m
  76. +2 −0 src/TapkuLibrary/TKButtonCell.h
  77. +10 −6 src/TapkuLibrary/TKCalendarMonthTableViewController.h
  78. +6 −16 src/TapkuLibrary/TKCalendarMonthTableViewController.m
  79. +63 −7 src/TapkuLibrary/TKCalendarMonthView.h
  80. +32 −65 src/TapkuLibrary/TKCalendarMonthView.m
  81. +13 −4 src/TapkuLibrary/TKCalendarMonthViewController.h
  82. +7 −10 src/TapkuLibrary/TKCalendarMonthViewController.m
  83. +10 −1 src/TapkuLibrary/TKCoverflowCoverView.h
  84. +38 −23 src/TapkuLibrary/TKCoverflowCoverView.m
  85. +49 −9 src/TapkuLibrary/TKCoverflowView.h
  86. +26 −23 src/TapkuLibrary/TKCoverflowView.m
  87. +53 −8 src/TapkuLibrary/TKEmptyView.h
  88. +1 −7 src/TapkuLibrary/TKEmptyView.m
  89. +20 −0 src/TapkuLibrary/TKGradientView.h
  90. +102 −16 src/TapkuLibrary/TKHTTPRequest.h
  91. +34 −24 src/TapkuLibrary/TKHTTPRequest.m
  92. +80 −7 src/TapkuLibrary/TKImageCache.h
  93. +40 −32 src/TapkuLibrary/TKImageCache.m
  94. +11 −2 src/TapkuLibrary/TKLabelCell.h
  95. +2 −1 src/TapkuLibrary/TKLabelFieldCell.h
  96. +5 −3 src/TapkuLibrary/TKLabelSwitchCell.h
  97. +6 −4 src/TapkuLibrary/TKLabelTextFieldCell.h
  98. +6 −3 src/TapkuLibrary/TKLabelTextViewCell.h
  99. +5 −9 src/TapkuLibrary/TKMapPlace.h
  100. +1 −7 src/TapkuLibrary/TKMapPlace.m
  101. +12 −0 src/TapkuLibrary/TKNetworkQueue.h
  102. +21 −5 src/TapkuLibrary/TKProgressAlertView.h
  103. +14 −0 src/TapkuLibrary/TKProgressBarView.h
  104. +9 −1 src/TapkuLibrary/TKProgressCircleView.h
  105. +4 −1 src/TapkuLibrary/TKProgressCircleView.m
  106. +2 −1 src/TapkuLibrary/TKSwitchCell.h
  107. +28 −1 src/TapkuLibrary/TKTableViewController.h
  108. +5 −3 src/TapkuLibrary/TKTextViewCell.h
  109. +29 −0 src/TapkuLibrary/TKViewController.h
  110. +3 −1 src/TapkuLibrary/TKViewController.m
  111. +9 −0 src/TapkuLibrary/TKWindow.h
  112. +3 −3 src/TapkuLibrary/TKWindow.m
  113. +2 −0 src/TapkuLibrary/TapkuLibrary.h
  114. +12 −1 src/TapkuLibrary/UIBarButtonItem+TKCategory.h
  115. +40 −0 src/TapkuLibrary/UIButton+TKCategory.h
  116. +19 −3 src/TapkuLibrary/UIColor+TKCategory.h
  117. +2 −1 src/TapkuLibrary/UIImage+TKCategory.h
  118. +13 −2 src/TapkuLibrary/UIImageView+TKCategory.h
  119. +3 −0 src/TapkuLibrary/UIScrollview+TKCategory.h
  120. +1 −1 src/TapkuLibrary/UIScrollview+TKCategory.m
  121. +6 −0 src/TapkuLibrary/UIView+TKCategory.h
  122. +57 −7 src/TapkuLibrary/UIViewController+TKCategory.h
  123. +26 −3 src/TapkuLibrary/UIViewController+TKCategory.m
View
@@ -1,39 +1,13 @@
TapkuLibrary
============
-TapkuLibrary is an open source iOS framework built on Cocoa and UIKit intended for broad use in applications. If you really like the framework, [drop me a line](http://devinsheaven.com/about#contact), I'd love to hear about it. Many thanks to those who have contributed to the project.
+TapkuLibrary is an iOS library built on Cocoa and UIKit intended for broad use in applications. If you're looking to see what the library can do, check out the demo project included. Some major components include coverflow, calendar grid, network requests and progress indicators.
-### Classes
+## Documentation
+Included in the repository is a .docset bundle with all documentation for the library. Place the bundle in the ~/Library/Developer/Shared/Documentation/DocSets directory. When you relaunch XCode, it will appear in the documentation section of the Organizer. You can also browse the documentation at [tapku.com/documentation](http://tapku.com/documentation/).
-* [TKHTTPRequest](https://github.com/devinross/tapkulibrary/blob/master/src/TapkuLibrary/TKHTTPRequest.h)
-* [TKCoverflowView](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKCoverflowView.h)
-* [TKCalendarMonthView](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKCalendarMonthView.h)
-* [TKImageCenter](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKImageCenter.h)
-* [TKAlertCenter](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKAlertCenter.h)
-* [TKProgressAlertView](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKProgressAlertView.h)
-* [TKLoadingView](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKLoadingView.h)
-* [TKButtonCell](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKButtonCell.h)
-* [TKLabelCell](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKLabelCell.h)
-* [TKEmptyView](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKEmptyView.h)
-* [TKWindow](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/TKWindow.h)
-* [(and more)](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary)
+## Adding Tapku To Your Project
+Instructions on adding tapku library can be [found here](https://github.com/devinross/tapkulibrary/wiki/Adding-Tapku-to-Your-Project-in-XCode-4). For additional help, check out the demo project.
-### Categories
-* [NSString](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/NSString+TKCategory.h)
-* [NSDate](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/NSDate+TKCategory.h)
-* [NSArray](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/NSArray+TKCategory.h)
-* [UIView](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/UIView+TKCategory.h)
-* [UIImage](https://github.com/devinross/tapkulibrary/tree/master/src/TapkuLibrary/UIImage+TKCategory.h)
-
-
-## Adding Tapku To Your Project / [Documentation](http://wiki.github.com/devinross/tapkulibrary/)
-
-The best place to start is by downloading the source and trying out the demo app. The demo project gives a brief overview of the functionality of the framework. Instructions on adding the framework in your own project for [XCode 3](https://github.com/devinross/tapkulibrary/wiki/Adding-Tapku-to-Your-Project-in-XCode-3) & [XCode 4](https://github.com/devinross/tapkulibrary/wiki/Adding-Tapku-to-Your-Project-in-XCode-4) and documentation, can be found on the [wiki](http://wiki.github.com/devinross/tapkulibrary/).
-
-
-### Links
-
-* [Creator's Homepage](http://devinsheaven.com)
-* [Framework Landing Page](http://tapku.com)
-* [Documentation](http://wiki.github.com/devinross/tapkulibrary/)
+Follow me on twitter, [@devin_ross](http://twitter.com/devin_ross).
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>en</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.tapku.tapku</string>
+ <key>CFBundleName</key>
+ <string>tapku Documentation</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+
+
+
+
+ <key>DocSetFeedName</key>
+ <string>tapku Documentation</string>
+
+ <key>DocSetMinimumXcodeVersion</key>
+ <string>3.0</string>
+
+ <key>DocSetPublisherIdentifier</key>
+ <string>com.tapku.documentation</string>
+ <key>DocSetPublisherName</key>
+ <string>Tapku Library</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright © 2012 Tapku Library. All rights reserved.</string>
+</dict>
+</plist>
Oops, something went wrong.

0 comments on commit 08ee8ba

Please sign in to comment.