Skip to content
Browse files

Changed names of a the scroller and imageView to better fit naming st…

…andards and also removed and added the views back in storyboard to make it work...
  • Loading branch information...
1 parent 6cbd821 commit 70f7f9b38b2b5a7b45d66c6dac32ba0ddf7e5621 @mandelum committed
View
1 .gitignore
@@ -1,2 +1,3 @@
iTid.xcodeproj/project.xcworkspace/xcuserdata
+iTid.xcodeproj/xcuserdata
.DS_Store
View
45 MainStoryboard.storyboard
@@ -126,31 +126,31 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
- <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="redraw" id="ZlL-wF-z9S">
+ <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="xUp-h4-sVO">
<rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Us7-sB-1Kk">
- <rect key="frame" x="0.0" y="0.0" width="40" height="37"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="Timeline-screenshot_03_03.png" id="CXL-hD-ysO">
+ <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </imageView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="P2R-G0-mno">
+ <rect key="frame" x="285" y="133" width="115" height="109"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="21"/>
- <state key="normal" title="X">
- <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+ <state key="normal">
+ <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
- <segue destination="F5x-xh-QlZ" kind="modal" modalTransitionStyle="crossDissolve" id="Lpr-EY-XYz"/>
+ <segue destination="kPs-lR-hUK" kind="modal" modalTransitionStyle="crossDissolve" id="lmI-39-oKa"/>
</connections>
</button>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="Timeline-screenshot_03_03.png" id="qMV-fx-f6b">
- <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- </imageView>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="a0J-Jf-45w">
- <rect key="frame" x="281" y="141" width="125" height="98"/>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Yvs-px-xac">
+ <rect key="frame" x="0.0" y="0.0" width="43" height="38"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal">
@@ -161,7 +161,7 @@
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
- <segue destination="kPs-lR-hUK" kind="modal" modalTransitionStyle="crossDissolve" id="gP3-Uq-Vff"/>
+ <segue destination="F5x-xh-QlZ" kind="modal" modalTransitionStyle="crossDissolve" id="Nic-7f-sjl"/>
</connections>
</button>
</subviews>
@@ -170,15 +170,14 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
</view>
- <navigationItem key="navigationItem" id="2IC-iT-H5f"/>
<nil key="simulatedStatusBarMetrics"/>
<nil key="simulatedTopBarMetrics"/>
<nil key="simulatedBottomBarMetrics"/>
<simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics"/>
<connections>
- <outlet property="imageView" destination="qMV-fx-f6b" id="gqx-bY-auG"/>
- <outlet property="scroller" destination="ZlL-wF-z9S" id="RK6-Q7-X1W"/>
+ <outlet property="TimelineBackground" destination="CXL-hD-ysO" id="lvH-5h-gYq"/>
+ <outlet property="TimelineScrollView" destination="xUp-h4-sVO" id="NAR-J7-9S9"/>
</connections>
</viewController>
</objects>
@@ -2367,7 +2366,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
<relationship kind="outlet" name="EndSwitch" candidateClass="UISwitch"/>
<relationship kind="outlet" name="EndingTailSwitch" candidateClass="UISwitch"/>
<relationship kind="outlet" name="NameOfActivity" candidateClass="UITextField"/>
- <relationship kind="outlet" name="PreperationSwitch" candidateClass="UISwitch"/>
+ <relationship kind="outlet" name="PreparationSwitch" candidateClass="UISwitch"/>
</relationships>
</class>
<class className="FontPickerViewController" superclassName="UITableViewController">
@@ -2397,8 +2396,8 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
<class className="TimelineViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/TimelineViewController.h"/>
<relationships>
- <relationship kind="outlet" name="imageView" candidateClass="UIImageView"/>
- <relationship kind="outlet" name="scroller" candidateClass="UIScrollView"/>
+ <relationship kind="outlet" name="TimelineBackground" candidateClass="UIImageView"/>
+ <relationship kind="outlet" name="TimelineScrollView" candidateClass="UIScrollView"/>
</relationships>
</class>
<class className="WeekdayPickerViewController" superclassName="UITableViewController">
@@ -2412,10 +2411,8 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="bN5-ic-Ppg"/>
- <segue reference="up9-Ob-gJb"/>
<segue reference="prT-ML-b40"/>
- <segue reference="WBG-Cb-cRw"/>
- <segue reference="EK4-r0-ASv"/>
+ <segue reference="p7v-Ek-c4b"/>
<segue reference="tZI-zB-gE4"/>
</inferredMetricsTieBreakers>
</document>
View
9 iTid.xcodeproj/xcuserdata/mandelum.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -2,4 +2,13 @@
<Bucket
type = "1"
version = "1.0">
+ <ExceptionBreakpoints>
+ <ExceptionBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ scope = "0"
+ stopOnStyle = "0">
+ </ExceptionBreakpoint>
+ </ExceptionBreakpoints>
</Bucket>
View
10 iTid/TimelineViewController.h
@@ -1,15 +1,15 @@
//
// TimelineViewController.h
// iTid
-// Robin vill jobba med Timeline kodning
+//
// Created by Robin Brandt on 2012-02-02.
#import <UIKit/UIKit.h>
@interface TimelineViewController : UIViewController
-{
- IBOutlet UIScrollView *scroller;
-}
-@property (weak, nonatomic) IBOutlet UIImageView *imageView;
+@property (weak, nonatomic) IBOutlet UIScrollView *TimelineScrollView;
+@property (weak, nonatomic) IBOutlet UIImageView *TimelineBackground;
+
+
@end
View
17 iTid/TimelineViewController.m
@@ -7,7 +7,9 @@
#import "TimelineViewController.h"
@implementation TimelineViewController
-@synthesize imageView = _imageView;
+@synthesize TimelineScrollView = _TimelineScrollView;
+@synthesize TimelineBackground = _TimelineBackground;
+
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
@@ -28,20 +30,20 @@ - (void)didReceiveMemoryWarning
#pragma mark - View lifecycle
-
+/*
// Implement loadView to create a view hierarchy programmatically, without using a nib.
- (void)loadView
{
}
-
+*/
// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
- (void)viewDidLoad
{
[super viewDidLoad];
- [scroller setScrollEnabled:YES];
- [scroller setContentSize:CGSizeMake(2000, 320)];
+ //[self.TimelineScrollView setScrollEnabled:YES];
+ [self.TimelineScrollView setContentSize:CGSizeMake(1000, 320)];
}
@@ -49,9 +51,8 @@ - (void)viewDidLoad
- (void)viewDidUnload
{
-
-
- [self setImageView:nil];
+ [self setTimelineScrollView:nil];
+ [self setTimelineBackground:nil];
[super viewDidUnload];
// Release any retained subviews of the main view.
// e.g. self.myOutlet = nil;

0 comments on commit 70f7f9b

Please sign in to comment.
Something went wrong with that request. Please try again.