Improve APCSignUpPermissionsType for use from Swift

p2 · p2 · commit 94bf69775556 · 2015-04-30T16:37:42.000-04:00
Resolves ResearchKit/AppKit#21
diff --git a/APCAppCore/APCAppCore/Library/Objects/APCConstants.h b/APCAppCore/APCAppCore/Library/Objects/APCConstants.h
@@ -34,14 +34,14 @@
 #import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSUInteger, APCSignUpPermissionsType) {
-    kSignUpPermissionsTypeNone = 0,
-    kSignUpPermissionsTypeHealthKit,
-    kSignUpPermissionsTypeLocation,
-    kSignUpPermissionsTypeLocalNotifications,
-    kSignUpPermissionsTypeCoremotion,
-    kSignUpPermissionsTypeMicrophone,
-    kSignUpPermissionsTypeCamera,
-    kSignUpPermissionsTypePhotoLibrary
+    kAPCSignUpPermissionsTypeNone = 0,
+    kAPCSignUpPermissionsTypeHealthKit,
+    kAPCSignUpPermissionsTypeLocation,
+    kAPCSignUpPermissionsTypeLocalNotifications,
+    kAPCSignUpPermissionsTypeCoremotion,
+    kAPCSignUpPermissionsTypeMicrophone,
+    kAPCSignUpPermissionsTypeCamera,
+    kAPCSignUpPermissionsTypePhotoLibrary
 };
 
 typedef NS_ENUM(NSUInteger, APCDashboardMessageType) {
diff --git a/APCAppCore/APCAppCore/Library/Permissions/APCPermissionsManager.m b/APCAppCore/APCAppCore/Library/Permissions/APCPermissionsManager.m
@@ -97,15 +97,15 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type
     BOOL isGranted = NO;
     [[NSUserDefaults standardUserDefaults]synchronize];
     switch (type) {
-        case kSignUpPermissionsTypeHealthKit:
+        case kAPCSignUpPermissionsTypeHealthKit:
         {
             HKCharacteristicType *dateOfBirth = [HKCharacteristicType characteristicTypeForIdentifier:HKCharacteristicTypeIdentifierDateOfBirth];
             HKAuthorizationStatus status = [self.healthStore authorizationStatusForType:dateOfBirth];
 
             isGranted = (status == HKAuthorizationStatusSharingAuthorized);
         }
             break;
-        case kSignUpPermissionsTypeLocation:
+        case kAPCSignUpPermissionsTypeLocation:
         {
 #if TARGET_IPHONE_SIMULATOR
             isGranted = YES;
@@ -122,12 +122,12 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type
 #endif
         }
             break;
-        case kSignUpPermissionsTypeLocalNotifications:
+        case kAPCSignUpPermissionsTypeLocalNotifications:
         {
             isGranted = [[UIApplication sharedApplication] currentUserNotificationSettings].types != 0;
         }
             break;
-        case kSignUpPermissionsTypeCoremotion:
+        case kAPCSignUpPermissionsTypeCoremotion:
         {
 #if TARGET_IPHONE_SIMULATOR
             isGranted = YES;
@@ -136,7 +136,7 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type
 #endif
         }
             break;
-        case kSignUpPermissionsTypeMicrophone:
+        case kAPCSignUpPermissionsTypeMicrophone:
         {
 #if TARGET_IPHONE_SIMULATOR
             isGranted = YES;
@@ -145,7 +145,7 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type
 #endif
         }
             break;
-        case kSignUpPermissionsTypeCamera:
+        case kAPCSignUpPermissionsTypeCamera:
         {
 #if TARGET_IPHONE_SIMULATOR
             isGranted = YES;
@@ -155,7 +155,7 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type
 #endif
         }
             break;
-        case kSignUpPermissionsTypePhotoLibrary:
+        case kAPCSignUpPermissionsTypePhotoLibrary:
         {
             ALAuthorizationStatus status = [ALAssetsLibrary authorizationStatus];
             isGranted = status == ALAuthorizationStatusAuthorized;
@@ -177,7 +177,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
     self.completionBlock = completion;
     __weak typeof(self) weakSelf = self;
     switch (type) {
-        case kSignUpPermissionsTypeHealthKit:
+        case kAPCSignUpPermissionsTypeHealthKit:
         {
     
             //------READ TYPES--------
@@ -242,7 +242,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
             
         }
             break;
-        case kSignUpPermissionsTypeLocation:
+        case kAPCSignUpPermissionsTypeLocation:
         {
             CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
             
@@ -252,18 +252,19 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
                 
             } else{
                 if (weakSelf.completionBlock) {
-                    weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeLocation]);
+                    weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeLocation]);
                     weakSelf.completionBlock = nil;
                 }
             }
         }
             break;
-        case kSignUpPermissionsTypeLocalNotifications:
+        case kAPCSignUpPermissionsTypeLocalNotifications:
         {
             if ([[UIApplication sharedApplication] currentUserNotificationSettings].types == UIUserNotificationTypeNone) {
                 UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeAlert
                                                                                                      |UIUserNotificationTypeBadge
-                                                                                                     |UIUserNotificationTypeSound) categories:[APCTasksReminderManager taskReminderCategories]];
+                                                                                                     |UIUserNotificationTypeSound)
+																						 categories:[APCTasksReminderManager taskReminderCategories]];
                 
                 [[UIApplication sharedApplication] registerUserNotificationSettings:settings];
                 [[NSUserDefaults standardUserDefaults]synchronize];
@@ -272,7 +273,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
             }
         }
             break;
-        case kSignUpPermissionsTypeCoremotion:
+        case kAPCSignUpPermissionsTypeCoremotion:
         {
             
             
@@ -288,7 +289,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
                     
                     if (weakSelf.completionBlock) {
                         dispatch_async(dispatch_get_main_queue(), ^{
-                        weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeCoremotion]);
+                        weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeCoremotion]);
                         weakSelf.completionBlock = nil;
                         });
                     }
@@ -298,7 +299,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
             
         }
             break;
-        case kSignUpPermissionsTypeMicrophone:
+        case kAPCSignUpPermissionsTypeMicrophone:
         {
             
             [[AVAudioSession sharedInstance] requestRecordPermission:^(BOOL granted) {
@@ -307,14 +308,14 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
                     weakSelf.completionBlock = nil;
                 } else {
                     if (weakSelf.completionBlock) {
-                        weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeMicrophone]);
+                        weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeMicrophone]);
                         weakSelf.completionBlock = nil;
                     }
                 }
             }];
         }
             break;
-        case kSignUpPermissionsTypeCamera:
+        case kAPCSignUpPermissionsTypeCamera:
         {
             
             [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
@@ -323,14 +324,14 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
                     weakSelf.completionBlock = nil;
                 } else {
                     if (weakSelf.completionBlock) {
-                        weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeCamera]);
+                        weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeCamera]);
                         weakSelf.completionBlock = nil;
                     }
                 }
             }];
         }
             break;
-        case kSignUpPermissionsTypePhotoLibrary:
+        case kAPCSignUpPermissionsTypePhotoLibrary:
         {
             
             ALAssetsLibrary *lib = [[ALAssetsLibrary alloc] init];
@@ -345,7 +346,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type
             } failureBlock:^(NSError *error) {
                 if (error.code == ALAssetsLibraryAccessUserDeniedError) {
                     if (weakSelf.completionBlock) {
-                        weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypePhotoLibrary]);
+                        weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypePhotoLibrary]);
                         weakSelf.completionBlock = nil;
                     }
                 }
@@ -387,31 +388,31 @@ - (NSError *)permissionDeniedErrorForType:(APCSignUpPermissionsType)type
     NSString *message;
     
     switch (type) {
-        case kSignUpPermissionsTypeHealthKit:{
+        case kAPCSignUpPermissionsTypeHealthKit:{
             message = [NSString localizedStringWithFormat:NSLocalizedString(@"Please go to Settings -> Privacy -> Health -> %@ to re-enable.", nil), appName];
         }
             break;
-        case kSignUpPermissionsTypeLocalNotifications:{
+        case kAPCSignUpPermissionsTypeLocalNotifications:{
             message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings -> Notifications and enable 'Allow Notifications'", nil), appName];
         }
             break;
-        case kSignUpPermissionsTypeLocation:{
+        case kAPCSignUpPermissionsTypeLocation:{
             message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings -> Location and check 'Always'", nil), appName];
         }
             break;
-        case kSignUpPermissionsTypeCoremotion:{
+        case kAPCSignUpPermissionsTypeCoremotion:{
             message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings and enable Motion Activity.", nil), appName];
         }
             break;
-        case kSignUpPermissionsTypeMicrophone:{
+        case kAPCSignUpPermissionsTypeMicrophone:{
             message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings and enable Microphone", nil), appName];
         }
             break;
-        case kSignUpPermissionsTypeCamera:{
+        case kAPCSignUpPermissionsTypeCamera:{
             message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings and enable Camera", nil), appName];
         }
             break;
-        case kSignUpPermissionsTypePhotoLibrary:{
+        case kAPCSignUpPermissionsTypePhotoLibrary:{
             message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings and enable Photos", nil), appName];
         }
             break;
@@ -458,7 +459,7 @@ - (void)locationManager:(CLLocationManager *) __unused manager didChangeAuthoriz
         case kCLAuthorizationStatusRestricted: {
             [self.locationManager stopUpdatingLocation];
             if (self.completionBlock) {
-                self.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeLocation]);
+                self.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeLocation]);
                 self.completionBlock = nil;
             }
             break;
@@ -472,17 +473,17 @@ - (void)locationManager:(CLLocationManager *) __unused manager didChangeAuthoriz
 
 - (void)appDidRegisterForRemoteNotifications: (NSNotification *)notification
 {
-    
     UIUserNotificationSettings *settings = (UIUserNotificationSettings *)notification.object;
     
     if (settings.types != 0) {
         if (self.completionBlock) {
             self.completionBlock(YES, nil);
             self.completionBlock = nil;
         }
-    }else{
+    }
+	else {
         if (self.completionBlock) {
-            self.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeLocalNotifications]);
+            self.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeLocalNotifications]);
             self.completionBlock = nil;
         }
     }
diff --git a/APCAppCore/APCAppCore/UI/Model/APCTableViewItem.m b/APCAppCore/APCAppCore/UI/Model/APCTableViewItem.m
@@ -116,7 +116,7 @@ - (instancetype)init
 {
     self = [super init];
     if (self) {
-        _permissionType = kSignUpPermissionsTypeNone;
+        _permissionType = kAPCSignUpPermissionsTypeNone;
         _permissionGranted = NO;
     }
     return self;
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCPermissionPrimingViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCPermissionPrimingViewController.m
@@ -55,7 +55,7 @@ - (void)viewDidLoad {
     
     NSDictionary *initialOptions = ((APCAppDelegate *)[UIApplication sharedApplication].delegate).initializationOptions;
     NSDictionary *servicesDescrtiptions = initialOptions[kAppServicesDescriptionsKey];
-    self.detailTextLabel.text = servicesDescrtiptions[@(kSignUpPermissionsTypeHealthKit)];
+    self.detailTextLabel.text = servicesDescrtiptions[@(kAPCSignUpPermissionsTypeHealthKit)];
 }
 
 - (void)setupAppearance
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpGeneralInfoViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpGeneralInfoViewController.m
@@ -74,7 +74,7 @@ - (void) viewDidLoad {
     self.permissionManager = [[APCPermissionsManager alloc] init];
     
     __weak typeof(self) weakSelf = self;
-    [self.permissionManager requestForPermissionForType:kSignUpPermissionsTypeHealthKit withCompletion:^(BOOL granted, NSError * __unused error) {
+    [self.permissionManager requestForPermissionForType:kAPCSignUpPermissionsTypeHealthKit withCompletion:^(BOOL granted, NSError * __unused error) {
         if (granted) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 weakSelf.permissionGranted = YES;
@@ -735,7 +735,7 @@ - (IBAction)changeProfileImage:(id) __unused sender
     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
     UIAlertAction *cameraAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Take Photo", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * __unused action) {
         
-        [self.permissionManager requestForPermissionForType:kSignUpPermissionsTypeCamera withCompletion:^(BOOL granted, NSError *error) {
+        [self.permissionManager requestForPermissionForType:kAPCSignUpPermissionsTypeCamera withCompletion:^(BOOL granted, NSError *error) {
             if (granted) {
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [weakSelf openCamera];
@@ -752,7 +752,7 @@ - (IBAction)changeProfileImage:(id) __unused sender
     }
     
     UIAlertAction *libraryAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Choose from Library", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * __unused action) {
-        [self.permissionManager requestForPermissionForType:kSignUpPermissionsTypePhotoLibrary withCompletion:^(BOOL granted, NSError *error) {
+        [self.permissionManager requestForPermissionForType:kAPCSignUpPermissionsTypePhotoLibrary withCompletion:^(BOOL granted, NSError *error) {
             if (granted) {
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [weakSelf openPhotoLibrary];
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpMedicalInfoViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpMedicalInfoViewController.m
@@ -62,11 +62,11 @@ - (void)viewDidLoad {
     
     self.permissionManager = [[APCPermissionsManager alloc] init];
     
-    self.permissionGranted = [self.permissionManager isPermissionsGrantedForType:kSignUpPermissionsTypeHealthKit];
+    self.permissionGranted = [self.permissionManager isPermissionsGrantedForType:kAPCSignUpPermissionsTypeHealthKit];
     
     __weak typeof(self) weakSelf = self;
     if (!self.permissionGranted) {
-        [self.permissionManager requestForPermissionForType:kSignUpPermissionsTypeHealthKit withCompletion:^(BOOL granted, NSError * __unused error) {
+        [self.permissionManager requestForPermissionForType:kAPCSignUpPermissionsTypeHealthKit withCompletion:^(BOOL granted, NSError * __unused error) {
             if (granted) {
                 dispatch_async(dispatch_get_main_queue(), ^{
                     weakSelf.permissionGranted = YES;
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpPermissionsViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpPermissionsViewController.m
diff --git a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.m b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.m

Original file line number	Diff line number	Diff line change
`@@ -97,15 +97,15 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type`
`97`	`97`	`BOOL isGranted = NO;`
`98`	`98`	`[[NSUserDefaults standardUserDefaults]synchronize];`
`99`	`99`	`switch (type) {`
`100`		`- case kSignUpPermissionsTypeHealthKit:`
	`100`	`+ case kAPCSignUpPermissionsTypeHealthKit:`
`101`	`101`	`{`
`102`	`102`	`HKCharacteristicType *dateOfBirth = [HKCharacteristicType characteristicTypeForIdentifier:HKCharacteristicTypeIdentifierDateOfBirth];`
`103`	`103`	`HKAuthorizationStatus status = [self.healthStore authorizationStatusForType:dateOfBirth];`
`104`	`104`
`105`	`105`	`isGranted = (status == HKAuthorizationStatusSharingAuthorized);`
`106`	`106`	`}`
`107`	`107`	`break;`
`108`		`- case kSignUpPermissionsTypeLocation:`
	`108`	`+ case kAPCSignUpPermissionsTypeLocation:`
`109`	`109`	`{`
`110`	`110`	`#if TARGET_IPHONE_SIMULATOR`
`111`	`111`	`isGranted = YES;`
`@@ -122,12 +122,12 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type`
`122`	`122`	`#endif`
`123`	`123`	`}`
`124`	`124`	`break;`
`125`		`- case kSignUpPermissionsTypeLocalNotifications:`
	`125`	`+ case kAPCSignUpPermissionsTypeLocalNotifications:`
`126`	`126`	`{`
`127`	`127`	`isGranted = [[UIApplication sharedApplication] currentUserNotificationSettings].types != 0;`
`128`	`128`	`}`
`129`	`129`	`break;`
`130`		`- case kSignUpPermissionsTypeCoremotion:`
	`130`	`+ case kAPCSignUpPermissionsTypeCoremotion:`
`131`	`131`	`{`
`132`	`132`	`#if TARGET_IPHONE_SIMULATOR`
`133`	`133`	`isGranted = YES;`
`@@ -136,7 +136,7 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type`
`136`	`136`	`#endif`
`137`	`137`	`}`
`138`	`138`	`break;`
`139`		`- case kSignUpPermissionsTypeMicrophone:`
	`139`	`+ case kAPCSignUpPermissionsTypeMicrophone:`
`140`	`140`	`{`
`141`	`141`	`#if TARGET_IPHONE_SIMULATOR`
`142`	`142`	`isGranted = YES;`
`@@ -145,7 +145,7 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type`
`145`	`145`	`#endif`
`146`	`146`	`}`
`147`	`147`	`break;`
`148`		`- case kSignUpPermissionsTypeCamera:`
	`148`	`+ case kAPCSignUpPermissionsTypeCamera:`
`149`	`149`	`{`
`150`	`150`	`#if TARGET_IPHONE_SIMULATOR`
`151`	`151`	`isGranted = YES;`
`@@ -155,7 +155,7 @@ - (BOOL)isPermissionsGrantedForType:(APCSignUpPermissionsType)type`
`155`	`155`	`#endif`
`156`	`156`	`}`
`157`	`157`	`break;`
`158`		`- case kSignUpPermissionsTypePhotoLibrary:`
	`158`	`+ case kAPCSignUpPermissionsTypePhotoLibrary:`
`159`	`159`	`{`
`160`	`160`	`ALAuthorizationStatus status = [ALAssetsLibrary authorizationStatus];`
`161`	`161`	`isGranted = status == ALAuthorizationStatusAuthorized;`
`@@ -177,7 +177,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`177`	`177`	`self.completionBlock = completion;`
`178`	`178`	`__weak typeof(self) weakSelf = self;`
`179`	`179`	`switch (type) {`
`180`		`- case kSignUpPermissionsTypeHealthKit:`
	`180`	`+ case kAPCSignUpPermissionsTypeHealthKit:`
`181`	`181`	`{`
`182`	`182`
`183`	`183`	`//------READ TYPES--------`
`@@ -242,7 +242,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`242`	`242`
`243`	`243`	`}`
`244`	`244`	`break;`
`245`		`- case kSignUpPermissionsTypeLocation:`
	`245`	`+ case kAPCSignUpPermissionsTypeLocation:`
`246`	`246`	`{`
`247`	`247`	`CLAuthorizationStatus status = [CLLocationManager authorizationStatus];`
`248`	`248`
`@@ -252,18 +252,19 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`252`	`252`
`253`	`253`	`} else{`
`254`	`254`	`if (weakSelf.completionBlock) {`
`255`		`- weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeLocation]);`
	`255`	`+ weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeLocation]);`
`256`	`256`	`weakSelf.completionBlock = nil;`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`	`break;`
`261`		`- case kSignUpPermissionsTypeLocalNotifications:`
	`261`	`+ case kAPCSignUpPermissionsTypeLocalNotifications:`
`262`	`262`	`{`
`263`	`263`	`if ([[UIApplication sharedApplication] currentUserNotificationSettings].types == UIUserNotificationTypeNone) {`
`264`	`264`	`UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeAlert`
`265`	`265`	`\|UIUserNotificationTypeBadge`
`266`		`- \|UIUserNotificationTypeSound) categories:[APCTasksReminderManager taskReminderCategories]];`
	`266`	`+ \|UIUserNotificationTypeSound)`
	`267`	`+ categories:[APCTasksReminderManager taskReminderCategories]];`
`267`	`268`
`268`	`269`	`[[UIApplication sharedApplication] registerUserNotificationSettings:settings];`
`269`	`270`	`[[NSUserDefaults standardUserDefaults]synchronize];`
`@@ -272,7 +273,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`272`	`273`	`}`
`273`	`274`	`}`
`274`	`275`	`break;`
`275`		`- case kSignUpPermissionsTypeCoremotion:`
	`276`	`+ case kAPCSignUpPermissionsTypeCoremotion:`
`276`	`277`	`{`
`277`	`278`
`278`	`279`
`@@ -288,7 +289,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`288`	`289`
`289`	`290`	`if (weakSelf.completionBlock) {`
`290`	`291`	`dispatch_async(dispatch_get_main_queue(), ^{`
`291`		`- weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeCoremotion]);`
	`292`	`+ weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeCoremotion]);`
`292`	`293`	`weakSelf.completionBlock = nil;`
`293`	`294`	`});`
`294`	`295`	`}`
`@@ -298,7 +299,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`298`	`299`
`299`	`300`	`}`
`300`	`301`	`break;`
`301`		`- case kSignUpPermissionsTypeMicrophone:`
	`302`	`+ case kAPCSignUpPermissionsTypeMicrophone:`
`302`	`303`	`{`
`303`	`304`
`304`	`305`	`[[AVAudioSession sharedInstance] requestRecordPermission:^(BOOL granted) {`
`@@ -307,14 +308,14 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`307`	`308`	`weakSelf.completionBlock = nil;`
`308`	`309`	`} else {`
`309`	`310`	`if (weakSelf.completionBlock) {`
`310`		`- weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeMicrophone]);`
	`311`	`+ weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeMicrophone]);`
`311`	`312`	`weakSelf.completionBlock = nil;`
`312`	`313`	`}`
`313`	`314`	`}`
`314`	`315`	`}];`
`315`	`316`	`}`
`316`	`317`	`break;`
`317`		`- case kSignUpPermissionsTypeCamera:`
	`318`	`+ case kAPCSignUpPermissionsTypeCamera:`
`318`	`319`	`{`
`319`	`320`
`320`	`321`	`[AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {`
`@@ -323,14 +324,14 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`323`	`324`	`weakSelf.completionBlock = nil;`
`324`	`325`	`} else {`
`325`	`326`	`if (weakSelf.completionBlock) {`
`326`		`- weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeCamera]);`
	`327`	`+ weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeCamera]);`
`327`	`328`	`weakSelf.completionBlock = nil;`
`328`	`329`	`}`
`329`	`330`	`}`
`330`	`331`	`}];`
`331`	`332`	`}`
`332`	`333`	`break;`
`333`		`- case kSignUpPermissionsTypePhotoLibrary:`
	`334`	`+ case kAPCSignUpPermissionsTypePhotoLibrary:`
`334`	`335`	`{`
`335`	`336`
`336`	`337`	`ALAssetsLibrary *lib = [[ALAssetsLibrary alloc] init];`
`@@ -345,7 +346,7 @@ - (void)requestForPermissionForType:(APCSignUpPermissionsType)type`
`345`	`346`	`} failureBlock:^(NSError *error) {`
`346`	`347`	`if (error.code == ALAssetsLibraryAccessUserDeniedError) {`
`347`	`348`	`if (weakSelf.completionBlock) {`
`348`		`- weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypePhotoLibrary]);`
	`349`	`+ weakSelf.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypePhotoLibrary]);`
`349`	`350`	`weakSelf.completionBlock = nil;`
`350`	`351`	`}`
`351`	`352`	`}`
`@@ -387,31 +388,31 @@ - (NSError *)permissionDeniedErrorForType:(APCSignUpPermissionsType)type`
`387`	`388`	`NSString *message;`
`388`	`389`
`389`	`390`	`switch (type) {`
`390`		`- case kSignUpPermissionsTypeHealthKit:{`
	`391`	`+ case kAPCSignUpPermissionsTypeHealthKit:{`
`391`	`392`	`message = [NSString localizedStringWithFormat:NSLocalizedString(@"Please go to Settings -> Privacy -> Health -> %@ to re-enable.", nil), appName];`
`392`	`393`	`}`
`393`	`394`	`break;`
`394`		`- case kSignUpPermissionsTypeLocalNotifications:{`
	`395`	`+ case kAPCSignUpPermissionsTypeLocalNotifications:{`
`395`	`396`	`message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings -> Notifications and enable 'Allow Notifications'", nil), appName];`
`396`	`397`	`}`
`397`	`398`	`break;`
`398`		`- case kSignUpPermissionsTypeLocation:{`
	`399`	`+ case kAPCSignUpPermissionsTypeLocation:{`
`399`	`400`	`message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings -> Location and check 'Always'", nil), appName];`
`400`	`401`	`}`
`401`	`402`	`break;`
`402`		`- case kSignUpPermissionsTypeCoremotion:{`
	`403`	`+ case kAPCSignUpPermissionsTypeCoremotion:{`
`403`	`404`	`message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings and enable Motion Activity.", nil), appName];`
`404`	`405`	`}`
`405`	`406`	`break;`
`406`		`- case kSignUpPermissionsTypeMicrophone:{`
	`407`	`+ case kAPCSignUpPermissionsTypeMicrophone:{`
`407`	`408`	`message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings and enable Microphone", nil), appName];`
`408`	`409`	`}`
`409`	`410`	`break;`
`410`		`- case kSignUpPermissionsTypeCamera:{`
	`411`	`+ case kAPCSignUpPermissionsTypeCamera:{`
`411`	`412`	`message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings and enable Camera", nil), appName];`
`412`	`413`	`}`
`413`	`414`	`break;`
`414`		`- case kSignUpPermissionsTypePhotoLibrary:{`
	`415`	`+ case kAPCSignUpPermissionsTypePhotoLibrary:{`
`415`	`416`	`message = [NSString localizedStringWithFormat:NSLocalizedString(@"Tap on Settings and enable Photos", nil), appName];`
`416`	`417`	`}`
`417`	`418`	`break;`
`@@ -458,7 +459,7 @@ - (void)locationManager:(CLLocationManager *) __unused manager didChangeAuthoriz`
`458`	`459`	`case kCLAuthorizationStatusRestricted: {`
`459`	`460`	`[self.locationManager stopUpdatingLocation];`
`460`	`461`	`if (self.completionBlock) {`
`461`		`- self.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeLocation]);`
	`462`	`+ self.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeLocation]);`
`462`	`463`	`self.completionBlock = nil;`
`463`	`464`	`}`
`464`	`465`	`break;`
`@@ -472,17 +473,17 @@ - (void)locationManager:(CLLocationManager *) __unused manager didChangeAuthoriz`
`472`	`473`
`473`	`474`	`- (void)appDidRegisterForRemoteNotifications: (NSNotification *)notification`
`474`	`475`	`{`
`475`		`-`
`476`	`476`	`UIUserNotificationSettings settings = (UIUserNotificationSettings )notification.object;`
`477`	`477`
`478`	`478`	`if (settings.types != 0) {`
`479`	`479`	`if (self.completionBlock) {`
`480`	`480`	`self.completionBlock(YES, nil);`
`481`	`481`	`self.completionBlock = nil;`
`482`	`482`	`}`
`483`		`- }else{`
	`483`	`+ }`
	`484`	`+ else {`
`484`	`485`	`if (self.completionBlock) {`
`485`		`- self.completionBlock(NO, [self permissionDeniedErrorForType:kSignUpPermissionsTypeLocalNotifications]);`
	`486`	`+ self.completionBlock(NO, [self permissionDeniedErrorForType:kAPCSignUpPermissionsTypeLocalNotifications]);`
`486`	`487`	`self.completionBlock = nil;`
`487`	`488`	`}`
`488`	`489`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ - (instancetype)init`
`116`	`116`	`{`
`117`	`117`	`self = [super init];`
`118`	`118`	`if (self) {`
`119`		`- _permissionType = kSignUpPermissionsTypeNone;`
	`119`	`+ _permissionType = kAPCSignUpPermissionsTypeNone;`
`120`	`120`	`_permissionGranted = NO;`
`121`	`121`	`}`
`122`	`122`	`return self;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ - (void)viewDidLoad {`
`55`	`55`
`56`	`56`	`NSDictionary initialOptions = ((APCAppDelegate )[UIApplication sharedApplication].delegate).initializationOptions;`
`57`	`57`	`NSDictionary *servicesDescrtiptions = initialOptions[kAppServicesDescriptionsKey];`
`58`		`- self.detailTextLabel.text = servicesDescrtiptions[@(kSignUpPermissionsTypeHealthKit)];`
	`58`	`+ self.detailTextLabel.text = servicesDescrtiptions[@(kAPCSignUpPermissionsTypeHealthKit)];`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`- (void)setupAppearance`