Skip to content

Commit 85a2a16

Browse files
RcalafRcalaf
committed
added activity indicator to all the views
hide map
1 parent 8e359fd commit 85a2a16

27 files changed

+367
-109
lines changed

‎AFCanuAPIClient.m

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212

1313
NSString * const kAFCanuAPIBaseURLString = @"http://api.canu.se/";
14-
15-
// NSString * const kAFCanuAPIBaseURLString = @"http://0.0.0.0:3000";
14+
//NSString * const kAFCanuAPIBaseURLString = @"http://0.0.0.0:3000";
1615

1716

1817
@implementation AFCanuAPIClient

‎ActivitiesFeedViewController.m

+4-9
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,20 @@ - (void)didReceiveMemoryWarning
8383
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration
8484
{
8585
if (UIInterfaceOrientationIsLandscape(interfaceOrientation)) {
86-
// [_map.map addAnnotations:_list.activities];
87-
8886
[_map reload:self];
89-
// [_map.map setCenterCoordinate: animated:YES];
90-
91-
92-
/* for (Activity *activity in _list.activities) {
93-
[_map.map addAnnotation:activity.location.placemark];
94-
}*/
9587
[_map.map setShowsUserLocation:YES];
9688
_map.view.hidden = NO;
9789
}
9890
}
9991

10092

93+
94+
95+
/*
10196
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
10297
{
10398
return UIInterfaceOrientationPortrait | UIInterfaceOrientationLandscapeLeft | UIInterfaceOrientationLandscapeRight;
10499
}
105-
100+
*/
106101

107102
@end

‎Activity.m

-3
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,6 @@ + (void)createActivityForUserWithTitle:(NSString *)title
430430

431431
AppDelegate *appDelegate =(AppDelegate *)[[UIApplication sharedApplication] delegate];
432432

433-
434-
435-
436433
NSArray *objectsArray = [NSArray arrayWithObjects:
437434
title,
438435
description,

‎ActivityTableViewController.m

+5-8
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,13 @@ - (void)viewDidLoad
170170
-(void)viewWillAppear:(BOOL)animated
171171
{
172172
[super viewWillAppear:YES];
173-
174-
if ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusAuthorized) {
173+
[self.locationManager startUpdatingLocation];
174+
175+
/*if ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusAuthorized) {
175176
[self.locationManager startUpdatingLocation];
176177
} else {
177178
[self showFeedback:nil];
178-
}
179+
}*/
179180

180181

181182

@@ -248,11 +249,7 @@ - (void)reload:(id)sender
248249
if (error) {
249250
if ([[error localizedRecoverySuggestion] rangeOfString:@"Access denied"].location != NSNotFound) {
250251
AppDelegate *appDelegate =(AppDelegate *)[[UIApplication sharedApplication] delegate];
251-
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"user"];
252-
appDelegate.user = nil;
253-
254-
MainViewController *mvc = [[MainViewController alloc] init];
255-
appDelegate.window.rootViewController = mvc;
252+
[appDelegate.user logOut];
256253
} else {
257254

258255
[[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", nil) message:[error localizedDescription] delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"OK", nil), nil] show];

‎CANU.xcodeproj/project.pbxproj

+19-3
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
DE713963179D47FE00EBCB91 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE713962179D47FE00EBCB91 /* CoreLocation.framework */; };
8989
DE81F8B1175E4D9E00AD1071 /* NewActivityViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81F8B0175E4D9E00AD1071 /* NewActivityViewController.m */; };
9090
DE85A6321744FCD400A050E5 /* UICanuTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = DE85A6311744FCD400A050E5 /* UICanuTextField.m */; };
91+
DE936C7F180A9B430058608D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DE936C7E180A9B430058608D /* Images.xcassets */; };
9192
DEA7C7EC17F1F2EF009CBE25 /* EditUserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DEA7C7EB17F1F2EF009CBE25 /* EditUserViewController.m */; };
9293
DEA7C7F017F1F73C009CBE25 /* button_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = DEA7C7EE17F1F73C009CBE25 /* button_arrow.png */; };
9394
DEA7C7F117F1F73C009CBE25 /* button_arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DEA7C7EF17F1F73C009CBE25 /* button_arrow@2x.png */; };
@@ -150,6 +151,7 @@
150151
DED1244117CFC81E000EE414 /* create_bg-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DED1243F17CFC81E000EE414 /* create_bg-568h@2x.png */; };
151152
DED1244217CFC81E000EE414 /* edit_bg-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DED1244017CFC81E000EE414 /* edit_bg-568h@2x.png */; };
152153
DED4901B17298A61005A0BF9 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = DED4901A17298A61005A0BF9 /* User.m */; };
154+
DEDACFD217FC58950068DB72 /* icon-60.png in Resources */ = {isa = PBXBuildFile; fileRef = DEDACFD117FC58950068DB72 /* icon-60.png */; };
153155
DEF015F91784B9020005FFC0 /* UICanuActivityCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DEF015F81784B9020005FFC0 /* UICanuActivityCell.m */; };
154156
DEFD7A6B174534830087CB8A /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = DEFD7A69174534830087CB8A /* back_arrow.png */; };
155157
DEFD7A6C174534830087CB8A /* back_arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DEFD7A6A174534830087CB8A /* back_arrow@2x.png */; };
@@ -264,6 +266,7 @@
264266
DE81F8B0175E4D9E00AD1071 /* NewActivityViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewActivityViewController.m; sourceTree = "<group>"; };
265267
DE85A6301744FCD400A050E5 /* UICanuTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICanuTextField.h; sourceTree = "<group>"; };
266268
DE85A6311744FCD400A050E5 /* UICanuTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICanuTextField.m; sourceTree = "<group>"; };
269+
DE936C7E180A9B430058608D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
267270
DEA7C7EA17F1F2EF009CBE25 /* EditUserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditUserViewController.h; sourceTree = "<group>"; };
268271
DEA7C7EB17F1F2EF009CBE25 /* EditUserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditUserViewController.m; sourceTree = "<group>"; };
269272
DEA7C7EE17F1F73C009CBE25 /* button_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = button_arrow.png; sourceTree = "<group>"; };
@@ -357,6 +360,8 @@
357360
DED1244017CFC81E000EE414 /* edit_bg-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "edit_bg-568h@2x.png"; sourceTree = "<group>"; };
358361
DED4901917298A61005A0BF9 /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = User.h; sourceTree = "<group>"; };
359362
DED4901A17298A61005A0BF9 /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = User.m; sourceTree = "<group>"; };
363+
DEDACFD017FC56D00068DB72 /* icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon-120.png"; path = "../icon-120.png"; sourceTree = "<group>"; };
364+
DEDACFD117FC58950068DB72 /* icon-60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon-60.png"; path = "../icon-60.png"; sourceTree = "<group>"; };
360365
DEF015F71784B9020005FFC0 /* UICanuActivityCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICanuActivityCell.h; sourceTree = "<group>"; };
361366
DEF015F81784B9020005FFC0 /* UICanuActivityCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICanuActivityCell.m; sourceTree = "<group>"; };
362367
DEFD7A69174534830087CB8A /* back_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back_arrow.png; sourceTree = "<group>"; };
@@ -460,6 +465,8 @@
460465
DE4D952417429EFE00FB026F /* Icons */ = {
461466
isa = PBXGroup;
462467
children = (
468+
DEDACFD117FC58950068DB72 /* icon-60.png */,
469+
DEDACFD017FC56D00068DB72 /* icon-120.png */,
463470
DEA7C7EE17F1F73C009CBE25 /* button_arrow.png */,
464471
DEA7C7EF17F1F73C009CBE25 /* button_arrow@2x.png */,
465472
DED1242F17CCFDFD000EE414 /* map_pin.png */,
@@ -672,6 +679,7 @@
672679
DEA93B7517205B2800303BB5 /* MainStoryboard.storyboard */,
673680
DEA93B7A1720616A00303BB5 /* Main */,
674681
DE4064E117D511C500B11CE9 /* PrivacyPolicy */,
682+
DE936C7E180A9B430058608D /* Images.xcassets */,
675683
);
676684
path = CANU;
677685
sourceTree = "<group>";
@@ -998,6 +1006,7 @@
9981006
DE6ED9B517C2928900C5E72E /* create_active.png in Resources */,
9991007
DE6ED9B617C2928900C5E72E /* create_active@2x.png in Resources */,
10001008
DE6ED9BF17C2958100C5E72E /* fullview_action_edit.png in Resources */,
1009+
DEDACFD217FC58950068DB72 /* icon-60.png in Resources */,
10011010
DE6ED9C017C2958100C5E72E /* fullview_action_edit@2x.png in Resources */,
10021011
DE6ED9C117C2958100C5E72E /* fullview_action_go.png in Resources */,
10031012
DE6ED9C217C2958100C5E72E /* fullview_action_go@2x.png in Resources */,
@@ -1019,6 +1028,7 @@
10191028
DE67FDC717CA64F500240E1C /* intro_bg@2x.png in Resources */,
10201029
DE67FDDC17CA66DD00240E1C /* guide_btn_gotit.png in Resources */,
10211030
DE67FDDD17CA66DD00240E1C /* guide_btn_gotit@2x.png in Resources */,
1031+
DE936C7F180A9B430058608D /* Images.xcassets in Resources */,
10221032
DE67FDDE17CA66DD00240E1C /* guide_btn_start.png in Resources */,
10231033
DE67FDDF17CA66DD00240E1C /* guide_btn_start@2x.png in Resources */,
10241034
DE67FDF117CA6AB100240E1C /* guide_btn_skip.png in Resources */,
@@ -1138,7 +1148,7 @@
11381148
ONLY_ACTIVE_ARCH = NO;
11391149
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
11401150
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "D620AC5A-281F-47F1-B6DF-8C5E71BB8F6F";
1141-
SDKROOT = iphoneos;
1151+
SDKROOT = iphoneos6.1;
11421152
SYMROOT = build/Products;
11431153
VALIDATE_PRODUCT = YES;
11441154
};
@@ -1147,6 +1157,8 @@
11471157
DE67B46217A71CC500F5CBC1 /* Distribution */ = {
11481158
isa = XCBuildConfiguration;
11491159
buildSettings = {
1160+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1161+
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
11501162
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Roger Cot (73TCT5FXV2)";
11511163
FRAMEWORK_SEARCH_PATHS = (
11521164
"$(inherited)",
@@ -1194,7 +1206,7 @@
11941206
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
11951207
ONLY_ACTIVE_ARCH = YES;
11961208
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "D620AC5A-281F-47F1-B6DF-8C5E71BB8F6F";
1197-
SDKROOT = iphoneos;
1209+
SDKROOT = iphoneos6.1;
11981210
SYMROOT = build/Products;
11991211
};
12001212
name = Debug;
@@ -1220,7 +1232,7 @@
12201232
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
12211233
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
12221234
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "4C62B1CD-8827-4F02-B8F6-07A77150CCC4";
1223-
SDKROOT = iphoneos;
1235+
SDKROOT = iphoneos6.1;
12241236
SYMROOT = build/Products;
12251237
VALIDATE_PRODUCT = YES;
12261238
};
@@ -1229,6 +1241,8 @@
12291241
DEA93B3B17204EA600303BB5 /* Debug */ = {
12301242
isa = XCBuildConfiguration;
12311243
buildSettings = {
1244+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1245+
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
12321246
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Roger Calaf (WZGVT5H53N)";
12331247
FRAMEWORK_SEARCH_PATHS = (
12341248
"$(inherited)",
@@ -1251,6 +1265,8 @@
12511265
DEA93B3C17204EA600303BB5 /* Release */ = {
12521266
isa = XCBuildConfiguration;
12531267
buildSettings = {
1268+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1269+
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
12541270
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Roger Cot (73TCT5FXV2)";
12551271
FRAMEWORK_SEARCH_PATHS = (
12561272
"$(inherited)",

‎CANU/AppDelegate.m

+4-3
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,19 @@ - (User *)user
7878

7979
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
8080
{
81-
/*if ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusAuthorized) {
81+
/* if ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusAuthorized) {
82+
8283
[[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", nil) message:@"no location service enabled" delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"OK", nil), nil] show];
8384
}*/
8485

85-
[[UIApplication sharedApplication] registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound|UIRemoteNotificationTypeAlert)];
86+
//[[UIApplication sharedApplication] registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound|UIRemoteNotificationTypeAlert)];
8687

8788
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
8889

8990
if (self.user) {
9091

9192
canuViewController = [[UICanuNavigationController alloc] init];
92-
_publicFeedViewController = [[ActivitiesFeedViewController alloc] init];
93+
// _publicFeedViewController = [[ActivitiesFeedViewController alloc] init];
9394
// _profileViewController = [[UserProfileViewController alloc] init];
9495
[canuViewController pushViewController:self.publicFeedViewController animated:NO];
9596
self.window.rootViewController = canuViewController;

‎CANU/CANU-Info.plist

+5-16
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,9 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIcons</key>
12-
<dict>
13-
<key>CFBundlePrimaryIcon</key>
14-
<dict>
15-
<key>CFBundleIconFiles</key>
16-
<array>
17-
<string>icon.png</string>
18-
<string>icon@2x.png</string>
19-
</array>
20-
<key>UIPrerenderedIcon</key>
21-
<true/>
22-
</dict>
23-
</dict>
12+
<dict/>
13+
<key>CFBundleIcons~ipad</key>
14+
<dict/>
2415
<key>CFBundleIdentifier</key>
2516
<string>se.canu.canu</string>
2617
<key>CFBundleInfoDictionaryVersion</key>
@@ -30,7 +21,7 @@
3021
<key>CFBundlePackageType</key>
3122
<string>APPL</string>
3223
<key>CFBundleShortVersionString</key>
33-
<string>1.0</string>
24+
<string>1.2</string>
3425
<key>CFBundleSignature</key>
3526
<string>????</string>
3627
<key>CFBundleURLTypes</key>
@@ -43,7 +34,7 @@
4334
</dict>
4435
</array>
4536
<key>CFBundleVersion</key>
46-
<string>1.0.0</string>
37+
<string>1.0.2</string>
4738
<key>FacebookAppID</key>
4839
<string>213847565419629</string>
4940
<key>FacebookDisplayName</key>
@@ -66,8 +57,6 @@
6657
<key>UISupportedInterfaceOrientations</key>
6758
<array>
6859
<string>UIInterfaceOrientationPortrait</string>
69-
<string>UIInterfaceOrientationLandscapeLeft</string>
70-
<string>UIInterfaceOrientationLandscapeRight</string>
7160
</array>
7261
</dict>
7362
</plist>

‎CANU/EditUserPasswordViewController.m

+29-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ @interface EditUserPasswordViewController () <UITextFieldDelegate>
2323
@property (strong, nonatomic) IBOutlet UITextField *password;
2424
@property (strong, nonatomic) IBOutlet UITextField *proxyPassword;
2525

26+
@property (strong, nonatomic) UIActivityIndicatorView *loadingIndicator;
27+
28+
- (void)operationInProcess:(BOOL)isInProcess;
29+
2630
@end
2731

2832
@implementation EditUserPasswordViewController
@@ -36,6 +40,19 @@ @implementation EditUserPasswordViewController
3640
@synthesize password = _password;
3741
@synthesize proxyPassword = _proxyPassword;
3842

43+
@synthesize loadingIndicator = _loadingIndicator;
44+
45+
- (void)operationInProcess:(BOOL)isInProcess
46+
{
47+
if (isInProcess) {
48+
[_loadingIndicator startAnimating];
49+
_saveButton.hidden = YES;
50+
}else{
51+
[_loadingIndicator stopAnimating];
52+
_saveButton.hidden = NO;
53+
}
54+
}
55+
3956
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
4057
{
4158
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
@@ -56,8 +73,10 @@ - (IBAction)updatePassword:(id)sender
5673
_proxyPassword.rightView = nil;
5774
//NSLog(@" %@ %@",_password.text,_proxyPassword.text);
5875
if ([_password.text isEqualToString:_proxyPassword.text]) {
76+
77+
[self operationInProcess:YES];
5978

60-
[self.user editUserWithUserName:_user.userName
79+
[self.user editUserWithUserName:_user.userName
6180
Password:_password.text
6281
FirstName:_user.firstName
6382
LastName:@""
@@ -81,12 +100,13 @@ - (IBAction)updatePassword:(id)sender
81100
}
82101

83102
if (user) {
84-
[self dismissViewControllerAnimated:YES completion:nil];
103+
[self dismissViewControllerAnimated:NO completion:nil];
85104
//AppDelegate *appDelegate =(AppDelegate *)[[UIApplication sharedApplication] delegate];
86105
//appDelegate.user = user;
87106
//self.user = user;
88107
}
89-
}];
108+
[self operationInProcess:NO];
109+
}];
90110
} else {
91111
if (!_password.text) _password.rightView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"feedback_bad.png"]];
92112
_proxyPassword.rightView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"feedback_bad.png"]];
@@ -163,6 +183,12 @@ - (void)loadView
163183

164184
[_toolBar addSubview:_saveButton];
165185

186+
// Activity Indicator
187+
188+
_loadingIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
189+
_loadingIndicator.center = CGPointMake(188.5f, 28.5f);
190+
[_toolBar addSubview:_loadingIndicator];
191+
166192
[_toolBar addSubview:_backButton];
167193
[self.view addSubview:_toolBar];
168194

0 commit comments

Comments
 (0)