diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 45afe7630..57e7cdded 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -53,6 +53,10 @@ struct AppAssets { return image.maskWithColor(color: AppAssets.masterFolderColor)! }() + static var selectionBackgroundColor: UIColor = { + return UIColor(named: "selectionBackgroundColor")! + }() + static var starColor: UIColor = { return UIColor(named: "starColor")! }() diff --git a/iOS/Master/Cell/MasterTableViewCell.swift b/iOS/Master/Cell/MasterTableViewCell.swift index c74d90ddb..97fd9ad06 100644 --- a/iOS/Master/Cell/MasterTableViewCell.swift +++ b/iOS/Master/Cell/MasterTableViewCell.swift @@ -129,12 +129,19 @@ class MasterTableViewCell : UITableViewCell { private extension MasterTableViewCell { func commonInit() { + theme() addSubviewAtInit(unreadCountView) addSubviewAtInit(faviconImageView) addSubviewAtInit(titleView) addDisclosureView() } - + + func theme() { + let bgView = UIView() + bgView.backgroundColor = AppAssets.selectionBackgroundColor + selectedBackgroundView = bgView + } + func addDisclosureView() { disclosureButton = UIButton(type: .roundedRect) diff --git a/iOS/Resources/Assets.xcassets/masterFolderColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/masterFolderColor.colorset/Contents.json index 275e8bba8..728894ebe 100644 --- a/iOS/Resources/Assets.xcassets/masterFolderColor.colorset/Contents.json +++ b/iOS/Resources/Assets.xcassets/masterFolderColor.colorset/Contents.json @@ -9,10 +9,10 @@ "color" : { "color-space" : "srgb", "components" : { - "red" : "103", + "red" : "111", "alpha" : "1.000", - "blue" : "249", - "green" : "202" + "blue" : "250", + "green" : "175" } } } diff --git a/iOS/Resources/Assets.xcassets/selectionBackgroundColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/selectionBackgroundColor.colorset/Contents.json new file mode 100644 index 000000000..728894ebe --- /dev/null +++ b/iOS/Resources/Assets.xcassets/selectionBackgroundColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "111", + "alpha" : "1.000", + "blue" : "250", + "green" : "175" + } + } + } + ] +} \ No newline at end of file diff --git a/iOS/Resources/Assets.xcassets/timelineUnreadCircleColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/timelineUnreadCircleColor.colorset/Contents.json index f3238b8c0..728894ebe 100644 --- a/iOS/Resources/Assets.xcassets/timelineUnreadCircleColor.colorset/Contents.json +++ b/iOS/Resources/Assets.xcassets/timelineUnreadCircleColor.colorset/Contents.json @@ -9,10 +9,10 @@ "color" : { "color-space" : "srgb", "components" : { - "red" : "0x2D", + "red" : "111", "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xB6" + "blue" : "250", + "green" : "175" } } } diff --git a/iOS/Timeline/Cell/MasterTimelineTableViewCell.swift b/iOS/Timeline/Cell/MasterTimelineTableViewCell.swift index ab536d22b..6b823784d 100644 --- a/iOS/Timeline/Cell/MasterTimelineTableViewCell.swift +++ b/iOS/Timeline/Cell/MasterTimelineTableViewCell.swift @@ -107,6 +107,7 @@ private extension MasterTimelineTableViewCell { func commonInit() { + theme() addAccessoryView() addSubviewAtInit(titleView, hidden: false) addSubviewAtInit(summaryView, hidden: true) @@ -118,6 +119,12 @@ private extension MasterTimelineTableViewCell { addSubviewAtInit(starView, hidden: true) } + + func theme() { + let bgView = UIView() + bgView.backgroundColor = AppAssets.selectionBackgroundColor + selectedBackgroundView = bgView + } func addAccessoryView() { accessoryView = UIImageView(image: AppAssets.chevronRightImage)