From 8d195e1a2f90f9e9b4810dfa17c736d846b4f292 Mon Sep 17 00:00:00 2001 From: Brad Taylor Date: Wed, 8 Aug 2012 16:59:24 -0700 Subject: [PATCH 1/2] Add license file A license file is required by CocoaPods so that users can easily identify what license a given project is. Yes, this is already in the headers of the project, but having a LICENSE file for the project is good practice. --- LICENSE | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..89de354 --- /dev/null +++ b/LICENSE @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From 8b8a01af336d1fe758a26b9d783c5881f9fc072e Mon Sep 17 00:00:00 2001 From: Zak Jacobson Date: Wed, 29 May 2013 11:22:38 -0500 Subject: [PATCH 2/2] rename image to prevent conflicts with other images names 'arrow' --- PullToRefreshView.m | 2 +- arrow.png => PullToRefreshViewArrow.png | Bin arrow@2x.png => PullToRefreshViewArrow@2x.png | Bin 3 files changed, 1 insertion(+), 1 deletion(-) rename arrow.png => PullToRefreshViewArrow.png (100%) rename arrow@2x.png => PullToRefreshViewArrow@2x.png (100%) diff --git a/PullToRefreshView.m b/PullToRefreshView.m index d98e115..0c314eb 100644 --- a/PullToRefreshView.m +++ b/PullToRefreshView.m @@ -95,7 +95,7 @@ - (id)initWithScrollView:(UIScrollView *)scroll { arrowImage = [[CALayer alloc] init]; arrowImage.frame = CGRectMake(25.0f, frame.size.height - 60.0f, 24.0f, 52.0f); arrowImage.contentsGravity = kCAGravityResizeAspect; - arrowImage.contents = (id) [UIImage imageNamed:@"arrow"].CGImage; + arrowImage.contents = (id) [UIImage imageNamed:@"PullToRefreshViewArrow"].CGImage; activityView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; activityView.frame = CGRectMake(30.0f, frame.size.height - 38.0f, 20.0f, 20.0f); diff --git a/arrow.png b/PullToRefreshViewArrow.png similarity index 100% rename from arrow.png rename to PullToRefreshViewArrow.png diff --git a/arrow@2x.png b/PullToRefreshViewArrow@2x.png similarity index 100% rename from arrow@2x.png rename to PullToRefreshViewArrow@2x.png