Skip to content
Browse files

Brings entire project back into one static project. Label cells are p…

…roperly organized on the contentview. Removes custom swizzling for the project in favor of subclassing uinavigationcontroller. Fixes image center issues with nsoperationqueue duplicates.
  • Loading branch information...
1 parent 2c9d9b3 commit bb7d31e35fc5686595d4a365dc3db833b5a2dc5a @devinross committed Mar 31, 2011
Showing with 1,010 additions and 1,492 deletions.
  1. BIN src/TapkuLibrary.bundle/Images/coverflow/coverflowgradient.png
  2. BIN src/TapkuLibrary.bundle/Images/gui/ui back button hover.png
  3. BIN src/TapkuLibrary.bundle/Images/gui/ui back button hover@2x.png
  4. BIN src/TapkuLibrary.bundle/Images/gui/ui back button.png
  5. BIN src/TapkuLibrary.bundle/Images/gui/ui back button@2x.png
  6. BIN src/TapkuLibrary.bundle/Images/gui/ui done button.png
  7. BIN src/TapkuLibrary.bundle/Images/gui/ui done button@2x.png
  8. BIN src/TapkuLibrary.bundle/Images/gui/ui plain button hover.png
  9. BIN src/TapkuLibrary.bundle/Images/gui/ui plain button hover@2x.png
  10. BIN src/TapkuLibrary.bundle/Images/gui/ui plain button.png
  11. BIN src/TapkuLibrary.bundle/Images/gui/ui plain button@2x.png
  12. BIN src/TapkuLibrary.bundle/Images/overview/ind_blue_left.png
  13. BIN src/TapkuLibrary.bundle/Images/overview/ind_blue_middle.png
  14. BIN src/TapkuLibrary.bundle/Images/overview/ind_blue_right.png
  15. BIN src/TapkuLibrary.bundle/Images/overview/ind_green_left.png
  16. BIN src/TapkuLibrary.bundle/Images/overview/ind_green_middle.png
  17. BIN src/TapkuLibrary.bundle/Images/overview/ind_green_right.png
  18. BIN src/TapkuLibrary.bundle/Images/overview/ind_red_left.png
  19. BIN src/TapkuLibrary.bundle/Images/overview/ind_red_middle.png
  20. BIN src/TapkuLibrary.bundle/Images/overview/ind_red_right.png
  21. +66 −176 src/TapkuLibrary.xcodeproj/project.pbxproj
  22. +0 −41 src/TapkuLibrary/ABTableViewCell.h
  23. +0 −99 src/TapkuLibrary/ABTableViewCell.m
  24. +1 −1 src/{TapkuLibraryExtra → TapkuLibrary}/NSDictionary+TKCategory.h
  25. +32 −12 src/{TapkuLibraryExtra → TapkuLibrary}/NSDictionary+TKCategory.m
  26. +0 −3 src/{TapkuLibraryExtra → TapkuLibrary}/NSMutableURLRequest+TKCategory.h
  27. +26 −3 src/{TapkuLibraryExtra → TapkuLibrary}/NSMutableURLRequest+TKCategory.m
  28. +1 −0 src/TapkuLibrary/NSString+TKCategory.h
  29. +14 −0 src/TapkuLibrary/NSString+TKCategory.m
  30. +2 −1 src/TapkuLibrary/TKAlertCenter.m
  31. +0 −55 src/TapkuLibrary/TKBarButtonItem.h
  32. +0 −242 src/TapkuLibrary/TKBarButtonItem.m
  33. +1 −6 src/TapkuLibrary/TKButtonCell.h
  34. +10 −29 src/TapkuLibrary/TKButtonCell.m
  35. +1 −5 src/TapkuLibrary/TKGlobal.h
  36. +0 −1 src/TapkuLibrary/TKGlobal.m
  37. +2 −2 src/TapkuLibrary/TKGraphView.m
  38. +24 −4 src/TapkuLibrary/TKImageCenter.m
  39. +2 −2 src/TapkuLibrary/TKIndicatorCell.h
  40. +17 −43 src/TapkuLibrary/TKIndicatorCell.m
  41. +1 −3 src/TapkuLibrary/TKLabelCell.h
  42. +27 −42 src/TapkuLibrary/TKLabelCell.m
  43. +1 −1 src/TapkuLibrary/TKLabelFieldCell.h
  44. +24 −39 src/TapkuLibrary/TKLabelFieldCell.m
  45. +1 −2 src/TapkuLibrary/TKLabelSwitchCell.h
  46. +21 −33 src/TapkuLibrary/TKLabelSwitchCell.m
  47. +1 −1 src/TapkuLibrary/TKLabelTextFieldCell.h
  48. +25 −61 src/TapkuLibrary/TKLabelTextFieldCell.m
  49. +1 −1 src/TapkuLibrary/TKLabelTextViewCell.h
  50. +23 −41 src/TapkuLibrary/TKLabelTextViewCell.m
  51. +2 −3 src/TapkuLibrary/TKLoadingView.m
  52. 0 src/{TapkuLibraryExtra → TapkuLibrary}/TKMapPlace.h
  53. 0 src/{TapkuLibraryExtra → TapkuLibrary}/TKMapPlace.m
  54. 0 src/{TapkuLibraryExtra → TapkuLibrary}/TKMapView.h
  55. 0 src/{TapkuLibraryExtra → TapkuLibrary}/TKMapView.m
  56. +56 −0 src/TapkuLibrary/TKNavigationController.h
  57. +126 −0 src/TapkuLibrary/TKNavigationController.m
  58. +2 −1 src/TapkuLibrary/TKProgressAlertView.m
  59. +1 −3 src/TapkuLibrary/TKSwitchCell.h
  60. +17 −52 src/TapkuLibrary/TKSwitchCell.m
  61. +6 −6 src/TapkuLibrary/{UINavigationController+TKCategory.h → TKTableViewCell.h}
  62. +85 −0 src/TapkuLibrary/TKTableViewCell.m
  63. +2 −4 src/TapkuLibrary/TKTableViewController.h
  64. +10 −12 src/TapkuLibrary/TKTableViewController.m
  65. +1 −1 src/TapkuLibrary/TKTextViewCell.h
  66. +8 −11 src/TapkuLibrary/TKTextViewCell.m
  67. +3 −7 src/TapkuLibrary/TKViewController.h
  68. +21 −3 src/TapkuLibrary/TKViewController.m
  69. +1 −5 src/TapkuLibrary/TKWindow.h
  70. +1 −4 src/TapkuLibrary/TKWindow.m
  71. +12 −2 src/TapkuLibrary/TapkuLibrary.h
  72. +25 −0 src/TapkuLibrary/UIBarButtonItem+TKCategory.h
  73. +43 −0 src/TapkuLibrary/UIBarButtonItem+TKCategory.m
  74. +1 −1 src/TapkuLibrary/UIButton+TKCategory.m
  75. +0 −52 src/TapkuLibrary/UINavigationController+TKCategory.m
  76. +1 −1 src/TapkuLibrary/UIView+TKCategory.h
  77. +2 −2 src/TapkuLibrary/UIView+TKCategory.m
  78. +0 −36 src/TapkuLibraryExtra/TapkuLibraryExtras.h
  79. +1 −1 src/TapkuLibrary_Prefix.pch
  80. +1 −11 universaldemo/Shared/main.m
  81. +1 −1 universaldemo/iPad/AppDelegate_iPad.h
  82. +1 −1 universaldemo/iPad/AppDelegate_iPad.m
  83. +1 −1 universaldemo/iPad/CoverflowViewController_iPad.h
  84. +1 −1 universaldemo/iPad/CoverflowViewController_iPad.m
  85. +1 −1 universaldemo/iPad/DetailViewController.h
  86. +1 −1 universaldemo/iPad/DetailViewController.m
  87. +1 −1 universaldemo/iPad/LeftTableViewController.h
  88. +1 −1 universaldemo/iPad/LeftTableViewController.m
  89. +27 −7 universaldemo/iPhone/AlertsViewController.h
  90. +34 −38 universaldemo/iPhone/AlertsViewController.m
  91. +3 −3 universaldemo/iPhone/AppDelegate_iPhone.h
  92. +9 −2 universaldemo/iPhone/AppDelegate_iPhone.m
  93. +1 −1 universaldemo/iPhone/DemoCalendarMonth.h
  94. +1 −1 universaldemo/iPhone/DemoCalendarMonth.m
  95. +3 −2 universaldemo/iPhone/EmptyViewController.h
  96. +4 −3 universaldemo/iPhone/EmptyViewController.m
  97. +2 −5 universaldemo/iPhone/FastTableViewController.h
  98. +9 −35 universaldemo/iPhone/FastTableViewController.m
  99. +1 −1 universaldemo/iPhone/GraphController.h
  100. +1 −1 universaldemo/iPhone/GraphController.m
  101. +1 −1 universaldemo/iPhone/HUDViewController.h
  102. +20 −29 universaldemo/iPhone/HUDViewController.m
  103. +1 −5 universaldemo/iPhone/ImageCenterViewController.h
  104. +37 −55 universaldemo/iPhone/ImageCenterViewController.m
  105. +1 −1 universaldemo/iPhone/LabelViewController.h
  106. +23 −34 universaldemo/iPhone/LabelViewController.m
  107. +1 −4 universaldemo/iPhone/MapViewController.h
  108. +8 −6 universaldemo/iPhone/MapViewController.m
  109. +1 −2 universaldemo/iPhone/MoreCellsViewController.h
  110. +31 −31 universaldemo/iPhone/MoreCellsViewController.m
  111. +2 −3 universaldemo/iPhone/RootViewController.h
  112. +25 −13 universaldemo/iPhone/RootViewController.m
  113. +4 −34 universaldemo/universaldemo.xcodeproj/project.pbxproj
View
BIN src/TapkuLibrary.bundle/Images/coverflow/coverflowgradient.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui back button hover.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui back button hover@2x.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui back button.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui back button@2x.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui done button.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui done button@2x.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui plain button hover.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui plain button hover@2x.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui plain button.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/gui/ui plain button@2x.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_blue_left.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_blue_middle.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_blue_right.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_green_left.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_green_middle.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_green_right.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_red_left.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_red_middle.png
Deleted file not rendered
View
BIN src/TapkuLibrary.bundle/Images/overview/ind_red_right.png
Deleted file not rendered
View
242 src/TapkuLibrary.xcodeproj/project.pbxproj
@@ -7,18 +7,18 @@
objects = {
/* Begin PBXBuildFile section */
+ 3B07B1C9133AA68A001B1C6F /* TKNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B07B1C7133AA68A001B1C6F /* TKNavigationController.h */; };
+ 3B07B1CA133AA68A001B1C6F /* TKNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B07B1C8133AA68A001B1C6F /* TKNavigationController.m */; };
+ 3B07B7CA133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B07B7C8133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.h */; };
+ 3B07B7CB133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B07B7C9133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.m */; };
3B1DCECA1289B84400884CDF /* NSArray+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B1DCEC81289B84400884CDF /* NSArray+TKCategory.h */; };
3B1DCECB1289B84400884CDF /* NSArray+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B1DCEC91289B84400884CDF /* NSArray+TKCategory.m */; };
3B30B174129EE0F400466666 /* TKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B30B165129EE0D600466666 /* TKViewController.m */; };
- 3B30B175129EE0F400466666 /* UINavigationController+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B30B169129EE0DF00466666 /* UINavigationController+TKCategory.m */; };
3B30B176129EE0F400466666 /* UINavigationBar+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B30B16B129EE0DF00466666 /* UINavigationBar+TKCategory.m */; };
3B30B177129EE0F400466666 /* UIToolbar+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B30B16D129EE0DF00466666 /* UIToolbar+TKCategory.m */; };
3B30B178129EE10B00466666 /* TKViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B30B164129EE0D600466666 /* TKViewController.h */; };
- 3B30B179129EE10B00466666 /* UINavigationController+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B30B168129EE0DF00466666 /* UINavigationController+TKCategory.h */; };
3B30B17A129EE10B00466666 /* UINavigationBar+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B30B16A129EE0DF00466666 /* UINavigationBar+TKCategory.h */; };
3B30B17B129EE10B00466666 /* UIToolbar+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B30B16C129EE0DF00466666 /* UIToolbar+TKCategory.h */; };
- 3B30B192129EE17500466666 /* TKBarButtonItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B30B190129EE17500466666 /* TKBarButtonItem.h */; };
- 3B30B193129EE17500466666 /* TKBarButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B30B191129EE17500466666 /* TKBarButtonItem.m */; };
3B4346E412DA6A240076579B /* UIButton+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B4346E212DA6A240076579B /* UIButton+TKCategory.h */; };
3B4346E512DA6A240076579B /* UIButton+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B4346E312DA6A240076579B /* UIButton+TKCategory.m */; };
3B6EDDD311547BEB00E454DA /* TapkuLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BAC9A1B10953E5200F235F1 /* TapkuLibrary.h */; };
@@ -76,8 +76,8 @@
3B6EDE1A11547C5400E454DA /* TKButtonCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BAC9A3110953E5200F235F1 /* TKButtonCell.h */; };
3B6EDE1D11547C5500E454DA /* TKIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BAC9A3910953E5200F235F1 /* TKIndicatorCell.m */; };
3B6EDE1E11547C5600E454DA /* TKIndicatorCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BAC9A3810953E5200F235F1 /* TKIndicatorCell.h */; };
- 3B6EDE1F11547C5600E454DA /* ABTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BAC9A3D10953E5200F235F1 /* ABTableViewCell.m */; };
- 3B6EDE2011547C5700E454DA /* ABTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BAC9A3C10953E5200F235F1 /* ABTableViewCell.h */; };
+ 3B6EDE1F11547C5600E454DA /* TKTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BAC9A3D10953E5200F235F1 /* TKTableViewCell.m */; };
+ 3B6EDE2011547C5700E454DA /* TKTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BAC9A3C10953E5200F235F1 /* TKTableViewCell.h */; };
3B9724BD11C54C5C0027A97F /* TKCalendarMonthView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B9724B911C54C5C0027A97F /* TKCalendarMonthView.h */; };
3B9724BE11C54C5C0027A97F /* TKCalendarMonthView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B9724BA11C54C5C0027A97F /* TKCalendarMonthView.m */; };
3B9D93DA12F74F8F007D839C /* TKAppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B9D93D812F74F8F007D839C /* TKAppDelegate.h */; };
@@ -96,23 +96,17 @@
3BB96F5912B55CD600C38F46 /* UIImageView+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BB96F5712B55CD600C38F46 /* UIImageView+TKCategory.m */; };
3BBF874B1296E976008AB2B1 /* TKTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BBF87491296E976008AB2B1 /* TKTableViewController.h */; };
3BBF874C1296E976008AB2B1 /* TKTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BBF874A1296E976008AB2B1 /* TKTableViewController.m */; };
- 3BBF88AC1297048A008AB2B1 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BAC995910953DF400F235F1 /* MapKit.framework */; };
- 3BBF890C1297061F008AB2B1 /* NSDictionary+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BBF89031297061F008AB2B1 /* NSDictionary+TKCategory.h */; };
- 3BBF890D1297061F008AB2B1 /* NSDictionary+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BBF89041297061F008AB2B1 /* NSDictionary+TKCategory.m */; };
- 3BBF890E1297061F008AB2B1 /* NSMutableURLRequest+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BBF89051297061F008AB2B1 /* NSMutableURLRequest+TKCategory.h */; };
- 3BBF890F1297061F008AB2B1 /* NSMutableURLRequest+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BBF89061297061F008AB2B1 /* NSMutableURLRequest+TKCategory.m */; };
- 3BBF89101297061F008AB2B1 /* TapkuLibraryExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BBF89071297061F008AB2B1 /* TapkuLibraryExtras.h */; };
- 3BBF89111297061F008AB2B1 /* TKMapPlace.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BBF89081297061F008AB2B1 /* TKMapPlace.h */; };
- 3BBF89121297061F008AB2B1 /* TKMapPlace.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BBF89091297061F008AB2B1 /* TKMapPlace.m */; };
- 3BBF89131297061F008AB2B1 /* TKMapView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BBF890A1297061F008AB2B1 /* TKMapView.h */; };
- 3BBF89141297061F008AB2B1 /* TKMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BBF890B1297061F008AB2B1 /* TKMapView.m */; };
- 3BBF89881297082B008AB2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
- 3BBF89891297082B008AB2B1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BAC995710953DF400F235F1 /* UIKit.framework */; };
- 3BBF898A1297082B008AB2B1 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BAC995510953DF400F235F1 /* SystemConfiguration.framework */; };
- 3BBF898B1297082B008AB2B1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BAC995610953DF400F235F1 /* CoreGraphics.framework */; };
- 3BBF898C1297082B008AB2B1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BAC995810953DF400F235F1 /* QuartzCore.framework */; };
3BD32972125B753900BE5EAF /* TKAlertCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BD32970125B753900BE5EAF /* TKAlertCenter.h */; };
3BD32973125B753900BE5EAF /* TKAlertCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BD32971125B753900BE5EAF /* TKAlertCenter.m */; };
+ 3BE54E61134548A100B59702 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BAC995910953DF400F235F1 /* MapKit.framework */; };
+ 3BE54E7E134548CA00B59702 /* NSDictionary+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BE54E7A134548CA00B59702 /* NSDictionary+TKCategory.h */; };
+ 3BE54E7F134548CA00B59702 /* NSDictionary+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BE54E7B134548CA00B59702 /* NSDictionary+TKCategory.m */; };
+ 3BE54E80134548CA00B59702 /* NSMutableURLRequest+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BE54E7C134548CA00B59702 /* NSMutableURLRequest+TKCategory.h */; };
+ 3BE54E81134548CA00B59702 /* NSMutableURLRequest+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BE54E7D134548CA00B59702 /* NSMutableURLRequest+TKCategory.m */; };
+ 3BE54E86134548E600B59702 /* TKMapPlace.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BE54E82134548E600B59702 /* TKMapPlace.h */; };
+ 3BE54E87134548E600B59702 /* TKMapPlace.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BE54E83134548E600B59702 /* TKMapPlace.m */; };
+ 3BE54E88134548E600B59702 /* TKMapView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BE54E84134548E600B59702 /* TKMapView.h */; };
+ 3BE54E89134548E600B59702 /* TKMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BE54E85134548E600B59702 /* TKMapView.m */; };
3BE8FF8512945C4400DBF3FC /* UIScrollview+TKCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BE8FF8312945C4400DBF3FC /* UIScrollview+TKCategory.h */; };
3BE8FF8612945C4400DBF3FC /* UIScrollview+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BE8FF8412945C4400DBF3FC /* UIScrollview+TKCategory.m */; };
3BEE1CBB12CFB78300FECF6D /* TKProgressCircleView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BEE1CB912CFB78300FECF6D /* TKProgressCircleView.h */; };
@@ -121,23 +115,22 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 3B07B1C7133AA68A001B1C6F /* TKNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKNavigationController.h; sourceTree = "<group>"; };
+ 3B07B1C8133AA68A001B1C6F /* TKNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKNavigationController.m; sourceTree = "<group>"; };
+ 3B07B7C8133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIBarButtonItem+TKCategory.h"; sourceTree = "<group>"; };
+ 3B07B7C9133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIBarButtonItem+TKCategory.m"; sourceTree = "<group>"; };
3B1DCEC81289B84400884CDF /* NSArray+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+TKCategory.h"; sourceTree = "<group>"; };
3B1DCEC91289B84400884CDF /* NSArray+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+TKCategory.m"; sourceTree = "<group>"; };
3B30B164129EE0D600466666 /* TKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKViewController.h; sourceTree = "<group>"; };
3B30B165129EE0D600466666 /* TKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKViewController.m; sourceTree = "<group>"; };
- 3B30B168129EE0DF00466666 /* UINavigationController+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+TKCategory.h"; sourceTree = "<group>"; };
- 3B30B169129EE0DF00466666 /* UINavigationController+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+TKCategory.m"; sourceTree = "<group>"; };
3B30B16A129EE0DF00466666 /* UINavigationBar+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UINavigationBar+TKCategory.h"; sourceTree = "<group>"; };
3B30B16B129EE0DF00466666 /* UINavigationBar+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UINavigationBar+TKCategory.m"; sourceTree = "<group>"; };
3B30B16C129EE0DF00466666 /* UIToolbar+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIToolbar+TKCategory.h"; sourceTree = "<group>"; };
3B30B16D129EE0DF00466666 /* UIToolbar+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIToolbar+TKCategory.m"; sourceTree = "<group>"; };
- 3B30B190129EE17500466666 /* TKBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKBarButtonItem.h; sourceTree = "<group>"; };
- 3B30B191129EE17500466666 /* TKBarButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKBarButtonItem.m; sourceTree = "<group>"; };
3B3991EE10CED8FD00B8FF4F /* TKGraphView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKGraphView.h; sourceTree = "<group>"; };
3B3991EF10CED8FD00B8FF4F /* TKGraphView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKGraphView.m; sourceTree = "<group>"; };
3B4346E212DA6A240076579B /* UIButton+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+TKCategory.h"; sourceTree = "<group>"; };
3B4346E312DA6A240076579B /* UIButton+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+TKCategory.m"; sourceTree = "<group>"; };
- 3B6EDD521154791900E454DA /* libTapkuLibraryExtra.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTapkuLibraryExtra.a; sourceTree = BUILT_PRODUCTS_DIR; };
3B879FC4109BFC07002012FD /* TKCalendarMonthTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKCalendarMonthTableViewController.h; sourceTree = "<group>"; };
3B879FC5109BFC07002012FD /* TKCalendarMonthTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKCalendarMonthTableViewController.m; sourceTree = "<group>"; };
3B917CE810F34BF400049677 /* TKCoverflowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKCoverflowView.h; sourceTree = "<group>"; };
@@ -192,8 +185,8 @@
3BAC9A3610953E5200F235F1 /* TKTextViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKTextViewCell.m; sourceTree = "<group>"; };
3BAC9A3810953E5200F235F1 /* TKIndicatorCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKIndicatorCell.h; sourceTree = "<group>"; };
3BAC9A3910953E5200F235F1 /* TKIndicatorCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKIndicatorCell.m; sourceTree = "<group>"; };
- 3BAC9A3C10953E5200F235F1 /* ABTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ABTableViewCell.h; sourceTree = "<group>"; };
- 3BAC9A3D10953E5200F235F1 /* ABTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ABTableViewCell.m; sourceTree = "<group>"; };
+ 3BAC9A3C10953E5200F235F1 /* TKTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKTableViewCell.h; sourceTree = "<group>"; };
+ 3BAC9A3D10953E5200F235F1 /* TKTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKTableViewCell.m; sourceTree = "<group>"; };
3BAC9A3F10953E5200F235F1 /* TKLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKLoadingView.h; sourceTree = "<group>"; };
3BAC9A4010953E5200F235F1 /* TKLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKLoadingView.m; sourceTree = "<group>"; };
3BAC9A4E10953E5200F235F1 /* TKEmptyView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKEmptyView.h; sourceTree = "<group>"; };
@@ -208,15 +201,6 @@
3BB96F5712B55CD600C38F46 /* UIImageView+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+TKCategory.m"; sourceTree = "<group>"; };
3BBF87491296E976008AB2B1 /* TKTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKTableViewController.h; sourceTree = "<group>"; };
3BBF874A1296E976008AB2B1 /* TKTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKTableViewController.m; sourceTree = "<group>"; };
- 3BBF89031297061F008AB2B1 /* NSDictionary+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+TKCategory.h"; path = "TapkuLibraryExtra/NSDictionary+TKCategory.h"; sourceTree = SOURCE_ROOT; };
- 3BBF89041297061F008AB2B1 /* NSDictionary+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+TKCategory.m"; path = "TapkuLibraryExtra/NSDictionary+TKCategory.m"; sourceTree = SOURCE_ROOT; };
- 3BBF89051297061F008AB2B1 /* NSMutableURLRequest+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSMutableURLRequest+TKCategory.h"; path = "TapkuLibraryExtra/NSMutableURLRequest+TKCategory.h"; sourceTree = SOURCE_ROOT; };
- 3BBF89061297061F008AB2B1 /* NSMutableURLRequest+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSMutableURLRequest+TKCategory.m"; path = "TapkuLibraryExtra/NSMutableURLRequest+TKCategory.m"; sourceTree = SOURCE_ROOT; };
- 3BBF89071297061F008AB2B1 /* TapkuLibraryExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TapkuLibraryExtras.h; path = ../TapkuLibraryExtra/TapkuLibraryExtras.h; sourceTree = "<group>"; };
- 3BBF89081297061F008AB2B1 /* TKMapPlace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TKMapPlace.h; path = TapkuLibraryExtra/TKMapPlace.h; sourceTree = SOURCE_ROOT; };
- 3BBF89091297061F008AB2B1 /* TKMapPlace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TKMapPlace.m; path = TapkuLibraryExtra/TKMapPlace.m; sourceTree = SOURCE_ROOT; };
- 3BBF890A1297061F008AB2B1 /* TKMapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TKMapView.h; path = TapkuLibraryExtra/TKMapView.h; sourceTree = SOURCE_ROOT; };
- 3BBF890B1297061F008AB2B1 /* TKMapView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TKMapView.m; path = TapkuLibraryExtra/TKMapView.m; sourceTree = SOURCE_ROOT; };
3BBF89D01297095F008AB2B1 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
3BBF89D11297095F008AB2B1 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
3BBF89D31297095F008AB2B1 /* CDataScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDataScanner.h; sourceTree = "<group>"; };
@@ -241,6 +225,14 @@
3BBF89E81297095F008AB2B1 /* CSerializedJSONData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSerializedJSONData.m; sourceTree = "<group>"; };
3BD32970125B753900BE5EAF /* TKAlertCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKAlertCenter.h; sourceTree = "<group>"; };
3BD32971125B753900BE5EAF /* TKAlertCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKAlertCenter.m; sourceTree = "<group>"; };
+ 3BE54E7A134548CA00B59702 /* NSDictionary+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+TKCategory.h"; sourceTree = "<group>"; };
+ 3BE54E7B134548CA00B59702 /* NSDictionary+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+TKCategory.m"; sourceTree = "<group>"; };
+ 3BE54E7C134548CA00B59702 /* NSMutableURLRequest+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableURLRequest+TKCategory.h"; sourceTree = "<group>"; };
+ 3BE54E7D134548CA00B59702 /* NSMutableURLRequest+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableURLRequest+TKCategory.m"; sourceTree = "<group>"; };
+ 3BE54E82134548E600B59702 /* TKMapPlace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKMapPlace.h; sourceTree = "<group>"; };
+ 3BE54E83134548E600B59702 /* TKMapPlace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKMapPlace.m; sourceTree = "<group>"; };
+ 3BE54E84134548E600B59702 /* TKMapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKMapView.h; sourceTree = "<group>"; };
+ 3BE54E85134548E600B59702 /* TKMapView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TKMapView.m; sourceTree = "<group>"; };
3BE8FF8312945C4400DBF3FC /* UIScrollview+TKCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollview+TKCategory.h"; sourceTree = "<group>"; };
3BE8FF8412945C4400DBF3FC /* UIScrollview+TKCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollview+TKCategory.m"; sourceTree = "<group>"; };
3BEAE08E1096C61A00A0A372 /* TKWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TKWindow.h; sourceTree = "<group>"; };
@@ -255,23 +247,11 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 3B6EDD501154791900E454DA /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 3BBF89881297082B008AB2B1 /* Foundation.framework in Frameworks */,
- 3BBF89891297082B008AB2B1 /* UIKit.framework in Frameworks */,
- 3BBF898A1297082B008AB2B1 /* SystemConfiguration.framework in Frameworks */,
- 3BBF898B1297082B008AB2B1 /* CoreGraphics.framework in Frameworks */,
- 3BBF898C1297082B008AB2B1 /* QuartzCore.framework in Frameworks */,
- 3BBF88AC1297048A008AB2B1 /* MapKit.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
D2AAC07C0554694100DB518D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 3BE54E61134548A100B59702 /* MapKit.framework in Frameworks */,
AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
3BAC995A10953DF400F235F1 /* SystemConfiguration.framework in Frameworks */,
3BAC995B10953DF400F235F1 /* CoreGraphics.framework in Frameworks */,
@@ -287,7 +267,6 @@
isa = PBXGroup;
children = (
D2AAC07E0554694100DB518D /* libTapkuLibrary.a */,
- 3B6EDD521154791900E454DA /* libTapkuLibraryExtra.a */,
);
name = Products;
sourceTree = "<group>";
@@ -296,7 +275,6 @@
isa = PBXGroup;
children = (
3BAC98C910953DCC00F235F1 /* TapkuLibrary */,
- 3BAC9A4110953E5200F235F1 /* TapkuLibraryExtra */,
32C88DFF0371C24200C91783 /* Other Sources */,
0867D69AFE84028FC02AAC07 /* Frameworks */,
034768DFFF38A50411DB9C8B /* Products */,
@@ -383,8 +361,8 @@
3BAC9A3410953E5200F235F1 /* TKSwitchCell.m */,
3BAC9A3510953E5200F235F1 /* TKTextViewCell.h */,
3BAC9A3610953E5200F235F1 /* TKTextViewCell.m */,
- 3BAC9A3C10953E5200F235F1 /* ABTableViewCell.h */,
- 3BAC9A3D10953E5200F235F1 /* ABTableViewCell.m */,
+ 3BAC9A3C10953E5200F235F1 /* TKTableViewCell.h */,
+ 3BAC9A3D10953E5200F235F1 /* TKTableViewCell.m */,
);
name = Cells;
sourceTree = "<group>";
@@ -423,17 +401,6 @@
name = HUD;
sourceTree = "<group>";
};
- 3BAC9A4110953E5200F235F1 /* TapkuLibraryExtra */ = {
- isa = PBXGroup;
- children = (
- 3BBF89071297061F008AB2B1 /* TapkuLibraryExtras.h */,
- 3BBF89161297062E008AB2B1 /* Additions */,
- 3BBF891512970627008AB2B1 /* Map */,
- );
- name = TapkuLibraryExtra;
- path = TapkuLibrary;
- sourceTree = "<group>";
- };
3BAC9A4D10953E5200F235F1 /* Empty View */ = {
isa = PBXGroup;
children = (
@@ -473,12 +440,16 @@
3B4346E312DA6A240076579B /* UIButton+TKCategory.m */,
3BE8FF8312945C4400DBF3FC /* UIScrollview+TKCategory.h */,
3BE8FF8412945C4400DBF3FC /* UIScrollview+TKCategory.m */,
- 3B30B168129EE0DF00466666 /* UINavigationController+TKCategory.h */,
- 3B30B169129EE0DF00466666 /* UINavigationController+TKCategory.m */,
3B30B16A129EE0DF00466666 /* UINavigationBar+TKCategory.h */,
3B30B16B129EE0DF00466666 /* UINavigationBar+TKCategory.m */,
3B30B16C129EE0DF00466666 /* UIToolbar+TKCategory.h */,
3B30B16D129EE0DF00466666 /* UIToolbar+TKCategory.m */,
+ 3B07B7C8133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.h */,
+ 3B07B7C9133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.m */,
+ 3BE54E7A134548CA00B59702 /* NSDictionary+TKCategory.h */,
+ 3BE54E7B134548CA00B59702 /* NSDictionary+TKCategory.m */,
+ 3BE54E7C134548CA00B59702 /* NSMutableURLRequest+TKCategory.h */,
+ 3BE54E7D134548CA00B59702 /* NSMutableURLRequest+TKCategory.m */,
);
name = Additions;
sourceTree = "<group>";
@@ -492,28 +463,6 @@
name = "Image Center";
sourceTree = "<group>";
};
- 3BBF891512970627008AB2B1 /* Map */ = {
- isa = PBXGroup;
- children = (
- 3BBF89081297061F008AB2B1 /* TKMapPlace.h */,
- 3BBF89091297061F008AB2B1 /* TKMapPlace.m */,
- 3BBF890A1297061F008AB2B1 /* TKMapView.h */,
- 3BBF890B1297061F008AB2B1 /* TKMapView.m */,
- );
- name = Map;
- sourceTree = "<group>";
- };
- 3BBF89161297062E008AB2B1 /* Additions */ = {
- isa = PBXGroup;
- children = (
- 3BBF89031297061F008AB2B1 /* NSDictionary+TKCategory.h */,
- 3BBF89041297061F008AB2B1 /* NSDictionary+TKCategory.m */,
- 3BBF89051297061F008AB2B1 /* NSMutableURLRequest+TKCategory.h */,
- 3BBF89061297061F008AB2B1 /* NSMutableURLRequest+TKCategory.m */,
- );
- name = Additions;
- sourceTree = "<group>";
- };
3BBF89CF1297095F008AB2B1 /* TouchJSON */ = {
isa = PBXGroup;
children = (
@@ -578,8 +527,8 @@
3B30B165129EE0D600466666 /* TKViewController.m */,
3BBF87491296E976008AB2B1 /* TKTableViewController.h */,
3BBF874A1296E976008AB2B1 /* TKTableViewController.m */,
- 3B30B190129EE17500466666 /* TKBarButtonItem.h */,
- 3B30B191129EE17500466666 /* TKBarButtonItem.m */,
+ 3B07B1C7133AA68A001B1C6F /* TKNavigationController.h */,
+ 3B07B1C8133AA68A001B1C6F /* TKNavigationController.m */,
3BEAE08E1096C61A00A0A372 /* TKWindow.h */,
3BEAE08F1096C61A00A0A372 /* TKWindow.m */,
3B9D93D812F74F8F007D839C /* TKAppDelegate.h */,
@@ -596,12 +545,24 @@
3BAC9A4D10953E5200F235F1 /* Empty View */,
3BAC9A5010953E5200F235F1 /* Graph */,
3BAC9A3E10953E5200F235F1 /* HUD */,
+ 3BE54E8A134548E800B59702 /* Map */,
3BB3A2261178186100553093 /* Image Center */,
3BAC9A2510953E5200F235F1 /* Cells */,
);
name = UI;
sourceTree = "<group>";
};
+ 3BE54E8A134548E800B59702 /* Map */ = {
+ isa = PBXGroup;
+ children = (
+ 3BE54E82134548E600B59702 /* TKMapPlace.h */,
+ 3BE54E83134548E600B59702 /* TKMapPlace.m */,
+ 3BE54E84134548E600B59702 /* TKMapView.h */,
+ 3BE54E85134548E600B59702 /* TKMapView.m */,
+ );
+ name = Map;
+ sourceTree = "<group>";
+ };
3BF002FE109662E30062DA49 /* Month */ = {
isa = PBXGroup;
children = (
@@ -618,18 +579,6 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
- 3B6EDD4E1154791900E454DA /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 3BBF890C1297061F008AB2B1 /* NSDictionary+TKCategory.h in Headers */,
- 3BBF890E1297061F008AB2B1 /* NSMutableURLRequest+TKCategory.h in Headers */,
- 3BBF89101297061F008AB2B1 /* TapkuLibraryExtras.h in Headers */,
- 3BBF89111297061F008AB2B1 /* TKMapPlace.h in Headers */,
- 3BBF89131297061F008AB2B1 /* TKMapView.h in Headers */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
D2AAC07A0554694100DB518D /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -662,7 +611,7 @@
3B6EDE1811547C5100E454DA /* TKLabelCell.h in Headers */,
3B6EDE1A11547C5400E454DA /* TKButtonCell.h in Headers */,
3B6EDE1E11547C5600E454DA /* TKIndicatorCell.h in Headers */,
- 3B6EDE2011547C5700E454DA /* ABTableViewCell.h in Headers */,
+ 3B6EDE2011547C5700E454DA /* TKTableViewCell.h in Headers */,
3BB3A2251178185B00553093 /* TKImageCenter.h in Headers */,
3BB92D2211896022002FA0F9 /* TKProgressBarView.h in Headers */,
3BA577BA1199DF1600ECB85B /* TKProgressAlertView.h in Headers */,
@@ -672,37 +621,24 @@
3BE8FF8512945C4400DBF3FC /* UIScrollview+TKCategory.h in Headers */,
3BBF874B1296E976008AB2B1 /* TKTableViewController.h in Headers */,
3B30B178129EE10B00466666 /* TKViewController.h in Headers */,
- 3B30B179129EE10B00466666 /* UINavigationController+TKCategory.h in Headers */,
3B30B17A129EE10B00466666 /* UINavigationBar+TKCategory.h in Headers */,
3B30B17B129EE10B00466666 /* UIToolbar+TKCategory.h in Headers */,
- 3B30B192129EE17500466666 /* TKBarButtonItem.h in Headers */,
3BB96F5812B55CD600C38F46 /* UIImageView+TKCategory.h in Headers */,
3BEE1CBB12CFB78300FECF6D /* TKProgressCircleView.h in Headers */,
3B4346E412DA6A240076579B /* UIButton+TKCategory.h in Headers */,
3B9D93DA12F74F8F007D839C /* TKAppDelegate.h in Headers */,
+ 3B07B1C9133AA68A001B1C6F /* TKNavigationController.h in Headers */,
+ 3B07B7CA133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.h in Headers */,
+ 3BE54E7E134548CA00B59702 /* NSDictionary+TKCategory.h in Headers */,
+ 3BE54E80134548CA00B59702 /* NSMutableURLRequest+TKCategory.h in Headers */,
+ 3BE54E86134548E600B59702 /* TKMapPlace.h in Headers */,
+ 3BE54E88134548E600B59702 /* TKMapView.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 3B6EDD511154791900E454DA /* TapkuLibraryExtra */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 3B6EDD581154792100E454DA /* Build configuration list for PBXNativeTarget "TapkuLibraryExtra" */;
- buildPhases = (
- 3B6EDD4E1154791900E454DA /* Headers */,
- 3B6EDD4F1154791900E454DA /* Sources */,
- 3B6EDD501154791900E454DA /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = TapkuLibraryExtra;
- productName = TapkuLibraryExtra;
- productReference = 3B6EDD521154791900E454DA /* libTapkuLibraryExtra.a */;
- productType = "com.apple.product-type.library.static";
- };
D2AAC07D0554694100DB518D /* TapkuLibrary */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "TapkuLibrary" */;
@@ -741,23 +677,11 @@
projectRoot = "";
targets = (
D2AAC07D0554694100DB518D /* TapkuLibrary */,
- 3B6EDD511154791900E454DA /* TapkuLibraryExtra */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
- 3B6EDD4F1154791900E454DA /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 3BBF890D1297061F008AB2B1 /* NSDictionary+TKCategory.m in Sources */,
- 3BBF890F1297061F008AB2B1 /* NSMutableURLRequest+TKCategory.m in Sources */,
- 3BBF89121297061F008AB2B1 /* TKMapPlace.m in Sources */,
- 3BBF89141297061F008AB2B1 /* TKMapView.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
D2AAC07B0554694100DB518D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -789,7 +713,7 @@
3B6EDE1711547C5000E454DA /* TKLabelCell.m in Sources */,
3B6EDE1911547C5100E454DA /* TKButtonCell.m in Sources */,
3B6EDE1D11547C5500E454DA /* TKIndicatorCell.m in Sources */,
- 3B6EDE1F11547C5600E454DA /* ABTableViewCell.m in Sources */,
+ 3B6EDE1F11547C5600E454DA /* TKTableViewCell.m in Sources */,
3BB3A2241178185B00553093 /* TKImageCenter.m in Sources */,
3BB92D2311896022002FA0F9 /* TKProgressBarView.m in Sources */,
3BA577BB1199DF1600ECB85B /* TKProgressAlertView.m in Sources */,
@@ -799,14 +723,18 @@
3BE8FF8612945C4400DBF3FC /* UIScrollview+TKCategory.m in Sources */,
3BBF874C1296E976008AB2B1 /* TKTableViewController.m in Sources */,
3B30B174129EE0F400466666 /* TKViewController.m in Sources */,
- 3B30B175129EE0F400466666 /* UINavigationController+TKCategory.m in Sources */,
3B30B176129EE0F400466666 /* UINavigationBar+TKCategory.m in Sources */,
3B30B177129EE0F400466666 /* UIToolbar+TKCategory.m in Sources */,
- 3B30B193129EE17500466666 /* TKBarButtonItem.m in Sources */,
3BB96F5912B55CD600C38F46 /* UIImageView+TKCategory.m in Sources */,
3BEE1CBC12CFB78300FECF6D /* TKProgressCircleView.m in Sources */,
3B4346E512DA6A240076579B /* UIButton+TKCategory.m in Sources */,
3B9D93DB12F74F8F007D839C /* TKAppDelegate.m in Sources */,
+ 3B07B1CA133AA68A001B1C6F /* TKNavigationController.m in Sources */,
+ 3B07B7CB133ADAD8001B1C6F /* UIBarButtonItem+TKCategory.m in Sources */,
+ 3BE54E7F134548CA00B59702 /* NSDictionary+TKCategory.m in Sources */,
+ 3BE54E81134548CA00B59702 /* NSMutableURLRequest+TKCategory.m in Sources */,
+ 3BE54E87134548E600B59702 /* TKMapPlace.m in Sources */,
+ 3BE54E89134548E600B59702 /* TKMapView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -893,35 +821,6 @@
};
name = Release;
};
- 3B6EDD561154791900E454DA /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/build/Debug-iphonesimulator\"",
- );
- PREBINDING = NO;
- PRODUCT_NAME = TapkuLibraryExtra;
- };
- name = Debug;
- };
- 3B6EDD571154791900E454DA /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- PREBINDING = NO;
- PRODUCT_NAME = TapkuLibraryExtra;
- ZERO_LINK = NO;
- };
- name = Release;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -943,15 +842,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 3B6EDD581154792100E454DA /* Build configuration list for PBXNativeTarget "TapkuLibraryExtra" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 3B6EDD561154791900E454DA /* Debug */,
- 3B6EDD571154791900E454DA /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
/* End XCConfigurationList section */
};
rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
View
41 src/TapkuLibrary/ABTableViewCell.h
@@ -1,41 +0,0 @@
-// Copyright (c) 2008 Loren Brichter
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// ABTableViewCell.h
-//
-// Created by Loren Brichter
-// Copyright 2008 Loren Brichter. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-// to use: subclass ABTableViewCell and implement -drawContentView:
-
-@interface ABTableViewCell : UITableViewCell
-{
- UIView *contentView;
-}
-
-- (void)drawContentView:(CGRect)r; // subclasses should implement
-
-@end
View
99 src/TapkuLibrary/ABTableViewCell.m
@@ -1,99 +0,0 @@
-// Copyright (c) 2008 Loren Brichter
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// ABTableViewCell.m
-//
-// Created by Loren Brichter
-// Copyright 2008 Loren Brichter. All rights reserved.
-//
-
-#import "ABTableViewCell.h"
-
-@interface ABTableViewCellView : UIView
-@end
-
-@implementation ABTableViewCellView
-
-- (void) drawRect:(CGRect)r{
- [(ABTableViewCell *)[self superview] drawContentView:r];
-}
-
-@end
-
-
-
-@implementation ABTableViewCell
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
- if(!(self=[super initWithStyle:style reuseIdentifier:reuseIdentifier])) return nil;
-
- contentView = [[ABTableViewCellView alloc] initWithFrame:CGRectZero];
- contentView.opaque = YES;
- [self addSubview:contentView];
- [contentView release];
-
- return self;
-}
-
-- (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier{
- if(!(self=[super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier])) return nil;
-
- contentView = [[ABTableViewCellView alloc] initWithFrame:CGRectZero];
- contentView.opaque = YES;
- [self addSubview:contentView];
- [contentView release];
-
- return self;
-}
-
-- (void)dealloc
-{
- [super dealloc];
-}
-
-- (void) layoutSubviews {
- [super layoutSubviews];
- [self setNeedsDisplay];
-}
-
-
-- (void)setFrame:(CGRect)f
-{
- [super setFrame:f];
- CGRect b = [self bounds];
- b.size.height -= 1; // leave room for the seperator line
- [contentView setFrame:b];
-}
-
-- (void)setNeedsDisplay
-{
- [super setNeedsDisplay];
- [contentView setNeedsDisplay];
-}
-
-- (void)drawContentView:(CGRect)r
-{
- // subclasses should implement this
-}
-
-@end
View
2 ...pkuLibraryExtra/NSDictionary+TKCategory.h → src/TapkuLibrary/NSDictionary+TKCategory.h
@@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
-@interface NSDictionary ( CurlHTTPExtensions )
+@interface NSDictionary ( TKCategory )
- (NSString *) formatForHTTP;
- (NSString *) formatForHTTPUsingEncoding:(NSStringEncoding)inEncoding;
View
44 ...pkuLibraryExtra/NSDictionary+TKCategory.m → src/TapkuLibrary/NSDictionary+TKCategory.m
@@ -1,15 +1,38 @@
//
// NSDictionaryAdditions.m
-// PhoneHome
-//
// Created by Devin Ross on 2/23/10.
-// Copyright 2010 __MyCompanyName__. All rights reserved.
//
+/*
+
+ tapku.com || http://github.com/devinross/tapkulibrary
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ */
#import "NSDictionary+TKCategory.h"
-@implementation NSDictionary ( CurlHTTPExtensions )
+@implementation NSDictionary ( TKCategory )
/*" This category adds methods for dealing with HTTP input and output to an #NSDictionary.
"*/
@@ -18,8 +41,7 @@ @implementation NSDictionary ( CurlHTTPExtensions )
see #formatForHTTPUsingEncoding.
"*/
-- (NSString *) formatForHTTP
-{
+- (NSString *) formatForHTTP {
return [self formatForHTTPUsingEncoding:NSASCIIStringEncoding];
// default to dumb ASCII only
}
@@ -29,16 +51,15 @@ - (NSString *) formatForHTTP
keys and values are output as %{key}=%{value}; in between arguments is !{&}.
"*/
-- (NSString *) formatForHTTPUsingEncoding:(NSStringEncoding)inEncoding
-{
+- (NSString *) formatForHTTPUsingEncoding:(NSStringEncoding)inEncoding{
return [self formatForHTTPUsingEncoding:inEncoding ordering:nil];
}
/*" Convert a dictionary to an HTTP-formatted string with the given encoding, as above. The inOrdering parameter specifies the order to place the inputs, for servers that care about this. (Note that keys in the dictionary that aren't in inOrdering will not be included.) If inOrdering is nil, all keys and values will be output in an unspecified order.
"*/
-- (NSString *) formatForHTTPUsingEncoding:(NSStringEncoding)inEncoding ordering:(NSArray *)inOrdering
-{
+- (NSString *) formatForHTTPUsingEncoding:(NSStringEncoding)inEncoding ordering:(NSArray *)inOrdering{
+
NSMutableString *s = [NSMutableString stringWithCapacity:256];
NSEnumerator *e = (nil == inOrdering) ? [self keyEnumerator] : [inOrdering objectEnumerator];
id key;
@@ -73,8 +94,7 @@ - (NSString *) formatForHTTPUsingEncoding:(NSStringEncoding)inEncoding ordering:
}
}
// Delete final & from the string
- if (![s isEqualToString:@""])
- {
+ if (![s isEqualToString:@""]){
[s deleteCharactersInRange:NSMakeRange([s length]-1, 1)];
}
return s;
View
3 ...aryExtra/NSMutableURLRequest+TKCategory.h → ...uLibrary/NSMutableURLRequest+TKCategory.h
@@ -1,9 +1,6 @@
//
// NSMutableURLRequestAdditions.h
-// PhoneHome
-//
// Created by Devin Ross on 2/23/10.
-// Copyright 2010 __MyCompanyName__. All rights reserved.
//
#import <Foundation/Foundation.h>
View
29 ...aryExtra/NSMutableURLRequest+TKCategory.m → ...uLibrary/NSMutableURLRequest+TKCategory.m
@@ -1,10 +1,33 @@
//
// NSMutableURLRequestAdditions.m
-// PhoneHome
-//
// Created by Devin Ross on 2/23/10.
-// Copyright 2010 __MyCompanyName__. All rights reserved.
//
+/*
+
+ tapku.com || http://github.com/devinross/tapkulibrary
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ */
#import "NSMutableURLRequest+TKCategory.h"
#import "NSDictionary+TKCategory.h"
View
1 src/TapkuLibrary/NSString+TKCategory.h
@@ -37,5 +37,6 @@
- (NSString*) URLEncode;
- (NSString *) escapeHTML;
- (NSString *) unescapeHTML;
+- (NSString*) stringByRemovingHTML;
@end
View
14 src/TapkuLibrary/NSString+TKCategory.m
@@ -145,5 +145,19 @@ - (NSString *) unescapeHTML{
}
+- (NSString*) stringByRemovingHTML{
+
+ NSString *html = self;
+ NSScanner *thescanner = [NSScanner scannerWithString:html];
+ NSString *text = nil;
+
+ while ([thescanner isAtEnd] == NO) {
+ [thescanner scanUpToString:@"<" intoString:NULL];
+ [thescanner scanUpToString:@">" intoString:&text];
+ html = [html stringByReplacingOccurrencesOfString:[NSString stringWithFormat:@"%@>",text] withString:@" "];
+ }
+ return html;
+}
+
@end
View
3 src/TapkuLibrary/TKAlertCenter.m
@@ -301,7 +301,8 @@ - (void) setImage:(UIImage*)img{
[self adjust];
}
- (void) drawRect:(CGRect)rect{
- [UIView drawRoundRectangleInRect:rect withRadius:10 color:[UIColor colorWithWhite:0 alpha:0.8]];
+ [[UIColor colorWithWhite:0 alpha:0.8] set];
+ [UIView drawRoundRectangleInRect:rect withRadius:10];
[[UIColor whiteColor] set];
[text drawInRect:messageRect withFont:[UIFont boldSystemFontOfSize:14] lineBreakMode:UILineBreakModeWordWrap alignment:UITextAlignmentCenter];
View
55 src/TapkuLibrary/TKBarButtonItem.h
@@ -1,55 +0,0 @@
-//
-// TKBarButtonItem.h
-// Created by Devin Ross on 11/24/10.
-//
-/*
-
- tapku.com || http://github.com/devinross/tapkulibrary
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- */
-
-#import <UIKit/UIKit.h>
-
-typedef enum {
- TKBarButtonItemStylePlain,
- TKBarButtonItemStyleBack,
- TKBarButtonItemStyleDone
-} TKBarButtonItemStyle;
-
-
-@interface TKBarButtonItem : UIBarButtonItem {
-
- UIButton *_buttonContainer;
- TKBarButtonItemStyle _style;
-
-}
-
-- (id) initWithTitle:(NSString*)title style:(TKBarButtonItemStyle)buttonStyle target:(id)target action:(SEL)action;
-- (id) initWithImage:(UIImage*)image style:(TKBarButtonItemStyle)buttonStyle target:(id)target action:(SEL)action;
-
-@property (nonatomic,assign) TKBarButtonItemStyle buttonStyle;
-
-- (void) setTarget:(id)target action:(SEL)action;
-
-@end
View
242 src/TapkuLibrary/TKBarButtonItem.m
@@ -1,242 +0,0 @@
-//
-// TKBarButtonItem.m
-// Created by Devin Ross on 11/24/10.
-//
-/*
-
- tapku.com || http://github.com/devinross/tapkulibrary
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- */
-
-#import "TKBarButtonItem.h"
-#import "TKGlobal.h"
-#import "UIImage+TKCategory.h"
-
-@implementation TKBarButtonItem
-
-- (UIImage*) imageForStyle:(TKBarButtonItemStyle)s{
- NSString *imageName;
- NSString *scale = [[UIScreen mainScreen] scale] > 1 ? @"@2x" : @"";
-
-
-
- switch (s) {
- case TKBarButtonItemStyleBack:
- imageName = @"ui back button";
- break;
- case TKBarButtonItemStyleDone:
- imageName = @"ui done button";
- break;
- default:
- imageName = @"ui plain button";
- break;
- }
-
- NSString *url = [NSString stringWithFormat:@"TapkuLibrary.bundle/Images/gui/%@%@.png",imageName,scale];
-
-
- UIImage *img = [UIImage imageWithCGImage:[UIImage imageWithContentsOfFile:TKBUNDLE(url)].CGImage
- scale:[[UIScreen mainScreen] scale] orientation:UIImageOrientationUp];
-
-
- return [img stretchableImageWithLeftCapWidth:24 topCapHeight:0];
-}
-- (UIImage*) hoverImageForStyle:(TKBarButtonItemStyle)s{
-
- NSString *imageName;
- NSString *scale = [[UIScreen mainScreen] scale] > 1 ? @"@2x" : @"";
-
-
- switch (s) {
- case TKBarButtonItemStyleBack:
- imageName = @"ui back button hover";
- break;
- default:
- imageName = @"ui plain button hover";
- break;
- }
-
- NSString *url = [NSString stringWithFormat:@"TapkuLibrary.bundle/Images/gui/%@%@.png",imageName,scale];
-
- UIImage *img = [UIImage imageWithCGImage:[UIImage imageWithContentsOfFile:TKBUNDLE(url)].CGImage
- scale:[[UIScreen mainScreen] scale] orientation:UIImageOrientationUp];
-
-
- return [img stretchableImageWithLeftCapWidth:24 topCapHeight:0];
-}
-- (UIEdgeInsets) insetForStyle:(TKBarButtonItemStyle)s{
-
- UIEdgeInsets e;
-
- switch (s) {
- case TKBarButtonItemStyleBack:
- e = UIEdgeInsetsMake(0, 14, 2, 6);
- break;
- default:
- e = UIEdgeInsetsMake(0, 8, 2, 8);
- break;
- }
-
- return e;
-
-}
-- (UIEdgeInsets) insetForImageWithStyle:(TKBarButtonItemStyle)s{
- UIEdgeInsets e;
-
- switch (s) {
- case TKBarButtonItemStyleBack:
- e = UIEdgeInsetsMake(0, 12, 2, 8);
- break;
- default:
- e = UIEdgeInsetsMake(0, 8, 2, 8);
- break;
- }
-
- return e;
-
-}
-
-- (void) setupButtonWithStyle:(TKBarButtonItemStyle)s{
-
-
- UIImage *glyph = [_buttonContainer imageForState:UIControlStateNormal];
-
-
- if(!glyph){
- UIEdgeInsets e = [self insetForStyle:s];
- _buttonContainer.titleEdgeInsets = e;
- NSString *ti = [_buttonContainer titleForState:UIControlStateNormal];
- CGSize size = [ti sizeWithFont:_buttonContainer.titleLabel.font forWidth:200 lineBreakMode:UILineBreakModeTailTruncation];
- _buttonContainer.frame = CGRectMake(_buttonContainer.frame.origin.x, _buttonContainer.frame.origin.y, size.width + e.left + e.right, 30);
-
- }else{
- UIEdgeInsets e = [self insetForImageWithStyle:s];
- _buttonContainer.imageEdgeInsets = e;
- _buttonContainer.frame = CGRectMake(_buttonContainer.frame.origin.x, _buttonContainer.frame.origin.y, glyph.size.width + e.left + e.right, 30);
- }
-
- UIImage *img = [self imageForStyle:s];
-
- //[_buttonContainer setImage:img forState:UIControlStateNormal];
- [_buttonContainer setBackgroundImage:img forState:UIControlStateNormal];
- [_buttonContainer setBackgroundImage:[self hoverImageForStyle:s] forState:UIControlStateHighlighted];
- _buttonContainer.showsTouchWhenHighlighted = NO;
- _buttonContainer.adjustsImageWhenHighlighted = NO;
-
-
-}
-
-
-- (id) initWithTitle:(NSString*)_title style:(TKBarButtonItemStyle)s target:(id)t action:(SEL)a{
- if(!(self = [super initWithCustomView:nil])) return nil;
-
- self.title = _title;
-
-
- _buttonContainer = [[UIButton buttonWithType:UIButtonTypeCustom] retain];
- _buttonContainer.frame = CGRectMake(0, 0, 30, 30);
-
-
- _buttonContainer.titleLabel.textColor = [UIColor whiteColor];
- _buttonContainer.titleLabel.font = [UIFont boldSystemFontOfSize:13];
- _buttonContainer.titleLabel.shadowColor = [UIColor blackColor];
- _buttonContainer.titleLabel.shadowOffset = CGSizeMake(0, -1);
- _buttonContainer.titleLabel.backgroundColor = [UIColor clearColor];
- _buttonContainer.showsTouchWhenHighlighted = NO;
- _buttonContainer.adjustsImageWhenHighlighted = NO;
-
-
- [_buttonContainer setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- [_buttonContainer setTitle:_title forState:UIControlStateNormal];
- [_buttonContainer addTarget:t action:a forControlEvents:UIControlEventTouchUpInside];
-
- [self setupButtonWithStyle:s];
-
- self.customView = _buttonContainer;
-
-
- _style = s;
-
-
- return self;
-}
-- (id) initWithImage:(UIImage*)img style:(TKBarButtonItemStyle)s target:(id)t action:(SEL)a{
-
- if(!(self = [super initWithCustomView:nil])) return nil;
-
- _buttonContainer = [[UIButton buttonWithType:UIButtonTypeCustom] retain];
- _buttonContainer.frame = CGRectMake(0, 0, 30, 30);
-
- [_buttonContainer setImage:img forState:UIControlStateNormal];
- [_buttonContainer addTarget:t action:a forControlEvents:UIControlEventTouchUpInside];
- [self setupButtonWithStyle:s];
-
- self.customView = _buttonContainer;
-
- _style = s;
-
-
- return self;
-}
-
-- (void) setTarget:(id)target{
- return;
-}
-- (void) setAction:(SEL)a{
- return;
-}
-- (id) target{
- NSSet *set = [_buttonContainer allTargets];
- if([set count] < 1) return nil;
- return [[_buttonContainer allTargets] anyObject];
-}
-- (SEL) action{
- return NSSelectorFromString([[_buttonContainer actionsForTarget:[[_buttonContainer allTargets] anyObject] forControlEvent:UIControlEventTouchUpInside] lastObject]);
-}
-- (void) setTarget:(id)tt action:(SEL)aa{
-
- id t = [self target];
- if(t != nil){
- SEL act = NSSelectorFromString([[_buttonContainer actionsForTarget:[[_buttonContainer allTargets] anyObject] forControlEvent:UIControlEventTouchUpInside] lastObject]);
- [_buttonContainer removeTarget:t action:act forControlEvents:UIControlEventTouchUpInside];
- }
-
-
- [_buttonContainer addTarget:tt action:aa forControlEvents:UIControlEventTouchUpInside];
-}
-- (TKBarButtonItemStyle) buttonStyle{
- return _style;
-}
-- (void) setButtonStyle:(TKBarButtonItemStyle)s{
- _style = s;
- [self setupButtonWithStyle:s];
-}
-
-
-- (void) dealloc{
- [_buttonContainer release];
- [super dealloc];
-}
-
-@end
View
7 src/TapkuLibrary/TKButtonCell.h
@@ -31,10 +31,5 @@
#import <UIKit/UIKit.h>
-@interface TKButtonCell : UITableViewCell {
- UILabel *title;
-}
-
-@property (retain,nonatomic) UILabel *title;
-
+@interface TKButtonCell : UITableViewCell
@end
View
39 src/TapkuLibrary/TKButtonCell.m
@@ -33,31 +33,23 @@
@implementation TKButtonCell
-@synthesize title;
- (id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-
-
if(!(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) return nil;
-
-
- [self addSubview:self.title];
-
-
+ self.textLabel.textAlignment = UITextAlignmentCenter;
+ self.textLabel.font = [UIFont boldSystemFontOfSize:14.0];
return self;
}
- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
-
return [self initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
-
}
-- (void)layoutSubviews {
+- (void) layoutSubviews {
[super layoutSubviews];
- CGRect r = CGRectInset(self.bounds, 16, 8);
- self.title.frame = r;
+ CGRect r = CGRectInset(self.contentView.bounds , 20, 8);
+ self.textLabel.frame = r;
}
@@ -68,35 +60,24 @@ - (void) setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
if(selected)
- self.title.textColor = [UIColor whiteColor];
+ self.textLabel.textColor = [UIColor whiteColor];
else
- self.title.textColor = [UIColor colorWithRed:74/255.0 green:110/255.0 blue:165/255.0 alpha:1.0];
+ self.textLabel.textColor = [UIColor colorWithRed:74/255.0 green:110/255.0 blue:165/255.0 alpha:1.0];
}
- (void) setHighlighted:(BOOL)highlight animated:(BOOL)animated {
[super setHighlighted:highlight animated:animated];
if(highlight)
- self.title.textColor = [UIColor whiteColor];
+ self.textLabel.textColor = [UIColor whiteColor];
else
- self.title.textColor = [UIColor colorWithRed:74/255.0 green:110/255.0 blue:165/255.0 alpha:1.0];
+ self.textLabel.textColor = [UIColor colorWithRed:74/255.0 green:110/255.0 blue:165/255.0 alpha:1.0];
}
-- (UILabel*) title{
- if(title == nil){
- title = [[UILabel alloc] initWithFrame:CGRectZero];
- title.textAlignment = UITextAlignmentCenter;
- title.font = [UIFont boldSystemFontOfSize:14.0];
- }
- return title;
-}
-- (void) dealloc {
- //[title dealloc];
- [super dealloc];
-}
+
@end
View
6 src/TapkuLibrary/TKGlobal.h
@@ -33,12 +33,8 @@
#define TKBUNDLE(_URL) [TKGlobal fullBundlePath:_URL]
-@interface TKGlobal : NSObject {
-
-}
-
+@interface TKGlobal : NSObject
+ (NSString*) fullBundlePath:(NSString*)bundlePath;
-
@end
View
1 src/TapkuLibrary/TKGlobal.m
@@ -30,7 +30,6 @@
*/
#import "TKGlobal.h"
-
@implementation TKGlobal
View
4 src/TapkuLibrary/TKGraphView.m
@@ -73,8 +73,8 @@ - (id) init{
}
- (void) drawRect:(CGRect)rect{
-
- [UIView drawRoundRectangleInRect:rect withRadius:4.0 color:[UIColor redColor]];
+ [[UIColor redColor] set];
+ [UIView drawRoundRectangleInRect:rect withRadius:4.0];
[[UIColor whiteColor] set];
[title drawInRect:CGRectMake(6, 2, 100, 12) withFont:[UIFont boldSystemFontOfSize:11]];
View
28 src/TapkuLibrary/TKImageCenter.m
@@ -96,6 +96,7 @@ + (TKImageCenter*) sharedImageCenter{
- (id) init{
if(!(self=[super init])) return nil;
queue = [[NSOperationQueue alloc] init];
+ [queue setMaxConcurrentOperationCount:3];
images = [[NSMutableDictionary alloc] init];
return self;
}
@@ -106,16 +107,35 @@ - (UIImage*) imageAtURL:(NSString*)imageURL queueIfNeeded:(BOOL)addToQueue{
UIImage *img = [images objectForKey:imageURL];
if(img != nil) return img;
- ImageLoadOperation *op = [[ImageLoadOperation alloc] initWithImageURLString:imageURL];
- op.imageCenter = self;
- [queue addOperation:op];
- [op release];
+
+ BOOL addOperation = addToQueue ? YES : NO;
+
+ if(addOperation){
+
+ for(ImageLoadOperation *op in [queue operations]){
+ if([op.imageURL isEqualToString:imageURL]){
+ addOperation = NO;
+ break;
+ }
+ }
+
+ if(addOperation){
+ ImageLoadOperation *op = [[ImageLoadOperation alloc] initWithImageURLString:imageURL];
+ op.imageCenter = self;
+ [queue addOperation:op];
+ [op release];
+ }
+
+ }
+
+
return nil;
}
+
- (UIImage*) adjustImageRecieved:(UIImage*)image{
return image;
}
View
4 src/TapkuLibrary/TKIndicatorCell.h
@@ -30,9 +30,9 @@
*/
-#import "ABTableViewCell.h"
+#import "TKTableViewCell.h"
-@interface TKIndicatorCell : ABTableViewCell {
+@interface TKIndicatorCell : TKTableViewCell {
NSString *_text;
int _count;
NSString *_countStr;
View
60 src/TapkuLibrary/TKIndicatorCell.m
@@ -30,22 +30,19 @@
*/
#import "TKIndicatorCell.h"
+#import "UIView+TKCategory.h"
-
+static UIFont *textFont = nil;
+static UIFont *indicatorFont = nil;
+static UIColor *indicatorColor = nil;
+static UIColor *indicatorBackgroundColor = nil;
@implementation TKIndicatorCell
@synthesize text = _text, count = _count;
-
-static UIFont *textFont = nil;
-static UIFont *indicatorFont = nil;
-static UIColor *indicatorColor = nil;
-static UIColor *indicatorBackgroundColor = nil;
-
-+ (void)initialize
-{
++ (void) initialize{
if(self == [TKIndicatorCell class])
{
textFont = [[UIFont boldSystemFontOfSize:18] retain];
@@ -55,26 +52,18 @@ + (void)initialize
}
}
-
-- (void)dealloc
-{
+- (void) dealloc{
[_text release];
[_countStr release];
- //[textFont release];
- //[indicatorFont release];
- //[indicatorBackgroundColor release];
[super dealloc];
}
-// the reason I don't synthesize setters for 'firstText' and 'lastText' is because I need to
-// call -setNeedsDisplay when they change
- (void) setText:(NSString*)s{
[_text release];
_text = [s copy];
[self setNeedsDisplay];
}
-
- (void) setCount:(int)s{
if(s==_count) return;
if(s > 99 && _count < 100){
@@ -90,18 +79,12 @@ - (void) setCount:(int)s{
}
-- (void)drawContentView:(CGRect)r{
+- (void) drawContentView:(CGRect)r{
-
CGContextRef context = UIGraphicsGetCurrentContext();
- UIColor *backgroundColor = [UIColor whiteColor];
- UIColor *textColor = [UIColor blackColor];
-
- if(self.selected || self.highlighted){
- backgroundColor = [UIColor clearColor];
- textColor = [UIColor whiteColor];
- }
+ UIColor *backgroundColor = self.selected || self.highlighted ? [UIColor clearColor] : [UIColor whiteColor];
+ UIColor *textColor = self.selected || self.highlighted ? [UIColor whiteColor] : [UIColor blackColor];
[backgroundColor set];
CGContextFillRect(context, r);
@@ -123,32 +106,23 @@ - (void)drawContentView:(CGRect)r{
[indicatorBackgroundColor set];
- CGRect rrect = CGRectMake(rect.size.width+ rect.origin.x, 12, 30,20);
- CGFloat radius = 10.0;
- CGFloat minx = CGRectGetMinX(rrect), midx = CGRectGetMidX(rrect), maxx = CGRectGetMaxX(rrect);
- CGFloat miny = CGRectGetMinY(rrect), midy = CGRectGetMidY(rrect), maxy = CGRectGetMaxY(rrect);
- CGContextMoveToPoint(context, minx, midy);
- CGContextAddArcToPoint(context, minx, miny, midx, miny, radius);
- CGContextAddArcToPoint(context, maxx, miny, maxx, midy, radius);
- CGContextAddArcToPoint(context, maxx, maxy, midx, maxy, radius);
- CGContextAddArcToPoint(context, minx, maxy, minx, midy, radius);
- CGContextClosePath(context);
- CGContextDrawPath(context, kCGPathFill);
+ CGRect rr = CGRectMake(rect.size.width+ rect.origin.x, 12, 30,20);
+ [UIView drawRoundRectangleInRect:rr withRadius:10];
+
+
- if(_count > 99)
- rrect.origin.y += 2;
+ if(_count > 99) rr.origin.y += 2;
[indicatorColor set];
- //[_countStr drawInRect:rrect withFont:indicatorFont];
- [_countStr drawInRect:rrect withFont:indicatorFont lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentCenter];
+ [_countStr drawInRect:rr withFont:indicatorFont lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentCenter];
}
}
-- (void)willTransitionToState:(UITableViewCellStateMask)state{
+- (void) willTransitionToState:(UITableViewCellStateMask)state{
[super willTransitionToState:state];
[self setNeedsDisplay];
}
View
4 src/TapkuLibrary/TKLabelCell.h
@@ -33,9 +33,7 @@
@interface TKLabelCell : UITableViewCell {
- UILabel *label;
+ UILabel *_label;
}
-
@property (retain, nonatomic) UILabel *label;
-
@end
View
69 src/TapkuLibrary/TKLabelCell.m
@@ -31,78 +31,63 @@
#import "TKLabelCell.h"
-
@implementation TKLabelCell
+@synthesize label=_label;
+
+
+
-@synthesize label;
- (id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if(!(self=[super initWithStyle:style reuseIdentifier:reuseIdentifier])) return nil;
- // Initialization code
- label = [[UILabel alloc] initWithFrame:CGRectZero];
- label.textAlignment = UITextAlignmentRight;
- label.textColor = [UIColor grayColor];
- label.font = [UIFont boldSystemFontOfSize:12.0];
- [self addSubview:label];
- label.adjustsFontSizeToFitWidth = YES;
- label.baselineAdjustment = UIBaselineAdjustmentNone;
-
- //label.backgroundColor = [UIColor redColor];
- label.numberOfLines = 20;
+ _label = [[UILabel alloc] initWithFrame:CGRectZero];
+ _label.textAlignment = UITextAlignmentRight;
+ _label.textColor = [UIColor grayColor];
+ _label.font = [UIFont boldSystemFontOfSize:12.0];
+ _label.adjustsFontSizeToFitWidth = YES;
+ _label.baselineAdjustment = UIBaselineAdjustmentNone;
+ _label.numberOfLines = 20;
+
+ [self.contentView addSubview:_label];
+
return self;
}
+- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
+ self = [self initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
+ return self;
+}
+- (void) dealloc {
+ [_label release];
+ [super dealloc];
+}
- (void) layoutSubviews {
[super layoutSubviews];
- //NSLog(@"Layout subviews %f",[self indentationWidth]);
- float insetx = 16;
- if(self.editing) insetx += 30;
-
-
- CGRect r = CGRectInset(self.bounds, insetx, 8);
+ CGRect r = CGRectInset(self.contentView.bounds, 8, 8);
r.size.width = 72;
r.size.height = 30;
- label.frame = r;
+ _label.frame = r;
}
-- (void) willTransitionToState:(UITableViewCellStateMask)state{
- [super willTransitionToState:state];
- [self setNeedsDisplay];
-}
-- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
+- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
-
- if(selected){
- label.textColor = [UIColor whiteColor];
- }else{
- label.textColor = [UIColor grayColor];
- }
-
+ _label.textColor = selected ? [UIColor whiteColor] : [UIColor grayColor];
}
- (void) setHighlighted:(BOOL)highlighted animated:(BOOL)animated{
[super setHighlighted:highlighted animated:animated];
- if(highlighted){
- label.textColor = [UIColor whiteColor];
- }else{
- label.textColor = [UIColor grayColor];
- }
+ _label.textColor = highlighted ? [UIColor whiteColor] : [UIColor grayColor];
}
-- (void) dealloc {
- [label release];
- [super dealloc];
-}
-
@end
View
2 src/TapkuLibrary/TKLabelFieldCell.h
@@ -33,7 +33,7 @@
#import "TKLabelCell.h"
@interface TKLabelFieldCell : TKLabelCell {
- UILabel *field;
+ UILabel *_field;
}
@property (retain, nonatomic) UILabel *field;
@end
View
63 src/TapkuLibrary/TKLabelFieldCell.m
@@ -33,62 +33,47 @@
@implementation TKLabelFieldCell
-@synthesize field;
+@synthesize field=_field;
+- (id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+ if(!(self=[super initWithStyle:style reuseIdentifier:reuseIdentifier])) return nil;
+
+ _field = [[UILabel alloc] initWithFrame:CGRectZero];
+ _field.font = [UIFont boldSystemFontOfSize:16.0];
+ [self.contentView addSubview:_field];
-- (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
- if(!(self=[super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier])) return nil;
-
- field = [[UILabel alloc] initWithFrame:CGRectZero];
- [self addSubview:field];
- field.font = [UIFont boldSystemFontOfSize:16.0];
-
return self;
}
+- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
+ self=[self initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
+ return self;
+}
+- (void) dealloc {
+ [_field release];
+ [super dealloc];
+}
-
-- (void)layoutSubviews {
+- (void) layoutSubviews {
[super layoutSubviews];
- CGRect r = CGRectInset(self.bounds, 16, 8);
- r.origin.x += 80;
- r.size.width -= 80;
-
- if(self.editing){
- r.origin.x += 30;
- r.size.width -= 30;
- }
-
- field.frame = r;
-
+ CGRect r = CGRectInset(self.contentView.bounds, 8, 8);
+ r.origin.x += self.label.frame.size.width + 6;
+ r.size.width -= self.label.frame.size.width + 6;
+ _field.frame = r;
}
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-
+- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
-
- if(selected){
- field.textColor = [UIColor whiteColor];
- }else{
- field.textColor = [UIColor blackColor];
- }
-
+ _field.textColor = selected ? [UIColor whiteColor] : [UIColor blackColor];
}
- (void) setHighlighted:(BOOL)highlighted animated:(BOOL)animated{
[super setHighlighted:highlighted animated:animated];
- if(highlighted){
- field.textColor = [UIColor whiteColor];
- }else{
- field.textColor = [UIColor blackColor];
- }
+ _field.textColor = highlighted ? [UIColor whiteColor] : [UIColor blackColor];
}
-- (void)dealloc {
- [field release];
- [super dealloc];
-}
+
@end
View
3 src/TapkuLibrary/TKLabelSwitchCell.h
@@ -33,8 +33,7 @@
#import "TKLabelCell.h"
@interface TKLabelSwitchCell : TKLabelCell {
- UISwitch *switcher;
+ UISwitch *_switcher;
}
@property (retain,nonatomic) UISwitch *switcher;
-
@end
View
54 src/TapkuLibrary/TKLabelSwitchCell.m
@@ -33,48 +33,36 @@
@implementation TKLabelSwitchCell
-@synthesize switcher;
+@synthesize switcher=_switcher;
-- (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
- if(!(self=[super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier])) return nil;
- switcher = [[UISwitch alloc] initWithFrame:CGRectZero];
- [self addSubview:switcher];
-
+- (id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+ if(!(self=[super initWithStyle:style reuseIdentifier:reuseIdentifier])) return nil;
+
+ _switcher = [[UISwitch alloc] initWithFrame:CGRectZero];
+ [self.contentView addSubview:_switcher];
+
return self;
}
+- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
+ self=[self initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
+ return self;
+}
+- (void) dealloc {
+ [_switcher release];
+ [super dealloc];
+}
-- (void)layoutSubviews {
+- (void) layoutSubviews {
[super layoutSubviews];
- CGRect r = CGRectInset(self.bounds, 16, 10);
- r.origin.x += label.frame.size.width + 10;
-
- if(self.editing){
- r.origin.x += 30;
- r.size.width -= 30;
- }
-
- switcher.frame = r;
+ CGRect r = CGRectInset(self.bounds, 8, 10);
+ r.origin.x += self.label.frame.size.width + 6;
+ r.size.width -= self.label.frame.size.width + 6;
+ _switcher.frame = r;
-
-}
-
-
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-
- [super setSelected:selected animated:animated];
-
- // Configure the view for the selected state
-}
-
-
-- (void)dealloc {
- [switcher release];
- [super dealloc];
}
-@end
+@end
View
2 src/TapkuLibrary/TKLabelTextFieldCell.h
@@ -33,7 +33,7 @@
#import "TKLabelCell.h"
@interface TKLabelTextFieldCell : TKLabelCell<UITextFieldDelegate> {
- UITextField *field;
+ UITextField *_field;
}
@property (retain, nonatomic) UITextField *field;
@end
View
86 src/TapkuLibrary/TKLabelTextFieldCell.m
@@ -33,91 +33,55 @@
@implementation TKLabelTextFieldCell
-@synthesize field;
+@synthesize field=_field;
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
+- (id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
if(!(self=[super initWithStyle:style reuseIdentifier:reuseIdentifier])) return nil;
- field = [[UITextField alloc] initWithFrame:CGRectZero];
- field.autocorrectionType = UITextAutocorrectionTypeYes;
- field.font = [UIFont boldSystemFontOfSize:16.0];
- field.delegate = self;
- [self addSubview:field];
+ _field = [[UITextField alloc] initWithFrame:CGRectZero];
+ _field.autocorrectionType = UITextAutocorrectionTypeYes;
+ _field.font = [UIFont boldSystemFontOfSize:16.0];
+ _field.delegate = self;
+ [self.contentView addSubview:_field];
return self;
}
+- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
+ self = [self initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
+ return self;
+}
+- (void) dealloc {
+ [_field release];
+ [super dealloc];
+}
-- (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
- if(!(self=[super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier])) return nil;
- // Initialization code
- field = [[UITextField alloc] initWithFrame:CGRectZero];
- field.autocorrectionType = UITextAutocorrectionTypeYes;
- field.delegate = self;
- [self addSubview:field];
- //field.backgroundColor = [UIColor redColor];
- field.font = [UIFont boldSystemFontOfSize:16.0];
-
-
- return self;
-}
-- (void)layoutSubviews {
+- (void) layoutSubviews {
[super layoutSubviews];
- CGRect r = CGRectInset(self.bounds, 16, 8);
- r.origin.y += 5;
- r.size.height -= 5;
- r.origin.x += 80;
- r.size.width -= 80;
-
- if(self.editing){
- r.origin.x += 30;
- r.size.width -= 30;
- }
-
-
- field.frame = r;
+ CGRect r = CGRectInset(self.contentView.bounds, 8, 8);
+ r.origin.x += self.label.frame.size.width + 6;
+ r.size.width -= self.label.frame.size.width + 6;
+ _field.frame = r;
}
-- (BOOL)textFieldShouldReturn:(UITextField *)textField{
- [field resignFirstResponder];
+- (BOOL) textFieldShouldReturn:(UITextField *)textField{
+ [_field resignFirstResponder];
return NO;
}
-- (void)willTransitionToState:(UITableViewCellStateMask)state{
- [super willTransitionToState:state];
- [self setNeedsDisplay];
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-
+- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
-
- if(selected){
- field.textColor = [UIColor whiteColor];
- }else{
- field.textColor = [UIColor blackColor];
- }
-
+ _field.textColor = selected ? [UIColor whiteColor] : [UIColor blackColor];
}
- (void) setHighlighted:(BOOL)highlighted animated:(BOOL)animated{
[super setHighlighted:highlighted animated:animated];
- if(highlighted){
- field.textColor = [UIColor whiteColor];
- }else{
- field.textColor = [UIColor blackColor];
- }
-}
-
-
-- (void)dealloc {
- [field release];
- [super dealloc];
+ _field.textColor = highlighted ? [UIColor whiteColor] : [UIColor blackColor];
}
View
2 src/TapkuLibrary/TKLabelTextViewCell.h
@@ -34,7 +34,7 @@
#import "TKLabelCell.h"
@interface TKLabelTextViewCell : TKLabelCell {
- UITextView *textView;
+ UITextView *_textView;
}
@property (retain, nonatomic) UITextView *textView;
@end
View
64 src/TapkuLibrary/TKLabelTextViewCell.m
@@ -33,65 +33,47 @@