put progressview back into storyboard to fix layout that is no longer…

… working
johnhartman · Sep 23, 2015 · 2944efd · 2944efd
1 parent f12dc5b
commit 2944efd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/Classy/Base.lproj/classy.storyboard b/Classy/Base.lproj/classy.storyboard
@@ -116,6 +116,7 @@
                         <outlet property="currentActivityLabel" destination="BgS-du-i0y" id="AlN-om-RZC"/>
                         <outlet property="nextActivityLabel" destination="ASE-1B-eKw" id="dnP-Ci-mnU"/>
                         <outlet property="nextActivityStartTimeLabel" destination="xqP-zY-dkd" id="qIL-KZ-Jqw"/>
+                        <outlet property="progressView" destination="lPY-sK-2S0" id="Vcj-uf-Mfk"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>

diff --git a/Classy/Classy-Info.plist b/Classy/Classy-Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>2</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Classy/ClassyViewController.h b/Classy/ClassyViewController.h
@@ -14,6 +14,7 @@
     IBOutlet UILabel* currentActivityLabel;
     IBOutlet UILabel* nextActivityLabel;
     IBOutlet UILabel* nextActivityStartTimeLabel;
+    IBOutlet UIProgressView* progressView;
 
     NSTimer* countdownTimer;
 }

diff --git a/Classy/ClassyViewController.m b/Classy/ClassyViewController.m
@@ -26,11 +26,6 @@ - (void)viewDidLoad
     [super viewDidLoad];
 
     [self setTimer];
-
-    self.progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
-
-    self.progressView.center = self.view.center;
-    [self.view addSubview:self.progressView];
 }
 
 // COUNTDOWN CODE