diff --git a/CriticalMaps.xcodeproj/project.pbxproj b/CriticalMaps.xcodeproj/project.pbxproj index c9e4848af..7f330b267 100644 --- a/CriticalMaps.xcodeproj/project.pbxproj +++ b/CriticalMaps.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 90F46A24D8DB4FCAABF4CF34 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FD3CAC801A84BBA8D151E5D /* libPods.a */; }; - 940A9AEE1AC861C800F90DC3 /* PLAdditional.m in Sources */ = {isa = PBXBuildFile; fileRef = 940A9AED1AC861C800F90DC3 /* PLAdditional.m */; }; 941511091A10004D0010205B /* PLTwitterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 941511081A10004D0010205B /* PLTwitterViewController.m */; }; 942B71B61A5770CA00D02CA1 /* PLTwitterTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 942B71B51A5770CA00D02CA1 /* PLTwitterTableViewCell.m */; }; 942E2D8219C316BD00BF92D7 /* PLUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 942E2D8119C316BD00BF92D7 /* PLUtils.m */; }; @@ -52,8 +51,6 @@ /* Begin PBXFileReference section */ 1FD3CAC801A84BBA8D151E5D /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 42F8D420591A3C7DB831663C /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; - 940A9AEC1AC861C800F90DC3 /* PLAdditional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLAdditional.h; sourceTree = ""; }; - 940A9AED1AC861C800F90DC3 /* PLAdditional.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLAdditional.m; sourceTree = ""; }; 941511071A10004D0010205B /* PLTwitterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLTwitterViewController.h; sourceTree = ""; }; 941511081A10004D0010205B /* PLTwitterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLTwitterViewController.m; sourceTree = ""; }; 942B71B41A5770CA00D02CA1 /* PLTwitterTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLTwitterTableViewCell.h; sourceTree = ""; }; @@ -186,8 +183,6 @@ 94F0304819C1E4EC00F86611 /* PLConstants.m */, 942E2D8019C316BD00BF92D7 /* PLUtils.h */, 942E2D8119C316BD00BF92D7 /* PLUtils.m */, - 940A9AEC1AC861C800F90DC3 /* PLAdditional.h */, - 940A9AED1AC861C800F90DC3 /* PLAdditional.m */, 94ECBDA41AD1B7CC00A8D75A /* UIColor+Helper.h */, 94ECBDA51AD1B7CC00A8D75A /* UIColor+Helper.m */, ); @@ -425,7 +420,6 @@ 94A9C1AF19BF43AB0027C5DC /* PLDataModel.m in Sources */, 94ECBDA61AD1B7CC00A8D75A /* UIColor+Helper.m in Sources */, 945441AE1A111A6A00C8024F /* PLLabel.m in Sources */, - 940A9AEE1AC861C800F90DC3 /* PLAdditional.m in Sources */, 94F0304919C1E4EC00F86611 /* PLConstants.m in Sources */, 94CF089919BDF227009FFF43 /* PLTabBarController.m in Sources */, 9484E8031A62E63F0007F9F3 /* HOButton.m in Sources */, diff --git a/CriticalMass/CriticalMaps-Info.plist b/CriticalMass/CriticalMaps-Info.plist index 39c345470..dbb08d7db 100644 --- a/CriticalMass/CriticalMaps-Info.plist +++ b/CriticalMass/CriticalMaps-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6.0 + 1.0 CFBundleSignature ???? CFBundleVersion - 0.6.0.2 + 1.0.1 LSApplicationCategoryType LSRequiresIPhoneOS diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon29@2x.png b/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon29@2x.png deleted file mode 100644 index 5b8f496c4..000000000 Binary files a/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon29@2x.png and /dev/null differ diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon40@2x.png b/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon40@2x.png deleted file mode 100644 index 967ee6874..000000000 Binary files a/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon40@2x.png and /dev/null differ diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon60@2x.png b/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon60@2x.png deleted file mode 100644 index e2369635b..000000000 Binary files a/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon60@2x.png and /dev/null differ diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon60@3x.png b/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon60@3x.png deleted file mode 100644 index fbff4b9fb..000000000 Binary files a/CriticalMass/Images.xcassets/AppIcon.appiconset/Appicon60@3x.png and /dev/null differ diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/Contents.json b/CriticalMass/Images.xcassets/AppIcon.appiconset/Contents.json index 5c2729ece..2e9a41dbb 100644 --- a/CriticalMass/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/CriticalMass/Images.xcassets/AppIcon.appiconset/Contents.json @@ -3,25 +3,25 @@ { "size" : "29x29", "idiom" : "iphone", - "filename" : "Appicon29@2x.png", + "filename" : "cm_app_58x58.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "Appicon40@2x.png", + "filename" : "cm_app_80x80.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "Appicon60@2x.png", + "filename" : "cm_app_120x120.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "Appicon60@3x.png", + "filename" : "cm_app_180x180.png", "scale" : "3x" } ], diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_120x120.png b/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_120x120.png new file mode 100644 index 000000000..48058b26e Binary files /dev/null and b/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_120x120.png differ diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_180x180.png b/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_180x180.png new file mode 100644 index 000000000..1ec38349b Binary files /dev/null and b/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_180x180.png differ diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_58x58.png b/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_58x58.png new file mode 100644 index 000000000..b093eabe3 Binary files /dev/null and b/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_58x58.png differ diff --git a/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_80x80.png b/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_80x80.png new file mode 100644 index 000000000..94d87b3af Binary files /dev/null and b/CriticalMass/Images.xcassets/AppIcon.appiconset/cm_app_80x80.png differ diff --git a/CriticalMass/PLAppDelegate.m b/CriticalMass/PLAppDelegate.m index 358a32576..801363b1e 100644 --- a/CriticalMass/PLAppDelegate.m +++ b/CriticalMass/PLAppDelegate.m @@ -12,7 +12,6 @@ #import "PLRulesViewController.h" #import "PLConstants.h" #import "PLDataModel.h" -#import "PLAdditional.h" #import "Appirater.h" @implementation PLAppDelegate @@ -21,6 +20,7 @@ @implementation PLAppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Set Appirater [Appirater setAppId:@"918669647"]; [Appirater setDaysUntilPrompt:1]; @@ -28,11 +28,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( [Appirater setSignificantEventsUntilPrompt:-1]; [Appirater setTimeBeforeReminding:2]; - if(kDebug && kDebugShowAppirater) { +#ifdef DEBUG + if(kDebugShowAppirater) { [Appirater setDebug:YES]; } - - [PLAdditional setup]; +#endif self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; self.window.backgroundColor = [UIColor whiteColor]; @@ -41,9 +41,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( self.window.rootViewController = self.tabBarController; [self.window makeKeyAndVisible]; - if(kDebug){ - [(UITabBarController *) self.window.rootViewController setSelectedIndex: 2]; - } +#ifdef DEBUG + [(UITabBarController *) self.window.rootViewController setSelectedIndex: kDebugInitialTabIndex]; +#endif [Appirater appLaunched:YES]; diff --git a/CriticalMass/PLChatModel.m b/CriticalMass/PLChatModel.m index 9f6f7ea8e..e7d2ad012 100644 --- a/CriticalMass/PLChatModel.m +++ b/CriticalMass/PLChatModel.m @@ -38,7 +38,6 @@ - (id)init { } - (void)collectMessage:(NSString*) text { - NSString *timestamp = [PLUtils getTimestamp]; NSString *messageId = [NSString stringWithFormat:@"%@%@", _data.uid, timestamp]; NSString *messageIdHashed = [messageId md5]; @@ -58,8 +57,7 @@ - (void)collectMessage:(NSString*) text { } - (void)addMessages: (NSDictionary*)messages { - - // iterate obtained messages + // Iterate obtained messages for(id key in messages){ NSDictionary *message = [messages objectForKey:key]; @@ -69,7 +67,6 @@ - (void)addMessages: (NSDictionary*)messages { co.isActive = YES; co.timestamp = [message objectForKey:@"timestamp"]; }else{ - // create chat object PLChatObject *co = [[PLChatObject alloc] init]; co.identifier = key; @@ -80,12 +77,11 @@ - (void)addMessages: (NSDictionary*)messages { co.isActive = YES; // fill dict - [_messages addObject:co]; } } - // iterate existing messages and clear old + // Iterate existing messages and clear old for (int i = 0; i < [_messages count]; i++) { PLChatObject *co = [_messages objectAtIndex:i]; if(co.isActive){ @@ -95,7 +91,7 @@ - (void)addMessages: (NSDictionary*)messages { } } - // sort + // Sort [_messages sortUsingDescriptors: [NSArray arrayWithObjects: [NSSortDescriptor sortDescriptorWithKey:@"timestamp" ascending:YES], nil]]; diff --git a/CriticalMass/PLChatViewController.m b/CriticalMass/PLChatViewController.m index 39e279ad2..7947c573d 100644 --- a/CriticalMass/PLChatViewController.m +++ b/CriticalMass/PLChatViewController.m @@ -67,6 +67,8 @@ - (void)viewDidLoad { self.btnSend = [HOButton buttonWithType:UIButtonTypeRoundedRect]; self.btnSend.frame = CGRectMake(260, 0, 50, 50); self.btnSend.layer.borderWidth = 1.0; + [self.btnSend setBackgroundColor:[UIColor clearColor]]; + [self.btnSend setTitleColor:[UIColor grayColor] forState:UIControlStateNormal]; [self.btnSend addTarget:self action:@selector(onSend) forControlEvents:UIControlEventTouchUpInside]; [self.btnSend setTitle:@"send" forState:UIControlStateNormal]; [self.controlView addSubview: self.btnSend]; @@ -92,7 +94,6 @@ -(void)viewDidAppear:(BOOL)animated{ - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. } - (void)onSend { @@ -105,7 +106,7 @@ - (void)onSend { self.textField.text = @""; } -- (void)moveContent:(BOOL)moveUp{ +- (void)moveContent:(BOOL)moveUp { [UIView beginAnimations:nil context:NULL]; [UIView setAnimationDuration:0.3]; // if you want to slide up the view @@ -147,7 +148,6 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView messageLabel.textColor = [UIColor blackColor]; messageLabel.numberOfLines = 0; messageLabel.textAlignment = NSTextAlignmentCenter; -// messageLabel.font = [UIFont fontWithName:@"Palatino-Italic" size:20]; [messageLabel sizeToFit]; self.tableView.backgroundView = messageLabel; @@ -168,7 +168,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N PLChatObject *message = [_chatModel.messages objectAtIndex:indexPath.row]; + cell.textLabel.font = [self fontForCell]; cell.textLabel.text = message.text; + cell.textLabel.numberOfLines = 0; + cell.textLabel.lineBreakMode = NSLineBreakByWordWrapping; cell.imageView.image = [UIImage imageNamed:@"Punk"]; cell.imageView.image = [cell.imageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; cell.imageView.tintColor = [UIColor magicColor]; @@ -196,12 +199,24 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N return cell; } --(BOOL)textFieldShouldBeginEditing:(UITextField *)textField { +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + PLChatObject *message = [_chatModel.messages objectAtIndex:indexPath.row]; + NSString *cellText = message.text; + NSDictionary *attributes = @{NSFontAttributeName: [self fontForCell]}; + CGRect rect = [cellText boundingRectWithSize:CGSizeMake(self.view.frame.size.width, CGFLOAT_MAX) + options:NSStringDrawingUsesLineFragmentOrigin + attributes:attributes + context:nil]; + return rect.size.height + 20; +} + +- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField { [self moveContent:YES]; return YES; } --(void)textFieldDidEndEditing:(UITextField *)textField { +- (void)textFieldDidEndEditing:(UITextField *)textField { [self moveContent:NO]; } @@ -215,9 +230,12 @@ - (void)onMessagesReceived { // [self.tableView scrollToRowAtIndexPath: ipath atScrollPosition: UITableViewScrollPositionTop animated: YES]; } -- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event -{ +- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { [self.textField resignFirstResponder]; } +- (UIFont*)fontForCell { + return [UIFont systemFontOfSize:18.0]; +} + @end diff --git a/CriticalMass/PLConstants.h b/CriticalMass/PLConstants.h index 0a4238c8c..4cbcde52b 100644 --- a/CriticalMass/PLConstants.h +++ b/CriticalMass/PLConstants.h @@ -11,7 +11,6 @@ @interface PLConstants : NSObject // Debug -FOUNDATION_EXPORT BOOL const kDebug; FOUNDATION_EXPORT BOOL const kDebugEnableTestURL; FOUNDATION_EXPORT BOOL const kDebugEnableTestLocation; FOUNDATION_EXPORT BOOL const kDebugDisableHTTPRequests; @@ -19,7 +18,6 @@ FOUNDATION_EXPORT BOOL const kDebugInitialTabIndex; FOUNDATION_EXPORT BOOL const kDebugShowAppirater; // Urls -//FOUNDATION_EXPORT NSString *const kUrlTile; FOUNDATION_EXPORT NSString *const kUrlService; // Notifications diff --git a/CriticalMass/PLConstants.m b/CriticalMass/PLConstants.m index 1ce87eedf..4c010b1a6 100644 --- a/CriticalMass/PLConstants.m +++ b/CriticalMass/PLConstants.m @@ -13,7 +13,6 @@ @implementation PLConstants @end // Debug -BOOL const kDebug = NO; BOOL const kDebugEnableTestURL = NO; BOOL const kDebugEnableTestLocation = NO; BOOL const kDebugDisableHTTPRequests = NO; diff --git a/CriticalMass/PLDataModel.m b/CriticalMass/PLDataModel.m index a2137f675..fc61e3ede 100644 --- a/CriticalMass/PLDataModel.m +++ b/CriticalMass/PLDataModel.m @@ -59,13 +59,18 @@ - (void)initLocationManager _locationManager.delegate = self; _locationManager.desiredAccuracy = kCLLocationAccuracyBestForNavigation; - if(kDebug && kDebugEnableTestLocation){ +#ifdef DEBUG + if(kDebugEnableTestLocation){ CLLocation *testLocation = [[CLLocation alloc] initWithLatitude:kTestLocationLatitude longitude:kTestLocationLongitude]; _currentLocation = testLocation; [self performSelector:@selector(startRequestInterval) withObject:nil afterDelay:1.0]; }else{ [self enableGps]; } +#else + [self enableGps]; +#endif + } - (void)initHTTPRequestManager @@ -190,9 +195,15 @@ - (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLoca if(_updateCount == 0){ [[NSNotificationCenter defaultCenter] postNotificationName:kNotificationInitialGpsDataReceived object:self]; - if(!(kDebug && kDebugDisableHTTPRequests)){ +#ifdef DEBUG + if(!kDebugDisableHTTPRequests){ [self performSelector:@selector(startRequestInterval) withObject:nil afterDelay:1.0]; } + +#else + [self performSelector:@selector(startRequestInterval) withObject:nil afterDelay:1.0]; +#endif + } _updateCount++; diff --git a/CriticalMass/PLMapViewController.m b/CriticalMass/PLMapViewController.m index 608a4a177..06175833a 100644 --- a/CriticalMass/PLMapViewController.m +++ b/CriticalMass/PLMapViewController.m @@ -67,9 +67,11 @@ - (void)initMap _map.mapType = MKMapTypeStandard; _map.showsPointsOfInterest = NO; - if(kDebug && kDebugEnableTestLocation){ +#ifdef DEBUG + if(kDebugEnableTestLocation){ _map.centerCoordinate = CLLocationCoordinate2DMake(kTestLocationLatitude, kTestLocationLongitude); } +#endif [self.view addSubview:_map]; } diff --git a/CriticalMass/PLTabBarController.m b/CriticalMass/PLTabBarController.m index f47160eab..8264b9d8a 100644 --- a/CriticalMass/PLTabBarController.m +++ b/CriticalMass/PLTabBarController.m @@ -20,6 +20,9 @@ - (void)viewDidLoad self.view.tintColor = [UIColor magicColor]; + [[UITabBar appearance] setBarTintColor:[UIColor whiteColor]]; + [[UITabBar appearance] setTranslucent:NO]; + UIViewController *viewController1 = [[PLMapViewController alloc] init]; UIViewController *viewController2 = [[PLRulesViewController alloc] init]; UIViewController *viewController3 = [[PLChatViewController alloc] init]; @@ -40,15 +43,15 @@ - (void)viewDidLoad [tabViewControllers addObject:viewController5]; viewController1.tabBarItem = - [[UITabBarItem alloc] initWithTitle:@"Map" image:[UIImage imageNamed:@"Map"] tag:1]; + [[UITabBarItem alloc] initWithTitle:@"Map" image:[UIImage imageNamed:@"Map"] tag:0]; viewController2.tabBarItem = - [[UITabBarItem alloc] initWithTitle:@"Knigge" image:[UIImage imageNamed:@"List"] tag:2]; + [[UITabBarItem alloc] initWithTitle:@"Knigge" image:[UIImage imageNamed:@"List"] tag:1]; viewController3.tabBarItem = - [[UITabBarItem alloc] initWithTitle:@"Chat" image:[UIImage imageNamed:@"Bubble"] tag:3]; + [[UITabBarItem alloc] initWithTitle:@"Chat" image:[UIImage imageNamed:@"Bubble"] tag:2]; viewController4.tabBarItem = - [[UITabBarItem alloc] initWithTitle:@"Twitter" image:[UIImage imageNamed:@"Twitter"] tag:4]; + [[UITabBarItem alloc] initWithTitle:@"Twitter" image:[UIImage imageNamed:@"Twitter"] tag:3]; viewController5.tabBarItem = - [[UITabBarItem alloc] initWithTitle:@"Settings" image:[UIImage imageNamed:@"Settings"] tag:5]; + [[UITabBarItem alloc] initWithTitle:@"Settings" image:[UIImage imageNamed:@"Settings"] tag:4]; [self setViewControllers:tabViewControllers animated:NO]; } diff --git a/CriticalMass/PLTwitterViewController.m b/CriticalMass/PLTwitterViewController.m index b9762575e..a00f34ba7 100644 --- a/CriticalMass/PLTwitterViewController.m +++ b/CriticalMass/PLTwitterViewController.m @@ -34,12 +34,16 @@ - (void)viewDidLoad { _supportedLocalities = @[ @"berlin", + @"leipzig", @"wien", @"cambridge", @"hamburg", @"dresden", @"köln", - @"potsdam" + @"potsdam", + @"stuttgart", + @"münchen", + @"frankfurt" ]; _data = [PLDataModel sharedManager]; diff --git a/CriticalMass/UIColor+Helper.m b/CriticalMass/UIColor+Helper.m index 913281cb9..285b1d2aa 100644 --- a/CriticalMass/UIColor+Helper.m +++ b/CriticalMass/UIColor+Helper.m @@ -13,7 +13,7 @@ @implementation UIColor (Helper) + (UIColor *)magicColor { - return UIColorFromRGB(0x028a68); + return UIColorFromRGB(0x51c9ec); } @end diff --git a/Gfx/Launch1.png b/Gfx/Launch1.png deleted file mode 100644 index 47b62301d..000000000 Binary files a/Gfx/Launch1.png and /dev/null differ diff --git a/Gfx/Launch2.png b/Gfx/Launch2.png deleted file mode 100644 index 696b03841..000000000 Binary files a/Gfx/Launch2.png and /dev/null differ diff --git a/Gfx/appicon/Appicon29@2x.png b/Gfx/appicon/Appicon29@2x.png deleted file mode 100644 index 5b8f496c4..000000000 Binary files a/Gfx/appicon/Appicon29@2x.png and /dev/null differ diff --git a/Gfx/appicon/Appicon40@2x.png b/Gfx/appicon/Appicon40@2x.png deleted file mode 100644 index 967ee6874..000000000 Binary files a/Gfx/appicon/Appicon40@2x.png and /dev/null differ diff --git a/Gfx/appicon/Appicon60@2x.png b/Gfx/appicon/Appicon60@2x.png deleted file mode 100644 index e2369635b..000000000 Binary files a/Gfx/appicon/Appicon60@2x.png and /dev/null differ diff --git a/Gfx/appicon/Appicon60@3x.png b/Gfx/appicon/Appicon60@3x.png deleted file mode 100644 index fbff4b9fb..000000000 Binary files a/Gfx/appicon/Appicon60@3x.png and /dev/null differ diff --git a/Podfile b/Podfile index 9c56b7e6c..228d9f816 100644 --- a/Podfile +++ b/Podfile @@ -9,7 +9,6 @@ pod 'NSString-Hashes' pod 'AccordionView' pod 'TTTAttributedLabel' pod 'STTwitter' -pod 'GoogleAnalytics-iOS-SDK', '3.0.3c' pod 'SAMLoadingView' pod 'SDWebImage' pod 'Appirater' \ No newline at end of file diff --git a/Podfile.lock b/Podfile.lock index dbd379488..c40c24233 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,28 +1,27 @@ PODS: - AccordionView (0.0.5) - - AFNetworking (2.5.2): - - AFNetworking/NSURLConnection (= 2.5.2) - - AFNetworking/NSURLSession (= 2.5.2) - - AFNetworking/Reachability (= 2.5.2) - - AFNetworking/Security (= 2.5.2) - - AFNetworking/Serialization (= 2.5.2) - - AFNetworking/UIKit (= 2.5.2) - - AFNetworking/NSURLConnection (2.5.2): + - AFNetworking (2.5.3): + - AFNetworking/NSURLConnection (= 2.5.3) + - AFNetworking/NSURLSession (= 2.5.3) + - AFNetworking/Reachability (= 2.5.3) + - AFNetworking/Security (= 2.5.3) + - AFNetworking/Serialization (= 2.5.3) + - AFNetworking/UIKit (= 2.5.3) + - AFNetworking/NSURLConnection (2.5.3): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/NSURLSession (2.5.2): + - AFNetworking/NSURLSession (2.5.3): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (2.5.2) - - AFNetworking/Security (2.5.2) - - AFNetworking/Serialization (2.5.2) - - AFNetworking/UIKit (2.5.2): + - AFNetworking/Reachability (2.5.3) + - AFNetworking/Security (2.5.3) + - AFNetworking/Serialization (2.5.3) + - AFNetworking/UIKit (2.5.3): - AFNetworking/NSURLConnection - AFNetworking/NSURLSession - - Appirater (2.0.4) - - GoogleAnalytics-iOS-SDK (3.0.3c) + - Appirater (2.0.5) - NSString-Hashes (1.2.2) - SAMLoadingView (0.1.0) - SDWebImage (3.7.2): @@ -35,7 +34,6 @@ DEPENDENCIES: - AccordionView - AFNetworking - Appirater - - GoogleAnalytics-iOS-SDK (= 3.0.3c) - NSString-Hashes - SAMLoadingView - SDWebImage @@ -44,13 +42,12 @@ DEPENDENCIES: SPEC CHECKSUMS: AccordionView: 4f82751476a96ec60985041a48bf4c94ac1ea5ab - AFNetworking: fefbce9660acb17f48ae0011292d4da0f457bf36 - Appirater: 8783318c36414e8de3ea023443028df94c1b784b - GoogleAnalytics-iOS-SDK: 44a1874cccd8294a0376fd8ee136f7c898c151a5 + AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe + Appirater: e7c0a47fb67ee5041ce8479e6ba960927fb40264 NSString-Hashes: c3848d809e92650e4fb17db5d8cc4bd2aa1eaddd SAMLoadingView: 7ffc4f0efe85f9717d6e367b6b93e32befe4407c SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29 STTwitter: 4fda61d0a96c707f94df85677b1a4aedbcec6fcd TTTAttributedLabel: 6f3174aef8e738f44dff97c2eb7d8184f6ab6277 -COCOAPODS: 0.36.3 +COCOAPODS: 0.37.1