summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Fenrich <Fenrich@Gmail.com>2013-06-14 08:03:00 -0600
committerRonny Fenrich <Fenrich@Gmail.com>2013-06-14 08:03:00 -0600
commit0d40c8c8a1850559a9204b717585ba42ad4f2e9f (patch)
tree3bface71d8577543c71bd5924414faa1f06a1821
parent2b581c85487287d3fb03396e4b13c304bdffa6ab (diff)
prettified UI
-rw-r--r--Volta.xcodeproj/project.pbxproj16
-rw-r--r--Volta/Images/arc.pngbin63488 -> 0 bytes
-rw-r--r--Volta/Images/grass2@2x.jpgbin0 -> 253804 bytes
-rw-r--r--Volta/Images/grass@2x.jpgbin0 -> 220005 bytes
-rw-r--r--Volta/Images/logo@2x.pngbin0 -> 4368 bytes
-rw-r--r--Volta/Views/LoginViewController.m3
-rw-r--r--Volta/Views/StatsViewController.m10
-rw-r--r--Volta/en.lproj/MainStoryboard.storyboard78
8 files changed, 61 insertions, 46 deletions
diff --git a/Volta.xcodeproj/project.pbxproj b/Volta.xcodeproj/project.pbxproj
index 0ca9851..37c6dcf 100644
--- a/Volta.xcodeproj/project.pbxproj
+++ b/Volta.xcodeproj/project.pbxproj
@@ -30,9 +30,11 @@
E31FF049176A5677009E4D27 /* UIView+Decoder.m in Sources */ = {isa = PBXBuildFile; fileRef = E31FF035176A5677009E4D27 /* UIView+Decoder.m */; };
E31FF04A176A5677009E4D27 /* MGOrderedDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = E31FF03A176A5677009E4D27 /* MGOrderedDictionary.m */; };
E31FF04B176A5677009E4D27 /* SSKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = E31FF03D176A5677009E4D27 /* SSKeychain.m */; };
- E31FF04F176A5B93009E4D27 /* arc.png in Resources */ = {isa = PBXBuildFile; fileRef = E31FF04E176A5B93009E4D27 /* arc.png */; };
E31FF052176A5D9D009E4D27 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E31FF051176A5D9D009E4D27 /* LoginViewController.m */; };
E31FF055176A760D009E4D27 /* StatsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E31FF054176A760D009E4D27 /* StatsViewController.m */; };
+ E31FF057176B551D009E4D27 /* grass@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E31FF056176B551D009E4D27 /* grass@2x.jpg */; };
+ E31FF059176B5639009E4D27 /* logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E31FF058176B5639009E4D27 /* logo@2x.png */; };
+ E31FF05B176B58BC009E4D27 /* grass2@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E31FF05A176B58BC009E4D27 /* grass2@2x.jpg */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -75,11 +77,13 @@
E31FF03A176A5677009E4D27 /* MGOrderedDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGOrderedDictionary.m; sourceTree = "<group>"; };
E31FF03C176A5677009E4D27 /* SSKeychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSKeychain.h; sourceTree = "<group>"; };
E31FF03D176A5677009E4D27 /* SSKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSKeychain.m; sourceTree = "<group>"; };
- E31FF04E176A5B93009E4D27 /* arc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arc.png; sourceTree = "<group>"; };
E31FF050176A5D9D009E4D27 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
E31FF051176A5D9D009E4D27 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
E31FF053176A760D009E4D27 /* StatsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatsViewController.h; sourceTree = "<group>"; };
E31FF054176A760D009E4D27 /* StatsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatsViewController.m; sourceTree = "<group>"; };
+ E31FF056176B551D009E4D27 /* grass@2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "grass@2x.jpg"; sourceTree = "<group>"; };
+ E31FF058176B5639009E4D27 /* logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo@2x.png"; sourceTree = "<group>"; };
+ E31FF05A176B58BC009E4D27 /* grass2@2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "grass2@2x.jpg"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -254,7 +258,9 @@
E31FF04D176A56D5009E4D27 /* Images */ = {
isa = PBXGroup;
children = (
- E31FF04E176A5B93009E4D27 /* arc.png */,
+ E31FF05A176B58BC009E4D27 /* grass2@2x.jpg */,
+ E31FF056176B551D009E4D27 /* grass@2x.jpg */,
+ E31FF058176B5639009E4D27 /* logo@2x.png */,
);
path = Images;
sourceTree = "<group>";
@@ -318,7 +324,9 @@
E31FF015176A5521009E4D27 /* Default-568h@2x.png in Resources */,
E31FF018176A5521009E4D27 /* MainStoryboard.storyboard in Resources */,
E31FF042176A5677009E4D27 /* readme.md in Resources */,
- E31FF04F176A5B93009E4D27 /* arc.png in Resources */,
+ E31FF057176B551D009E4D27 /* grass@2x.jpg in Resources */,
+ E31FF059176B5639009E4D27 /* logo@2x.png in Resources */,
+ E31FF05B176B58BC009E4D27 /* grass2@2x.jpg in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/Volta/Images/arc.png b/Volta/Images/arc.png
deleted file mode 100644
index 7163f9a..0000000
--- a/Volta/Images/arc.png
+++ /dev/null
Binary files differ
diff --git a/Volta/Images/grass2@2x.jpg b/Volta/Images/grass2@2x.jpg
new file mode 100644
index 0000000..4b434f0
--- /dev/null
+++ b/Volta/Images/grass2@2x.jpg
Binary files differ
diff --git a/Volta/Images/grass@2x.jpg b/Volta/Images/grass@2x.jpg
new file mode 100644
index 0000000..0c366d9
--- /dev/null
+++ b/Volta/Images/grass@2x.jpg
Binary files differ
diff --git a/Volta/Images/logo@2x.png b/Volta/Images/logo@2x.png
new file mode 100644
index 0000000..46fddf0
--- /dev/null
+++ b/Volta/Images/logo@2x.png
Binary files differ
diff --git a/Volta/Views/LoginViewController.m b/Volta/Views/LoginViewController.m
index 4ae5862..ba1c86b 100644
--- a/Volta/Views/LoginViewController.m
+++ b/Volta/Views/LoginViewController.m
@@ -25,7 +25,6 @@
{
[super viewDidLoad];
-
UIView *emailPaddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)];
self.email.leftView = emailPaddingView;
self.email.leftViewMode = UITextFieldViewModeAlways;
@@ -103,7 +102,7 @@
{
[UIView animateWithDuration:HUD_ANIMATION_DURATION animations:^{
- self.contentView.$y = (-1) * self.logo.$height - 10;
+ self.contentView.$y = -116;
}];
}
diff --git a/Volta/Views/StatsViewController.m b/Volta/Views/StatsViewController.m
index baa1976..3862ad1 100644
--- a/Volta/Views/StatsViewController.m
+++ b/Volta/Views/StatsViewController.m
@@ -26,6 +26,16 @@
self.navigationController.navigationBarHidden = NO;
self.navigationItem.hidesBackButton = YES;
self.navigationController.navigationBar.barStyle = UIBarStyleBlack;
+
+ UIView *paddingView1 = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)];
+ self.startDate.leftView = paddingView1;
+ self.startDate.leftViewMode = UITextFieldViewModeAlways;
+
+ UIView *paddingView2 = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)];
+ self.endDate.leftView = paddingView2;
+ self.endDate.leftViewMode = UITextFieldViewModeAlways;
+
+ self.content.$y = 0;
}
- (IBAction)statsCurrentMonth:(id)sender
diff --git a/Volta/en.lproj/MainStoryboard.storyboard b/Volta/en.lproj/MainStoryboard.storyboard
index dafe5e6..cbe17dd 100644
--- a/Volta/en.lproj/MainStoryboard.storyboard
+++ b/Volta/en.lproj/MainStoryboard.storyboard
@@ -12,46 +12,39 @@
<rect key="frame" x="0.0" y="20" width="480" height="300"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" image="grass@2x.jpg" id="Ixb-r1-Hqj">
+ <rect key="frame" x="0.0" y="0.0" width="480" height="300"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </imageView>
<view contentMode="scaleToFill" id="uqJ-49-w8p">
<rect key="frame" x="0.0" y="0.0" width="480" height="241"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" image="arc.png" id="Ixb-r1-Hqj">
- <rect key="frame" x="0.0" y="-5" width="480" height="100"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- </imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email address" minimumFontSize="17" clearButtonMode="whileEditing" id="4Wx-1t-eWb">
- <rect key="frame" x="64" y="158" width="170" height="30"/>
+ <rect key="frame" x="155" y="130" width="170" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<textInputTraits key="textInputTraits" returnKeyType="next"/>
<connections>
<outlet property="delegate" destination="2" id="KQv-28-eUu"/>
</connections>
</textField>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" minimumFontSize="17" clearButtonMode="whileEditing" id="8gW-e7-dmr">
- <rect key="frame" x="245" y="158" width="170" height="30"/>
+ <rect key="frame" x="155" y="167" width="170" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<textInputTraits key="textInputTraits" returnKeyType="go" secureTextEntry="YES"/>
<connections>
<outlet property="delegate" destination="2" id="Rn3-Vi-9zm"/>
</connections>
</textField>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please login to your Volta account..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4Qw-4O-HqB">
- <rect key="frame" x="0.0" y="114" width="480" height="29"/>
- <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="21"/>
- <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
- <nil key="highlightedColor"/>
- </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="qNQ-ju-GIV">
- <rect key="frame" x="159" y="204" width="162" height="34"/>
+ <rect key="frame" x="155" y="204" width="170" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" red="0.074509806931018829" green="0.062745101749897003" blue="0.29019609093666077" alpha="1" colorSpace="deviceRGB"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <color key="backgroundColor" red="0.26666666666666666" green="0.70588235294117652" blue="0.61176470588235299" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Login...">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -63,6 +56,10 @@
<action selector="login:" destination="2" eventType="touchUpInside" id="nPu-5G-s8p"/>
</connections>
</button>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="logo@2x.png" id="kiQ-eY-yKl">
+ <rect key="frame" x="165" y="13" width="150" height="106"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ </imageView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
@@ -152,6 +149,10 @@
<rect key="frame" x="0.0" y="64" width="480" height="256"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" image="grass2@2x.jpg" id="2hC-7o-OtM">
+ <rect key="frame" x="0.0" y="0.0" width="480" height="256"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </imageView>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="UXO-Vt-5K9">
<rect key="frame" x="0.0" y="0.0" width="480" height="256"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -160,7 +161,7 @@
<rect key="frame" x="72" y="185" width="120" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <fontDescription key="fontDescription" type="system" pointSize="18"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<textInputTraits key="textInputTraits" returnKeyType="next"/>
<connections>
<outlet property="delegate" destination="lv2-8L-bY1" id="6TX-S1-CNs"/>
@@ -169,8 +170,8 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="cuU-tX-8gu">
<rect key="frame" x="368" y="183" width="92" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <color key="backgroundColor" red="0.2666666667" green="0.70588235290000001" blue="0.61176470589999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Go">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -185,8 +186,8 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="PJM-6d-TeN">
<rect key="frame" x="20" y="99" width="440" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <color key="backgroundColor" red="0.2666666667" green="0.70588235290000001" blue="0.61176470589999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Last 60 days">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -201,8 +202,8 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="X35-Uk-NCu">
<rect key="frame" x="20" y="141" width="440" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <color key="backgroundColor" red="0.2666666667" green="0.70588235290000001" blue="0.61176470589999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Current Year (2013)">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -217,8 +218,8 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="hCt-Nf-lhx">
<rect key="frame" x="20" y="56" width="440" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <color key="backgroundColor" red="0.2666666667" green="0.70588235290000001" blue="0.61176470589999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Last 30 days">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -231,10 +232,10 @@
</connections>
</button>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="End Date" minimumFontSize="17" id="7zh-ce-be2">
- <rect key="frame" x="240" y="185" width="120" height="30"/>
+ <rect key="frame" x="232" y="185" width="120" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <fontDescription key="fontDescription" type="system" pointSize="18"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<textInputTraits key="textInputTraits" returnKeyType="next"/>
<connections>
<outlet property="delegate" destination="lv2-8L-bY1" id="aNe-SM-ZxM"/>
@@ -243,8 +244,8 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="Prl-07-V0C">
<rect key="frame" x="20" y="14" width="440" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
- <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <color key="backgroundColor" red="0.2666666667" green="0.70588235290000001" blue="0.61176470589999998" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<state key="normal" title="Current Month (June 2013)">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -259,14 +260,14 @@
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="From" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0zU-1a-0yD">
<rect key="frame" x="23" y="189" width="40" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="to" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GM9-Lw-EXV">
- <rect key="frame" x="205" y="189" width="23" height="21"/>
+ <rect key="frame" x="206" y="189" width="23" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
@@ -311,7 +312,9 @@
</scene>
</scenes>
<resources>
- <image name="arc.png" width="624" height="100"/>
+ <image name="grass2@2x.jpg" width="1100" height="846"/>
+ <image name="grass@2x.jpg" width="1100" height="846"/>
+ <image name="logo@2x.png" width="234" height="166"/>
</resources>
<classes>
<class className="LoginViewController" superclassName="UIViewController">
@@ -329,11 +332,6 @@
<class className="StatsViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/StatsViewController.h"/>
<relationships>
- <relationship kind="action" name="statsCurrentMonth:"/>
- <relationship kind="action" name="statsCurrentYear:"/>
- <relationship kind="action" name="statsLast30days:"/>
- <relationship kind="action" name="statsLast60days:"/>
- <relationship kind="action" name="statsStartdateEnddate:"/>
<relationship kind="outlet" name="content" candidateClass="UIScrollView"/>
<relationship kind="outlet" name="endDate" candidateClass="UITextField"/>
<relationship kind="outlet" name="startDate" candidateClass="UITextField"/>