Brion VIBBER has submitted this change and it was merged.
Change subject: Made category search dark grey.
......................................................................
Made category search dark grey.
Disabled the wiki page category links. Need to re-visit.
Change-Id: Idbe8936fdec01e5d6e6f0b475be5b91187bf7f18
---
M Commons-iOS/AddCategoryCell.xib
M Commons-iOS/CategoryCell.xib
M Commons-iOS/CategorySearchTableViewController.m
M Commons-iOS/en.lproj/MainStoryboard.storyboard
4 files changed, 94 insertions(+), 346 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Commons-iOS/AddCategoryCell.xib b/Commons-iOS/AddCategoryCell.xib
index 3842247..8d65318 100644
--- a/Commons-iOS/AddCategoryCell.xib
+++ b/Commons-iOS/AddCategoryCell.xib
@@ -1,170 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1552</int>
- <string key="IBDocument.SystemVersion">12E55</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.39</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
- <object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
- <string
key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">2083</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBProxyObject</string>
- <string>IBUILabel</string>
- <string>IBUITableViewCell</string>
- </array>
- <array key="IBDocument.PluginDependencies">
-
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string
key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects"
id="1000">
- <object class="IBProxyObject" id="841351856">
- <string
key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="371349661">
- <string
key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUITableViewCell" id="477831162">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">1280</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="IBUIView" id="212443833">
- <reference
key="NSNextResponder" ref="477831162"/>
- <int key="NSvFlags">1280</int>
- <array class="NSMutableArray"
key="NSSubviews">
- <object
class="IBUILabel" id="585011370">
- <reference
key="NSNextResponder" ref="212443833"/>
- <int
key="NSvFlags">1280</int>
- <string
key="NSFrame">{{10, 0}, {300, 44}}</string>
- <reference
key="NSSuperview" ref="212443833"/>
- <reference
key="NSWindow"/>
- <bool
key="IBUIOpaque">NO</bool>
- <bool
key="IBUIClipsSubviews">YES</bool>
- <int
key="IBUIContentMode">7</int>
- <bool
key="IBUIMultipleTouchEnabled">YES</bool>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string
key="IBUIText">Add category...</string>
- <object
class="NSColor" key="IBUITextColor">
- <int
key="NSColorSpace">1</int>
- <bytes
key="NSRGB">MCAwIDAAA</bytes>
- <string
key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
- </object>
- <object
class="NSColor" key="IBUIHighlightedColor">
- <int
key="NSColorSpace">1</int>
- <bytes
key="NSRGB">MSAxIDEAA</bytes>
- </object>
- <string
key="IBUIShadowOffset">{0, 0}</string>
- <int
key="IBUIBaselineAdjustment">0</int>
- <int
key="IBUITextAlignment">1</int>
- <object
class="IBUIFontDescription" key="IBUIFontDescription">
- <int
key="type">2</int>
- <double
key="pointSize">17</double>
- </object>
- <object
class="NSFont" key="IBUIFont">
- <string
key="NSName">Helvetica-Bold</string>
- <double
key="NSSize">17</double>
- <int
key="NSfFlags">16</int>
- </object>
- <bool
key="IBUIAdjustsFontSizeToFit">NO</bool>
- </object>
- </array>
- <object class="NSPSMatrix"
key="NSFrameMatrix"/>
- <string key="NSFrameSize">{320,
44}</string>
- <reference key="NSSuperview"
ref="477831162"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"
ref="585011370"/>
- <object class="NSColor"
key="IBUIBackgroundColor">
- <int
key="NSColorSpace">3</int>
- <bytes
key="NSWhite">MCAwAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool
key="IBUIClipsSubviews">YES</bool>
- <int
key="IBUIContentMode">4</int>
- <bool
key="IBUIMultipleTouchEnabled">YES</bool>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </array>
- <object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrameSize">{320, 45}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="212443833"/>
- <string key="IBUIRestorationIdentifier"/>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUISelectionStyle">0</int>
- <bool
key="IBUIHidesAccessoryWhenEditing">NO</bool>
- <int key="IBUIIndentationLevel">1</int>
- <float key="IBUIIndentationWidth">0.0</float>
- <reference key="IBUIContentView"
ref="212443833"/>
- <string
key="IBUIReuseIdentifier">AddCategoryCell</string>
- <real value="0.0" key="IBUIStyle"/>
- <reference key="IBUITextLabel" ref="585011370"/>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords"/>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <array key="orderedObjects">
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <array key="object" id="0"/>
- <reference key="children"
ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object"
ref="841351856"/>
- <reference key="parent"
ref="0"/>
- <string key="objectName">File's
Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object"
ref="371349661"/>
- <reference key="parent"
ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object"
ref="477831162"/>
- <array class="NSMutableArray"
key="children">
- <reference
ref="585011370"/>
- </array>
- <reference key="parent"
ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object"
ref="585011370"/>
- <reference key="parent"
ref="477831162"/>
- </object>
- </array>
- </object>
- <dictionary class="NSMutableDictionary"
key="flattenedProperties">
- <string
key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string
key="-2.CustomClassName">UIResponder</string>
- <string
key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string
key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <reference key="2.IBUserGuides" ref="0"/>
- <boolean value="NO" key="2.showNotes"/>
- <string
key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </dictionary>
- <dictionary class="NSMutableDictionary"
key="unlocalizedProperties"/>
- <nil key="activeLocalization"/>
- <dictionary class="NSMutableDictionary"
key="localizations"/>
- <nil key="sourceID"/>
- <int key="maxID">3</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
- <int key="IBDocument.localizationMode">0</int>
- <string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <bool key="IBDocument.UseAutolayout">YES</bool>
- <string key="IBCocoaTouchPluginVersion">2083</string>
- </data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0"
toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch"
propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment defaultVersion="1536" identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version="3742"/>
+ </dependencies>
+ <objects>
+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1"
userLabel="File's Owner"/>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2"
customClass="UIResponder"/>
+ <tableViewCell contentMode="scaleToFill" restorationIdentifier=""
selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1"
indentationWidth="0.0" reuseIdentifier="AddCategoryCell" textLabel="3"
style="IBUITableViewCellStyleDefault" id="2">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO"
clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"
tableViewCell="2" id="4Yq-qI-Jdl">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <label opaque="NO" clipsSubviews="YES"
multipleTouchEnabled="YES" contentMode="left" text="Add category..."
textAlignment="center" lineBreakMode="tailTruncation"
baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3">
+ <rect key="frame" x="15" y="0.0" width="290"
height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <fontDescription key="fontDescription"
type="boldSystem" pointSize="17"/>
+ <color key="textColor" white="0" alpha="1"
colorSpace="calibratedWhite"/>
+ <color key="highlightedColor" red="1" green="1"
blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <size key="shadowOffset" width="0.0" height="0.0"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="0.0" alpha="1"
colorSpace="calibratedWhite"/>
+ <color key="tintColor" white="1" alpha="1"
colorSpace="calibratedWhite"/>
+ </tableViewCellContentView>
+ </tableViewCell>
+ </objects>
+</document>
\ No newline at end of file
diff --git a/Commons-iOS/CategoryCell.xib b/Commons-iOS/CategoryCell.xib
index 792d1a5..b5c977e 100644
--- a/Commons-iOS/CategoryCell.xib
+++ b/Commons-iOS/CategoryCell.xib
@@ -1,168 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1552</int>
- <string key="IBDocument.SystemVersion">12E55</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.39</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
- <object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
- <string
key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">2083</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBProxyObject</string>
- <string>IBUILabel</string>
- <string>IBUITableViewCell</string>
- </array>
- <array key="IBDocument.PluginDependencies">
-
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string
key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects"
id="1000">
- <object class="IBProxyObject" id="841351856">
- <string
key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="371349661">
- <string
key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUITableViewCell" id="975327160">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">1280</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="IBUIView" id="790834041">
- <reference
key="NSNextResponder" ref="975327160"/>
- <int key="NSvFlags">1280</int>
- <array class="NSMutableArray"
key="NSSubviews">
- <object
class="IBUILabel" id="477569096">
- <reference
key="NSNextResponder" ref="790834041"/>
- <int
key="NSvFlags">1280</int>
- <string
key="NSFrame">{{10, 0}, {267, 44}}</string>
- <reference
key="NSSuperview" ref="790834041"/>
- <reference
key="NSWindow"/>
- <bool
key="IBUIOpaque">NO</bool>
- <bool
key="IBUIClipsSubviews">YES</bool>
- <int
key="IBUIContentMode">7</int>
- <bool
key="IBUIMultipleTouchEnabled">YES</bool>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string
key="IBUIText">Title</string>
- <object
class="NSColor" key="IBUITextColor">
- <int
key="NSColorSpace">3</int>
- <bytes
key="NSWhite">MQA</bytes>
- </object>
- <object
class="NSColor" key="IBUIHighlightedColor">
- <int
key="NSColorSpace">1</int>
- <bytes
key="NSRGB">MSAxIDEAA</bytes>
- </object>
- <string
key="IBUIShadowOffset">{0, 0}</string>
- <int
key="IBUIBaselineAdjustment">0</int>
- <object
class="IBUIFontDescription" key="IBUIFontDescription">
- <int
key="type">1</int>
- <double
key="pointSize">14</double>
- </object>
- <object
class="NSFont" key="IBUIFont">
- <string
key="NSName">Helvetica</string>
- <double
key="NSSize">14</double>
- <int
key="NSfFlags">16</int>
- </object>
- <bool
key="IBUIAdjustsFontSizeToFit">NO</bool>
- </object>
- </array>
- <object class="NSPSMatrix"
key="NSFrameMatrix"/>
- <string key="NSFrameSize">{287,
44}</string>
- <reference key="NSSuperview"
ref="975327160"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"
ref="477569096"/>
- <object class="NSColor"
key="IBUIBackgroundColor">
- <int
key="NSColorSpace">3</int>
- <bytes
key="NSWhite">MCAwAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool
key="IBUIClipsSubviews">YES</bool>
- <int
key="IBUIContentMode">4</int>
- <bool
key="IBUIMultipleTouchEnabled">YES</bool>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </array>
- <object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrameSize">{320, 45}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="790834041"/>
- <string key="IBUIRestorationIdentifier"/>
- <string
key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIAccessoryType">2</int>
- <bool
key="IBUIHidesAccessoryWhenEditing">NO</bool>
- <int key="IBUIIndentationLevel">1</int>
- <float key="IBUIIndentationWidth">0.0</float>
- <reference key="IBUIContentView"
ref="790834041"/>
- <string
key="IBUIReuseIdentifier">CategoryCell</string>
- <real value="0.0" key="IBUIStyle"/>
- <reference key="IBUITextLabel" ref="477569096"/>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords"/>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <array key="orderedObjects">
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <array key="object" id="0"/>
- <reference key="children"
ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object"
ref="841351856"/>
- <reference key="parent"
ref="0"/>
- <string key="objectName">File's
Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object"
ref="371349661"/>
- <reference key="parent"
ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object"
ref="975327160"/>
- <array class="NSMutableArray"
key="children">
- <reference
ref="477569096"/>
- </array>
- <reference key="parent"
ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object"
ref="477569096"/>
- <reference key="parent"
ref="975327160"/>
- </object>
- </array>
- </object>
- <dictionary class="NSMutableDictionary"
key="flattenedProperties">
- <string
key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string
key="-2.CustomClassName">UIResponder</string>
- <string
key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string
key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <reference key="2.IBUserGuides" ref="0"/>
- <boolean value="NO" key="2.showNotes"/>
- <string
key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </dictionary>
- <dictionary class="NSMutableDictionary"
key="unlocalizedProperties"/>
- <nil key="activeLocalization"/>
- <dictionary class="NSMutableDictionary"
key="localizations"/>
- <nil key="sourceID"/>
- <int key="maxID">3</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
- <int key="IBDocument.localizationMode">0</int>
- <string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <bool key="IBDocument.UseAutolayout">YES</bool>
- <string key="IBCocoaTouchPluginVersion">2083</string>
- </data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0"
toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch"
propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment defaultVersion="1536" identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version="3742"/>
+ </dependencies>
+ <objects>
+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1"
userLabel="File's Owner"/>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2"
customClass="UIResponder"/>
+ <tableViewCell opaque="NO" contentMode="scaleToFill"
restorationIdentifier="" selectionStyle="gray" hidesAccessoryWhenEditing="NO"
indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CategoryCell"
textLabel="3" style="IBUITableViewCellStyleDefault" id="2">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="45"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO"
clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"
tableViewCell="2" id="wai-KK-mv6">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <label opaque="NO" clipsSubviews="YES"
multipleTouchEnabled="YES" contentMode="left" text="Title"
lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
adjustsFontSizeToFit="NO" id="3">
+ <rect key="frame" x="15" y="0.0" width="290"
height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <color key="backgroundColor" white="0.0" alpha="1"
colorSpace="calibratedWhite"/>
+ <fontDescription key="fontDescription" type="system"
pointSize="14"/>
+ <color key="textColor" white="1" alpha="1"
colorSpace="calibratedWhite"/>
+ <color key="highlightedColor" red="1" green="1"
blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <size key="shadowOffset" width="0.0" height="0.0"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="0.0" alpha="0.0"
colorSpace="calibratedWhite"/>
+ </tableViewCellContentView>
+ <color key="backgroundColor" white="0.0" alpha="0.0"
colorSpace="calibratedWhite"/>
+ <color key="tintColor" white="1" alpha="1"
colorSpace="calibratedWhite"/>
+ </tableViewCell>
+ </objects>
+</document>
\ No newline at end of file
diff --git a/Commons-iOS/CategorySearchTableViewController.m
b/Commons-iOS/CategorySearchTableViewController.m
index bac1ac5..3d058bb 100644
--- a/Commons-iOS/CategorySearchTableViewController.m
+++ b/Commons-iOS/CategorySearchTableViewController.m
@@ -47,7 +47,17 @@
[self.searchBar setPlaceholder:[MWMessage
forKey:@"catadd-search-placeholder"].text];
- self.searchBar.tintColor = [UIColor darkGrayColor];
+ self.searchBar.tintColor = [UIColor blackColor];
+
+ self.view.backgroundColor = [UIColor darkGrayColor];
+
+ for (UIView *v in self.tableView.subviews) {
+ v.backgroundColor = [UIColor darkGrayColor];
+ }
+
+ for (UIView *v in self.view.subviews) {
+ v.backgroundColor = [UIColor darkGrayColor];
+ }
}
- (void)didReceiveMemoryWarning
@@ -101,7 +111,12 @@
static NSString *CellIdentifier = @"CategoryCell";
UITableViewCell *cell = [tableView
dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
- cell.textLabel.textColor = [UIColor blackColor];
+ cell.textLabel.textColor = [UIColor whiteColor];
+ cell.textLabel.backgroundColor = [UIColor darkGrayColor];
+
+ for (UIView *v in cell.subviews) {
+ v.backgroundColor = [UIColor darkGrayColor];
+ }
NSArray *cats;
if (tableView == self.tableView) {
@@ -185,6 +200,8 @@
{
CommonsApp *app = CommonsApp.singleton;
+ [controller.searchResultsTableView setBackgroundColor:[UIColor
darkGrayColor]];
+
// cancel live search
if (self.api != nil) {
[self.api cancelCurrentRequest];
diff --git a/Commons-iOS/en.lproj/MainStoryboard.storyboard
b/Commons-iOS/en.lproj/MainStoryboard.storyboard
index 6b3cb57..3c2e5b2 100644
--- a/Commons-iOS/en.lproj/MainStoryboard.storyboard
+++ b/Commons-iOS/en.lproj/MainStoryboard.storyboard
@@ -1160,18 +1160,20 @@
<tableView key="view" clipsSubviews="YES"
clearsContextBeforeDrawing="NO" contentMode="scaleToFill"
alwaysBounceVertical="YES" dataMode="prototypes" style="plain"
separatorStyle="default" rowHeight="44" sectionHeaderHeight="22"
sectionFooterHeight="22" id="p2R-Ck-7B8">
<rect key="frame" x="0.0" y="20" width="320"
height="460"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1"
colorSpace="calibratedWhite"/>
- <searchBar key="tableHeaderView" contentMode="redraw"
placeholder="Search categories" id="0kF-Fh-Cbc">
+ <color key="backgroundColor" white="0.0" alpha="1"
colorSpace="calibratedWhite"/>
+ <color key="separatorColor"
white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="sectionIndexTrackingBackgroundColor"
white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+ <searchBar key="tableHeaderView" contentMode="redraw"
barStyle="black" placeholder="Search categories" id="0kF-Fh-Cbc">
<rect key="frame" x="0.0" y="0.0" width="320"
height="44"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" white="1" alpha="1"
colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" white="0.0" alpha="1"
colorSpace="calibratedWhite"/>
<textInputTraits key="textInputTraits"
autocapitalizationType="sentences"/>
<connections>
<outlet property="delegate"
destination="wdV-pe-EgK" id="plF-EO-R8g"/>
</connections>
</searchBar>
<prototypes>
- <tableViewCell contentMode="scaleToFill"
restorationIdentifier="CategorySelectorCell" selectionStyle="blue"
accessoryType="detailDisclosureButton" hidesAccessoryWhenEditing="NO"
indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CatSelectorCell"
textLabel="nOA-cR-Gwf" style="IBUITableViewCellStyleDefault" id="2z7-6z-YdF">
+ <tableViewCell contentMode="scaleToFill"
restorationIdentifier="CategorySelectorCell" selectionStyle="gray"
accessoryType="detailDisclosureButton" hidesAccessoryWhenEditing="NO"
indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CatSelectorCell"
textLabel="nOA-cR-Gwf" style="IBUITableViewCellStyleDefault" id="2z7-6z-YdF">
<rect key="frame" x="0.0" y="66" width="320"
height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView"
opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"
tableViewCell="2z7-6z-YdF" id="i3g-Wh-Qea">
@@ -1181,13 +1183,15 @@
<label opaque="NO" clipsSubviews="YES"
multipleTouchEnabled="YES" contentMode="left" text="Title"
lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
adjustsFontSizeToFit="NO" id="nOA-cR-Gwf">
<rect key="frame" x="10" y="0.0"
width="267" height="43"/>
<autoresizingMask
key="autoresizingMask"/>
+ <color key="backgroundColor"
white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription
key="fontDescription" type="boldSystem" pointSize="20"/>
- <color key="textColor"
cocoaTouchSystemColor="darkTextColor"/>
+ <color key="textColor" white="1"
alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor"
red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</label>
</subviews>
+ <color key="backgroundColor" white="0.0"
alpha="1" colorSpace="calibratedWhite"/>
</tableViewCellContentView>
- <color key="backgroundColor" white="1"
alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" white="0.0"
alpha="1" colorSpace="calibratedWhite"/>
</tableViewCell>
</prototypes>
<connections>
@@ -2011,6 +2015,7 @@
<image name="photo-button-bg.png" width="72" height="72"/>
<image name="settings.png" width="30" height="30"/>
</resources>
+ <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
--
To view, visit https://gerrit.wikimedia.org/r/88174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idbe8936fdec01e5d6e6f0b475be5b91187bf7f18
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/commons
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
