Create, complete , toggle completed reminder.

2026-01-12 22:40:29 +08:00 · 2013-02-27 16:56:55 +08:00
parent 656deba724
commit 96b41d864f
5 changed files with 154 additions and 28 deletions
--- a/1
+++ b/1
@@ -6,6 +6,7 @@ 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'
--- a/Progress/PPEvenKitManager.h
+++ b/Progress/PPEvenKitManager.h
@@ -28,4 +28,6 @@

 - (BOOL)deleteReminder:(EKReminder *)reminder;

+- (EKReminder *)createReminderWithTitle:(NSString *)reminderTitle;
+
@end
--- a/Progress/PPEvenKitManager.m
+++ b/Progress/PPEvenKitManager.m
@@ -12,6 +12,7 @@
@interface PPEvenKitManager()

@property (nonatomic, strong) EKEventStore *defaultStore;
+@property (nonatomic, strong) EKCalendar *currentCalendar;

@end

@@ -38,6 +39,13 @@ static PPEvenKitManager *_sharedManager;
    return self;
 }

+- (EKCalendar *)currentCalendar{
+    if (!_currentCalendar) {
+        _currentCalendar = [self.defaultStore defaultCalendarForNewReminders];
+    }
+    return _currentCalendar;
+}
+
 - (void)setupEventManagerWithCompletionBlock:(void (^)(BOOL))completionBlock{
    if ([self haveAccessToReminder]) {
        completionBlock(YES);
@@ -111,4 +119,15 @@ static PPEvenKitManager *_sharedManager;
    return [self.defaultStore removeReminder:reminder commit:YES error:nil];
 }

+- (EKReminder *)createReminderWithTitle:(NSString *)reminderTitle{
+    EKReminder *newReminder = [EKReminder reminderWithEventStore:self.defaultStore];
+    newReminder.title = reminderTitle;
+    newReminder.calendar = self.currentCalendar;
+    if ([self saveReminder:newReminder]) {
+        return newReminder;
+    } else {
+        return nil;
+    }
+}
+
@end
--- a/Progress/PPRemindersViewController.m
+++ b/Progress/PPRemindersViewController.m
@@ -12,17 +12,17 @@
 #import "UIScrollView+ZGPullDrag.h"
 #import <NUI/UILabel+NUI.h>
 #import "ReminderItemCell.h"
+#import "GVUserDefaults+Progress.h"

 typedef NSUInteger ZGScrollViewStyle;

-@interface PPRemindersViewController () <ReminderItemCellDelegate, ZGPullDragViewDelegate>
+@interface PPRemindersViewController () <ReminderItemCellDelegate, ZGPullDragViewDelegate, UITextFieldDelegate>
@property (strong, nonatomic) IBOutlet UIView *pullDownView;
@property (nonatomic, strong) UITableViewCell *placeHolderCell;
-@property (nonatomic, strong) UITableViewCell *editingCell;
@property (nonatomic) BOOL isEdingAReminder;
-@property (nonatomic) NSArray *remindersDatasource;
+@property (nonatomic) NSMutableArray *remindersDatasource;
@property (nonatomic) CGFloat pullViewShowRadio;
-@property (nonatomic) CGFloat xTouchPoint;
+@property (nonatomic) CGFloat dragViewShowRadio;
@end

@implementation PPRemindersViewController
@@ -30,7 +30,6 @@ typedef NSUInteger ZGScrollViewStyle;
 static NSString *CellIdentifier = @"ReminderCell";


-
 - (void)viewDidLoad
 {
    [super viewDidLoad];
@@ -45,19 +44,20 @@ static NSString *CellIdentifier = @"ReminderCell";
    
    [SVProgressHUD show];
    NSString *defaultReminderIdentifier = [[PPEvenKitManager sharedManager] defaultReminderListIdentifier];
-    [[PPEvenKitManager sharedManager] getReminderItemsInListWithIdentifier:defaultReminderIdentifier includeCompleted:YES includeImcompleted:YES withCompletionBlock:^(NSArray *reminedrItems) {
-        self.remindersDatasource = reminedrItems;
-        [SVProgressHUD dismiss];
+    [[PPEvenKitManager sharedManager] getReminderItemsInListWithIdentifier:defaultReminderIdentifier includeCompleted:![GVUserDefaults standardUserDefaults].hideCompleted includeImcompleted:YES withCompletionBlock:^(NSArray *reminedrItems) {
+        self.remindersDatasource = [reminedrItems mutableCopy];
+        [self sortReminders];
        [self.tableView reloadData];
+        [SVProgressHUD dismiss];
        
        [self.tableView addZGPullView:self.placeHolderCell];
        
-        UIView *dragView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, self.tableView.rowHeight)];
+        UIView *dragView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 100)];
        dragView.backgroundColor = [UIColor clearColor];
        UILabel *label = [[UILabel alloc] initWithFrame:dragView.frame];
        label.nuiClass = @"WhiteLabel";
        [label applyNUI];
-        label.text = @"Hide Completed";
+        label.text = [GVUserDefaults standardUserDefaults].hideCompleted ? @"Show Completed" : @"Hide Completed";
        label.tag = 1;
        [dragView addSubview:label];
        [self.tableView addZGDragView:dragView];
@@ -66,23 +66,13 @@ static NSString *CellIdentifier = @"ReminderCell";
    }];
 }

- (void)viewWillAppear:(BOOL)animated{
-    [super viewWillAppear:animated];
-}
-
- (void)viewDidAppear:(BOOL)animated{
-    [super viewDidAppear:animated];
-    
-}
-
 - (void)didReceiveMemoryWarning
 {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
 }

-#pragma mark - 
-#pragma mark - Pull
+#pragma mark - Pull And Drag

 - (UITableViewCell *)placeHolderCell{
    if (!_placeHolderCell) {
@@ -95,6 +85,23 @@ static NSString *CellIdentifier = @"ReminderCell";
    return _placeHolderCell;
 }

+- (void)setIsEdingAReminder:(BOOL)isEdingAReminder{
+    if (isEdingAReminder != _isEdingAReminder) {
+        _isEdingAReminder = isEdingAReminder;
+        
+        if (isEdingAReminder) {
+            [UIView animateWithDuration:0.2 animations:^{
+                self.tableView.contentInset = UIEdgeInsetsMake(80, 0, 0, 0);
+            } completion:^(BOOL finished) {
+                CGPoint offSet = self.tableView.contentOffset;
+                [self.tableView reloadData];
+                offSet.y += 80;
+                [self.tableView setContentOffset:offSet animated:NO];
+                [self.tableView setContentInset:UIEdgeInsetsZero];
+            }];
+        }
+    }
+}

 - (void)pullView:(UIView *)pullView Show:(CGFloat)shownPixels ofTotal:(CGFloat)totalPixels{
    self.pullViewShowRadio = shownPixels/totalPixels;
@@ -105,10 +112,57 @@ static NSString *CellIdentifier = @"ReminderCell";
 - (void)dragView:(UIView *)dragView Show:(CGFloat)showPixels ofTotal:(CGFloat)totalPixels{
    CGFloat dragProgress = MAX(0, MIN(1, showPixels/totalPixels));
    dragView.alpha = dragProgress;
+    if (self.dragViewShowRadio <= 1 && showPixels/totalPixels >= 1 && showPixels/totalPixels > self.dragViewShowRadio) {
+        UILabel *label = (UILabel *)[dragView viewWithTag:1];
+        label.text = [GVUserDefaults standardUserDefaults].hideCompleted ? @"Release to Show Completed" : @"Release to Hide Completed";
+    } else if (self.dragViewShowRadio >= 1 && showPixels/totalPixels <= 1 && showPixels/totalPixels < self.dragViewShowRadio) {
+        UILabel *label = (UILabel *)[dragView viewWithTag:1];
+        label.text = [GVUserDefaults standardUserDefaults].hideCompleted ? @"Show Completed" : @"Hide Completed";
+    }
+    self.dragViewShowRadio = showPixels/totalPixels;
 }

 - (void)userPullOrDragStoppedWithPullView:(UIView *)pullView dragView:(UIView *)dragView{
-    NSLog(@"Stopped");
+    if (self.pullViewShowRadio > 1) {
+        self.isEdingAReminder = YES;
+        self.pullDownView = 0;
+    }
+    
+    if (self.dragViewShowRadio > 1) {
+        BOOL hideCompleted = [GVUserDefaults standardUserDefaults].hideCompleted;
+        
+        [[PPEvenKitManager sharedManager] getReminderItemsInListWithIdentifier:[[PPEvenKitManager sharedManager] defaultReminderListIdentifier] includeCompleted:hideCompleted includeImcompleted:YES withCompletionBlock:^(NSArray *reminedrItems) {
+
+            [UIView animateWithDuration:1.0 animations:^{
+                self.remindersDatasource = [NSMutableArray array];
+                [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationTop];
+            } completion:^(BOOL finished) {
+                self.remindersDatasource = [reminedrItems mutableCopy];
+                [self sortReminders];
+                [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade];
+                [GVUserDefaults standardUserDefaults].hideCompleted = !hideCompleted;
+                UILabel *label = (UILabel *)[dragView viewWithTag:1];
+                label.text = [GVUserDefaults standardUserDefaults].hideCompleted ? @"Show Completed" : @"Hide Completed";
+                self.dragViewShowRadio = 0;
+            }];
+        }];
+    }
+}
+
+#pragma mark - UITextFeild Delegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField{
+    [textField resignFirstResponder];
+    if (!textField.text || [textField.text isEqualToString:@""]) {
+        self.isEdingAReminder = NO;
+        [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone];
+    } else {
+        EKReminder *newReminder = [[PPEvenKitManager sharedManager] createReminderWithTitle:textField.text];
+        [self.remindersDatasource insertObject:newReminder atIndex:0];
+        self.isEdingAReminder = NO;
+        [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone];
+    }
+    return YES;
 }

 #pragma mark - Table view data source
@@ -121,7 +175,16 @@ static NSString *CellIdentifier = @"ReminderCell";
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
    if (self.isEdingAReminder && indexPath.row == 0) {
-        return self.editingCell;
+        UITableViewCell *cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil];
+        UITextField *textField = [[UITextField alloc] initWithFrame:CGRectZero];
+        textField.borderStyle = UITextBorderStyleNone;
+        textField.font = [UIFont systemFontOfSize:17.f];
+        textField.delegate = self;
+        textField.text = @"";
+        [cell addSubview:textField];
+        textField.frame = CGRectMake(10, 29, 300, 21);
+        [textField becomeFirstResponder];
+        return cell;
    } else {
        ReminderItemCell *cell = [[ReminderItemCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:CellIdentifier];
        EKReminder *reminder = [self.remindersDatasource objectAtIndex:self.isEdingAReminder?indexPath.row-1:indexPath.row];
@@ -129,6 +192,14 @@ static NSString *CellIdentifier = @"ReminderCell";
        cell.textLabel.text = reminder.title;
        cell.detailTextLabel.text = [NSString stringWithFormat:@"%d", indexPath.row];
        cell.accessoryType = reminder.completed ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
+
+        if (self.isEdingAReminder) {
+            cell.contentView.alpha = 0.4;
+            [cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+        } else {
+            cell.contentView.alpha = 1;
+            [cell setSelectionStyle:UITableViewCellSelectionStyleBlue];
+        }
        return cell;
    }
 }
@@ -149,17 +220,32 @@ static NSString *CellIdentifier = @"ReminderCell";
    sender.accessoryType = reminder.completed ? UITableViewCellAccessoryNone : UITableViewCellAccessoryCheckmark;
    reminder.completed = !reminder.completed;
    [[PPEvenKitManager sharedManager] saveReminder:reminder];
+    if (indexPath.row +1 < self.remindersDatasource.count && reminder.completed) {
+        [self.remindersDatasource removeObject:reminder];
+        [self.remindersDatasource addObject:reminder];
+        [self.tableView moveRowAtIndexPath:indexPath toIndexPath:[NSIndexPath indexPathForRow:self.remindersDatasource.count-1 inSection:0]];
+    } else if (indexPath.row > 0 && !reminder.completed) {
+        [self.remindersDatasource removeObject:reminder];
+        [self.remindersDatasource insertObject:reminder atIndex:0];
+        [self.tableView moveRowAtIndexPath:indexPath toIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+    }
 }

 - (void)deletedByTheUser:(ReminderItemCell *)sender{
    NSIndexPath *indexPath = [self.tableView indexPathForCell:sender];
    EKReminder *reminder = [self.remindersDatasource objectAtIndex:indexPath.row];
-    NSMutableArray *mutableDataSource = [self.remindersDatasource mutableCopy];
-    [mutableDataSource removeObjectAtIndex:indexPath.row];
-    self.remindersDatasource = mutableDataSource;
+    [self.remindersDatasource removeObjectAtIndex:indexPath.row];
    [self.tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
    [[PPEvenKitManager sharedManager] deleteReminder:reminder];
 }


+#pragma mark - Sort Reminders
+- (void)sortReminders{
+    NSSortDescriptor *sortWithCompleted = [[NSSortDescriptor alloc] initWithKey:@"completed"
+                                                  ascending:YES];
+    NSSortDescriptor *sortWithID = [[NSSortDescriptor alloc] initWithKey:@"calendarItemIdentifier" ascending:YES];
+    self.remindersDatasource = [[self.remindersDatasource sortedArrayUsingDescriptors:@[sortWithCompleted, sortWithID]] mutableCopy];
+}
+
@end
--- a/Progress/en.lproj/Progress.storyboard
+++ b/Progress/en.lproj/Progress.storyboard
@@ -13,20 +13,24 @@
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="EditingCell" id="h0U-eI-tuO">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="EditingCell" id="h0U-eI-tuO">
                                <rect key="frame" x="0.0" y="22" width="320" height="80"/>
                                <autoresizingMask key="autoresizingMask"/>
                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                    <rect key="frame" x="0.0" y="0.0" width="320" height="79"/>
                                    <autoresizingMask key="autoresizingMask"/>
                                    <subviews>
-                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="#task" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="J3Y-ph-mra">
+                                        <textField opaque="NO" clipsSubviews="YES" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="J3Y-ph-mra">
                                            <constraints>
                                                <constraint firstAttribute="width" constant="300" id="0si-pG-2j5"/>
                                                <constraint firstAttribute="height" constant="30" id="Es2-z9-CFd"/>
                                            </constraints>
                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                            <textInputTraits key="textInputTraits"/>
+                                            <connections>
+                                                <action selector="undo:" destination="UnO-Gb-ptI" eventType="editingDidEnd" id="fSB-8b-FdH"/>
+                                                <outlet property="delegate" destination="1MC-Iw-JPa" id="Mby-kL-U5L"/>
+                                            </connections>
                                        </textField>
                                    </subviews>
                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -130,6 +134,20 @@
            <point key="canvasLocation" x="-97" y="705"/>
        </scene>
    </scenes>
+    <classes>
+        <class className="NSLayoutConstraint" superclassName="NSObject">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/NSLayoutConstraint.h"/>
+        </class>
+        <class className="PPRemindersViewController" superclassName="UITableViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/PPRemindersViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="pullDownView" candidateClass="UIView"/>
+            </relationships>
+        </class>
+        <class className="ReminderItemCell" superclassName="UITableViewCell">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/ReminderItemCell.h"/>
+        </class>
+    </classes>
    <simulatedMetricsContainer key="defaultSimulatedMetrics">
        <simulatedStatusBarMetrics key="statusBar"/>
        <simulatedOrientationMetrics key="orientation"/>