From b42efbd2f9e1c322e501b8ef9b8f2cec10305949 Mon Sep 17 00:00:00 2001
From: Miles Crabbe <mecrabbe@crimson.ua.edu>
Date: Tue, 1 Jul 2014 10:37:29 -0500
Subject: [PATCH] -slight change in design of the user info page

---
 .../CommentViewController.xib                 |  4 +--
 .../UniversityPrograms/MyUPViewController.m   | 17 ++++++++----
 .../UpcomingEventViewController.m             |  1 +
 .../UpcomingEventViewController.xib           |  2 +-
 .../UpcomingEventsTableViewCell.xib           |  4 +--
 .../UserInfoViewController.m                  | 26 ++++++++++++-------
 .../UserInfoViewController.xib                | 18 ++++++++-----
 7 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/UniversityPrograms/UniversityPrograms/CommentViewController.xib b/UniversityPrograms/UniversityPrograms/CommentViewController.xib
index d45d0af..38e11a2 100644
--- a/UniversityPrograms/UniversityPrograms/CommentViewController.xib
+++ b/UniversityPrograms/UniversityPrograms/CommentViewController.xib
@@ -48,12 +48,12 @@
                     </connections>
                 </textField>
                 <view contentMode="scaleToFill" id="eRz-bz-2Ko">
-                    <rect key="frame" x="10" y="55" width="310" height="1"/>
+                    <rect key="frame" x="10" y="45" width="310" height="1"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
                 </view>
                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="interactive" id="hht-Br-oah">
-                    <rect key="frame" x="17" y="56" width="300" height="400"/>
+                    <rect key="frame" x="17" y="47" width="300" height="411"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="15"/>
diff --git a/UniversityPrograms/UniversityPrograms/MyUPViewController.m b/UniversityPrograms/UniversityPrograms/MyUPViewController.m
index f332d86..3562599 100644
--- a/UniversityPrograms/UniversityPrograms/MyUPViewController.m
+++ b/UniversityPrograms/UniversityPrograms/MyUPViewController.m
@@ -38,7 +38,7 @@ @interface MyUPViewController ()
 @property NSArray *unsortedEventArray;
 @property NSMutableArray *sortedEventArray;
 @property UIRefreshControl *refreshControl;
-
+@property BOOL buttonControlFlag;
 @property BOOL controlFlag;
 @end
 
@@ -80,7 +80,7 @@ -(void)viewWillAppear:(BOOL)animated{
     [self loadData];
     [self build];
     [self.selectorControl setEnabled:YES forSegmentAtIndex:0];
-    
+    self.buttonControlFlag = NO;
     [self.myUPTableView scrollRectToVisible:CGRectMake(0, 0, 320, 125) animated:NO];
 }
 
@@ -185,14 +185,21 @@ - (IBAction)changedCategories:(id)sender {
     [self.myUPTableView scrollRectToVisible:CGRectMake(0, 0, 320, 125) animated:NO];
 }
 -(void)didSelectComment{
+    
+    self.navigationController.navigationItem.rightBarButtonItem.enabled = NO;
     CommentViewController *comments = [[CommentViewController alloc] init];
-    [self.navigationController pushViewController:comments
-                                         animated:YES];
-}
+    [self.navigationController pushViewController:comments animated:YES];
+    self.navigationController.navigationItem.rightBarButtonItem.enabled = YES;
+    
+    
+} 
 
 -(void)didSelectSettings{
+    
+    self.navigationController.navigationItem.leftBarButtonItem.enabled = NO;
     SettingsViewController *settings = [[SettingsViewController alloc] init];
     [self.navigationController pushViewController:settings animated:YES];
+    self.navigationController.navigationItem.leftBarButtonItem.enabled = YES;
     
 }
 
diff --git a/UniversityPrograms/UniversityPrograms/UpcomingEventViewController.m b/UniversityPrograms/UniversityPrograms/UpcomingEventViewController.m
index fd23c21..32fc21a 100644
--- a/UniversityPrograms/UniversityPrograms/UpcomingEventViewController.m
+++ b/UniversityPrograms/UniversityPrograms/UpcomingEventViewController.m
@@ -62,6 +62,7 @@ -(void)viewWillAppear:(BOOL)animated{
     if(self.child){
         [self.child viewWillAppear:NO];
     }
+    self.upComingEventsTable.separatorColor = [UIColor getThemeColor];
     self.upComingEventsTable.backgroundColor = [UIColor getStyleColor];
     //[self.upComingEventsTable reloadData];
     //[self.upComingEventsTable scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:NO];
diff --git a/UniversityPrograms/UniversityPrograms/UpcomingEventViewController.xib b/UniversityPrograms/UniversityPrograms/UpcomingEventViewController.xib
index 42f3666..fd63e9e 100644
--- a/UniversityPrograms/UniversityPrograms/UpcomingEventViewController.xib
+++ b/UniversityPrograms/UniversityPrograms/UpcomingEventViewController.xib
@@ -16,7 +16,7 @@
             <rect key="frame" x="0.0" y="64" width="320" height="455"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="180" sectionHeaderHeight="22" sectionFooterHeight="22" id="ce7-1f-JLL">
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" rowHeight="180" sectionHeaderHeight="22" sectionFooterHeight="22" id="ce7-1f-JLL">
                     <rect key="frame" x="0.0" y="0.0" width="320" height="455"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/UniversityPrograms/UniversityPrograms/UpcomingEventsTableViewCell.xib b/UniversityPrograms/UniversityPrograms/UpcomingEventsTableViewCell.xib
index bbe9b8c..1d3478b 100644
--- a/UniversityPrograms/UniversityPrograms/UpcomingEventsTableViewCell.xib
+++ b/UniversityPrograms/UniversityPrograms/UpcomingEventsTableViewCell.xib
@@ -14,7 +14,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="1D3-kb-Q7m">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="179"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="180"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     </imageView>
                     <view contentMode="scaleToFill" id="hTx-Xm-ybH">
@@ -40,7 +40,7 @@
                     </view>
                 </subviews>
             </tableViewCellContentView>
-            <inset key="separatorInset" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/>
+            <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
             <connections>
                 <outlet property="dateLabel" destination="gqM-5I-JXG" id="aWD-EG-Sq8"/>
                 <outlet property="eventImage" destination="1D3-kb-Q7m" id="TUg-5P-6RM"/>
diff --git a/UniversityPrograms/UniversityPrograms/UserInfoViewController.m b/UniversityPrograms/UniversityPrograms/UserInfoViewController.m
index a3b2fef..6d89580 100644
--- a/UniversityPrograms/UniversityPrograms/UserInfoViewController.m
+++ b/UniversityPrograms/UniversityPrograms/UserInfoViewController.m
@@ -20,6 +20,7 @@ @interface UserInfoViewController ()
 @property (weak, nonatomic) IBOutlet UIView *firstDivider;
 @property (weak, nonatomic) IBOutlet UIView *secondDivider;
 @property (weak, nonatomic) IBOutlet UIView *thirdDivider;
+@property (weak, nonatomic) IBOutlet UIView *fourthDivider;
 @property (weak, nonatomic) IBOutlet UILabel *notificationLabel;
 @property UIBarStyle *currentSyle;
 
@@ -55,22 +56,27 @@ - (void)viewDidLoad
     
 }
 -(void)viewWillAppear:(BOOL)animated{
-    self.view.backgroundColor = [UIColor getStyleColor];
-    self.notificationLabel.backgroundColor = [UIColor getStyleColor];
-    self.notificationLabel.textColor = [UIColor getTextColor];
-    self.firstName.textColor = [UIColor getTextColor];
-    self.lastName.textColor = [UIColor getTextColor];
-    self.email.textColor =[UIColor getTextColor];
-    self.cwid.textColor = [UIColor getTextColor];
+    UIColor *themeColor = [UIColor getThemeColor];
+    UIColor *textColor = [UIColor getTextColor];
+    UIColor *styleColor = [UIColor getStyleColor];
+    
+    self.view.backgroundColor = styleColor;
+    self.notificationLabel.backgroundColor = styleColor;
+    self.notificationLabel.textColor = textColor;
+    self.firstName.textColor = textColor;
+    self.lastName.textColor = textColor;
+    self.email.textColor =textColor;
+    self.cwid.textColor = textColor;
     //self.firstName.tintColor = [UIColor getThemeColor];
     
     self.firstName.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"First Name" attributes:@{NSForegroundColorAttributeName: [UIColor lightGrayColor]}];
     self.lastName.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"Last Name" attributes:@{NSForegroundColorAttributeName: [UIColor lightGrayColor]}];
     self.cwid.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"CWID" attributes:@{NSForegroundColorAttributeName: [UIColor lightGrayColor]}];
     self.email.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"Email" attributes:@{NSForegroundColorAttributeName: [UIColor lightGrayColor]}];
-    self.firstDivider.backgroundColor = [UIColor getThemeColor];
-    self.secondDivider.backgroundColor = [UIColor getThemeColor];
-    self.thirdDivider.backgroundColor = [UIColor getThemeColor];
+    self.firstDivider.backgroundColor = themeColor;
+    self.secondDivider.backgroundColor = themeColor;
+    self.thirdDivider.backgroundColor = themeColor;
+    self.fourthDivider.backgroundColor = themeColor;
     if([[NSUserDefaults standardUserDefaults]boolForKey:@"darkMode"]){
         self.email.keyboardAppearance = UIKeyboardAppearanceDark;
         self.cwid.keyboardAppearance = UIKeyboardAppearanceDark;
diff --git a/UniversityPrograms/UniversityPrograms/UserInfoViewController.xib b/UniversityPrograms/UniversityPrograms/UserInfoViewController.xib
index 22352a8..6905ddf 100644
--- a/UniversityPrograms/UniversityPrograms/UserInfoViewController.xib
+++ b/UniversityPrograms/UniversityPrograms/UserInfoViewController.xib
@@ -10,6 +10,7 @@
                 <outlet property="email" destination="679-5I-mib" id="qVe-1N-aij"/>
                 <outlet property="firstDivider" destination="0fK-nT-8Ip" id="BnC-q3-rNR"/>
                 <outlet property="firstName" destination="wOP-gH-6E4" id="0gE-XZ-nyn"/>
+                <outlet property="fourthDivider" destination="lur-LG-SAd" id="y8m-xe-WYu"/>
                 <outlet property="lastName" destination="xj4-CM-k7c" id="crQ-zL-VMp"/>
                 <outlet property="secondDivider" destination="ejK-3p-1Nv" id="yQe-ST-xKt"/>
                 <outlet property="thirdDivider" destination="mIX-DQ-ZRB" id="ikm-t3-2z5"/>
@@ -22,7 +23,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="First Name" minimumFontSize="17" id="wOP-gH-6E4">
-                    <rect key="frame" x="10" y="10" width="300" height="44"/>
+                    <rect key="frame" x="15" y="20" width="300" height="44"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="yes" returnKeyType="next"/>
@@ -31,7 +32,7 @@
                     </connections>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Last Name" minimumFontSize="17" id="xj4-CM-k7c">
-                    <rect key="frame" x="10" y="56" width="300" height="44"/>
+                    <rect key="frame" x="15" y="60" width="300" height="44"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" returnKeyType="next"/>
@@ -40,7 +41,7 @@
                     </connections>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="CWID" minimumFontSize="17" id="r6p-ZG-jEr">
-                    <rect key="frame" x="10" y="102" width="300" height="44"/>
+                    <rect key="frame" x="15" y="100" width="300" height="44"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" returnKeyType="next"/>
@@ -49,7 +50,7 @@
                     </connections>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="student email (@crimson.ua.edu)" minimumFontSize="17" id="679-5I-mib">
-                    <rect key="frame" x="10" y="148" width="300" height="44"/>
+                    <rect key="frame" x="15" y="140" width="300" height="44"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done"/>
@@ -63,15 +64,20 @@
                     <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
                 </view>
                 <view contentMode="scaleToFill" id="ejK-3p-1Nv">
-                    <rect key="frame" x="10" y="101" width="310" height="1"/>
+                    <rect key="frame" x="10" y="95" width="310" height="1"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
                 </view>
                 <view contentMode="scaleToFill" id="mIX-DQ-ZRB">
-                    <rect key="frame" x="10" y="147" width="310" height="1"/>
+                    <rect key="frame" x="10" y="135" width="310" height="1"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
                 </view>
+                <view contentMode="scaleToFill" id="lur-LG-SAd">
+                    <rect key="frame" x="10" y="175" width="310" height="1"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>