Skip to content
Browse files

Added support for Twinkle; changed 'TwitterFon' with its new name 'Ec…

…hofon'
  • Loading branch information...
1 parent 4a17853 commit 9c2f01edf06dfedb304de65aa2543a6416d6c391 Adrian Kosmaczewski committed Sep 25, 2009
View
17 Classes/Controllers/TwitThisViewController.m
@@ -23,7 +23,6 @@ - (void)viewDidLoad
[super viewDidLoad];
_clientManager = [TwitterClientManager sharedTwitterClientManager];
_clients = [[_clientManager supportedClients] retain];
- self.tableView.scrollEnabled = NO;
}
- (void)didReceiveMemoryWarning
@@ -57,7 +56,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
- if (indexPath.section == 0)
+ if (indexPath.section == 1)
{
return 60.0;
}
@@ -66,7 +65,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
- if (section == 0)
+ if (section == 1)
{
return [_clients count];
}
@@ -75,7 +74,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
{
- if (section == 0)
+ if (section == 1)
{
return @"Supported Twitter Clients";
}
@@ -84,7 +83,7 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
{
- if (section == 1)
+ if (section == 0)
{
return @"You can also change the value of your current Twitter client in the Settings application.";
}
@@ -94,7 +93,7 @@ - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInte
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
UITableViewCell *cell = nil;
- if (indexPath.section == 0)
+ if (indexPath.section == 1)
{
TwitterClient *client = [_clients objectAtIndex:indexPath.row];
static NSString *cellIdentifier = @"TwitterClientCell";
@@ -119,7 +118,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
cell.imageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"%@.png", client.name]];
return cell;
}
- else if (indexPath.section == 1)
+ else
{
static NSString *anotherIdentifier = @"AnotherIdentifier";
cell = [tableView dequeueReusableCellWithIdentifier:anotherIdentifier];
@@ -145,7 +144,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
{
[self.tableView deselectRowAtIndexPath:indexPath animated:YES];
- if (indexPath.section == 0)
+ if (indexPath.section == 1)
{
TwitterClient *client = [_clients objectAtIndex:indexPath.row];
[_clientManager setSelectedClientName:client.name];
@@ -168,7 +167,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
[alert release];
}
}
- else if (indexPath.section == 1)
+ else
{
if ([_clientManager isAnyClientAvailable])
{
View
BIN Resources/Images/Echofon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/Images/Twinkle.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/Images/Twitterfon.png
Deleted file not rendered
View
6 Resources/Settings.bundle/Root.plist
@@ -24,18 +24,20 @@
<key>Values</key>
<array>
<string>None</string>
- <string>TwitterFon</string>
+ <string>Echofon</string>
<string>Twitterriffic</string>
<string>Tweetie</string>
<string>Twittelator</string>
+ <string>Twinkle</string>
</array>
<key>Titles</key>
<array>
<string>None</string>
- <string>TwitterFon</string>
+ <string>Echofon</string>
<string>Twitterriffic</string>
<string>Tweetie</string>
<string>Twittelator</string>
+ <string>Twinkle</string>
</array>
</dict>
</array>
View
8 Resources/TwitterClients.plist
@@ -4,7 +4,7 @@
<array>
<dict>
<key>name</key>
- <string>TwitterFon</string>
+ <string>Echofon</string>
<key>template</key>
<string>twitterfon:///message?%@</string>
</dict>
@@ -26,5 +26,11 @@
<key>template</key>
<string>twit:///post?message=%@</string>
</dict>
+ <dict>
+ <key>name</key>
+ <string>Twinkle</string>
+ <key>template</key>
+ <string>twinkle://message=%@</string>
+ </dict>
</array>
</plist>
View
12 TwitThis.xcodeproj/project.pbxproj
@@ -11,14 +11,15 @@
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
+ 3A7D4833106D1C24007B63B4 /* Twinkle.png in Resources */ = {isa = PBXBuildFile; fileRef = 3A7D4832106D1C24007B63B4 /* Twinkle.png */; };
+ 3A7D4836106D1C30007B63B4 /* Echofon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3A7D4835106D1C30007B63B4 /* Echofon.png */; };
3ACD6777105AC14100CC3E12 /* TwitThisAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ACD6772105AC14100CC3E12 /* TwitThisAppDelegate.m */; };
3ACD677D105AC16A00CC3E12 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3ACD677B105AC16A00CC3E12 /* MainWindow.xib */; };
3ACD6797105AC1C100CC3E12 /* TwitThisViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ACD6795105AC1C100CC3E12 /* TwitThisViewController.m */; };
3ACD67A3105AC20C00CC3E12 /* TwitterClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ACD67A0105AC20C00CC3E12 /* TwitterClient.m */; };
3ACD67A4105AC20C00CC3E12 /* TwitterClientManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ACD67A2105AC20C00CC3E12 /* TwitterClientManager.m */; };
3ACD67BD105AC25900CC3E12 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3ACD67BC105AC25900CC3E12 /* Settings.bundle */; };
3ACD67C2105AC26100CC3E12 /* TwitterClients.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3ACD67C1105AC26100CC3E12 /* TwitterClients.plist */; };
- 3ACD67F4105AC63400CC3E12 /* TwitterFon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3ACD67F0105AC63400CC3E12 /* TwitterFon.png */; };
3ACD67F5105AC63400CC3E12 /* Twitterrific.png in Resources */ = {isa = PBXBuildFile; fileRef = 3ACD67F1105AC63400CC3E12 /* Twitterrific.png */; };
3ACD67F6105AC63400CC3E12 /* Twittelator.png in Resources */ = {isa = PBXBuildFile; fileRef = 3ACD67F2105AC63400CC3E12 /* Twittelator.png */; };
3ACD67F7105AC63400CC3E12 /* Tweetie.png in Resources */ = {isa = PBXBuildFile; fileRef = 3ACD67F3105AC63400CC3E12 /* Tweetie.png */; };
@@ -34,6 +35,8 @@
288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* TwitThis_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwitThis_Prefix.pch; sourceTree = "<group>"; };
+ 3A7D4832106D1C24007B63B4 /* Twinkle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Twinkle.png; sourceTree = "<group>"; };
+ 3A7D4835106D1C30007B63B4 /* Echofon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Echofon.png; sourceTree = "<group>"; };
3ACD6771105AC14100CC3E12 /* TwitThisAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwitThisAppDelegate.h; sourceTree = "<group>"; };
3ACD6772105AC14100CC3E12 /* TwitThisAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TwitThisAppDelegate.m; sourceTree = "<group>"; };
3ACD677B105AC16A00CC3E12 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
@@ -46,7 +49,6 @@
3ACD67B8105AC23000CC3E12 /* Definitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Definitions.h; sourceTree = "<group>"; };
3ACD67BC105AC25900CC3E12 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
3ACD67C1105AC26100CC3E12 /* TwitterClients.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = TwitterClients.plist; sourceTree = "<group>"; };
- 3ACD67F0105AC63400CC3E12 /* TwitterFon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = TwitterFon.png; sourceTree = "<group>"; };
3ACD67F1105AC63400CC3E12 /* Twitterrific.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Twitterrific.png; sourceTree = "<group>"; };
3ACD67F2105AC63400CC3E12 /* Twittelator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Twittelator.png; sourceTree = "<group>"; };
3ACD67F3105AC63400CC3E12 /* Tweetie.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Tweetie.png; sourceTree = "<group>"; };
@@ -173,12 +175,13 @@
3ACD67EF105AC63100CC3E12 /* Images */ = {
isa = PBXGroup;
children = (
+ 3A7D4835106D1C30007B63B4 /* Echofon.png */,
3ACD6853105ACA6800CC3E12 /* Default.png */,
3ACD6845105AC9F300CC3E12 /* icon.png */,
- 3ACD67F0105AC63400CC3E12 /* TwitterFon.png */,
3ACD67F1105AC63400CC3E12 /* Twitterrific.png */,
3ACD67F2105AC63400CC3E12 /* Twittelator.png */,
3ACD67F3105AC63400CC3E12 /* Tweetie.png */,
+ 3A7D4832106D1C24007B63B4 /* Twinkle.png */,
);
path = Images;
sourceTree = "<group>";
@@ -228,13 +231,14 @@
3ACD677D105AC16A00CC3E12 /* MainWindow.xib in Resources */,
3ACD67BD105AC25900CC3E12 /* Settings.bundle in Resources */,
3ACD67C2105AC26100CC3E12 /* TwitterClients.plist in Resources */,
- 3ACD67F4105AC63400CC3E12 /* TwitterFon.png in Resources */,
3ACD67F5105AC63400CC3E12 /* Twitterrific.png in Resources */,
3ACD67F6105AC63400CC3E12 /* Twittelator.png in Resources */,
3ACD67F7105AC63400CC3E12 /* Tweetie.png in Resources */,
3ACD6846105AC9F300CC3E12 /* icon.png in Resources */,
3ACD6854105ACA6800CC3E12 /* Default.png in Resources */,
3ACD68CD105AD34800CC3E12 /* Entitlements.plist in Resources */,
+ 3A7D4833106D1C24007B63B4 /* Twinkle.png in Resources */,
+ 3A7D4836106D1C30007B63B4 /* Echofon.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

0 comments on commit 9c2f01e

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