diff --git a/UniversityPrograms/Pods/NKOColorPickerView/NKOColorPickerView.m b/UniversityPrograms/Pods/NKOColorPickerView/NKOColorPickerView.m
index 4c9a0f2..e61bd03 100644
--- a/UniversityPrograms/Pods/NKOColorPickerView/NKOColorPickerView.m
+++ b/UniversityPrograms/Pods/NKOColorPickerView/NKOColorPickerView.m
@@ -28,7 +28,7 @@ - (UIImage*)nko_tintImageWithColor:(UIColor*)tintColor;
CGFloat const NKOPickerViewDefaultMargin = 10.f;
CGFloat const NKOPickerViewBrightnessIndicatorWidth = 16.f;
CGFloat const NKOPickerViewBrightnessIndicatorHeight = 48.f;
-CGFloat const NKOPickerViewCrossHairshWidthAndHeight = 38.f;
+CGFloat const NKOPickerViewCrossHairshWidthAndHeight = 20.f;
@interface NKOColorPickerView() {
CGFloat currentBrightness;
@@ -298,7 +298,7 @@ - (UIView*)crossHairs
UIColor *edgeColor = [UIColor colorWithWhite:0.9 alpha:0.8];
- self->_crossHairs.layer.cornerRadius = 19;
+ self->_crossHairs.layer.cornerRadius = NKOPickerViewCrossHairshWidthAndHeight/2;
self->_crossHairs.layer.borderColor = edgeColor.CGColor;
self->_crossHairs.layer.borderWidth = 2;
self->_crossHairs.layer.shadowColor = [UIColor blackColor].CGColor;
diff --git a/UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj b/UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj
index 2d62d71..8723c56 100644
--- a/UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj
+++ b/UniversityPrograms/UniversityPrograms.xcodeproj/project.pbxproj
@@ -915,14 +915,14 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
- CODE_SIGN_IDENTITY = "iPhone Developer: Matthew Hudnall (Y3BWVQJ2DH)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Matthew Hudnall (Y3BWVQJ2DH)";
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "UniversityPrograms/UniversityPrograms-Prefix.pch";
INFOPLIST_FILE = "UniversityPrograms/UniversityPrograms-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = "$(TARGET_NAME)";
- PROVISIONING_PROFILE = "928EC205-E2A8-419B-853E-E3A6A02EC38F";
+ PROVISIONING_PROFILE = "";
WRAPPER_EXTENSION = app;
};
name = Debug;
diff --git a/UniversityPrograms/UniversityPrograms/AppDelegate.m b/UniversityPrograms/UniversityPrograms/AppDelegate.m
index fda4383..218429c 100644
--- a/UniversityPrograms/UniversityPrograms/AppDelegate.m
+++ b/UniversityPrograms/UniversityPrograms/AppDelegate.m
@@ -23,7 +23,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
// Override point for customization after application launch.
self.window.backgroundColor = [UIColor whiteColor];
[self.window makeKeyAndVisible];
-
+ if(![[NSUserDefaults standardUserDefaults] boolForKey:@"firstLoad"]){
+ [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"firstLoad"];
+ [UIColor setThemeColor:[UIColor grassColor]];
+ [[NSUserDefaults standardUserDefaults] synchronize];
+ }
//create the tab bar and set it to be the main view controller
[UIColor setThemeColor:[UIColor getThemeColor]];
@@ -47,6 +51,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
self.baseTabBarController = [[UPTabbarViewController alloc]init];
self.baseTabBarController.tabBar.translucent = NO;
+
_baseTabBarController.tabBar.tintColor = [UIColor getThemeColor];
if([[NSUserDefaults standardUserDefaults]boolForKey:@"darkMode"]){
self.baseTabBarController.tabBar.barStyle = UIBarStyleBlackOpaque;
diff --git a/UniversityPrograms/UniversityPrograms/GetInvolvedTableViewCell.xib b/UniversityPrograms/UniversityPrograms/GetInvolvedTableViewCell.xib
index ea15d6a..8bd6293 100644
--- a/UniversityPrograms/UniversityPrograms/GetInvolvedTableViewCell.xib
+++ b/UniversityPrograms/UniversityPrograms/GetInvolvedTableViewCell.xib
@@ -23,7 +23,7 @@
diff --git a/UniversityPrograms/UniversityPrograms/SettingsViewController.m b/UniversityPrograms/UniversityPrograms/SettingsViewController.m
index e7034aa..b25ae06 100644
--- a/UniversityPrograms/UniversityPrograms/SettingsViewController.m
+++ b/UniversityPrograms/UniversityPrograms/SettingsViewController.m
@@ -87,23 +87,29 @@ -(void)changedColorScheme:(UIColor *)color {
self.darkModeToggle.onTintColor = [UIColor UPCrimsonColor];
[UIColor setThemeColor:[UIColor UPCrimsonColor]];
[self updateColors:[UIColor getThemeColor]];
+ [self.colorPickerView removeFromSuperview];
+ [[NSUserDefaults standardUserDefaults] setInteger:self.colorSelector.selectedSegmentIndex forKey:@"colorSelection"];
}
else if(self.colorSelector.selectedSegmentIndex==1){
self.colorSelector.tintColor = [UIColor grassColor];
self.darkModeToggle.onTintColor = [UIColor grassColor];
[UIColor setThemeColor:[UIColor grassColor]];
[self updateColors:[UIColor getThemeColor]];
+ [self.colorPickerView removeFromSuperview];
+ [[NSUserDefaults standardUserDefaults] setInteger:self.colorSelector.selectedSegmentIndex forKey:@"colorSelection"];
}
else if(self.colorSelector.selectedSegmentIndex==2){
self.colorSelector.tintColor = [UIColor tealColor];
self.darkModeToggle.onTintColor = [UIColor tealColor];
[UIColor setThemeColor:[UIColor tealColor]];
[self updateColors:[UIColor getThemeColor]];
+ [self.colorPickerView removeFromSuperview];
+ [[NSUserDefaults standardUserDefaults] setInteger:self.colorSelector.selectedSegmentIndex forKey:@"colorSelection"];
}
else{
-
+ [[NSUserDefaults standardUserDefaults] setInteger:self.colorSelector.selectedSegmentIndex forKey:@"colorSelection"];
self.colorSelector.tintColor = [UIColor getThemeColor];
self.darkModeToggle.onTintColor = [UIColor getThemeColor];
if(!self.colorPickerView){
@@ -115,11 +121,12 @@ -(void)changedColorScheme:(UIColor *)color {
}];
- [self.view addSubview:self.colorPickerView];
+
}
+ [self.view addSubview:self.colorPickerView];
self.colorPickerView.color=[UIColor getThemeColor];
}
-
+ [[NSUserDefaults standardUserDefaults] synchronize];
//[UITabBar appearance].tintColor=[UIColor getThemeColor];
diff --git a/UniversityPrograms/UniversityPrograms/SettingsViewController.xib b/UniversityPrograms/UniversityPrograms/SettingsViewController.xib
index 60b9313..89eae3d 100644
--- a/UniversityPrograms/UniversityPrograms/SettingsViewController.xib
+++ b/UniversityPrograms/UniversityPrograms/SettingsViewController.xib
@@ -19,7 +19,7 @@
-
+
@@ -33,14 +33,14 @@
-
+