rhodes 2.0.0.beta7 → 2.0.0.beta8

data/platform/iphone/Classes/NavBar.m

@@ -25,7 +25,7 @@
     NSString *title = [args objectAtIndex:0];
     NSArray *left = [args objectAtIndex:1];
     NSArray *right = [args objectAtIndex:2];
-    [[[Rhodes sharedInstance] mainView] setNavBar:title left:left right:right];
+    [[[Rhodes sharedInstance] mainView] addNavBar:title left:left right:right];
 }
 @end
 

data/platform/iphone/Classes/RhoMainView.h

@@ -11,6 +11,9 @@
 @protocol RhoMainView
 
 - (UIView*)view;
+- (UIView*)parent;
+
+- (UIWebView*)detachWebView;
 
 - (void)loadHTMLString:(NSString*)data;
 
@@ -27,7 +30,7 @@
 - (void)switchTab:(int)index;
 - (int)activeTab;
 
-- (void)setNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right;
 - (void)removeNavBar;
 
 @end

data/platform/iphone/Classes/Rhodes.h

@@ -32,13 +32,12 @@
     LogViewController* logViewController;
     DateTimePickerDelegate* dateTimePickerDelegate;
     PickImageDelegate* pickImageDelegate;
-@public
+    
     id<RhoMainView,NSObject> mainView;
 }
 
 @property (nonatomic, retain) UIWindow *window;
 @property (nonatomic, retain) AVAudioPlayer *player;
-@property (nonatomic, retain) id<RhoMainView,NSObject> mainView;
 @property (nonatomic, retain) NSMutableDictionary *cookies;
 
 + (Rhodes*)sharedInstance;
@@ -48,6 +47,8 @@
 + (CGRect)applicationFrame;
 + (void)setStatusBarHidden:(BOOL)v;
 
+//+ (UIView*)subviewWithTag:(NSInteger)tag ofView:(UIView*)view;
+
 + (void)performOnUiThread:(id)runnable wait:(BOOL)wait;
 + (void)performOnUiThread:(id)runnable arg:(id)arg wait:(BOOL)wait;
 + (void)performOnUiThread:(id)runnable arg:(id)arg1 arg:(id)arg2 wait:(BOOL)wait;
@@ -60,4 +61,7 @@
 - (void)setCookie:(NSString*)cookie forUrl:(NSString*)url;
 - (NSString*)cookie:(NSString*)url;
 
+- (id<RhoMainView,NSObject>)mainView;
+- (void)setMainView:(id<RhoMainView,NSObject>)view;
+
 @end

data/platform/iphone/Classes/Rhodes.m

@@ -17,7 +17,7 @@ void rho_geoimpl_init();
 
 @implementation Rhodes
 
-@synthesize window, player, mainView, cookies;
+@synthesize window, player, cookies;
 
 static Rhodes *instance = NULL;
 
@@ -46,6 +46,24 @@ static Rhodes *instance = NULL;
     [[[[Rhodes sharedInstance] mainView] view] setFrame:[Rhodes applicationFrame]];
 }
 
+#if 0
++ (UIView*)subviewWithTag:(NSInteger)tag ofView:(UIView*)view {
+    if (!view)
+        return nil;
+    
+    for (int i = 0, lim = [view.subviews count]; i < lim; ++i) {
+        UIView *subview = [view.subviews objectAtIndex:i];
+        if (subview.tag == tag)
+            return subview;
+        subview = [self subviewWithTag:tag ofView:subview];
+        if (subview)
+            return subview;
+    }
+    
+    return nil;
+}
+#endif
+
 - (void)runRunnable:(NSArray*)args {
     id runnable = [args objectAtIndex:0];
     if ([runnable respondsToSelector:@selector(run)])
@@ -231,12 +249,15 @@ static Rhodes *instance = NULL;
         splashViewController = nil;
     }
     
-    [mainView.view removeFromSuperview];
     [mainView release];
     mainView = [view retain];
     [window addSubview:mainView.view];
 }
 
+- (id<RhoMainView,NSObject>)mainView {
+    return mainView;
+}
+
 - (void) showLoadingPage 
 {
     NSFileManager *fileManager = [NSFileManager defaultManager];
@@ -288,7 +309,6 @@ static Rhodes *instance = NULL;
     dateTimePickerDelegate = [[DateTimePickerDelegate alloc] init];
     pickImageDelegate = [[PickImageDelegate alloc] init];
     
-    rho_geoimpl_init();
     rho_rhodesapp_start();
     
 #ifdef __IPHONE_3_0

data/platform/iphone/Classes/SimpleMainView.h

@@ -18,13 +18,9 @@
 }
 
 @property (retain) UIView *root;
-@property (retain) UIWebView *webView;
-@property (retain) UIToolbar *toolbar;
-@property (retain) UINavigationBar *navbar;
 
-- (id)initWithParentView:(UIView *)v;
-- (id)initWithParentView:(UIView *)v frame:(CGRect)frame;
-- (id)initWithParentView:(UIView *)v toolbar:(NSArray*)items;
-- (id)initWithParentView:(UIView *)v frame:(CGRect)frame toolbar:(NSArray*)items;
+- (id)initWithMainView:(id<RhoMainView>)v;
+- (id)initWithMainView:(id<RhoMainView>)v toolbar:(NSArray*)items;
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame;
 
 @end

data/platform/iphone/Classes/SimpleMainView.m

@@ -1,4 +1,4 @@
-    //
+//
 //  SimpleMainView.m
 //  rhorunner
 //
@@ -17,6 +17,10 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "SimpleMainView"
 
+#define RHO_TAG_WEBVIEW 1
+#define RHO_TAG_TOOLBAR 2
+#define RHO_TAG_NAVBAR 3
+
 @interface RhoToolbarButtonItemAction : NSObject
 {
     NSString *url;
@@ -53,7 +57,7 @@
 
 @implementation SimpleMainView
 
-@synthesize root, webView, toolbar, navbar;
+@synthesize root;
 
 - (UIBarButtonItem*)newButton:(NSString*)url label:(NSString*)label icon:(NSString*)icon {
     UIImage *img = nil;
@@ -176,50 +180,66 @@
     return tb;
 }
 
-- (id)initWithParentView:(UIView *)v {
-    return [self initWithParentView:v toolbar:nil];
+- (void)removeToolbar {
+    if (toolbar) {
+        CGRect wFrame = webView.frame;
+        CGRect tbFrame = toolbar.frame;
+        wFrame.size.height += tbFrame.size.height;
+        webView.frame = wFrame;
+    }
+    
+    [toolbar removeFromSuperview];
+    toolbar = nil;
 }
 
-- (id)initWithParentView:(UIView *)v frame:(CGRect)frame {
-    return [self initWithParentView:v frame:frame toolbar:nil];
+- (void)addToolbar:(NSArray*)items {
+    [self removeToolbar];
+    
+    if (!items)
+        return;
+    
+    CGRect wFrame = webView.frame;
+    
+    [toolbar removeFromSuperview];
+    toolbar = [self newToolbar:items frame:wFrame];
+    toolbar.tag = RHO_TAG_TOOLBAR;
+    [root addSubview:toolbar];
+    
+    CGRect tbFrame = toolbar.frame;
+    wFrame.size.height -= tbFrame.size.height;
+    webView.frame = wFrame;
 }
 
-- (id)initWithParentView:(UIView *)v toolbar:(NSArray*)items {
-    return [self initWithParentView:v frame:v.frame toolbar:items];
+- (UIWebView*)newWebView:(CGRect)frame {
+    UIWebView *w = [[UIWebView alloc] initWithFrame:frame];
+    w.scalesPageToFit = YES;
+    w.userInteractionEnabled = YES;
+    w.multipleTouchEnabled = YES;
+    w.autoresizesSubviews = YES;
+    w.clipsToBounds = NO;
+    w.dataDetectorTypes = UIDataDetectorTypeNone;
+    w.delegate = self;
+    w.tag = RHO_TAG_WEBVIEW;
+    
+    return w;
 }
 
-- (id)initWithParentView:(UIView *)v frame:(CGRect)frame toolbar:(NSArray*)items {
-    parent = v;
+- (id)init:(UIView*)p webView:(UIWebView*)w frame:(CGRect)frame toolbar:(NSArray*)items {
+    parent = p;
     
     root = [[UIView alloc] initWithFrame:frame];
     root.userInteractionEnabled = YES;
     
+    [webView removeFromSuperview];
+    webView = w;
+    if (!webView)
+        webView = [self newWebView:frame];
+    [root addSubview:webView];
     CGRect wFrame = frame;
     wFrame.origin.y = 0;
-    webView = [[UIWebView alloc] initWithFrame:wFrame];
-    webView.scalesPageToFit = YES;
-    webView.userInteractionEnabled = YES;
-    //webView.detectsPhoneNumbers = YES;
-    webView.multipleTouchEnabled = YES;
-    webView.autoresizesSubviews = YES;
-    webView.clipsToBounds = NO;
-    webView.delegate = self;
-    
-    [root addSubview:webView];
-    
-    if (items) {
-        UIToolbar *tb = [self newToolbar:items frame:wFrame];
-        self.toolbar = tb;
-        [root addSubview:toolbar];
-        
-        CGRect newFrame = wFrame;
-        CGRect tbFrame = tb.frame;
-        newFrame.size.height -= tbFrame.size.height;
-        webView.frame = newFrame;
-        
-        [tb release];
-    }
+    webView.frame = wFrame;
     
+    [self addToolbar:items];
     navbar = nil;
     
     self.view = root;
@@ -227,6 +247,26 @@
     return self;
 }
 
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame toolbar:(NSArray*)items {
+    return [self init:p webView:nil frame:frame toolbar:items];
+}
+
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame {
+    return [self initWithParentView:p frame:frame toolbar:nil];
+}
+
+- (id)initWithMainView:(id<RhoMainView>)v {
+    return [self initWithMainView:v toolbar:nil];
+}
+
+- (id)initWithMainView:(id<RhoMainView>)v toolbar:(NSArray*)items {
+    UIView *p = [v parent];
+    CGRect frame = [[v view] frame];
+    //UIWebView *w = (UIWebView*)[Rhodes subviewWithTag:RHO_TAG_WEBVIEW ofView:[v view]];
+    UIWebView *w = [v detachWebView];
+    return [self init:p webView:w frame:frame toolbar:items];
+}
+
 - (void)didReceiveMemoryWarning {
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
@@ -236,13 +276,10 @@
 
 - (void)viewDidUnload {
     [super viewDidUnload];
-    [root removeFromSuperview];
 }
 
 - (void)dealloc {
-    [navbar release];
-    [toolbar release];
-    [webView release];
+    [root removeFromSuperview];
     [root release];
     [super dealloc];
 }
@@ -277,6 +314,18 @@
     return root;
 }
 
+- (UIView*)parent {
+    return parent;
+}
+
+- (UIWebView*)detachWebView {
+    UIWebView *w = [webView retain];
+    [w removeFromSuperview];
+    webView = nil;
+    
+    return w;
+}
+
 - (void)loadHTMLString:(NSString *)data {
     [webView loadHTMLString:data baseURL:[NSURL URLWithString:@""]];
 }
@@ -290,17 +339,14 @@
 }
 
 - (void)navigate:(NSString *)url tab:(int)index {
-    NSString *escapedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:escapedUrl]];
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:url]];
     [webView loadRequest:request];
 }
 
 - (void)navigateRedirect:(NSString *)url tab:(int)index {
-    NSString* escapedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    NSString* redirector = [@"/system/redirect_to?url=" stringByAppendingString:escapedUrl];
     NSString* homeurl = [NSString stringWithUTF8String:rho_rhodesapp_gethomeurl()];
-    NSString* redirector1 = [homeurl stringByAppendingString:redirector];
-    [self navigate:redirector1 tab:index];
+    NSString *redirect = [NSString stringWithFormat:@"%@/system/redirect_to?url=%@", homeurl, url];
+    [self navigate:redirect tab:index];
 }
 
 - (void)reload:(int)index {
@@ -326,10 +372,11 @@
     return 0;
 }
 
-- (void)setNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
     [self removeNavBar];
     
     UINavigationBar *nb = [[UINavigationBar alloc] initWithFrame:CGRectZero];
+    nb.tag = RHO_TAG_NAVBAR;
     [nb sizeToFit];
     
     UINavigationItem *ni = [[UINavigationItem alloc] initWithTitle:title];
@@ -352,9 +399,8 @@
     }
     
     [nb pushNavigationItem:ni animated:NO];
-    self.navbar = nb;
-    [nb release];
-    
+    [navbar removeFromSuperview];
+    navbar = nb;
     [root addSubview:navbar];
     
     CGRect nFrame = navbar.frame;
@@ -374,7 +420,7 @@
     }
     
     [navbar removeFromSuperview];
-    self.navbar = nil;
+    navbar = nil;
 }
 
 // UIWebViewDelegate imlementation
@@ -382,12 +428,20 @@
 - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request
  navigationType:(UIWebViewNavigationType)navigationType {
     NSString *url = [[request URL] absoluteString];
-    if (url) {
-        NSString *c = [[Rhodes sharedInstance] cookie:url];
-        if (c) {
-            NSMutableURLRequest *r = (NSMutableURLRequest*)request;
-            [r addValue:c forHTTPHeaderField:@"Cookie"];
-        }
+    if (!url)
+        return NO;
+    
+    if (![url hasPrefix:@"http:"]) {
+        // This is not http url so try to open external application for it
+        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:url]];
+        return NO;
+    }
+    
+    // Retrieve cookie for http url
+    NSString *c = [[Rhodes sharedInstance] cookie:url];
+    if (c && [request isKindOfClass:[NSMutableURLRequest class]]) {
+        NSMutableURLRequest *r = (NSMutableURLRequest*)request;
+        [r addValue:c forHTTPHeaderField:@"Cookie"];
     }
     return YES;
 }

data/platform/iphone/Classes/TabbedMainView.h

@@ -18,7 +18,8 @@
 @property (nonatomic,retain) UITabBarController *tabbar;
 @property (nonatomic,retain) NSArray *tabbarData;
 
-- (id)initWithParentView:(UIView*)v items:(NSArray*)items;
-- (id)initWithParentView:(UIView*)v frame:(CGRect)frame items:(NSArray*)items;
+//- (id)initWithParentView:(UIView*)v items:(NSArray*)items;
+//- (id)initWithParentView:(UIView*)v frame:(CGRect)frame items:(NSArray*)items;
+- (id)initWithMainView:(id<RhoMainView>)v tabs:(NSArray*)items;
 
 @end

data/platform/iphone/Classes/TabbedMainView.m

@@ -54,12 +54,15 @@
 
 @synthesize tabbar, tabbarData;
 
-- (id)initWithParentView:(UIView *)v items:(NSArray *)items {
-    return [self initWithParentView:v frame:v.frame items:items];
-}
+//- (id)initWithParentView:(UIView *)v items:(NSArray *)items {
+//    return [self initWithParentView:v frame:v.frame items:items];
+//}
 
-- (id)initWithParentView:(UIView *)v frame:(CGRect)frame items:(NSArray*)items {
-    parent = v;
+//- (id)initWithParentView:(UIView *)v frame:(CGRect)frame items:(NSArray*)items {
+- (id)initWithMainView:(id<RhoMainView>)v tabs:(NSArray *)items {
+    parent = [v parent];
+    
+    CGRect frame = [[v view] frame];
     
     tabbar = [[UITabBarController alloc] initWithNibName:nil bundle:nil];
     tabbar.delegate = [Rhodes sharedInstance];
@@ -90,7 +93,7 @@
             subController.title = label;
             NSString *imagePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:icon];
             subController.tabBarItem.image = [UIImage imageWithContentsOfFile:imagePath];
-            [subController navigate:url tab:0];
+            [subController navigateRedirect:url tab:0];
             
             [tabs addObject:td];
             [views addObject:subController];
@@ -118,11 +121,11 @@
 
 - (void)viewDidUnload {
     [super viewDidUnload];
-    self.tabbar = nil;
 }
 
 - (void)dealloc {
-    [tabbar release];
+    [tabbar.view removeFromSuperview];
+    [tabbarData release];
     [super dealloc];
 }
 
@@ -140,6 +143,14 @@
     return tabbar.view;
 }
 
+- (UIView*)parent {
+    return parent;
+}
+
+- (UIWebView*)detachWebView {
+    return [[self subView:[self activeTab]] detachWebView];
+}
+
 - (void)loadHTMLString:(NSString *)data {
     [[self subView:[self activeTab]] loadHTMLString:data];
 }
@@ -190,8 +201,8 @@
     return tabbar.selectedIndex;
 }
 
-- (void)setNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
-    [[self subView:[self activeTab]] setNavBar:title left:left right:right];
+- (void)addNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
+    [[self subView:[self activeTab]] addNavBar:title left:left right:right];
 }
 
 - (void)removeNavBar {