Merge lp:~rockstar/ubuntuone-ios-music/settings-view into lp:ubuntuone-ios-music

[Paul Hummer]

Polish SettingsAuthenticationViewController and SettingsViewController

This branch adds the polish to the SettingsAuthenticationViewController and SettingsViewController.

SettingsAuthenticationViewController's code didn't really change. Just the look changed. Here's some screeshots:

http://ubuntuone.com/7QYUnlpdHl3UxPk3l1hE2A
http://ubuntuone.com/1ltKZCSNmB2MpUuDKRKAMn

The SettingsViewController changed the look, but I added some IBOutlet's for displaying the Version and Bundle Version numbers, as well as displaying how much space is being used by the app, with an option for clearing that cache out. Here's a screenshot:

http://ubuntuone.com/7h4qBXjVj6pDXPtIHFng8Z

[Michał Karnicki (karni)]

review: Approve

=== modified file 'Music/Storyboard_iPhone.storyboard'
--- Music/Storyboard_iPhone.storyboard	2013-01-28 17:45:31 +0000
+++ Music/Storyboard_iPhone.storyboard	2013-01-28 17:45:31 +0000
@@ -614,39 +614,110 @@
                         <rect key="frame" x="0.0" y="20" width="320" height="411"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="2qY-Nn-ktN">
-                                <rect key="frame" x="64" y="68" width="193" height="44"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                            <navigationBar contentMode="scaleToFill" barStyle="blackOpaque" id="fi9-Gu-y7h">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                <items>
+                                    <navigationItem title="Settings" id="1OL-cf-ieJ"/>
+                                </items>
+                            </navigationBar>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Song cache size" lineBreakMode="tailTruncation" minimumFontSize="10" id="PUs-Rk-Zrs">
+                                <rect key="frame" x="20" y="245" width="158" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Album art cache size" lineBreakMode="tailTruncation" minimumFontSize="10" id="oEU-Li-sVc">
+                                <rect key="frame" x="20" y="274" width="158" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" reversesTitleShadowWhenHighlighted="YES" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="LNT-7d-odm">
+                                <rect key="frame" x="64" y="303" width="193" height="32"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" red="0.86666673419999996" green="0.2823529541" blue="0.078431375319999996" alpha="1" colorSpace="deviceRGB"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="14"/>
+                                <state key="normal" title="Clear all caches">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <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>
+                                    <action selector="deleteCaches:" destination="1UW-CE-b1Y" eventType="touchUpInside" id="1Gj-ny-7JM"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" reversesTitleShadowWhenHighlighted="YES" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="863-4b-UXs">
+                                <rect key="frame" x="64" y="134" width="193" height="32"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" red="0.86666673419999996" green="0.2823529541" blue="0.078431375319999996" alpha="1" colorSpace="deviceRGB"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="14"/>
                                 <state key="normal" title="Sign out of Ubuntu One">
-                                    <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <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>
-                                    <action selector="deleteCredentials:" destination="1UW-CE-b1Y" eventType="touchUpInside" id="dMs-la-BSc"/>
+                                    <action selector="deleteCredentials:" destination="1UW-CE-b1Y" eventType="touchUpInside" id="M8K-LG-oBl"/>
                                 </connections>
                             </button>
-                            <navigationBar contentMode="scaleToFill" barStyle="blackOpaque" id="fi9-Gu-y7h">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                <items>
-                                    <navigationItem title="Settings" id="1OL-cf-ieJ">
-                                        <barButtonItem key="rightBarButtonItem" title="About" id="5t4-pZ-HZ3">
-                                            <connections>
-                                                <segue destination="XwX-yD-gmZ" kind="modal" identifier="AboutSegue" id="q67-cb-9ch"/>
-                                            </connections>
-                                        </barButtonItem>
-                                    </navigationItem>
-                                </items>
-                            </navigationBar>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Build number" lineBreakMode="tailTruncation" minimumFontSize="10" id="QdR-b3-4bk">
+                                <rect key="frame" x="20" y="105" width="158" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Version number" lineBreakMode="tailTruncation" minimumFontSize="10" id="Qow-i4-9k0">
+                                <rect key="frame" x="20" y="76" width="158" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1.0" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="10" id="cOm-2r-Il3">
+                                <rect key="frame" x="186" y="76" width="114" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="69" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="10" id="mm9-ic-ZRm">
+                                <rect key="frame" x="186" y="105" width="114" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="800MB" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="10" id="lVK-6h-cMd">
+                                <rect key="frame" x="186" y="245" width="114" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="40MB" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="10" id="YkC-kB-145">
+                                <rect key="frame" x="186" y="274" width="114" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="Settings" image="settings.png" id="PuB-gs-lxg"/>
                     <connections>
+                        <outlet property="artCacheSize" destination="YkC-kB-145" id="jvN-6G-FSp"/>
+                        <outlet property="buildNumber" destination="mm9-ic-ZRm" id="b6H-Qo-xNW"/>
+                        <outlet property="songCacheSize" destination="lVK-6h-cMd" id="MiM-1J-9Ww"/>
+                        <outlet property="versionNumber" destination="cOm-2r-Il3" id="ith-pv-96x"/>
                         <segue destination="iRB-yQ-1TX" kind="modal" identifier="AuthenticationSegue" id="HlT-h9-MTb"/>
                     </connections>
                 </viewController>
@@ -662,45 +733,69 @@
                         <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Username" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZEC-2H-d7Z">
-                                <rect key="frame" x="121" y="20" width="79" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UfC-eE-bcj">
-                                <rect key="frame" x="123" y="87" width="75" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="waC-mM-MFm">
-                                <rect key="frame" x="20" y="116" width="280" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
-                            </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="9eo-83-zSr">
-                                <rect key="frame" x="20" y="49" width="280" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress" returnKeyType="next"/>
-                            </textField>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="du9-HJ-oTk">
-                                <rect key="frame" x="126" y="154" width="69" height="44"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                <state key="normal" title="Log In">
-                                    <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+                            <view contentMode="scaleToFill" id="br3-co-Aht">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" id="lUF-KI-wuR">
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <subviews>
+                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Log in to Ubuntu One" lineBreakMode="tailTruncation" minimumFontSize="10" id="m0d-R2-p4A">
+                                                <rect key="frame" x="69" y="11" width="182" height="22"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <nil key="highlightedColor"/>
+                                                <color key="shadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                <size key="shadowOffset" width="0.0" height="0.0"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" red="0.86666673419999996" green="0.2823529541" blue="0.078431375319999996" alpha="1" colorSpace="deviceRGB"/>
+                            </view>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="[e-mail]" minimumFontSize="17" id="JoC-hu-hLx">
+                                <rect key="frame" x="120" y="58" width="180" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="12"/>
+                                <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress"/>
+                            </textField>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="password" minimumFontSize="17" id="Ks6-tM-pWd">
+                                <rect key="frame" x="120" y="97" width="180" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
+                            </textField>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Email address:" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="10" id="dLK-0a-SBm">
+                                <rect key="frame" x="13" y="62" width="101" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Password:" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="10" id="tPE-XB-SZr">
+                                <rect key="frame" x="13" y="101" width="101" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" reversesTitleShadowWhenHighlighted="YES" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="tcx-D1-zOs">
+                                <rect key="frame" x="180" y="143" width="120" height="32"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" red="0.86666673419999996" green="0.2823529541" blue="0.078431375319999996" alpha="1" colorSpace="deviceRGB"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="14"/>
+                                <state key="normal" title="Log in">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <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>
-                                    <action selector="authenticate:" destination="iRB-yQ-1TX" eventType="touchUpInside" id="Sfs-XA-OBI"/>
+                                    <action selector="authenticate:" destination="iRB-yQ-1TX" eventType="touchUpInside" id="w5w-kg-773"/>
                                 </connections>
                             </button>
                             <view hidden="YES" alpha="0.70000000000000007" contentMode="scaleToFill" id="KV8-kp-weQ">
@@ -720,55 +815,16 @@
                     <navigationItem key="navigationItem" title="Log In" id="lZr-l9-Rd0"/>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <connections>
-                        <outlet property="passwordField" destination="waC-mM-MFm" id="J4I-c0-hPj"/>
+                        <outlet property="passwordField" destination="Ks6-tM-pWd" id="gGt-DG-MeG"/>
                         <outlet property="shade" destination="KV8-kp-weQ" id="HgB-zm-dOv"/>
                         <outlet property="spinner" destination="ixc-ts-ry3" id="Zjn-Dn-l1x"/>
-                        <outlet property="usernameField" destination="9eo-83-zSr" id="k5m-z6-dNf"/>
+                        <outlet property="usernameField" destination="JoC-hu-hLx" id="GNM-ip-H5g"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Oct-dr-Jot" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="1047" y="2638"/>
         </scene>
-        <!--Settings About View Controller - Ubuntu One Music-->
-        <scene sceneID="DCB-cK-aCY">
-            <objects>
-                <viewController storyboardIdentifier="SettingsAboutViewController" title="Ubuntu One Music" useStoryboardIdentifierAsRestorationIdentifier="YES" id="XwX-yD-gmZ" customClass="SettingsAboutViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="ezs-Zb-PEL">
-                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="4sj-Hk-nsd">
-                                <rect key="frame" x="130" y="248" width="62" height="44"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                <state key="normal" title="Done">
-                                    <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>
-                                    <action selector="close:" destination="XwX-yD-gmZ" eventType="touchUpInside" id="GOR-Ec-Jnn"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="Ubuntu One Music" id="mZO-nv-iEf">
-                        <barButtonItem key="rightBarButtonItem" title="Done" id="sDu-OP-vCU">
-                            <connections>
-                                <action selector="close:" destination="XwX-yD-gmZ" id="3kP-cf-7xQ"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
-                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Gk9-4p-GpB" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1047" y="3324"/>
-        </scene>
         <!--Navigation Controller - Songs-->
         <scene sceneID="H5C-K6-iJr">
             <objects>
@@ -818,114 +874,6 @@
         <image name="settings.png" width="30" height="30"/>
         <image name="songs.png" width="30" height="30"/>
     </resources>
-    <classes>
-        <class className="AlbumCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumCell.h"/>
-        </class>
-        <class className="AlbumViewController" superclassName="SubsonicTableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="albumDescription" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="albumTitle" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="AlbumsViewController" superclassName="UOIndexedViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumsViewController.h"/>
-        </class>
-        <class className="ArtistCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistCell.h"/>
-        </class>
-        <class className="ArtistViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="artistDescription" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="artistName" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="ArtistsViewController" superclassName="UOIndexedViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistsViewController.h"/>
-        </class>
-        <class className="PlayerHeaderView" superclassName="UIView">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerHeaderView.h"/>
-            <relationships>
-                <relationship kind="outlet" name="album" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="artist" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="title" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="PlayerViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="hide:"/>
-                <relationship kind="action" name="next:"/>
-                <relationship kind="action" name="pause:"/>
-                <relationship kind="action" name="play:"/>
-                <relationship kind="action" name="previous:"/>
-                <relationship kind="outlet" name="albumart" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="artistLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="controlBar" candidateClass="UIToolbar"/>
-                <relationship kind="outlet" name="nextButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="pauseButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="playButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="previousButton" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="PlaylistCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistCell.h"/>
-        </class>
-        <class className="PlaylistsViewController" superclassName="UOIndexedViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistsViewController.h"/>
-        </class>
-        <class className="SettingsAboutViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAboutViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="close:"/>
-            </relationships>
-        </class>
-        <class className="SettingsAuthenticationViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAuthenticationViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="authenticate:"/>
-                <relationship kind="outlet" name="passwordField" candidateClass="UITextField"/>
-                <relationship kind="outlet" name="shade" candidateClass="UIView"/>
-                <relationship kind="outlet" name="spinner" candidateClass="UIActivityIndicatorView"/>
-                <relationship kind="outlet" name="usernameField" candidateClass="UITextField"/>
-            </relationships>
-        </class>
-        <class className="SettingsViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="deleteCredentials:"/>
-            </relationships>
-        </class>
-        <class className="SongCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SongCell.h"/>
-            <relationships>
-                <relationship kind="outlet" name="cacheImageIndicator" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="cacheIndicator" candidateClass="UIView"/>
-                <relationship kind="outlet" name="clock" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="handle" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="title" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="topView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="track" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="SongsViewController" superclassName="UOIndexedViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SongsViewController.h"/>
-        </class>
-        <class className="UOIndexedViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/UOIndexedViewController.h"/>
-            <relationships>
-                <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>

=== modified file 'Music/View Controllers/SettingsViewController.m'
--- Music/View Controllers/SettingsViewController.m	2013-01-22 19:50:43 +0000
+++ Music/View Controllers/SettingsViewController.m	2013-01-28 17:45:31 +0000
@@ -8,40 +8,31 @@
 
 #import "SettingsViewController.h"
 #import "UOAuthManager.h"
+#import "UOAppDelegate.h"
 
 @interface SettingsViewController ()
 - (IBAction)deleteCredentials:(id)sender;
+- (IBAction)deleteCaches:(id)sender;
+
+@property (nonatomic, weak) IBOutlet UILabel *versionNumber;
+@property (nonatomic, weak) IBOutlet UILabel *buildNumber;
+@property (nonatomic, weak) IBOutlet UILabel *songCacheSize;
+@property (nonatomic, weak) IBOutlet UILabel *artCacheSize;
 
 @end
 
 @implementation SettingsViewController
 
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-	// Do any additional setup after loading the view.
-}
-
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
+    
+    self.versionNumber.text = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
+    self.buildNumber.text = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey];
+    [self updateCacheSizes];
+    
     [self checkAuthentication];
 }
 
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
 #pragma mark - Actions
 
 - (IBAction)deleteCredentials:(id)sender {
@@ -49,6 +40,20 @@
     [self checkAuthentication];
 }
 
+- (IBAction)deleteCaches:(id)sender {
+    NSArray *cacheDirectories = @[
+        [[UOAppDelegate delegate] songDirectory],
+        [[UOAppDelegate delegate] albumArtDirectory]
+    ];
+    
+    NSError *error = nil;
+    for (NSURL *directory in cacheDirectories) {
+        [[NSFileManager defaultManager] removeItemAtURL:directory error:&error];
+        [[NSFileManager defaultManager] createDirectoryAtPath:[directory path] withIntermediateDirectories:YES attributes:nil error:&error];
+    }
+    [self updateCacheSizes];
+}
+
 #pragma mark - Private methods
 
 - (void)checkAuthentication {
@@ -57,4 +62,30 @@
     }
 }
 
+- (void)updateCacheSizes {	
+    double artCacheSize = [self getFolderSize:[[[UOAppDelegate delegate] albumArtDirectory] path]];
+	self.artCacheSize.text = [NSString stringWithFormat:@"%.2f MB",((artCacheSize / 1024.0f) / 1024.0f)];
+    
+    double offlineCacheSize = [self getFolderSize:[[[UOAppDelegate delegate] songDirectory] path]];
+    self.songCacheSize.text = [NSString stringWithFormat:@"%.2f MB", ((offlineCacheSize / 1024.0f) / 1024.0f)];
+}
+
+- (double)getFolderSize:(NSString *)path {
+    static int minBlock = 4096;
+	
+	NSString *file = nil;
+	NSDictionary *fileAttrs = nil;
+	double totalSize = 0;
+	
+	NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:path];
+	
+	while (file = [enumerator nextObject]) {
+		fileAttrs = [enumerator fileAttributes];
+		if (![[fileAttrs valueForKey:NSFileType] isEqual:NSFileTypeDirectory]) {
+			totalSize += ((([[fileAttrs valueForKey:NSFileSize] unsignedIntValue] + minBlock - 1) / minBlock) * minBlock);
+		}
+	}
+    return totalSize;
+}
+
 @end

=== modified file 'U1Music-Info.plist'
--- U1Music-Info.plist	2013-01-22 19:50:43 +0000
+++ U1Music-Info.plist	2013-01-28 17:45:31 +0000
@@ -24,7 +24,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4</string>
+	<string>3.0b1</string>
 	<key>CFBundleSignature</key>
 	<string>UOMS</string>
 	<key>CFBundleURLTypes</key>