diff --git a/Podfile b/Podfile index cfbb1d1..03816ba 100644 --- a/Podfile +++ b/Podfile @@ -6,7 +6,6 @@ platform :ios, '6.0' pod 'AHAlertView', '~>0.0.2' pod 'GVUserDefaults', '~>0.9.0' pod 'SVProgressHUD', '~>0.9' - pod 'PaperFold', '~>1.1' target :ProgressTests, :exclusive => true do pod 'GVUserDefaults', '~>0.9.0' diff --git a/Progress.xcodeproj/project.pbxproj b/Progress.xcodeproj/project.pbxproj index 9edfe15..322d048 100644 --- a/Progress.xcodeproj/project.pbxproj +++ b/Progress.xcodeproj/project.pbxproj @@ -56,7 +56,7 @@ 044C661416AFE28100F9BC1E /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "../Icon@2x.png"; sourceTree = ""; }; 044C661716AFE29F00F9BC1E /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = ../Icon.png; sourceTree = ""; }; 0486284B16B000D700F62384 /* Progress.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Progress.xcdatamodel; sourceTree = ""; }; - 048D433C16DB9BA400A40CB1 /* Progress.nss */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Progress.nss; sourceTree = ""; }; + 048D433C16DB9BA400A40CB1 /* Progress.nss */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Progress.nss; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.css; }; 048D433E16DB9D5300A40CB1 /* PPRemindersViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPRemindersViewController.h; sourceTree = ""; }; 048D433F16DB9D5400A40CB1 /* PPRemindersViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPRemindersViewController.m; sourceTree = ""; }; 048D437016DBC4E000A40CB1 /* ReminderItemCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReminderItemCell.h; sourceTree = ""; }; diff --git a/Progress/PPRemindersViewController.m b/Progress/PPRemindersViewController.m index a523f73..b9c53a9 100644 --- a/Progress/PPRemindersViewController.m +++ b/Progress/PPRemindersViewController.m @@ -11,7 +11,7 @@ #import #import "ReminderItemCell.h" -@interface PPRemindersViewController () +@interface PPRemindersViewController () @property (nonatomic) NSArray *remindersDatasource; @end diff --git a/Progress/Progress.nss b/Progress/Progress.nss index e194810..cc34473 100644 --- a/Progress/Progress.nss +++ b/Progress/Progress.nss @@ -110,7 +110,7 @@ TableCellDetail { font-size: 14; font-color: @secondaryFontColor; } -TextField { +CustomTextField { height: 37; font-name: @inputFontName; font-size: 18; @@ -124,4 +124,4 @@ LargeTextField { CustomView { background-color: @primaryBackgroundColor; background-image: NUIViewBackground.png; -} \ No newline at end of file +} diff --git a/Progress/ReminderItemCell.m b/Progress/ReminderItemCell.m index 7866900..551fd29 100644 --- a/Progress/ReminderItemCell.m +++ b/Progress/ReminderItemCell.m @@ -49,9 +49,11 @@ self.originalCenter = self.center; UIImageView *checkMarkView = [[UIImageView alloc] initWithFrame:checkMarkOriginFrame]; checkMarkView.backgroundColor = [UIColor greenColor]; + checkMarkView.highlightedImage = nil; checkMarkView.tag = 1; UIImageView *deleteMarkView = [[UIImageView alloc] initWithFrame:deleteMarkOriginFrame]; deleteMarkView.backgroundColor = [UIColor redColor]; + deleteMarkView.highlightedImage = nil; deleteMarkView.tag = 2; [self insertSubview:checkMarkView atIndex:0]; [self insertSubview:deleteMarkView atIndex:0]; diff --git a/Progress/en.lproj/Progress.storyboard b/Progress/en.lproj/Progress.storyboard index b0e5191..9563655 100644 --- a/Progress/en.lproj/Progress.storyboard +++ b/Progress/en.lproj/Progress.storyboard @@ -87,6 +87,17 @@ + + + + + + + + + + +