Commit 9a50ab41 authored by Monica Basta's avatar Monica Basta Committed by Chromium LUCI CQ

[LocalProfileCreation]: Add customize avatar button.

This CL adds the edit avatar button in the local profile creation flow.

Bug: 1162443
Change-Id: Ie6b9c1907dde8fbd5609ab28b77cace32ff69b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2607305
Commit-Queue: Monica Basta <msalama@chromium.org>
Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840607}
parent fc74c0ef
...@@ -761,6 +761,9 @@ ...@@ -761,6 +761,9 @@
<message name="IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_TITLE" desc="Title for the local profile customiztion screen on the picker."> <message name="IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_TITLE" desc="Title for the local profile customiztion screen on the picker.">
Customize your profile Customize your profile
</message> </message>
<message name="IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_CUSTOMIZE_AVATAR_BUTTON_LABEL" desc="Accessibility label for edit avatar button when the pencil icon is focused that is not rendered.">
Customize avatar
</message>
<message name="IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_THEME_TEXT" desc="Text of a section to pick a color for the profile."> <message name="IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_THEME_TEXT" desc="Text of a section to pick a color for the profile.">
Pick a theme color Pick a theme color
</message> </message>
......
...@@ -10,6 +10,48 @@ ...@@ -10,6 +10,48 @@
text-align: center; text-align: center;
} }
#avatarContainer {
--edit-avatar-border: 3px;
--edit-avatar-size : 36px;
}
#customizeAvatarEllipse {
background-color: var(--md-background-color);
border-radius: 50%;
bottom: 0;
height: var(--edit-avatar-size);
margin: auto;
position: absolute;
right: 0;
width : var(--edit-avatar-size);
z-index: 2;
}
#customizeAvatarIcon {
--cr-icon-button-icon-size: 18px;
--cr-icon-button-size: calc(var(--edit-avatar-size) -
2 * var(--edit-avatar-border));
background-color: var(--md-background-color);
border-radius: 50%;
bottom: var(--edit-avatar-border);
box-shadow: 0 0 2px rgba(60, 64, 67, 0.12), 0 0 6px rgba(60, 64, 67, 0.15);
box-sizing: border-box;
margin: auto;
position: absolute;
right: var(--edit-avatar-border);
z-index: 3;
}
:host-context([dir='rtl']) #customizeAvatarEllipse {
left: 0;
right: initial;
}
:host-context([dir='rtl']) #customizeAvatarIcon {
left: var(--edit-avatar-border);
right: initial;
}
#wrapperContainer { #wrapperContainer {
display: flex; display: flex;
height: calc(max(100vh, var(--view-min-size)) - height: calc(max(100vh, var(--view-min-size)) -
...@@ -106,6 +148,10 @@ ...@@ -106,6 +148,10 @@
--cr-input-placeholder-color: rgba(var(--google-grey-200-rgb), .5); --cr-input-placeholder-color: rgba(var(--google-grey-200-rgb), .5);
} }
#customizeAvatarIcon {
border: 1px solid var(--google-grey-refresh-500);
}
#colorPickerContainer { #colorPickerContainer {
border-color: var(--google-grey-refresh-700); border-color: var(--google-grey-refresh-700);
} }
...@@ -121,7 +167,14 @@ ...@@ -121,7 +167,14 @@
on-click="onClickBack_" aria-label="$i18n{backButtonLabel}"> on-click="onClickBack_" aria-label="$i18n{backButtonLabel}">
</cr-icon-button> </cr-icon-button>
<h2 id="title">$i18n{localProfileCreationTitle}</h2> <h2 id="title">$i18n{localProfileCreationTitle}</h2>
<img class="avatar" alt="" src$="[[profileThemeInfo.themeGenericAvatar]]"> <div id="avatarContainer">
<img class="avatar" alt="" src$="[[profileThemeInfo.themeGenericAvatar]]">
<div id="customizeAvatarEllipse"></div>
<cr-icon-button id="customizeAvatarIcon"
iron-icon="profiles:create" on-click="onCustomizeAvatarClick_"
aria-label="$i18n{localProfileCreationCustomizeAvatarLabel}">
</cr-icon-button>
</div>
</div> </div>
<div id="wrapperContainer"> <div id="wrapperContainer">
......
...@@ -183,6 +183,11 @@ Polymer({ ...@@ -183,6 +183,11 @@ Polymer({
navigateToPreviousRoute(); navigateToPreviousRoute();
}, },
/** @private */
onCustomizeAvatarClick_() {
// TODO(msalama): Open select avatar dialog.
},
/** @private */ /** @private */
onProfileThemeInfoChange_() { onProfileThemeInfoChange_() {
if (this.disableSelectedThemeUpdates_) { if (this.disableSelectedThemeUpdates_) {
......
...@@ -61,7 +61,9 @@ ...@@ -61,7 +61,9 @@
disabled="[[loadSigninInProgess_]]"> disabled="[[loadSigninInProgess_]]">
</cr-icon-button> </cr-icon-button>
<div id="signinPromoBanner" class="banner"></div> <div id="signinPromoBanner" class="banner"></div>
<img class="avatar" alt="" src="[[profileThemeInfo.themeGenericAvatar]]"> <div id="avatarContainer">
<img class="avatar" alt="" src="[[profileThemeInfo.themeGenericAvatar]]">
</div>
</div> </div>
<div class="title-container"> <div class="title-container">
<h2>$i18n{profileTypeChoiceTitle}</h2> <h2>$i18n{profileTypeChoiceTitle}</h2>
......
...@@ -31,15 +31,20 @@ ...@@ -31,15 +31,20 @@
z-index: 1; z-index: 1;
} }
.avatar { #avatarContainer {
border: 2px solid var(--md-background-color); bottom: calc(var(--avatar-size) / -2);
border-radius: 50%; height: calc(var(--avatar-size) + 4px);
bottom: calc(var(--avatar-size)/-2);
height: var(--avatar-size);
left: 0; left: 0;
margin: auto; margin: auto;
position: absolute; position: absolute;
right: 0; right: 0;
width: calc(var(--avatar-size) + 4px);
}
.avatar {
border: 2px solid var(--md-background-color);
border-radius: 50%;
height: var(--avatar-size);
width: var(--avatar-size); width: var(--avatar-size);
z-index: 1; z-index: 1;
} }
......
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
width: 130px; width: 130px;
} }
.footer { .footer {
bottom: 0; bottom: 0;
display: flex; display: flex;
font-size: var(--text-font-size); font-size: var(--text-font-size);
margin-bottom: var(--footer-margin); margin-bottom: var(--footer-margin);
position: absolute; position: absolute;
width: 100%; width: 100%;
} }
</style> </style>
</template> </template>
...@@ -106,6 +106,8 @@ void AddStrings(content::WebUIDataSource* html_source) { ...@@ -106,6 +106,8 @@ void AddStrings(content::WebUIDataSource* html_source) {
IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_NOT_NOW_BUTTON_LABEL}, IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_NOT_NOW_BUTTON_LABEL},
{"localProfileCreationTitle", {"localProfileCreationTitle",
IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_TITLE}, IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_TITLE},
{"localProfileCreationCustomizeAvatarLabel",
IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_CUSTOMIZE_AVATAR_BUTTON_LABEL},
{"localProfileCreationThemeText", {"localProfileCreationThemeText",
IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_THEME_TEXT}, IDS_PROFILE_PICKER_PROFILE_CREATION_FLOW_LOCAL_PROFILE_CREATION_THEME_TEXT},
{"createProfileNamePlaceholder", {"createProfileNamePlaceholder",
......
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