Merge pull request #73 from cloudspace/70393186_fix_add_by_url

70393186 fix add by url

Author: jlorich

EasyReader/Application/Controllers/EZRHomeScrollViewDelegate.m

@@ -13,6 +13,8 @@ @implementation EZRHomeScrollViewDelegate
 {
     EZRHomeViewController *controller;
     NSString *currentURL;
+    BOOL dragging;
+    CGPoint dragStart;
 }
 
 - (instancetype)initWithController:(EZRHomeViewController *)homeController
@@ -21,18 +23,41 @@ - (instancetype)initWithController:(EZRHomeViewController *)homeController
 
     if (self) {
         controller = homeController;
+        dragging = NO;
     }
 
     return self;
 }
 
 //
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    // Make scrolling back up to the top feel more natural
     if (scrollView.contentOffset.y == scrollView.frame.size.height) {
         if (controller.webView_feedItem.scrollView.contentOffset.y == 0) {
             controller.webView_feedItem.scrollView.contentOffset = CGPointMake(0, 1);
         }
     }
+    
+    // Prevent collectionview scrolling when shar bar is showing
+    if (scrollView.contentOffset.y < 0) {
+        controller.collectionView_feedItems.userInteractionEnabled = NO;
+    } else {
+        controller.collectionView_feedItems.userInteractionEnabled = YES;
+    }
+    
+    // Don't allow drags from the share view to go past the base view without a stop
+    if (dragging && dragStart.y < 0 && scrollView.contentOffset.y >= 0) {
+        scrollView.contentOffset = CGPointMake(0,0);
+    }
+}
+
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
+    dragging = YES;
+    dragStart = scrollView.contentOffset;
+}
+
+- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate {
+    dragging = NO;
 }
 
 /**

EasyReader/Application/Controllers/Home/EZRHomeViewController.h

@@ -42,11 +42,6 @@
 /// Displays website that hosts article
 @property (nonatomic, strong) EZRNestableWebView *webView_feedItem;
 
-@property (nonatomic, strong) UIToolbar *toolbar_webView;
-
-@property (nonatomic, strong) UIImageView *upIndicatorView;
-
-
 
 # pragma mark - Properties
 

EasyReader/Application/Controllers/Home/EZRHomeViewController.m

@@ -47,13 +47,15 @@ @interface EZRHomeViewController()
 @property User *currentUser;
 
 
-///
+/// The current feeds provider object
 @property (nonatomic, strong) EZRCurrentFeedsProvider *currentFeedsProvider;
 
-
-
+/// The social sharing toolbar
 @property (nonatomic, weak) IBOutlet CLDSocialShareToolbar *socialShareToolbar;
 
+/// The up indicator displayed over the web view to assist in navigating to the top of the page
+@property (nonatomic, strong) UIImageView *upIndicatorView;
+
 @end
 
 

EasyReader/Application/Controllers/Menu/EZRMenuSearchController.m

@@ -112,6 +112,7 @@ - (void)displayURL:(NSString*)searchText {
         ]
     };
 
+    [self postSearchStateChangeNotification:kEZRSearchStateResultsAvailable];
 }
 
 - (void)postSearchStateChangeNotification:(EZRSearchState)state

EasyReader/Application/Controllers/Menu/EZRMenuTableViewDelegate.m

@@ -42,7 +42,6 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         Feed *existingFeed = [Feed MR_findFirstByAttribute:@"id" withValue:feedData[@"id"]];
 
         if (!existingFeed) {
-            
             [Feed createFeedWithUrl:feedData[@"url"] success:^(id responseObject, NSInteger httpStatus) {
 
             } failure:^(id responseObject, NSInteger httpStatus, NSError *error) {