Skip to content

Commit ae47a83

Browse files
committed
fix bubble assets jessesquires#524
1 parent 1fb7f9f commit ae47a83

File tree

7 files changed

+28
-2
lines changed

7 files changed

+28
-2
lines changed

JSQMessages.xcodeproj/project.pbxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
8846441F19EB17CF001EBA43 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8846441C19EB17CF001EBA43 /* [email protected] */; };
3838
8846442019EB17CF001EBA43 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8846441D19EB17CF001EBA43 /* [email protected] */; };
3939
8846442119EB17CF001EBA43 /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = 8846441E19EB17CF001EBA43 /* play.png */; };
40+
8846442519EB1830001EBA43 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8846442319EB1830001EBA43 /* [email protected] */; };
41+
8846442719EB189E001EBA43 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8846442619EB189E001EBA43 /* [email protected] */; };
42+
8846442A19EB18A5001EBA43 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8846442819EB18A5001EBA43 /* [email protected] */; };
43+
8846442B19EB18A5001EBA43 /* bubble_tailless.png in Resources */ = {isa = PBXBuildFile; fileRef = 8846442919EB18A5001EBA43 /* bubble_tailless.png */; };
4044
886FFD2E19E9A65D00EB8485 /* UIDevice+JSQMessages.m in Sources */ = {isa = PBXBuildFile; fileRef = 886FFD2D19E9A65D00EB8485 /* UIDevice+JSQMessages.m */; };
4145
8885734A19DE540400E89D20 /* DemoSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8885734919DE540400E89D20 /* DemoSettingsViewController.m */; };
4246
8885734D19DE55D000E89D20 /* NSUserDefaults+DemoSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 8885734C19DE55D000E89D20 /* NSUserDefaults+DemoSettings.m */; };
@@ -163,6 +167,10 @@
163167
8846441C19EB17CF001EBA43 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
164168
8846441D19EB17CF001EBA43 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
165169
8846441E19EB17CF001EBA43 /* play.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = play.png; sourceTree = "<group>"; };
170+
8846442319EB1830001EBA43 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
171+
8846442619EB189E001EBA43 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
172+
8846442819EB18A5001EBA43 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
173+
8846442919EB18A5001EBA43 /* bubble_tailless.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bubble_tailless.png; sourceTree = "<group>"; };
166174
886FFD2C19E9A65D00EB8485 /* UIDevice+JSQMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIDevice+JSQMessages.h"; sourceTree = "<group>"; };
167175
886FFD2D19E9A65D00EB8485 /* UIDevice+JSQMessages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIDevice+JSQMessages.m"; sourceTree = "<group>"; };
168176
8885734819DE540400E89D20 /* DemoSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoSettingsViewController.h; sourceTree = "<group>"; };
@@ -464,8 +472,12 @@
464472
88AE58EB19E77FBF0042B0DE /* bubble_stroked.png */,
465473
88AE58EC19E77FBF0042B0DE /* [email protected] */,
466474
8846441419EB15B2001EBA43 /* [email protected] */,
475+
8846442919EB18A5001EBA43 /* bubble_tailless.png */,
476+
8846442819EB18A5001EBA43 /* [email protected] */,
477+
8846442619EB189E001EBA43 /* [email protected] */,
467478
88A25F4119D8E01A00924534 /* bubble.png */,
468479
88A25F4219D8E01A00924534 /* [email protected] */,
480+
8846442319EB1830001EBA43 /* [email protected] */,
469481
88078A9E19D8FFEA005B4595 /* clip.png */,
470482
88078A9F19D8FFEA005B4595 /* [email protected] */,
471483
88078AA019D8FFEA005B4595 /* [email protected] */,
@@ -773,11 +785,13 @@
773785
88A25FA319D8E01A00924534 /* bubble.png in Resources */,
774786
88A25FA519D8E01A00924534 /* bubble_min.png in Resources */,
775787
8846441A19EB15B2001EBA43 /* [email protected] in Resources */,
788+
8846442B19EB18A5001EBA43 /* bubble_tailless.png in Resources */,
776789
88A25FA619D8E01A00924534 /* [email protected] in Resources */,
777790
88A25FCD19D8E01A00924534 /* JSQMessagesCollectionViewCellIncoming.xib in Resources */,
778791
88A25FD619D8E01A00924534 /* JSQMessagesToolbarContentView.xib in Resources */,
779792
88A25F3A19D8DF2500924534 /* Images.xcassets in Resources */,
780793
88A25FBC19D8E01A00924534 /* JSQMessagesViewController.xib in Resources */,
794+
8846442A19EB18A5001EBA43 /* [email protected] in Resources */,
781795
88078AA219D8FFEA005B4595 /* [email protected] in Resources */,
782796
88A25FA419D8E01A00924534 /* [email protected] in Resources */,
783797
88078AA319D8FFEA005B4595 /* [email protected] in Resources */,
@@ -787,7 +801,9 @@
787801
88A25FB419D8E01A00924534 /* message_sent.aiff in Resources */,
788802
88A25F3919D8DF2500924534 /* Main.storyboard in Resources */,
789803
88A25FD419D8E01A00924534 /* JSQMessagesLoadEarlierHeaderView.xib in Resources */,
804+
8846442519EB1830001EBA43 /* [email protected] in Resources */,
790805
88078AA819D9034F005B4595 /* [email protected] in Resources */,
806+
8846442719EB189E001EBA43 /* [email protected] in Resources */,
791807
8846442119EB17CF001EBA43 /* play.png in Resources */,
792808
88AE58EF19E77FBF0042B0DE /* bubble_stroked.png in Resources */,
793809
8846442019EB17CF001EBA43 /* [email protected] in Resources */,
Loading
Loading
Loading
Loading

JSQMessagesViewController/Categories/UIImage+JSQMessages.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
*/
3535
+ (UIImage *)jsq_bubbleRegularImage;
3636

37+
/**
38+
* @return The regular message bubble image without a tail.
39+
*/
40+
+ (UIImage *)jsq_bubbleRegularTaillessImage;
41+
3742
/**
3843
* @return The regular message bubble image stroked, not filled.
3944
*/

JSQMessagesViewController/Categories/UIImage+JSQMessages.m

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,19 @@ + (UIImage *)jsq_bubbleRegularImage
5050
return [UIImage imageNamed:@"bubble"];
5151
}
5252

53+
+ (UIImage *)jsq_bubbleRegularTaillessImage
54+
{
55+
return [UIImage imageNamed:@"bubble_tailless"];
56+
}
57+
5358
+ (UIImage *)jsq_bubbleRegularStrokedImage
5459
{
5560
return [UIImage imageNamed:@"bubble_stroked"];
5661
}
5762

5863
+ (UIImage *)jsq_bubbleRegularStrokedTaillessImage
5964
{
60-
return [UIImage imageNamed:@"bubble_stroked"];
65+
return [UIImage imageNamed:@"bubble_stroked_tailless"];
6166
}
6267

6368
+ (UIImage *)jsq_bubbleCompactImage
@@ -67,7 +72,7 @@ + (UIImage *)jsq_bubbleCompactImage
6772

6873
+ (UIImage *)jsq_bubbleCompactTaillessImage
6974
{
70-
return [UIImage imageNamed:@"bubble_min"];
75+
return [UIImage imageNamed:@"bubble_min_tailless"];
7176
}
7277

7378
@end

0 commit comments

Comments
 (0)