Skip to content

Commit 497cea1

Browse files
author
Joey Lorich
committed
reorder share icons, further improve scrolling
1 parent 3ccb1d0 commit 497cea1

8 files changed

Lines changed: 75 additions & 31 deletions

File tree

‎EasyReader.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@
5454
8E6980CC190057C30075D009 /* EZRBaseCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6980CB190057C30075D009 /* EZRBaseCategoryTests.m */; };
5555
8E6980CE190058B60075D009 /* EZRSortingAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6980CD190058B60075D009 /* EZRSortingAdditionsTests.m */; };
5656
8E7F81F018D0BF8500BC50C2 /* CSRemoteObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E7F81EF18D0BF8500BC50C2 /* CSRemoteObject.m */; };
57-
9D00DE84190816F900A0C65F /* CLDSocialShareToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */; };
58-
9D00DE85190816FF00A0C65F /* CLDSocialShareToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */; };
59-
9D00DE86190816FF00A0C65F /* CLDSocialShareToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */; };
60-
9D00DE87190816FF00A0C65F /* CLDSocialShareToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */; };
6157
8EA5082C19057DA5004A4EB9 /* EZRFeedItemUpdateServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA5082B19057DA5004A4EB9 /* EZRFeedItemUpdateServiceTests.m */; };
6258
8EA5082E190597FA004A4EB9 /* EZRCurrentFeedsProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA5082D190597FA004A4EB9 /* EZRCurrentFeedsProviderTests.m */; };
6359
8EB0714D18E6121E009B1BA3 /* EZRMenuFeedCellTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EB0714C18E6121E009B1BA3 /* EZRMenuFeedCellTests.m */; };
6460
8EB5226C1900632100628A24 /* EZRFeedImageAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EB5226B1900632100628A24 /* EZRFeedImageAdditions.m */; };
6561
8EB5226E190067F000628A24 /* CSNilAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EB5226D190067F000628A24 /* CSNilAdditionsTests.m */; };
6662
8EB5227219016ADE00628A24 /* EZRBaseServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EB5227119016ADE00628A24 /* EZRBaseServiceTests.m */; };
6763
8EB5227419016B4300628A24 /* EZRFeedImageServiceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EB5227319016B4300628A24 /* EZRFeedImageServiceTests.m */; };
64+
9D00DE84190816F900A0C65F /* CLDSocialShareToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */; };
65+
9D00DE85190816FF00A0C65F /* CLDSocialShareToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */; };
66+
9D00DE86190816FF00A0C65F /* CLDSocialShareToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */; };
67+
9D00DE87190816FF00A0C65F /* CLDSocialShareToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */; };
6868
9D010EE618F58BA2001999EE /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9D010EE518F58BA2001999EE /* Media.xcassets */; };
6969
9D010EE718F58BA2001999EE /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9D010EE518F58BA2001999EE /* Media.xcassets */; };
7070
9D010EE818F58BA2001999EE /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9D010EE518F58BA2001999EE /* Media.xcassets */; };
@@ -674,15 +674,6 @@
674674
name = MenuCells;
675675
sourceTree = "<group>";
676676
};
677-
9D00DE81190816F900A0C65F /* CLDSocialShareToolbar */ = {
678-
isa = PBXGroup;
679-
children = (
680-
9D00DE82190816F900A0C65F /* CLDSocialShareToolbar.h */,
681-
9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */,
682-
);
683-
path = CLDSocialShareToolbar;
684-
sourceTree = "<group>";
685-
};
686677
8EB5226F19016A8000628A24 /* Services */ = {
687678
isa = PBXGroup;
688679
children = (
@@ -695,6 +686,15 @@
695686
name = Services;
696687
sourceTree = "<group>";
697688
};
689+
9D00DE81190816F900A0C65F /* CLDSocialShareToolbar */ = {
690+
isa = PBXGroup;
691+
children = (
692+
9D00DE82190816F900A0C65F /* CLDSocialShareToolbar.h */,
693+
9D00DE83190816F900A0C65F /* CLDSocialShareToolbar.m */,
694+
);
695+
path = CLDSocialShareToolbar;
696+
sourceTree = "<group>";
697+
};
698698
9D16D33518DB75BF001E9C38 /* Services */ = {
699699
isa = PBXGroup;
700700
children = (
@@ -1130,6 +1130,9 @@
11301130
9D8E39C618E5AE080025B73E = {
11311131
TestTargetID = 9DAC16C31709D48E00383722;
11321132
};
1133+
9DAC16C31709D48E00383722 = {
1134+
DevelopmentTeam = 34V4E5MT6Z;
1135+
};
11331136
};
11341137
};
11351138
buildConfigurationList = 9DAC16BF1709D48E00383722 /* Build configuration list for PBXProject "EasyReader" */;
@@ -1955,16 +1958,16 @@
19551958
buildSettings = {
19561959
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
19571960
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1958-
CODE_SIGN_IDENTITY = "iPhone Developer: Joseph Lorich (G28849DAB7)";
1959-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Joseph Lorich (G28849DAB7)";
1961+
CODE_SIGN_IDENTITY = "iPhone Developer";
1962+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
19601963
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
19611964
GCC_PRECOMPILE_PREFIX_HEADER = YES;
19621965
GCC_PREFIX_HEADER = "EasyReader/Other Sources/EasyReader-Prefix.pch";
19631966
INFOPLIST_FILE = "EasyReader/Supporting Files/Development-Info.plist";
19641967
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
19651968
LIBRARY_SEARCH_PATHS = "\"$(PODS_ROOT)/TestFlightSDK\"";
19661969
PRODUCT_NAME = Development;
1967-
PROVISIONING_PROFILE = "0B1685CC-627C-4832-97D4-79736E8FE8EE";
1970+
PROVISIONING_PROFILE = "";
19681971
TARGETED_DEVICE_FAMILY = 1;
19691972
VALID_ARCHS = "armv7 arm64 armv7s";
19701973
WRAPPER_EXTENSION = app;
@@ -1977,8 +1980,8 @@
19771980
buildSettings = {
19781981
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
19791982
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1980-
CODE_SIGN_IDENTITY = "iPhone Distribution: Unity Marketing, Inc. (34V4E5MT6Z)";
1981-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Unity Marketing, Inc. (34V4E5MT6Z)";
1983+
CODE_SIGN_IDENTITY = "iPhone Developer";
1984+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
19821985
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
19831986
GCC_PRECOMPILE_PREFIX_HEADER = YES;
19841987
GCC_PREFIX_HEADER = "EasyReader/Other Sources/EasyReader-Prefix.pch";

‎EasyReader/Application/Controllers/EZRHomeScrollViewDelegate.m‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ - (instancetype)initWithController:(EZRHomeViewController *)homeController
2727
}
2828

2929
//
30-
//- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
31-
// if (scrollView.contentOffset.y == scrollView.frame.size.height) {
32-
//
33-
// }
34-
//}
30+
- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
31+
if (scrollView.contentOffset.y == scrollView.frame.size.height) {
32+
if (controller.webView_feedItem.scrollView.contentOffset.y == 0) {
33+
controller.webView_feedItem.scrollView.contentOffset = CGPointMake(0, 1);
34+
}
35+
}
36+
}
3537

3638
/**
3739
*

‎EasyReader/Application/Controls/CSNestableScrollView.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ - (UIView*)hitTest:(CGPoint)point withEvent:(UIEvent *)event
3232

3333

3434

35+
3536
//- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
3637
//{
3738
// if (self.contentOffset.y >= self.frame.size.height)

‎EasyReader/Application/Controls/EZRNestableWebView.m‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,57 @@
99
#import "EZRNestableWebView.h"
1010

1111
@implementation EZRNestableWebView
12+
{
13+
CGPoint lastContentOffset;
14+
BOOL scrollViewHasScrolled;
15+
}
1216

17+
- (id)initWithCoder:(NSCoder *)aDecoder {
18+
self = [super initWithCoder:aDecoder];
19+
20+
if (self) {
21+
scrollViewHasScrolled = NO;
22+
}
23+
24+
return self;
25+
}
1326

1427
- (void) layoutSubviews {
1528
[super layoutSubviews];
1629
[self fixOffsetIfZeroForScrollView:self.scrollView];
1730
}
1831

32+
33+
1934
- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
20-
[self fixOffsetIfZeroForScrollView:scrollView];
35+
//
36+
[super scrollViewDidScroll:scrollView];
37+
38+
BOOL scrollingUp = (scrollViewHasScrolled && scrollView.contentOffset.y < lastContentOffset.y) || scrollView.contentOffset.y <= 0;
39+
// BOOL crossedOrAtZeroGoingUp = scrollingUp && (scrollView.contentOffset.y == 0 || (lastContentOffset.y > 0 && scrollView.contentOffset.y < 0));
40+
//
41+
// if (scrollingUp)
42+
// {
43+
// NSLog(@"SCROLLING UP - %f", scrollView.contentOffset.y);
44+
// if (scrollView.contentOffset.y == 0) {
45+
// NSLog(@"at zero");
46+
// }
47+
// }
48+
//
49+
// if (crossedOrAtZeroGoingUp) {
50+
// NSLog(@"crossed or at zero going up");
51+
// }
52+
53+
if (!scrollingUp) {
54+
[self fixOffsetIfZeroForScrollView:scrollView];
55+
// scrollViewHasScrolled = NO;
56+
}
57+
58+
scrollViewHasScrolled = YES;
59+
lastContentOffset = scrollView.contentOffset;
2160
}
2261

62+
2363
- (void)fixOffsetIfZeroForScrollView:(UIScrollView *)scrollView {
2464
if (scrollView.contentOffset.y == 0) {
2565
scrollView.contentOffset = CGPointMake(0, 1);

‎EasyReader/Application/Services/EZRFeedImageService.m‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ - (void)blurredBlockForURLString:(NSString *)urlString withImage:(UIImage *)imag
134134
{
135135
[blurredImageCache queryDiskCacheForKey:urlString
136136
done:^(UIImage *blurredImage, SDImageCacheType blurredCacheType) {
137-
[self triggerCompletionBlocksForUrlString:urlString
138-
withImage:image
139-
blurredImage:blurredImage];
137+
[self triggerOrDownloadForURLString:urlString withImage:image blurredImage:blurredImage];
140138
}
141139
];
142140
}

‎EasyReader/Library/CLDSocialShareToolbar/CLDSocialShareToolbar.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ - (id)initWithFrame:(CGRect)frame
8282
self.items = @[
8383
barButtonItem_title,
8484
flexSpace,
85-
self.button_shareTwitter,
86-
smallSpace1,
8785
self.button_shareFacebook,
86+
smallSpace1,
87+
self.button_shareTwitter,
8888
smallSpace2,
8989
self.button_shareMail
9090
];

‎EasyReader/Supporting Files/Development-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</dict>
3939
</array>
4040
<key>CFBundleVersion</key>
41-
<string>2.0.18</string>
41+
<string>2.0.19</string>
4242
<key>FacebookAppID</key>
4343
<string>456979891044426</string>
4444
<key>LSApplicationCategoryType</key>

‎EasyReader/Supporting Files/Staging-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>2.0.40</string>
39+
<string>2.0.41</string>
4040
<key>LSApplicationCategoryType</key>
4141
<string></string>
4242
<key>LSRequiresIPhoneOS</key>

0 commit comments

Comments
 (0)