Browse Source

Menu: updated color scheme

Felix Paul Kühne 12 years ago
parent
commit
f18ed1ddcf

+ 5 - 5
AspenProject/VLCMenuTableViewController.m

@@ -71,7 +71,7 @@
 	_tableView.delegate = self;
 	_tableView.delegate = self;
 	_tableView.dataSource = self;
 	_tableView.dataSource = self;
 	_tableView.autoresizingMask = UIViewAutoresizingFlexibleHeight;
 	_tableView.autoresizingMask = UIViewAutoresizingFlexibleHeight;
-	_tableView.backgroundColor = [UIColor clearColor];
+	_tableView.backgroundColor = [UIColor colorWithRed:(43.0f/255.0f) green:(43.0f/255.0f) blue:(43.0f/255.0f) alpha:1.0f];
 	_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
 	_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     _tableView.rowHeight = [VLCWiFiUploadTableViewCell heightOfCell];
     _tableView.rowHeight = [VLCWiFiUploadTableViewCell heightOfCell];
 
 
@@ -195,8 +195,8 @@
 		CAGradientLayer *gradient = [CAGradientLayer layer];
 		CAGradientLayer *gradient = [CAGradientLayer layer];
 		gradient.frame = headerView.bounds;
 		gradient.frame = headerView.bounds;
 		gradient.colors = @[
 		gradient.colors = @[
-                      (id)[UIColor colorWithRed:(67.0f/255.0f) green:(74.0f/255.0f) blue:(94.0f/255.0f) alpha:1.0f].CGColor,
-                      (id)[UIColor colorWithRed:(57.0f/255.0f) green:(64.0f/255.0f) blue:(82.0f/255.0f) alpha:1.0f].CGColor,
+                      (id)[UIColor colorWithRed:(66.0f/255.0f) green:(66.0f/255.0f) blue:(66.0f/255.0f) alpha:1.0f].CGColor,
+                      (id)[UIColor colorWithRed:(56.0f/255.0f) green:(56.0f/255.0f) blue:(56.0f/255.0f) alpha:1.0f].CGColor,
                       ];
                       ];
 		[headerView.layer insertSublayer:gradient atIndex:0];
 		[headerView.layer insertSublayer:gradient atIndex:0];
 
 
@@ -210,11 +210,11 @@
 		[headerView addSubview:textLabel];
 		[headerView addSubview:textLabel];
 
 
 		UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
 		UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
-		topLine.backgroundColor = [UIColor colorWithRed:(78.0f/255.0f) green:(86.0f/255.0f) blue:(103.0f/255.0f) alpha:1.0f];
+		topLine.backgroundColor = [UIColor colorWithRed:(95.0f/255.0f) green:(95.0f/255.0f) blue:(95.0f/255.0f) alpha:1.0f];
 		[headerView addSubview:topLine];
 		[headerView addSubview:topLine];
 
 
 		UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 21.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
 		UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 21.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
-		bottomLine.backgroundColor = [UIColor colorWithRed:(36.0f/255.0f) green:(42.0f/255.0f) blue:(5.0f/255.0f) alpha:1.0f];
+		bottomLine.backgroundColor = [UIColor colorWithRed:(16.0f/255.0f) green:(16.0f/255.0f) blue:(16.0f/255.0f) alpha:1.0f];
 		[headerView addSubview:bottomLine];
 		[headerView addSubview:bottomLine];
 	}
 	}
 	return headerView;
 	return headerView;

+ 4 - 6
AspenProject/VLCWiFiUploadTableViewCell.m

@@ -29,20 +29,18 @@
     self.titleLabel.shadowColor = [UIColor colorWithWhite:0.0f alpha:0.25f];
     self.titleLabel.shadowColor = [UIColor colorWithWhite:0.0f alpha:0.25f];
     self.titleLabel.textColor = [UIColor colorWithRed:(196.0f/255.0f) green:(204.0f/255.0f) blue:(218.0f/255.0f) alpha:1.0f];
     self.titleLabel.textColor = [UIColor colorWithRed:(196.0f/255.0f) green:(204.0f/255.0f) blue:(218.0f/255.0f) alpha:1.0f];
 
 
+    self.backgroundColor = [UIColor colorWithRed:(43.0f/255.0f) green:(43.0f/255.0f) blue:(43.0f/255.0f) alpha:1.0f];
+
     self.uploadAddressLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
     self.uploadAddressLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
     self.uploadAddressLabel.shadowColor = [UIColor colorWithWhite:0.0f alpha:0.25f];
     self.uploadAddressLabel.shadowColor = [UIColor colorWithWhite:0.0f alpha:0.25f];
     self.uploadAddressLabel.textColor = [UIColor colorWithRed:(196.0f/255.0f) green:(204.0f/255.0f) blue:(218.0f/255.0f) alpha:1.0f];
     self.uploadAddressLabel.textColor = [UIColor colorWithRed:(196.0f/255.0f) green:(204.0f/255.0f) blue:(218.0f/255.0f) alpha:1.0f];
 
 
     UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
     UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
-    topLine.backgroundColor = [UIColor colorWithRed:(54.0f/255.0f) green:(61.0f/255.0f) blue:(76.0f/255.0f) alpha:1.0f];
+    topLine.backgroundColor = [UIColor colorWithRed:(16.0f/255.0f) green:(16.0f/255.0f) blue:(16.0f/255.0f) alpha:1.0f];
     [self.titleLabel.superview addSubview:topLine];
     [self.titleLabel.superview addSubview:topLine];
 
 
-    UIView *topLine2 = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 1.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
-    topLine2.backgroundColor = [UIColor colorWithRed:(54.0f/255.0f) green:(61.0f/255.0f) blue:(77.0f/255.0f) alpha:1.0f];
-    [self.titleLabel.superview addSubview:topLine2];
-
     UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 50.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
     UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 50.0f, [UIScreen mainScreen].bounds.size.height, 1.0f)];
-    bottomLine.backgroundColor = [UIColor colorWithRed:(40.0f/255.0f) green:(47.0f/255.0f) blue:(61.0f/255.0f) alpha:1.0f];
+    bottomLine.backgroundColor = [UIColor colorWithRed:(23.0f/255.0f) green:(23.0f/255.0f) blue:(23.0f/255.0f) alpha:1.0f];
     [self.titleLabel.superview addSubview:bottomLine];
     [self.titleLabel.superview addSubview:bottomLine];
 }
 }
 
 

+ 25 - 1
Resources/VLCDownloadViewController.xib

@@ -50,6 +50,7 @@
 								<int key="NSvFlags">290</int>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 101}</string>
 								<string key="NSFrameSize">{320, 101}</string>
 								<reference key="NSSuperview" ref="234033301"/>
 								<reference key="NSSuperview" ref="234033301"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="205664075"/>
 								<reference key="NSNextKeyView" ref="205664075"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -64,6 +65,7 @@
 								<int key="NSvFlags">290</int>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{10, 15}, {195, 30}}</string>
 								<string key="NSFrame">{{10, 15}, {195, 30}}</string>
 								<reference key="NSSuperview" ref="234033301"/>
 								<reference key="NSSuperview" ref="234033301"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="325478617"/>
 								<reference key="NSNextKeyView" ref="325478617"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIOpaque">NO</bool>
@@ -105,6 +107,7 @@
 								<int key="NSvFlags">289</int>
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{213, 11}, {97, 39}}</string>
 								<string key="NSFrame">{{213, 11}, {97, 39}}</string>
 								<reference key="NSSuperview" ref="234033301"/>
 								<reference key="NSSuperview" ref="234033301"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1066205493"/>
 								<reference key="NSNextKeyView" ref="1066205493"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIOpaque">NO</bool>
@@ -143,6 +146,7 @@
 								<int key="NSvFlags">274</int>
 								<int key="NSvFlags">274</int>
 								<string key="NSFrame">{{10, 49}, {300, 50}}</string>
 								<string key="NSFrame">{{10, 49}, {300, 50}}</string>
 								<reference key="NSSuperview" ref="234033301"/>
 								<reference key="NSSuperview" ref="234033301"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="209774297"/>
 								<reference key="NSNextKeyView" ref="209774297"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIOpaque">NO</bool>
@@ -167,6 +171,7 @@
 						</array>
 						</array>
 						<string key="NSFrameSize">{320, 101}</string>
 						<string key="NSFrameSize">{320, 101}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="433654949"/>
 						<reference key="NSNextKeyView" ref="433654949"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="130677336">
 						<object class="NSColor" key="IBUIBackgroundColor" id="130677336">
@@ -188,6 +193,7 @@
 								<int key="NSvFlags">290</int>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 60}</string>
 								<string key="NSFrameSize">{320, 60}</string>
 								<reference key="NSSuperview" ref="1066205493"/>
 								<reference key="NSSuperview" ref="1066205493"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="761747136"/>
 								<reference key="NSNextKeyView" ref="761747136"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -199,6 +205,7 @@
 								<int key="NSvFlags">-2147483358</int>
 								<int key="NSvFlags">-2147483358</int>
 								<string key="NSFrame">{{11, 9}, {280, 21}}</string>
 								<string key="NSFrame">{{11, 9}, {280, 21}}</string>
 								<reference key="NSSuperview" ref="1066205493"/>
 								<reference key="NSSuperview" ref="1066205493"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="250280512"/>
 								<reference key="NSNextKeyView" ref="250280512"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIOpaque">NO</bool>
@@ -229,6 +236,7 @@
 								<int key="NSvFlags">-2147483358</int>
 								<int key="NSvFlags">-2147483358</int>
 								<string key="NSFrame">{{11, 38}, {299, 9}}</string>
 								<string key="NSFrame">{{11, 38}, {299, 9}}</string>
 								<reference key="NSSuperview" ref="1066205493"/>
 								<reference key="NSSuperview" ref="1066205493"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="385572310"/>
 								<reference key="NSNextKeyView" ref="385572310"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIOpaque">NO</bool>
@@ -240,6 +248,7 @@
 								<int key="NSvFlags">-2147483359</int>
 								<int key="NSvFlags">-2147483359</int>
 								<string key="NSFrame">{{283, 5}, {29, 31}}</string>
 								<string key="NSFrame">{{283, 5}, {29, 31}}</string>
 								<reference key="NSSuperview" ref="1066205493"/>
 								<reference key="NSSuperview" ref="1066205493"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="802027691"/>
 								<reference key="NSNextKeyView" ref="802027691"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIOpaque">NO</bool>
@@ -264,6 +273,7 @@
 								<int key="NSvFlags">-2147483355</int>
 								<int key="NSvFlags">-2147483355</int>
 								<string key="NSFrame">{{142, 11}, {37, 37}}</string>
 								<string key="NSFrame">{{142, 11}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="1066205493"/>
 								<reference key="NSSuperview" ref="1066205493"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="831264216"/>
 								<reference key="NSNextKeyView" ref="831264216"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIOpaque">NO</bool>
@@ -274,6 +284,7 @@
 						</array>
 						</array>
 						<string key="NSFrame">{{0, 105}, {320, 60}}</string>
 						<string key="NSFrame">{{0, 105}, {320, 60}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1005679980"/>
 						<reference key="NSNextKeyView" ref="1005679980"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="130677336"/>
 						<reference key="IBUIBackgroundColor" ref="130677336"/>
@@ -285,6 +296,7 @@
 						<int key="NSvFlags">274</int>
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 168}, {320, 215}}</string>
 						<string key="NSFrame">{{0, 168}, {320, 215}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<int key="NSColorSpace">3</int>
@@ -310,6 +322,7 @@
 				</array>
 				</array>
 				<string key="NSFrameSize">{320, 383}</string>
 				<string key="NSFrameSize">{320, 383}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="234033301"/>
 				<reference key="NSNextKeyView" ref="234033301"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<int key="NSColorSpace">3</int>
@@ -558,7 +571,18 @@
 			<nil key="sourceID"/>
 			<nil key="sourceID"/>
 			<int key="maxID">96</int>
 			<int key="maxID">96</int>
 		</object>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">VLCMenuButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/VLCMenuButton.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">