MD + Carthage

1.修改MD 2.支持Carthage 3.完善contentInset的设置
Azraeltulips · Sep 28, 2017 · 5716324 · 5716324
1 parent 4590486
commit 5716324
Show file tree

Hide file tree

Showing 9 changed files with 433 additions and 47 deletions.
diff --git a/MJRefresh.podspec b/MJRefresh.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'MJRefresh'
-    s.version      = '3.1.13'
+    s.version      = '3.1.14'
     s.summary      = 'An easy way to use pull-to-refresh'
     s.homepage     = 'https://github.com/CoderMJLee/MJRefresh'
     s.license      = 'MIT'

diff --git a/MJRefresh/Base/MJRefreshComponent.h b/MJRefresh/Base/MJRefreshComponent.h
@@ -68,7 +68,8 @@ typedef void (^MJRefreshComponentEndRefreshingCompletionBlock)();
 - (void)endRefreshing;
 - (void)endRefreshingWithCompletionBlock:(void (^)())completionBlock;
 /** 是否正在刷新 */
-- (BOOL)isRefreshing;
+@property (assign, nonatomic, readonly, getter=isRefreshing) BOOL refreshing;
+//- (BOOL)isRefreshing;
 /** 刷新状态 一般交给子类内部实现 */
 @property (assign, nonatomic) MJRefreshState state;
 

diff --git a/MJRefresh/Base/MJRefreshComponent.m b/MJRefresh/Base/MJRefreshComponent.m
@@ -95,7 +95,7 @@ - (void)addObservers
 - (void)removeObservers
 {
     [self.superview removeObserver:self forKeyPath:MJRefreshKeyPathContentOffset];
-    [self.superview removeObserver:self forKeyPath:MJRefreshKeyPathContentSize];;
+    [self.superview removeObserver:self forKeyPath:MJRefreshKeyPathContentSize];
     [self.pan removeObserver:self forKeyPath:MJRefreshKeyPathPanState];
     self.pan = nil;
 }

diff --git a/MJRefresh/UIScrollView+MJExtension.m b/MJRefresh/UIScrollView+MJExtension.m
@@ -60,6 +60,11 @@ - (void)setMj_insetL:(CGFloat)mj_insetL
 {
     UIEdgeInsets inset = self.contentInset;
     inset.left = mj_insetL;
+#ifdef __IPHONE_11_0
+    if(@available(iOS 11.0, *)){
+        inset.left -= (self.adjustedContentInset.left - self.contentInset.left);
+    }
+#endif
     self.contentInset = inset;
 }
 
@@ -72,6 +77,11 @@ - (void)setMj_insetR:(CGFloat)mj_insetR
 {
     UIEdgeInsets inset = self.contentInset;
     inset.right = mj_insetR;
+#ifdef __IPHONE_11_0
+    if(@available(iOS 11.0, *)){
+        inset.right -= (self.adjustedContentInset.right - self.contentInset.right);
+    }
+#endif
     self.contentInset = inset;
 }
 

diff --git a/MJRefreshExample.xcodeproj/project.pbxproj b/MJRefreshExample.xcodeproj/project.pbxproj
diff --git a/MJRefreshExample.xcodeproj/xcshareddata/xcschemes/MJRefreshFramework.xcscheme b/MJRefreshExample.xcodeproj/xcshareddata/xcschemes/MJRefreshFramework.xcscheme
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0900"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2D9DF4511F7CE29B0042D6DD"
+               BuildableName = "MJRefreshFramework.framework"
+               BlueprintName = "MJRefreshFramework"
+               ReferencedContainer = "container:MJRefreshExample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2D9DF4511F7CE29B0042D6DD"
+            BuildableName = "MJRefreshFramework.framework"
+            BlueprintName = "MJRefreshFramework"
+            ReferencedContainer = "container:MJRefreshExample.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2D9DF4511F7CE29B0042D6DD"
+            BuildableName = "MJRefreshFramework.framework"
+            BlueprintName = "MJRefreshFramework"
+            ReferencedContainer = "container:MJRefreshExample.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/MJRefreshFramework/Info.plist b/MJRefreshFramework/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/MJRefreshFramework/MJRefreshFramework.h b/MJRefreshFramework/MJRefreshFramework.h
@@ -0,0 +1,19 @@
+//
+//  MJRefreshFramework.h
+//  MJRefreshFramework
+//
+//  Created by MJ Lee on 2017/9/28.
+//  Copyright © 2017年 小码哥. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for MJRefreshFramework.
+FOUNDATION_EXPORT double MJRefreshFrameworkVersionNumber;
+
+//! Project version string for MJRefreshFramework.
+FOUNDATION_EXPORT const unsigned char MJRefreshFrameworkVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <MJRefreshFramework/PublicHeader.h>
+
+