Changeset 896 for apps

Timestamp:

09/13/11 11:09:35 (21 months ago)

Author:

henri

Message:

Added sharing actions

Location:

apps/iphone/superbook/trunk

Files:

• Classes/LocateThem_AppDelegate.m (modified) (2 diffs)
• Classes/NaptrViewController.h (modified) (2 diffs)
• Classes/NaptrViewController.m (modified) (8 diffs)
• English.lproj/Localizable.strings (modified) (1 diff)
• French.lproj/Localizable.strings (modified) (1 diff)
• German.lproj/Localizable.strings (modified) (1 diff)

apps/iphone/superbook/trunk/Classes/LocateThem_AppDelegate.m

@@ -30 +30 @@
 #import "TelDomain.h"
 #import "NetworkUtility.h"
+#import "SHK.h"
 
 @implementation LocateThem_AppDelegate
@@ -108 +109 @@
         }
         
+    [SHK flushOfflineQueue];
+    
         LocateThem_ViewController *lVC = [[[LocateThem_ViewController alloc] initWithNibName:@"MainView" bundle:[NSBundle mainBundle]] autorelease];
         navC = [[UINavigationController alloc] initWithRootViewController:lVC];

apps/iphone/superbook/trunk/Classes/NaptrViewController.h

@@ -50 +50 @@
         UIActivityIndicatorView *loadingAIView;
         UIBarButtonItem *loadingAIButton;
-        UIBarButtonItem *storeContactButton;
+        UIBarButtonItem *actionContactButton;
         UIImage *logoImage;
         NSNumber *abId; // addressbook id
@@ -66 +66 @@
 - (void)didFinishRetrievingLogo;
 - (void)actOnUri:(NSString *)uri;
+- (IBAction)domainAction:(id)sender;
 - (IBAction)saveContact:(id)sender;
+- (IBAction)shareContact:(id)sender;
 
 @property (nonatomic, retain) TelDomain *theDomain;
 @property (nonatomic, retain) UIActivityIndicatorView *loadingAIView;
 @property (nonatomic, retain) UIBarButtonItem *loadingAIButton;
-@property (nonatomic, retain) UIBarButtonItem *storeContactButton;
+@property (nonatomic, retain) UIBarButtonItem *actionContactButton;
 @property (nonatomic, retain) UIImage *logoImage;
 @property (nonatomic, retain) NSNumber *abId;

apps/iphone/superbook/trunk/Classes/NaptrViewController.m

@@ -35 +35 @@
 #import "WebUrlViewController.h"
 #import "RecordNaptr+HAAdditions.h"
+#import "SHK.h"
 
 static UIFont *headerFont;
@@ -41 +42 @@
 static CGFloat naptrCellRowLineHeight;
 static CGSize maximumLabelSize;
+
+enum ActionSheets_enum {
+    ActionSheet_Action,
+    ActionSheet_Call,
+    ActionSheet_Share
+};
 
 @interface NaptrViewController (PrivateMethods)
@@ -58 +65 @@
 @synthesize loadingAIButton;
 @synthesize logoImage;
-@synthesize storeContactButton;
+@synthesize actionContactButton;
 @synthesize abId;
 
@@ -98 +105 @@
         self.loadingAIButton = [[[UIBarButtonItem alloc] initWithCustomView:self.loadingAIView] autorelease];
         
-        self.storeContactButton = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave 
+        self.actionContactButton = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction 
                                                                                                                                                         target:self 
-                                                                                                                                                        action:@selector(saveContact:)] autorelease];
+                                                                                                                                                        action:@selector(domainAction:)] autorelease];
         self.logoImage = nil;
     
@@ -186 +193 @@
                 [self.loadingAIView stopAnimating];
         [self performSelector:@selector(stopLoading) withObject:nil afterDelay:0.1];
-                self.navigationItem.rightBarButtonItem = self.storeContactButton;
+                self.navigationItem.rightBarButtonItem = self.actionContactButton;
         if (! self.theDomain.isCached) {
             // Cache the domain data if it's new data
@@ -824 +831 @@
                                                                                                    destructiveButtonTitle:nil
                                                                                                                 otherButtonTitles:nil];
+        actionSheet.tag = ActionSheet_Call;
                 callButtonIndex = [actionSheet addButtonWithTitle:NSLocalizedString(@"Call this number", @"Call this number")];
                 smsButtonIndex = [actionSheet addButtonWithTitle:NSLocalizedString(@"Send an SMS Message", @"Send an SMS Message")];
@@ -846 +854 @@
                 return;
         }
-        NSURL *naptrUrl;
-        NSString *uri = [actionSheet title];
-    if (buttonIndex == callButtonIndex) {
-                naptrUrl = [NSURL URLWithString:[uri stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]];
-                [[UIApplication sharedApplication] openURL:naptrUrl];
-        } else if (buttonIndex == smsButtonIndex) {
-                NSRange telPrefixRange = [uri rangeOfString:@"tel:"];
-                naptrUrl = [NSURL URLWithString:[uri stringByReplacingCharactersInRange:telPrefixRange withString:@"sms:"]];
-                [[UIApplication sharedApplication] openURL:naptrUrl];
+    if (actionSheet.tag == ActionSheet_Call) {
+        NSURL *naptrUrl;
+        NSString *uri = [actionSheet title];
+        if (buttonIndex == callButtonIndex) {
+            naptrUrl = [NSURL URLWithString:[uri stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]];
+            [[UIApplication sharedApplication] openURL:naptrUrl];
+        } else if (buttonIndex == smsButtonIndex) {
+            NSRange telPrefixRange = [uri rangeOfString:@"tel:"];
+            naptrUrl = [NSURL URLWithString:[uri stringByReplacingCharactersInRange:telPrefixRange withString:@"sms:"]];
+            [[UIApplication sharedApplication] openURL:naptrUrl];
+        }
+    } else if (actionSheet.tag == ActionSheet_Action) {
+        if (buttonIndex == 0) { // Save
+            [self saveContact:nil];
+        } else if (buttonIndex == 1) { // Share
+            [self shareContact:nil];
+        }
     }
         return;
 }
 
-#pragma mark ------ Methods to save a contact
+#pragma mark ------ Action methods
+
+- (IBAction)domainAction:(id)sender {
+    UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:nil
+                                                             delegate:self
+                                                    cancelButtonTitle:nil
+                                               destructiveButtonTitle:nil
+                                                    otherButtonTitles:nil];
+    actionSheet.tag = ActionSheet_Action;
+    [actionSheet addButtonWithTitle:NSLocalizedString(@"Save to Address Book", @"Save")];
+    [actionSheet addButtonWithTitle:NSLocalizedString(@"Share this", @"Share")];
+    actionSheet.cancelButtonIndex = [actionSheet addButtonWithTitle:NSLocalizedString(@"Cancel", @"Cancel")];
+    [actionSheet showInView:self.view];
+    [actionSheet release];
+}
 
 - (IBAction)saveContact:(id)sender {
@@ -874 +904 @@
                 [self showError:err];
         }
+}
+
+- (IBAction)shareContact:(id)sender {
+    // Create the item to share (in this example, a url)
+        NSURL *url = [NSURL URLWithString:[@"http://" stringByAppendingString:self.theDomain.telName]];
+    NSString *urlString = [url.absoluteString stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString *sharingString = [NSString stringWithFormat:NSLocalizedString(@"I just checked out %@ on Superbook", @"sharing string"), urlString];
+        SHKItem *item = [SHKItem text:sharingString];
+    
+        // Get the ShareKit action sheet
+        SHKActionSheet *actionSheet = [SHKActionSheet actionSheetForItem:item];    
+        // Display the action sheet
+    [actionSheet showInView:self.view];
 }
 

apps/iphone/superbook/trunk/English.lproj/Localizable.strings

@@ -110 +110 @@
 "Coordinates" = "Coordinates";
 
+/* Share this */
+"Share this" = "Share this";
 
 /*** AddressBook Mapping ***/

apps/iphone/superbook/trunk/French.lproj/Localizable.strings

@@ -161 +161 @@
 "CreateNewContact" = "Créer un nouveau contact";
 
+/* Share this */
+"Share this" = "Partager";
 
 /*** Map View ***/

apps/iphone/superbook/trunk/German.lproj/Localizable.strings

@@ -110 +110 @@
 /* Coordinates */
 "Coordinates" = "Koordinaten";
+
+/* Share this */
+"Share this" = "Teilen";