Skip to content

Commit 9243352

Browse files
dreampiggydreampiggy
committed
Rename the SDWebImage prefixed class, into the FUI prefix, make it match the framework name
1 parent f14bfd9 commit 9243352

13 files changed

+149
-69
lines changed

‎Storage/FirebaseStorageUI.xcodeproj/project.pbxproj

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
32450161224B963B00AF2E90 /* SDWebImageFIRStorageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3245015F224B963B00AF2E90 /* SDWebImageFIRStorageLoader.h */; settings = {ATTRIBUTES = (Public, ); }; };
11-
32450162224B963B00AF2E90 /* SDWebImageFIRStorageLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 32450160224B963B00AF2E90 /* SDWebImageFIRStorageLoader.m */; };
12-
32450165224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 32450163224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.h */; settings = {ATTRIBUTES = (Public, ); }; };
13-
32450166224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 32450164224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.m */; };
14-
3245016D224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 3245016B224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.h */; settings = {ATTRIBUTES = (Public, ); }; };
15-
3245016E224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = 3245016C224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.m */; };
10+
32450161224B963B00AF2E90 /* FUIStorageImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3245015F224B963B00AF2E90 /* FUIStorageImageLoader.h */; settings = {ATTRIBUTES = (Public, ); }; };
11+
32450162224B963B00AF2E90 /* FUIStorageImageLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 32450160224B963B00AF2E90 /* FUIStorageImageLoader.m */; };
12+
32450165224B96B400AF2E90 /* NSURL+FirebaseStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 32450163224B96B400AF2E90 /* NSURL+FirebaseStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
13+
32450166224B96B400AF2E90 /* NSURL+FirebaseStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 32450164224B96B400AF2E90 /* NSURL+FirebaseStorage.m */; };
14+
3245016D224B987400AF2E90 /* FUIStorageDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 3245016B224B987400AF2E90 /* FUIStorageDefine.h */; settings = {ATTRIBUTES = (Public, ); }; };
15+
3245016E224B987400AF2E90 /* FUIStorageDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = 3245016C224B987400AF2E90 /* FUIStorageDefine.m */; };
16+
32A5DB2722755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A5DB2522755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
17+
32A5DB2822755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 32A5DB2622755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.m */; };
1618
8D69E60621DE968300CFA49B /* FirebaseStorageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E5FC21DE968300CFA49B /* FirebaseStorageUI.framework */; };
1719
8D69E60D21DE968300CFA49B /* FirebaseStorageUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E5FF21DE968300CFA49B /* FirebaseStorageUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
1820
8D69E61821DE96CF00CFA49B /* UIImageView+FirebaseStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E61621DE96CF00CFA49B /* UIImageView+FirebaseStorage.m */; };
@@ -34,12 +36,14 @@
3436

3537
/* Begin PBXFileReference section */
3638
2531884B814A605E24AF1BD1 /* Pods-FirebaseStorageUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseStorageUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseStorageUI/Pods-FirebaseStorageUI.release.xcconfig"; sourceTree = "<group>"; };
37-
3245015F224B963B00AF2E90 /* SDWebImageFIRStorageLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageFIRStorageLoader.h; sourceTree = "<group>"; };
38-
32450160224B963B00AF2E90 /* SDWebImageFIRStorageLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageFIRStorageLoader.m; sourceTree = "<group>"; };
39-
32450163224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSURL+SDWebImageFIRStorageLoader.h"; sourceTree = "<group>"; };
40-
32450164224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURL+SDWebImageFIRStorageLoader.m"; sourceTree = "<group>"; };
41-
3245016B224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageFIRStorageLoaderDefine.h; sourceTree = "<group>"; };
42-
3245016C224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageFIRStorageLoaderDefine.m; sourceTree = "<group>"; };
39+
3245015F224B963B00AF2E90 /* FUIStorageImageLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUIStorageImageLoader.h; sourceTree = "<group>"; };
40+
32450160224B963B00AF2E90 /* FUIStorageImageLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUIStorageImageLoader.m; sourceTree = "<group>"; };
41+
32450163224B96B400AF2E90 /* NSURL+FirebaseStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSURL+FirebaseStorage.h"; sourceTree = "<group>"; };
42+
32450164224B96B400AF2E90 /* NSURL+FirebaseStorage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURL+FirebaseStorage.m"; sourceTree = "<group>"; };
43+
3245016B224B987400AF2E90 /* FUIStorageDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUIStorageDefine.h; sourceTree = "<group>"; };
44+
3245016C224B987400AF2E90 /* FUIStorageDefine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUIStorageDefine.m; sourceTree = "<group>"; };
45+
32A5DB2522755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FIRStorageDownloadTask+SDWebImage.h"; sourceTree = "<group>"; };
46+
32A5DB2622755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "FIRStorageDownloadTask+SDWebImage.m"; sourceTree = "<group>"; };
4347
394D01F06479F5F133E31EA7 /* Pods_FirebaseStorageUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseStorageUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4448
47BA3EFFA8182422FCFF3BA8 /* Pods-FirebaseStorageUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseStorageUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseStorageUITests/Pods-FirebaseStorageUITests.release.xcconfig"; sourceTree = "<group>"; };
4549
4F5D5A91D72EF2D6714BF575 /* Pods-FirebaseStorageUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseStorageUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseStorageUI/Pods-FirebaseStorageUI.debug.xcconfig"; sourceTree = "<group>"; };
@@ -113,12 +117,14 @@
113117
8D69E5FF21DE968300CFA49B /* FirebaseStorageUI.h */,
114118
8D69E61721DE96CF00CFA49B /* UIImageView+FirebaseStorage.h */,
115119
8D69E61621DE96CF00CFA49B /* UIImageView+FirebaseStorage.m */,
116-
3245015F224B963B00AF2E90 /* SDWebImageFIRStorageLoader.h */,
117-
32450160224B963B00AF2E90 /* SDWebImageFIRStorageLoader.m */,
118-
3245016B224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.h */,
119-
3245016C224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.m */,
120-
32450163224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.h */,
121-
32450164224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.m */,
120+
3245015F224B963B00AF2E90 /* FUIStorageImageLoader.h */,
121+
32450160224B963B00AF2E90 /* FUIStorageImageLoader.m */,
122+
3245016B224B987400AF2E90 /* FUIStorageDefine.h */,
123+
3245016C224B987400AF2E90 /* FUIStorageDefine.m */,
124+
32450163224B96B400AF2E90 /* NSURL+FirebaseStorage.h */,
125+
32450164224B96B400AF2E90 /* NSURL+FirebaseStorage.m */,
126+
32A5DB2522755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.h */,
127+
32A5DB2622755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.m */,
122128
8D69E60021DE968300CFA49B /* Info.plist */,
123129
);
124130
path = FirebaseStorageUI;
@@ -150,9 +156,10 @@
150156
buildActionMask = 2147483647;
151157
files = (
152158
8D69E61921DE96CF00CFA49B /* UIImageView+FirebaseStorage.h in Headers */,
153-
32450161224B963B00AF2E90 /* SDWebImageFIRStorageLoader.h in Headers */,
154-
3245016D224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.h in Headers */,
155-
32450165224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.h in Headers */,
159+
32A5DB2722755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.h in Headers */,
160+
32450161224B963B00AF2E90 /* FUIStorageImageLoader.h in Headers */,
161+
3245016D224B987400AF2E90 /* FUIStorageDefine.h in Headers */,
162+
32450165224B96B400AF2E90 /* NSURL+FirebaseStorage.h in Headers */,
156163
8D69E60D21DE968300CFA49B /* FirebaseStorageUI.h in Headers */,
157164
);
158165
runOnlyForDeploymentPostprocessing = 0;
@@ -326,9 +333,10 @@
326333
buildActionMask = 2147483647;
327334
files = (
328335
8D69E61821DE96CF00CFA49B /* UIImageView+FirebaseStorage.m in Sources */,
329-
3245016E224B987400AF2E90 /* SDWebImageFIRStorageLoaderDefine.m in Sources */,
330-
32450166224B96B400AF2E90 /* NSURL+SDWebImageFIRStorageLoader.m in Sources */,
331-
32450162224B963B00AF2E90 /* SDWebImageFIRStorageLoader.m in Sources */,
336+
3245016E224B987400AF2E90 /* FUIStorageDefine.m in Sources */,
337+
32450166224B96B400AF2E90 /* NSURL+FirebaseStorage.m in Sources */,
338+
32450162224B963B00AF2E90 /* FUIStorageImageLoader.m in Sources */,
339+
32A5DB2822755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.m in Sources */,
332340
);
333341
runOnlyForDeploymentPostprocessing = 0;
334342
};

‎Storage/FirebaseStorageUI/FIRStorageDownloadTask+SDWebImage.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
//
2+
// Copyright (c) 2016 Google Inc.
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
//
16+
17+
#import <FirebaseStorage/FirebaseStorage.h>
18+
#import <SDWebImage/SDWebImage.h>
19+
20+
NS_ASSUME_NONNULL_BEGIN
21+
22+
// `FIRStorageDownloadTask` conforms to `SDWebImageOperation` protocol
23+
@interface FIRStorageDownloadTask (SDWebImage) <SDWebImageOperation>
24+
25+
@end
26+
27+
NS_ASSUME_NONNULL_END

‎Storage/FirebaseStorageUI/FIRStorageDownloadTask+SDWebImage.m

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//
2+
// FIRStorageDownloadTask+SDWebImage.m
3+
// FirebaseStorageUI
4+
//
5+
// Created by lizhuoli on 2019/4/28.
6+
// Copyright © 2019 Firebase. All rights reserved.
7+
//
8+
9+
#import "FIRStorageDownloadTask+SDWebImage.h"
10+
11+
@implementation FIRStorageDownloadTask (SDWebImage)
12+
13+
@end

‎Storage/FirebaseStorageUI/FUIStorageDefine.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
//
2+
// Copyright (c) 2016 Google Inc.
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
//
16+
17+
#import <FirebaseStorage/FirebaseStorage.h>
18+
#import <SDWebImage/SDWebImage.h>
19+
20+
/**
21+
* The scheme when identifing the URL is Firebase Storage URL
22+
*/
23+
FOUNDATION_EXPORT NSString * _Nonnull const FUIStorageScheme;
24+
25+
/**
26+
* A UInt64 raw value specify the maximum size of the downloaded image. If the downloaded image
27+
* exceeds this size, an error will be raised in the completion block. (NSNumber *)
28+
*/
29+
FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const FUIStorageMaxImageSize;

‎Storage/FirebaseStorageUI/SDWebImageFIRStorageLoaderDefine.m renamed to ‎Storage/FirebaseStorageUI/FUIStorageDefine.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
// limitations under the License.
1515
//
1616

17-
#import "SDWebImageFIRStorageLoaderDefine.h"
17+
#import "FUIStorageDefine.h"
1818

19-
NSString * _Nonnull const SDWebImageFIRStorageScheme = @"gs";
19+
NSString * _Nonnull const FUIStorageScheme = @"gs";
2020

21-
SDWebImageContextOption _Nonnull const SDWebImageContextFIRStorageMaxImageSize = @"firebaseMaxImageSize";
21+
SDWebImageContextOption _Nonnull const FUIStorageMaxImageSize = @"firebaseMaxImageSize";

‎Storage/FirebaseStorageUI/SDWebImageFIRStorageLoader.h renamed to ‎Storage/FirebaseStorageUI/FUIStorageImageLoader.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
//
1616

1717
#import <SDWebImage/SDWebImage.h>
18-
#import "SDWebImageFIRStorageLoaderDefine.h"
19-
#import "NSURL+SDWebImageFIRStorageLoader.h"
18+
#import "FUIStorageDefine.h"
19+
#import "NSURL+FirebaseStorage.h"
2020

2121
NS_ASSUME_NONNULL_BEGIN
2222

@@ -36,7 +36,8 @@ NS_ASSUME_NONNULL_BEGIN
3636
[imageView sd_setImageWithURL:url];
3737
* @endcode
3838
*/
39-
@interface SDWebImageFIRStorageLoader : NSObject<SDImageLoader>
39+
NS_SWIFT_NAME(StorageImageLoader)
40+
@interface FUIStorageImageLoader : NSObject<SDImageLoader>
4041

4142
/**
4243
* The maximum image download size, in bytes. Defaults to 10e6.
@@ -46,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
4647
/**
4748
The global shared instance for Firebase Storage loader.
4849
*/
49-
@property (nonatomic, class, readonly, nonnull) SDWebImageFIRStorageLoader *sharedLoader;
50+
@property (nonatomic, class, readonly, nonnull) FUIStorageImageLoader *sharedLoader;
5051

5152
@end
5253

‎Storage/FirebaseStorageUI/SDWebImageFIRStorageLoader.m renamed to ‎Storage/FirebaseStorageUI/FUIStorageImageLoader.m

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414
// limitations under the License.
1515
//
1616

17-
#import "SDWebImageFIRStorageLoader.h"
17+
#import "FUIStorageImageLoader.h"
18+
#import "FIRStorageDownloadTask+SDWebImage.h"
1819
#import <FirebaseCore/FirebaseCore.h>
1920

20-
@implementation SDWebImageFIRStorageLoader
21+
@implementation FUIStorageImageLoader
2122

22-
+ (SDWebImageFIRStorageLoader *)sharedLoader {
23+
+ (FUIStorageImageLoader *)sharedLoader {
2324
static dispatch_once_t onceToken;
24-
static SDWebImageFIRStorageLoader *loader;
25+
static FUIStorageImageLoader *loader;
2526
dispatch_once(&onceToken, ^{
26-
loader = [[SDWebImageFIRStorageLoader alloc] init];
27+
loader = [[FUIStorageImageLoader alloc] init];
2728
});
2829
return loader;
2930
}
@@ -52,8 +53,8 @@ - (BOOL)canRequestImageForURL:(NSURL *)url {
5253
}
5354

5455
UInt64 size;
55-
if (context[SDWebImageContextFIRStorageMaxImageSize]) {
56-
size = [context[SDWebImageContextFIRStorageMaxImageSize] unsignedLongLongValue];
56+
if (context[FUIStorageMaxImageSize]) {
57+
size = [context[FUIStorageMaxImageSize] unsignedLongLongValue];
5758
} else {
5859
size = self.defaultMaxImageSize;
5960
}

‎Storage/FirebaseStorageUI/FirebaseStorageUI.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ FOUNDATION_EXPORT double FirebaseStorageUIVersionNumber;
2424
FOUNDATION_EXPORT const unsigned char FirebaseStorageUIVersionString[];
2525

2626
#import "UIImageView+FirebaseStorage.h"
27-
#import "SDWebImageFIRStorageLoader.h"
28-
#import "SDWebImageFIRStorageLoaderDefine.h"
29-
#import "NSURL+SDWebImageFIRStorageLoader.h"
27+
#import "FUIStorageImageLoader.h"
28+
#import "FUIStorageDefine.h"
29+
#import "NSURL+FirebaseStorage.h"
30+
#import "FIRStorageDownloadTask+SDWebImage.h"

‎Storage/FirebaseStorageUI/NSURL+SDWebImageFIRStorageLoader.h renamed to ‎Storage/FirebaseStorageUI/NSURL+FirebaseStorage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
NS_ASSUME_NONNULL_BEGIN
2020

21-
@interface NSURL (SDWebImageFIRStorageLoader)
21+
@interface NSURL (FirebaseStorage)
2222

2323
/**
2424
The `FIRStorageReference` value for Firebase Storage reference, or nil for other URL.

‎Storage/FirebaseStorageUI/NSURL+SDWebImageFIRStorageLoader.m renamed to ‎Storage/FirebaseStorageUI/NSURL+FirebaseStorage.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
// limitations under the License.
1515
//
1616

17-
#import "NSURL+SDWebImageFIRStorageLoader.h"
18-
#import "SDWebImageFIRStorageLoaderDefine.h"
17+
#import "NSURL+FirebaseStorage.h"
18+
#import "FUIStorageDefine.h"
1919
#import <objc/runtime.h>
2020

21-
@implementation NSURL (SDWebImageFIRStorageLoader)
21+
@implementation NSURL (FirebaseStorage)
2222

2323
- (FIRStorageReference *)sd_storageReference {
2424
return objc_getAssociatedObject(self, @selector(sd_storageReference));
@@ -33,7 +33,7 @@ + (instancetype)sd_URLWithStorageReference:(FIRStorageReference *)storageRef {
3333
return nil;
3434
}
3535
// gs://bucket/path/to/object.txt
36-
NSURLComponents *components = [[NSURLComponents alloc] initWithString:[NSString stringWithFormat:@"%@://%@/", SDWebImageFIRStorageScheme, storageRef.bucket]];
36+
NSURLComponents *components = [[NSURLComponents alloc] initWithString:[NSString stringWithFormat:@"%@://%@/", FUIStorageScheme, storageRef.bucket]];
3737
NSString *encodedPath = [storageRef.fullPath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLPathAllowedCharacterSet]];
3838
components.path = [components.path stringByAppendingString:encodedPath];
3939

‎Storage/FirebaseStorageUI/SDWebImageFIRStorageLoaderDefine.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
/**
2121
* The scheme when identifing the URL is Firebase Storage URL
2222
*/
23-
FOUNDATION_EXPORT NSString * _Nonnull const SDWebImageFIRStorageScheme;
23+
FOUNDATION_EXPORT NSString * _Nonnull const FUIStorageScheme;
2424

2525
/**
2626
* A UInt64 raw value specify the maximum size of the downloaded image. If the downloaded image
2727
* exceeds this size, an error will be raised in the completion block. (NSNumber *)
2828
*/
29-
FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const SDWebImageContextFIRStorageMaxImageSize;
29+
FOUNDATION_EXPORT SDWebImageContextOption _Nonnull const FUIStorageMaxImageSize;
3030

3131
// `FIRStorageDownloadTask` conforms to `SDWebImageOperation` protocol
3232
@interface FIRStorageDownloadTask (SDWebImage) <SDWebImageOperation>

‎Storage/FirebaseStorageUI/UIImageView+FirebaseStorage.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
//
1616

1717
#import "UIImageView+FirebaseStorage.h"
18-
#import "SDWebImageFIRStorageLoader.h"
18+
#import "FUIStorageImageLoader.h"
1919

2020
static SDWebImageManager *DefaultWebImageManager(void) {
2121
static dispatch_once_t onceToken;
2222
static SDWebImageManager *manager;
2323
dispatch_once(&onceToken, ^{
24-
manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:SDWebImageFIRStorageLoader.sharedLoader];
24+
manager = [[SDWebImageManager alloc] initWithCache:SDImageCache.sharedImageCache loader:FUIStorageImageLoader.sharedLoader];
2525
});
2626
return manager;
2727
}
@@ -44,7 +44,7 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
4444
SDImageCacheType,
4545
FIRStorageReference *))completionBlock {
4646
[self sd_setImageWithStorageReference:storageRef
47-
maxImageSize:SDWebImageFIRStorageLoader.sharedLoader.defaultMaxImageSize
47+
maxImageSize:FUIStorageImageLoader.sharedLoader.defaultMaxImageSize
4848
placeholderImage:placeholder
4949
completion:completionBlock];
5050
}
@@ -124,8 +124,8 @@ - (void)sd_setImageWithStorageReference:(FIRStorageReference *)storageRef
124124
if (!mutableContext[SDWebImageContextCustomManager]) {
125125
mutableContext[SDWebImageContextCustomManager] = DefaultWebImageManager();
126126
}
127-
if (!mutableContext[SDWebImageContextFIRStorageMaxImageSize]) {
128-
mutableContext[SDWebImageContextFIRStorageMaxImageSize] = @(size);
127+
if (!mutableContext[FUIStorageMaxImageSize]) {
128+
mutableContext[FUIStorageMaxImageSize] = @(size);
129129
}
130130

131131
[self sd_setImageWithURL:url placeholderImage:placeholder options:options context:[mutableContext copy] progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) {

0 commit comments

Comments
 (0)