Skip to content

GitLab

T
tangled
Commit 246c8db4 authored by Robbie Gibson's avatar Robbie Gibson Committed by Commit Bot
Browse files
Options

[iOS][Dark Mode] Support dark mode on overscroll actions 

Bug: 986804, 987907
Change-Id: Ibf4b7664100f9d318c2110017ea631dc28d66866
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713536
Commit-Queue: Robbie Gibson <rkgibson@google.com>
Reviewed-by: default avatarKurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682247}
parent de65a83d
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 82 deletions
ios/chrome/browser/overscroll_actions/BUILD.gn
View file @ 246c8db4
......@@ -30,6 +30,7 @@ source_set("unit_tests") {
"//base/test:test_support",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/ui/overscroll_actions",
"//ios/chrome/common/colors",
"//ios/chrome/test/fakes",
"//ios/web/public",
"//ios/web/public/test",
......
ios/chrome/browser/overscroll_actions/overscroll_actions_tab_helper_unittest.mm
View file @ 246c8db4
......@@ -10,6 +10,8 @@
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
#import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.h"
#import "ios/chrome/common/colors/incognito_color_util.h"
#import "ios/chrome/common/colors/semantic_color_names.h"
#import "ios/chrome/test/fakes/fake_overscroll_actions_controller_delegate.h"
#import "ios/web/public/test/fakes/test_web_state.h"
#include "ios/web/public/test/test_web_thread_bundle.h"
......@@ -112,9 +114,7 @@ TEST_F(OverscrollActionsTabHelperTest, MAYBE_TestRegularBrowserStateStyle) {
web_state_.SetBrowserState(browser_state_.get());
overscroll_tab_helper()->SetDelegate(overscroll_delegate_);
SimulatePullForRefreshAction();
UIColor* expected_color =
[UIColor colorWithWhite:kActionViewBackgroundColorBrightnessNonIncognito
alpha:1.0];
UIColor* expected_color = [UIColor colorNamed:kBackgroundColor];
EXPECT_TRUE(action_view());
EXPECT_NSEQ(expected_color, action_view().backgroundColor);
}
......@@ -135,9 +135,11 @@ TEST_F(OverscrollActionsTabHelperTest,
browser_state_->GetOffTheRecordChromeBrowserState());
overscroll_tab_helper()->SetDelegate(overscroll_delegate_);
SimulatePullForRefreshAction();
// For iOS 13 and dark mode, the incognito overscroll actions view uses a
// dynamic color.
UIColor* expected_color =
[UIColor colorWithWhite:kActionViewBackgroundColorBrightnessIncognito
alpha:1.0];
color::IncognitoDynamicColor(true, [UIColor colorNamed:kBackgroundColor],
[UIColor colorNamed:kBackgroundDarkColor]);
EXPECT_TRUE(action_view());
EXPECT_NSEQ(expected_color, action_view().backgroundColor);
}
......
ios/chrome/browser/ui/overscroll_actions/BUILD.gn
View file @ 246c8db4
......@@ -34,6 +34,7 @@ source_set("overscroll_actions") {
"//ios/chrome/browser/ui/toolbar/public",
"//ios/chrome/browser/ui/util",
"//ios/chrome/browser/ui/voice",
"//ios/chrome/common/colors",
"//ios/public/provider/chrome/browser",
"//ios/public/provider/chrome/browser/ui",
"//ios/web/common",
......
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
View file @ 246c8db4
......@@ -367,7 +367,7 @@ NSString* const kOverscrollActionsDidEnd = @"OverscrollActionsDidStop";
}
- (void)setStyle:(OverscrollStyle)style {
[self.overscrollActionView setStyle:style];
self.overscrollActionView.style = style;
}
#pragma mark - webViewScrollView and UIScrollView delegates implementations
......
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.h
View file @ 246c8db4
......@@ -58,6 +58,8 @@ extern const CGFloat kActionViewBackgroundColorBrightnessIncognito;
@property(nonatomic, strong, readonly) UIView* backgroundView;
// Whether cropping is set on the selection circle (true by default).
@property(nonatomic, assign) BOOL selectionCroppingEnabled;
// The current style of the overscroll actions UI.
@property(nonatomic, assign) OverscrollStyle style;
@property(nonatomic, assign) id<OverscrollActionsViewDelegate> delegate;
......@@ -82,9 +84,6 @@ extern const CGFloat kActionViewBackgroundColorBrightnessIncognito;
// action has been selected.
- (void)displayActionAnimation;
// Sets the style of the overscroll action UI.
- (void)setStyle:(OverscrollStyle)style;
@end
#endif // IOS_CHROME_BROWSER_UI_OVERSCROLL_ACTIONS_OVERSCROLL_ACTIONS_VIEW_H_
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.mm
View file @ 246c8db4
......@@ -12,6 +12,8 @@
#import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
#include "ios/chrome/browser/ui/util/rtl_geometry.h"
#include "ios/chrome/browser/ui/util/uikit_ui_util.h"
#import "ios/chrome/common/colors/incognito_color_util.h"
#import "ios/chrome/common/colors/semantic_color_names.h"
#include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h"
#include "ios/chrome/grit/ios_theme_resources.h"
......@@ -88,9 +90,6 @@ const CGFloat kDirectTouchFrameExpansion = 20;
const CGFloat kActionLabelVerticalPadding = 25.0;
// The minimum distance between the action labels and the side of the screen.
const CGFloat kActionLabelSidePadding = 15.0;
// The value to use as the R, B, and B components for the action label text and
// selection layer animation.
const CGFloat kSelectionColor = 0.4;
// This function maps a value from a range to another.
CGFloat MapValueToRange(FloatRange from, FloatRange to, CGFloat value) {
......@@ -196,6 +195,8 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
@property(nonatomic, strong, readwrite) UIView* snapshotView;
// The parent layer on the selection circle used for cropping purpose.
@property(nonatomic, strong, readwrite) CALayer* selectionCircleCroppingLayer;
// Computed property for whether the current state is incognito or not.
@property(nonatomic, assign, readonly) BOOL incognito;
// An absolute horizontal offset that also takes into account snapping.
- (CGFloat)absoluteHorizontalOffset;
......@@ -249,30 +250,6 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
@implementation OverscrollActionsView
@synthesize selectedAction = _selectedAction;
@synthesize addTabActionImageView = _addTabActionImageView;
@synthesize reloadActionImageView = _reloadActionImageView;
@synthesize closeTabActionImageView = _closeTabActionImageView;
@synthesize addTabActionImageViewHighlighted =
_addTabActionImageViewHighlighted;
@synthesize reloadActionImageViewHighlighted =
_reloadActionImageViewHighlighted;
@synthesize closeTabActionImageViewHighlighted =
_closeTabActionImageViewHighlighted;
@synthesize addTabLabel = _addTabLabel;
@synthesize reloadLabel = _reloadLabel;
@synthesize closeTabLabel = _closeTabLabel;
@synthesize highlightMaskLayer = _highlightMaskLayer;
@synthesize selectionCircleLayer = _selectionCircleLayer;
@synthesize selectionCircleMaskLayer = _selectionCircleMaskLayer;
@synthesize verticalOffset = _verticalOffset;
@synthesize horizontalOffset = _horizontalOffset;
@synthesize overscrollState = _overscrollState;
@synthesize backgroundView = _backgroundView;
@synthesize snapshotView = _snapshotView;
@synthesize selectionCircleCroppingLayer = _selectionCircleCroppingLayer;
@synthesize delegate = _delegate;
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
......@@ -291,18 +268,36 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
[_selectionCircleCroppingLayer addSublayer:_selectionCircleLayer];
_addTabActionImageView = [[UIImageView alloc] init];
_addTabActionImageView.image = [[UIImage imageNamed:kNewTabActionImage]
imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
_addTabActionImageView.tintColor =
[UIColor colorNamed:@"tab_toolbar_button_color"];
[_addTabActionImageView sizeToFit];
[self addSubview:_addTabActionImageView];
_reloadActionImageView = [[UIImageView alloc] init];
_reloadActionImageView.image = [[UIImage imageNamed:kReloadActionImage]
imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
_reloadActionImageView.tintColor =
[UIColor colorNamed:@"tab_toolbar_button_color"];
[_reloadActionImageView sizeToFit];
if (UseRTLLayout())
[_reloadActionImageView setTransform:CGAffineTransformMakeScale(-1, 1)];
[self addSubview:_reloadActionImageView];
_closeTabActionImageView = [[UIImageView alloc] init];
_closeTabActionImageView.image = [[UIImage imageNamed:kCloseActionImage]
imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
_closeTabActionImageView.tintColor =
[UIColor colorNamed:@"tab_toolbar_button_color"];
[_closeTabActionImageView sizeToFit];
[self addSubview:_closeTabActionImageView];
_highlightMaskLayer = [[CALayer alloc] init];
_highlightMaskLayer.frame = self.bounds;
_highlightMaskLayer.contentsGravity = kCAGravityCenter;
_highlightMaskLayer.backgroundColor = [[UIColor clearColor] CGColor];
// Disable the entire highlight mask.
// TODO(crbug.com/986804): Remove the highlight mask after dark mode
// launches and this design is permanent.
_selectionCircleMaskLayer.fillColor = UIColor.clearColor.CGColor;
[_highlightMaskLayer setMask:_selectionCircleMaskLayer];
[self.layer addSublayer:_highlightMaskLayer];
......@@ -325,7 +320,7 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
_addTabLabel.font =
[UIFont preferredFontForTextStyle:UIFontTextStyleCaption1];
_addTabLabel.adjustsFontForContentSizeCategory = NO;
_addTabLabel.textColor = [UIColor colorWithWhite:kSelectionColor alpha:1.0];
_addTabLabel.textColor = [UIColor colorNamed:@"tab_toolbar_button_color"];
_addTabLabel.text =
l10n_util::GetNSString(IDS_IOS_OVERSCROLL_NEW_TAB_LABEL);
[self addSubview:_addTabLabel];
......@@ -337,7 +332,7 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
_reloadLabel.font =
[UIFont preferredFontForTextStyle:UIFontTextStyleCaption1];
_reloadLabel.adjustsFontForContentSizeCategory = NO;
_reloadLabel.textColor = [UIColor colorWithWhite:kSelectionColor alpha:1.0];
_reloadLabel.textColor = [UIColor colorNamed:@"tab_toolbar_button_color"];
_reloadLabel.text = l10n_util::GetNSString(IDS_IOS_OVERSCROLL_RELOAD_LABEL);
[self addSubview:_reloadLabel];
_closeTabLabel = [[UILabel alloc] init];
......@@ -348,8 +343,7 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
_closeTabLabel.font =
[UIFont preferredFontForTextStyle:UIFontTextStyleCaption1];
_closeTabLabel.adjustsFontForContentSizeCategory = NO;
_closeTabLabel.textColor =
[UIColor colorWithWhite:kSelectionColor alpha:1.0];
_closeTabLabel.textColor = [UIColor colorNamed:@"tab_toolbar_button_color"];
_closeTabLabel.text =
l10n_util::GetNSString(IDS_IOS_OVERSCROLL_CLOSE_TAB_LABEL);
[self addSubview:_closeTabLabel];
......@@ -507,6 +501,11 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
[CATransaction commit];
}
- (void)traitCollectionDidChange:(UITraitCollection*)previousTraitCollection {
[super traitCollectionDidChange:previousTraitCollection];
[self updateLayerColors];
}
#pragma mark - Private
- (CGFloat)absoluteHorizontalOffset {
......@@ -895,7 +894,7 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
const CGRect bounds = CGRectMake(0, 0, kSelectionEdge, kSelectionEdge);
CAShapeLayer* selectionCircleLayer = [[CAShapeLayer alloc] init];
selectionCircleLayer.bounds = bounds;
selectionCircleLayer.backgroundColor = [[UIColor clearColor] CGColor];
selectionCircleLayer.backgroundColor = UIColor.clearColor.CGColor;
selectionCircleLayer.opacity = 0;
selectionCircleLayer.transform = CATransform3DMakeScale(
kSelectionInitialDownScale, kSelectionInitialDownScale, 1);
......@@ -942,7 +941,8 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
}
- (void)setStyle:(OverscrollStyle)style {
switch (style) {
_style = style;
switch (self.style) {
case OverscrollStyle::NTP_NON_INCOGNITO:
self.backgroundColor = ntp_home::kNTPBackgroundColor();
break;
......@@ -950,54 +950,47 @@ const CGFloat kActionViewBackgroundColorBrightnessIncognito = 80.0 / 256.0;
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0];
break;
case OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO:
self.backgroundColor = [UIColor
colorWithWhite:kActionViewBackgroundColorBrightnessNonIncognito
alpha:1.0];
self.backgroundColor = [UIColor colorNamed:kBackgroundColor];
break;
case OverscrollStyle::REGULAR_PAGE_INCOGNITO:
self.backgroundColor =
[UIColor colorWithWhite:kActionViewBackgroundColorBrightnessIncognito
alpha:1.0];
self.backgroundColor = color::IncognitoDynamicColor(
true, [UIColor colorNamed:kBackgroundColor],
[UIColor colorNamed:kBackgroundDarkColor]);
break;
}
BOOL incognito = style == OverscrollStyle::NTP_INCOGNITO ||
style == OverscrollStyle::REGULAR_PAGE_INCOGNITO;
if (incognito) {
[_addTabActionImageView
setImage:[UIImage imageNamed:kNewTabActionActiveImage]];
[_reloadActionImageView
setImage:[UIImage imageNamed:kReloadActionActiveImage]];
[_closeTabActionImageView
setImage:[UIImage imageNamed:kCloseActionActiveImage]];
_selectionCircleLayer.fillColor =
[UIColor colorWithRed:1 green:1 blue:1 alpha:0.2].CGColor;
_selectionCircleMaskLayer.fillColor = [[UIColor clearColor] CGColor];
[_addTabLabel setTextColor:[UIColor whiteColor]];
[_reloadLabel setTextColor:[UIColor whiteColor]];
[_closeTabLabel setTextColor:[UIColor whiteColor]];
} else {
[_addTabActionImageView setImage:[UIImage imageNamed:kNewTabActionImage]];
[_reloadActionImageView setImage:[UIImage imageNamed:kReloadActionImage]];
[_closeTabActionImageView setImage:[UIImage imageNamed:kCloseActionImage]];
[self updateLayerColors];
}
[_addTabActionImageViewHighlighted
setImage:[UIImage imageNamed:kNewTabActionActiveImage]];
[_reloadActionImageViewHighlighted
setImage:[UIImage imageNamed:kReloadActionActiveImage]];
[_closeTabActionImageViewHighlighted
setImage:[UIImage imageNamed:kCloseActionActiveImage]];
// CGColor doesn't support iOS 13 dynamic colors, so those must be resolved
// more often.
- (void)updateLayerColors {
#if defined(__IPHONE_13_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0)
if (@available(iOS 13, *)) {
[self.traitCollection performAsCurrentTraitCollection:^{
_selectionCircleLayer.fillColor =
[UIColor colorNamed:kTextfieldBackgroundColor].CGColor;
}];
return;
}
#endif
// Fallback for iOS 12.
if (self.incognito) {
UIColor* buttonColor =
[UIColor colorNamed:@"tab_toolbar_button_color_incognito"];
_addTabActionImageView.tintColor = buttonColor;
_reloadActionImageView.tintColor = buttonColor;
_closeTabActionImageView.tintColor = buttonColor;
_addTabLabel.textColor = buttonColor;
_reloadLabel.textColor = buttonColor;
_closeTabLabel.textColor = buttonColor;
_selectionCircleLayer.fillColor =
[UIColor colorWithWhite:kSelectionColor alpha:1.0].CGColor;
_selectionCircleMaskLayer.fillColor = [[UIColor blackColor] CGColor];
[UIColor colorNamed:kTextfieldBackgroundDarkColor].CGColor;
} else {
_selectionCircleLayer.fillColor =
[UIColor colorNamed:kTextfieldBackgroundColor].CGColor;
}
[_addTabActionImageView sizeToFit];
[_reloadActionImageView sizeToFit];
[_closeTabActionImageView sizeToFit];
[_addTabActionImageViewHighlighted sizeToFit];
[_reloadActionImageViewHighlighted sizeToFit];
[_closeTabActionImageViewHighlighted sizeToFit];
}
- (OverscrollAction)actionAtLocation:(CGPoint)location {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment