release 0.5.3

criticalmaps · Jan 3, 2015 · ef46734 · ef46734
1 parent 4b13828
commit ef46734
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 59 deletions.
diff --git a/CriticalMass.xcodeproj/project.pbxproj → CriticalMaps.xcodeproj/project.pbxproj b/CriticalMass.xcodeproj/project.pbxproj → CriticalMaps.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/CriticalMass.xcworkspace/contents.xcworkspacedata b/CriticalMass.xcworkspace/contents.xcworkspacedata
diff --git a/CriticalMass/CriticalMass-Info.plist → CriticalMass/CriticalMaps-Info.plist b/CriticalMass/CriticalMass-Info.plist → CriticalMass/CriticalMaps-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.2</string>
+	<string>0.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.5.2</string>
+	<string>0.5.3</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/CriticalMass/CriticalMass-Prefix.pch → CriticalMass/CriticalMaps-Prefix.pch b/CriticalMass/CriticalMass-Prefix.pch → CriticalMass/CriticalMaps-Prefix.pch
diff --git a/CriticalMass/PLConstants.m b/CriticalMass/PLConstants.m
@@ -13,9 +13,9 @@ @implementation PLConstants
 @end
 
 // Debug
-BOOL const kDebug = NO;
-BOOL const kDebugEnableTestURL = NO;
-BOOL const kDebugEnableTestLocation = NO;
+BOOL const kDebug = YES;
+BOOL const kDebugEnableTestURL = YES;
+BOOL const kDebugEnableTestLocation = YES;
 BOOL const kDebugDisableHTTPRequests = NO;
 BOOL const kDebugInitialTabIndex = 0;
 
@@ -36,5 +36,5 @@ @implementation PLConstants
 NSUInteger const kMaxRequestsInBackground = 480;
 double const kTestLocationLatitude = +52.50266880;
 double const kTestLocationLongitude = +13.41227278;
-NSString *const kTwitterQuery = @"#criticalmass";
+NSString *const kTwitterQuery = @"#criticalmaps";
 
diff --git a/CriticalMass/PLSettingsTableViewController.m b/CriticalMass/PLSettingsTableViewController.m
@@ -34,7 +34,6 @@ - (void)viewDidLoad
     [super viewDidLoad];
 
     self.clearsSelectionOnViewWillAppear = YES;
-    //self.navigationItem.rightBarButtonItem = self.editButtonItem;
 }
 
 - (void)didReceiveMemoryWarning
@@ -47,7 +46,7 @@ - (void)didReceiveMemoryWarning
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    return 4;
+    return 3;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
@@ -89,11 +88,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             cell.textLabel.text = @"Critical Mass Berlin";
             cell.detailTextLabel.text = @"www.criticalmass-berlin.org";
         }else if(indexPath.row == 1){
-            cell.textLabel.text = @"GitHub Open Source";
-            cell.detailTextLabel.text = @"www.github.com/headione/criticalmass-berlin";
+            cell.textLabel.text = @"Open Source";
+            cell.detailTextLabel.text = @"www.github.com/headione/criticalmaps-ios";
         }else if(indexPath.row == 2){
             cell.textLabel.text = @"Logo Design";
-            cell.detailTextLabel.text = @"www.thomas-hollnack.de";
+            cell.detailTextLabel.text = @"gitti la mar";
         }else if(indexPath.row == 3){
             cell.textLabel.text = @"Programmierung";
             cell.detailTextLabel.text = @"www.pokuslabs.com";
@@ -122,17 +121,11 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *
         if(indexPath.row == 0){
             [[UIApplication sharedApplication] openURL:[NSURL URLWithString: @"http://www.criticalmass-berlin.org"]];
         }else if(indexPath.row == 1){
-            [[UIApplication sharedApplication] openURL:[NSURL URLWithString: @"https://github.com/headione/criticalmass-berlin"]];
-        }else if(indexPath.row == 2){
-            [[UIApplication sharedApplication] openURL:[NSURL URLWithString: @"http://www.thomas-hollnack.de"]];
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString: @"https://github.com/headione/criticalmaps-ios"]];
         }else if(indexPath.row == 3){
             [[UIApplication sharedApplication] openURL:[NSURL URLWithString: @"http://www.pokuslabs.com"]];
         }
 
-    }else if (indexPath.section == 3){
-        if(indexPath.row == 0){
-            [[UIApplication sharedApplication] openURL:[NSURL URLWithString: @"https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TQGCAK3G3Z9GQ"]];
-        }
     }
 }
 
@@ -144,8 +137,6 @@ -(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteg
         return @"Social Media";
     }else if (section == 2){
         return @"About";
-    }else if (section == 3){
-        return @"Please donate";
     }
 
     return @"";

diff --git a/CriticalMass/PLTwitterViewController.m b/CriticalMass/PLTwitterViewController.m
@@ -10,6 +10,7 @@
 #import "PLLabel.h"
 #import "PLConstants.h"
 #import "PLTwitterTableViewCell.h"
+#import "HOButton.h"
 
 
 @interface PLTwitterViewController ()
@@ -21,14 +22,16 @@ @implementation PLTwitterViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    PLLabel *label = [[PLLabel alloc] initWithFrame:CGRectMake(0, 20, self.view.frame.size.width, 50)];
-    label.text = @"Latest Tweets of #criticalmass";
-    [label setFont: [UIFont fontWithName:@"HelveticaNeue-Medium" size:18.0f]];
+    PLLabel *label = [[PLLabel alloc] initWithFrame:CGRectMake(0, 19, self.view.frame.size.width, 50)];
+    label.text = @"Latest Tweets of #criticalmaps";
+    [label setFont: [UIFont fontWithName:@"HelveticaNeue-Light" size:16.0f]];
     [self.view addSubview:label];
 
-    UIButton *reloadBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.view.frame.size.width-52, 35, 22, 20)];
+    HOButton *reloadBtn = [[HOButton alloc] init];
     [reloadBtn setImage:[UIImage imageNamed:@"Reload"] forState:UIControlStateNormal];
+    reloadBtn.imageEdgeInsets = UIEdgeInsetsMake(10, 9, 10, 9);
     [reloadBtn addTarget:self action:@selector(onClickReload:) forControlEvents:UIControlEventTouchUpInside];
+    reloadBtn.center = CGPointMake(self.view.frame.size.width-40, 40);
     [self.view addSubview:reloadBtn];
 
     CGRect frame = CGRectMake(0, 70, self.view.frame.size.width, self.view.frame.size.height - 120);
@@ -77,6 +80,7 @@ - (void)loadTweets {
                                       _statuses = statuses;
                                       [_tableView reloadData];
                                       [_loadingView setHidden:YES];
+
                                   } errorBlock:^(NSError *error) {
                                       // ...
                                   }];
@@ -122,6 +126,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         cell.textLabel.lineBreakMode = NSLineBreakByWordWrapping;
         cell.textLabel.numberOfLines = 0;
+        UIFont *myFont = [ UIFont fontWithName: @"Helvetica" size: 14.0 ];
+        cell.textLabel.font  = myFont;
     }
 
     NSDictionary *status = [_statuses objectAtIndex:indexPath.row];

diff --git a/CriticalMass/main.m b/CriticalMass/main.m
@@ -15,4 +15,4 @@ int main(int argc, char * argv[])
     @autoreleasepool {
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([PLAppDelegate class]));
     }
-}
+}
diff --git a/...calMassTests/CriticalMassTests-Info.plist → ...calMassTests/CriticalMapsTests-Info.plist b/...calMassTests/CriticalMassTests-Info.plist → ...calMassTests/CriticalMapsTests-Info.plist
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,4 @@ int main(int argc, char * argv[]) @@
         @autoreleasepool {
             return UIApplicationMain(argc, argv, nil, NSStringFromClass([PLAppDelegate class]));
         }
-    }
+    }