Merge pull request #7 from CommuteStream/0.8_dev

0.8 dev

Author: BFrog

CommuteStream.xcodeproj/project.pbxproj

@@ -0,0 +1,23 @@
+//
+//  CSAdFactory.h
+//  CommuteStream
+//
+//  Created by David Rogers on 10/20/16.
+//  Copyright © 2016 CommuteStream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+
+extern NSString * const gotFilePathNotification;
+
+@interface CSAdFactory : NSObject {
+    
+}
+
++ (CSAdFactory *) factoryWithAdType:(NSString *)adType;
+
+- (UIView *)adViewFromDictionary:(NSMutableDictionary*)dictionary;
+
+@end

CommuteStream/CSAdFactory.h

@@ -0,0 +1,38 @@
+//
+//  CSAdFactory.m
+//  CommuteStream
+//
+//  Created by David Rogers on 10/20/16.
+//  Copyright © 2016 CommuteStream. All rights reserved.
+//
+
+#import "CSAdFactory.h"
+#import "CSBasicBannerAdFactory.h"
+#import "CSHTMLBannerFactory.h"
+#import "CSMRAIDViewFactory.h"
+
+NSString * const BASIC_BANNER_AD = @"basic_banner_ad";
+NSString * const HTML_BANNER = @"html";
+NSString * const MRAID_BANNER = @"mraid_banner";
+
+@implementation CSAdFactory
+
++ (CSAdFactory *) factoryWithAdType:(NSString *)adType {
+    
+    if([adType isEqualToString:BASIC_BANNER_AD]){
+        return [[CSBasicBannerAdFactory alloc] init];
+    }else if([adType isEqualToString:HTML_BANNER]){
+        return [[CSHTMLBannerFactory alloc] init];
+    }else if([adType isEqualToString:MRAID_BANNER]){
+        return [[CSMRAIDViewFactory alloc] init];
+    }else{
+        return [[CSHTMLBannerFactory alloc] init];
+    }
+
+}
+
+- (UIView *)adViewFromDictionary:(NSMutableDictionary*)dictionary {
+    return nil;
+}
+
+@end

CommuteStream/CSAdFactory.m

@@ -0,0 +1,19 @@
+//
+//  CSBasicBannerAd.h
+//  CommuteStream
+//
+//  Created by David Rogers on 10/24/16.
+//  Copyright © 2016 CommuteStream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CSBasicBannerAd : UIWebView<UIGestureRecognizerDelegate>
+
+ - (void)setUrl:(NSString *)url;
+
+
+
+
+
+@end

CommuteStream/CSBasicBannerAd.h

@@ -0,0 +1,67 @@
+//
+//  CSBasicBannerAd.m
+//  CommuteStream
+//
+//  Created by David Rogers on 10/24/16.
+//  Copyright © 2016 CommuteStream. All rights reserved.
+//
+
+#import "CSBasicBannerAd.h"
+
+@implementation CSBasicBannerAd{
+    NSString *basicBannerAdUrl;
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        
+        
+        
+    }
+    return self;
+}
+
+- (void)setUrl:(NSString *)url{
+    basicBannerAdUrl = url;
+    
+    UITapGestureRecognizer *webViewTappedRecognizer = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapViewAction:)];
+    webViewTappedRecognizer.numberOfTapsRequired = 1;
+    webViewTappedRecognizer.delegate = self;
+    NSLog(@"Web View Tapped Delegate: %@", webViewTappedRecognizer.delegate);
+    [self addGestureRecognizer:webViewTappedRecognizer];
+    
+    
+    
+}
+
+
+
+
+- (void)tapViewAction:(UITapGestureRecognizer *)sender
+{
+    NSLog(@"%@", basicBannerAdUrl);
+    
+    NSURL *url = [NSURL URLWithString:basicBannerAdUrl];
+    [[UIApplication sharedApplication] openURL:url];
+    
+
+}
+
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+    return YES;
+}
+
+@end

CommuteStream/CSBasicBannerAd.m

@@ -0,0 +1,17 @@
+//
+//  CSBasicBannerAdFactory.h
+//  CommuteStream
+//
+//  Created by David Rogers on 10/20/16.
+//  Copyright © 2016 CommuteStream. All rights reserved.
+//
+
+#import "CSAdFactory.h"
+
+@interface CSBasicBannerAdFactory : CSAdFactory {
+    
+}
+
+- (UIView *)adViewFromDictionary:(NSMutableDictionary*)dictionary;
+
+@end

CommuteStream/CSBasicBannerAdFactory.h

@@ -0,0 +1,45 @@
+//
+//  CSBasicBannerAdFactory.m
+//  CommuteStream
+//
+//  Created by David Rogers on 10/20/16.
+//  Copyright © 2016 CommuteStream. All rights reserved.
+//
+
+#import "CSBasicBannerAdFactory.h"
+#import "CSBasicBannerAd.h"
+
+@implementation CSBasicBannerAdFactory
+
+NSString *basicBannerUrl;
+
+- (UIView *)adViewFromDictionary:(NSMutableDictionary*)dictionary {
+    
+    float banner_width = [[dictionary objectForKey:@"bannerWidth"] floatValue];
+    float banner_height = [[dictionary objectForKey:@"bannerHeight"] floatValue];
+    
+   
+    NSLog(@"CS_SDK: Generating UIWebView for ad display.");
+    //NSLog(@"Web View %f width, %f height", [banner_width floatValue],  [banner_height floatValue]);
+    CSBasicBannerAd *webView = [[CSBasicBannerAd alloc] initWithFrame:CGRectMake(0.0, 0.0, banner_width, banner_height)];
+    NSString *htmlString = [dictionary objectForKey:@"html"];
+    basicBannerUrl = [dictionary objectForKey:@"url"];
+    [webView loadHTMLString:htmlString baseURL:nil];
+    [webView setUrl:basicBannerUrl];
+    webView.scrollView.scrollEnabled = NO;
+    webView.scrollView.bounces = NO;
+    
+    
+    
+    return webView;
+    
+}
+
+
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+    return YES;
+}
+
+@end

CommuteStream/CSBasicBannerAdFactory.m

@@ -4,13 +4,11 @@
 #import "GADBannerView.h"
 #import "GADBannerViewDelegate.h"
 #import "CSNetworkEngine.h"
+#import "CSCustomEventDelegate.h"
 
-@interface CSCustomBanner : NSObject <GADCustomEventBanner, GADBannerViewDelegate, UIGestureRecognizerDelegate> {
+@interface CSCustomBanner : NSObject <GADCustomEventBanner, GADBannerViewDelegate, UIGestureRecognizerDelegate, CSCustomEventDelegate> {
     GADBannerView *bannerView_;
 }
 
-@property (nonatomic, strong) CSNetworkEngine *csNetworkEngine;
--(void)buildWebView:(NSMutableDictionary*)dict;
-+ (NSString *)getIdfa;
-+ (NSString *)getMacSha:(NSString *)deviceAddress;
-@end
+
+@end