Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Nicer graphics and moving the graphics into bundle

  • Loading branch information...
commit 039a7a74ea8d253846ff00ab34f67f9487dcb3ae 1 parent ed03609
Alex Barinov authored
View
44 example/UIBubbleTableViewExample.xcodeproj/project.pbxproj
@@ -7,10 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- 760D927D15DD824900E06D4A /* typingMine.png in Resources */ = {isa = PBXBuildFile; fileRef = 760D927915DD824900E06D4A /* typingMine.png */; };
- 760D927E15DD824900E06D4A /* typingMine@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 760D927A15DD824900E06D4A /* typingMine@2x.png */; };
- 760D927F15DD824900E06D4A /* typingSomeone.png in Resources */ = {isa = PBXBuildFile; fileRef = 760D927B15DD824900E06D4A /* typingSomeone.png */; };
- 760D928015DD824900E06D4A /* typingSomeone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 760D927C15DD824900E06D4A /* typingSomeone@2x.png */; };
76ED206315BF096C00E186D3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76ED206215BF096C00E186D3 /* UIKit.framework */; };
76ED206515BF096C00E186D3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76ED206415BF096C00E186D3 /* Foundation.framework */; };
76ED206715BF096C00E186D3 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76ED206615BF096C00E186D3 /* CoreGraphics.framework */; };
@@ -24,19 +20,12 @@
76ED209115BF263600E186D3 /* NSBubbleDataInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = 76ED209015BF263600E186D3 /* NSBubbleDataInternal.m */; };
76ED209415BF29EE00E186D3 /* UIBubbleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 76ED209315BF29EE00E186D3 /* UIBubbleTableViewCell.m */; };
76ED209615BF2A1400E186D3 /* UIBubbleTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76ED209515BF2A1400E186D3 /* UIBubbleTableViewCell.xib */; };
- 76ED209A15BF32AA00E186D3 /* bubbleMine.png in Resources */ = {isa = PBXBuildFile; fileRef = 76ED209815BF32AA00E186D3 /* bubbleMine.png */; };
- 76ED209B15BF32AA00E186D3 /* bubbleSomeone.png in Resources */ = {isa = PBXBuildFile; fileRef = 76ED209915BF32AA00E186D3 /* bubbleSomeone.png */; };
- C86D4FF815BFE7B3003F161E /* bubbleMine@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C86D4FF615BFE7B3003F161E /* bubbleMine@2x.png */; };
- C86D4FF915BFE7B3003F161E /* bubbleSomeone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C86D4FF715BFE7B3003F161E /* bubbleSomeone@2x.png */; };
+ C83B106915DE3DA10067DADE /* UIBubbleTableData.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C83B106815DE3DA10067DADE /* UIBubbleTableData.bundle */; };
C86D4FFC15BFEBBF003F161E /* icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = C86D4FFB15BFEBBF003F161E /* icon_57.png */; };
C86D4FFE15BFEBC1003F161E /* icon_114.png in Resources */ = {isa = PBXBuildFile; fileRef = C86D4FFD15BFEBC1003F161E /* icon_114.png */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- 760D927915DD824900E06D4A /* typingMine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = typingMine.png; path = ../../images/typingMine.png; sourceTree = "<group>"; };
- 760D927A15DD824900E06D4A /* typingMine@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "typingMine@2x.png"; path = "../../images/typingMine@2x.png"; sourceTree = "<group>"; };
- 760D927B15DD824900E06D4A /* typingSomeone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = typingSomeone.png; path = ../../images/typingSomeone.png; sourceTree = "<group>"; };
- 760D927C15DD824900E06D4A /* typingSomeone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "typingSomeone@2x.png"; path = "../../images/typingSomeone@2x.png"; sourceTree = "<group>"; };
76ED205E15BF096C00E186D3 /* UIBubbleTableViewExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UIBubbleTableViewExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
76ED206215BF096C00E186D3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
76ED206415BF096C00E186D3 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -60,10 +49,7 @@
76ED209215BF29EE00E186D3 /* UIBubbleTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIBubbleTableViewCell.h; path = ../../src/UIBubbleTableViewCell.h; sourceTree = "<group>"; };
76ED209315BF29EE00E186D3 /* UIBubbleTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UIBubbleTableViewCell.m; path = ../../src/UIBubbleTableViewCell.m; sourceTree = "<group>"; };
76ED209515BF2A1400E186D3 /* UIBubbleTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UIBubbleTableViewCell.xib; path = ../../src/UIBubbleTableViewCell.xib; sourceTree = "<group>"; };
- 76ED209815BF32AA00E186D3 /* bubbleMine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bubbleMine.png; path = ../../images/bubbleMine.png; sourceTree = "<group>"; };
- 76ED209915BF32AA00E186D3 /* bubbleSomeone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bubbleSomeone.png; path = ../../images/bubbleSomeone.png; sourceTree = "<group>"; };
- C86D4FF615BFE7B3003F161E /* bubbleMine@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bubbleMine@2x.png"; path = "../../images/bubbleMine@2x.png"; sourceTree = "<group>"; };
- C86D4FF715BFE7B3003F161E /* bubbleSomeone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bubbleSomeone@2x.png"; path = "../../images/bubbleSomeone@2x.png"; sourceTree = "<group>"; };
+ C83B106815DE3DA10067DADE /* UIBubbleTableData.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = UIBubbleTableData.bundle; path = ../../src/UIBubbleTableData.bundle; sourceTree = "<group>"; };
C86D4FFB15BFEBBF003F161E /* icon_57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_57.png; path = ../icon_57.png; sourceTree = "<group>"; };
C86D4FFD15BFEBC1003F161E /* icon_114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_114.png; path = ../icon_114.png; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -112,7 +98,6 @@
76ED206815BF096C00E186D3 /* UIBubbleTableViewExample */ = {
isa = PBXGroup;
children = (
- 76ED209715BF329800E186D3 /* images */,
76ED208315BF09AD00E186D3 /* src */,
76ED207115BF096C00E186D3 /* AppDelegate.h */,
76ED207215BF096C00E186D3 /* AppDelegate.m */,
@@ -140,6 +125,7 @@
76ED208315BF09AD00E186D3 /* src */ = {
isa = PBXGroup;
children = (
+ C83B106815DE3DA10067DADE /* UIBubbleTableData.bundle */,
76ED208915BF0BB100E186D3 /* NSBubbleData.h */,
76ED208A15BF0BB100E186D3 /* NSBubbleData.m */,
76ED208F15BF263600E186D3 /* NSBubbleDataInternal.h */,
@@ -154,21 +140,6 @@
name = src;
sourceTree = "<group>";
};
- 76ED209715BF329800E186D3 /* images */ = {
- isa = PBXGroup;
- children = (
- 76ED209815BF32AA00E186D3 /* bubbleMine.png */,
- C86D4FF615BFE7B3003F161E /* bubbleMine@2x.png */,
- 76ED209915BF32AA00E186D3 /* bubbleSomeone.png */,
- C86D4FF715BFE7B3003F161E /* bubbleSomeone@2x.png */,
- 760D927915DD824900E06D4A /* typingMine.png */,
- 760D927A15DD824900E06D4A /* typingMine@2x.png */,
- 760D927B15DD824900E06D4A /* typingSomeone.png */,
- 760D927C15DD824900E06D4A /* typingSomeone@2x.png */,
- );
- name = images;
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -222,16 +193,9 @@
76ED206D15BF096C00E186D3 /* InfoPlist.strings in Resources */,
76ED207915BF096C00E186D3 /* ViewController.xib in Resources */,
76ED209615BF2A1400E186D3 /* UIBubbleTableViewCell.xib in Resources */,
- 76ED209A15BF32AA00E186D3 /* bubbleMine.png in Resources */,
- 76ED209B15BF32AA00E186D3 /* bubbleSomeone.png in Resources */,
- C86D4FF815BFE7B3003F161E /* bubbleMine@2x.png in Resources */,
- C86D4FF915BFE7B3003F161E /* bubbleSomeone@2x.png in Resources */,
C86D4FFC15BFEBBF003F161E /* icon_57.png in Resources */,
C86D4FFE15BFEBC1003F161E /* icon_114.png in Resources */,
- 760D927D15DD824900E06D4A /* typingMine.png in Resources */,
- 760D927E15DD824900E06D4A /* typingMine@2x.png in Resources */,
- 760D927F15DD824900E06D4A /* typingSomeone.png in Resources */,
- 760D928015DD824900E06D4A /* typingSomeone@2x.png in Resources */,
+ C83B106915DE3DA10067DADE /* UIBubbleTableData.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN  images/typingMine.png
Deleted file not rendered
View
BIN  images/typingMine@2x.png
Deleted file not rendered
View
BIN  images/typingSomeone.png
Deleted file not rendered
View
BIN  images/typingSomeone@2x.png
Deleted file not rendered
View
BIN  psd/myTyping@2x.psd
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  psd/someoneTyping@2x.psd
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  images/bubbleMine.png → src/UIBubbleTableData.bundle/bubbleMine.png
File renamed without changes
View
0  images/bubbleMine@2x.png → ...IBubbleTableData.bundle/bubbleMine@2x.png
File renamed without changes
View
0  images/bubbleSomeone.png → ...IBubbleTableData.bundle/bubbleSomeone.png
File renamed without changes
View
0  images/bubbleSomeone@2x.png → ...bbleTableData.bundle/bubbleSomeone@2x.png
File renamed without changes
View
BIN  src/UIBubbleTableData.bundle/typingMine.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/UIBubbleTableData.bundle/typingMine@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/UIBubbleTableData.bundle/typingSomeone.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/UIBubbleTableData.bundle/typingSomeone@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
8 src/UIBubbleTableView.m
@@ -159,7 +159,7 @@ - (void)reloadData
dataInternal.data = nil;
dataInternal.type = NSBubbleDataTypeTypingBubble;
dataInternal.labelSize = CGSizeMake(0, 0);
- dataInternal.height = 30;
+ dataInternal.height = 40;
[self.bubbleDictionary setObject:[NSMutableArray arrayWithObject:dataInternal] forKey:[NSString stringWithFormat:@"%d", count]];
}
@@ -239,17 +239,17 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
if (self.typingBubble == NSBubbleTypingTypeMe)
{
bubbleImage = [UIImage imageNamed:@"typingMine.png"];
- x = cell.frame.size.width - 8 - bubbleImage.size.width;
+ x = cell.frame.size.width - 4 - bubbleImage.size.width;
}
else
{
bubbleImage = [UIImage imageNamed:@"typingSomeone.png"];
- x = 8;
+ x = 4;
}
UIImageView *bubbleImageView = [[UIImageView alloc] initWithImage:bubbleImage];
- bubbleImageView.frame = CGRectMake(x, 4, 48, 22);
+ bubbleImageView.frame = CGRectMake(x, 4, 73, 31);
[cell addSubview:[bubbleImageView autorelease]];
}

0 comments on commit 039a7a7

Please sign in to comment.
Something went wrong with that request. Please try again.