Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Implement Use Case Selection screen #8984

Merged
merged 32 commits into from
Jul 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b330052
Update analytics dependency
justjanne Jul 6, 2022
ebb3f97
Add new, updated icons
justjanne Jul 6, 2022
9bbb9f2
Introduce new splash page wrapper
justjanne Jul 6, 2022
c2e7271
Introduce new use case selection screen
justjanne Jul 6, 2022
44f0055
Update translations
justjanne Jul 6, 2022
354e046
Update tests
justjanne Jul 6, 2022
0c2d9c4
Fix issue with this binding
justjanne Jul 7, 2022
edc204a
Update splash gradient specifics
justjanne Jul 7, 2022
6722b20
Merge remote-tracking branch 'origin/develop' into justjanne/feat/use…
justjanne Jul 7, 2022
2055a2d
Merge branch 'develop' into justjanne/feat/use-case-selection
justjanne Jul 7, 2022
dfccf87
Track use case in posthog properties as well
justjanne Jul 7, 2022
cde871a
Remove outdated comment
justjanne Jul 7, 2022
754659d
Update animation specs
justjanne Jul 7, 2022
fe23e98
Update animation specs
justjanne Jul 7, 2022
8bb1c75
Merge remote-tracking branch 'origin/develop' into justjanne/feat/use…
justjanne Jul 8, 2022
089dc0d
Update copyright
justjanne Jul 11, 2022
1b7b6c3
Extract UseCase enum
justjanne Jul 11, 2022
be875bd
Use final CSS values, with variables wherever possible
justjanne Jul 11, 2022
6a40381
Avoid using smart quotes
justjanne Jul 11, 2022
7123a47
Use clearer syntax for if statement
justjanne Jul 11, 2022
dda9de4
Use overridable setting level
justjanne Jul 11, 2022
4ef1ab3
Follow naming guidelines for settings
justjanne Jul 11, 2022
b12fcf3
Update i18n
justjanne Jul 11, 2022
5aef1f0
Clarify intent for settings watcher
justjanne Jul 12, 2022
93055db
Use dithering against color banding
justjanne Jul 12, 2022
d6314fc
Merge remote-tracking branch 'origin/develop' into justjanne/feat/use…
justjanne Jul 12, 2022
979c4cd
Split use case selection into separate files for button and dialog
justjanne Jul 12, 2022
6c4ed56
Fix imports
justjanne Jul 12, 2022
878c3ba
Make lint happy
justjanne Jul 12, 2022
ff868f8
Update i18n
justjanne Jul 12, 2022
b3942b7
Make lint even happier
justjanne Jul 12, 2022
409584e
Try to reduce flakiness of spotlight test
justjanne Jul 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cypress/e2e/1-register/register.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ describe("Registration", () => {
cy.startMeasuring("from-submit-to-home");
cy.get(".mx_InteractiveAuthEntryComponents_termsSubmit").click();

cy.get(".mx_UseCaseSelection_skip .mx_AccessibleButton").click();

cy.url().should('contain', '/#/home');
cy.stopMeasuring("from-submit-to-home");

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/12-spotlight/spotlight.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ describe("Spotlight", () => {
cy.spotlightSearch().clear().type("b");
// our debouncing logic only starts the search after a short timeout,
// so we wait a few milliseconds.
cy.wait(300);
cy.wait(1000);
cy.get(".mx_Spinner").should("not.exist").then(() => {
cy.spotlightResults().should("have.length", 2).then(() => {
cy.spotlightResults().eq(0)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"dependencies": {
"@babel/runtime": "^7.12.5",
"@matrix-org/analytics-events": "^0.1.1",
"@matrix-org/analytics-events": "^0.1.2",
"@matrix-org/react-sdk-module-api": "^0.0.3",
"@sentry/browser": "^6.11.0",
"@sentry/tracing": "^6.11.0",
Expand Down
3 changes: 3 additions & 0 deletions res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
@import "./structures/_SpaceHierarchy.scss";
@import "./structures/_SpacePanel.scss";
@import "./structures/_SpaceRoomView.scss";
@import "./structures/_SplashPage.scss";
@import "./structures/_TabbedView.scss";
@import "./structures/_ToastContainer.scss";
@import "./structures/_UploadBar.scss";
Expand Down Expand Up @@ -189,6 +190,8 @@
@import "./views/elements/_ToggleSwitch.scss";
@import "./views/elements/_Tooltip.scss";
@import "./views/elements/_TooltipButton.scss";
@import "./views/elements/_UseCaseSelection.scss";
@import "./views/elements/_UseCaseSelectionButton.scss";
@import "./views/elements/_Validation.scss";
@import "./views/emojipicker/_EmojiPicker.scss";
@import "./views/location/_LocationPicker.scss";
Expand Down
63 changes: 63 additions & 0 deletions res/css/structures/_SplashPage.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_SplashPage {
justjanne marked this conversation as resolved.
Show resolved Hide resolved
position: relative;
height: 100%;

&::before {
content: "";
display: block;
position: absolute;
z-index: -1;
opacity: 0.6;
background-image:
radial-gradient(
53.85% 66.75% at 87.55% 0%,
hsla(250, 76%, 71%, 0.261) 0%,
hsla(250, 100%, 88%, 0) 100%
),
radial-gradient(
41.93% 41.93% at 0% 0%,
hsla(222, 29%, 20%, 0.28) 0%,
hsla(250, 100%, 88%, 0) 100%
),
radial-gradient(
100% 100% at 0% 0%,
hsla(250, 100%, 88%, 0.174) 0%,
hsla(0, 100%, 86%, 0) 100%
),
radial-gradient(
106.35% 96.26% at 100% 0%,
hsla(250, 100%, 88%, 0.4) 0%,
hsla(167, 76%, 82%, 0) 100%
);
/* blur to reduce color banding issues due to alpha-blending multiple gradients */
filter: blur(8px);
inset: -9px;
mask:
/* mask to dither resulting combined gradient */
url("$(res)/img/noise.png"),
/* gradient to apply different amounts of dithering to different parts of the gradient */
linear-gradient(
to bottom,
/* 10% dithering at the top */
rgba(0, 0, 0, 0.9) 20%,
/* 80% dithering at the bottom */
rgba(0, 0, 0, 0.2) 100%
);
}
}
129 changes: 129 additions & 0 deletions res/css/views/elements/_UseCaseSelection.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_UseCaseSelection {
display: grid;
grid-template-rows: 1fr 1fr max-content 2fr;
height: 100%;
grid-gap: $spacing-40;

.mx_UseCaseSelection_title {
display: flex;
flex-direction: column;
justify-content: end;

h1 {
font-weight: 600;
font-size: $font-32px;
text-align: center;
}
}

.mx_UseCaseSelection_info {
display: flex;
flex-direction: column;
gap: $spacing-8;
align-self: end;

h2 {
margin: 0;
font-weight: 500;
font-size: $font-24px;
text-align: center;
}

h4 {
margin: 0;
font-weight: 400;
font-size: $font-16px;
color: $secondary-content;
text-align: center;
}
}

.mx_UseCaseSelection_options {
display: grid;
grid-template-columns: repeat(auto-fit, 232px);
gap: $spacing-32;
align-self: stretch;
justify-content: center;
}

.mx_UseCaseSelection_skip {
display: flex;
flex-direction: column;
align-self: start;
}
}

.mx_UseCaseSelection_slideIn {
animation-delay: 800ms;
animation-duration: 300ms;
animation-timing-function: cubic-bezier(0, 0, 0.58, 1);
animation-name: mx_UseCaseSelection_slideInLong;
animation-fill-mode: backwards;
will-change: opacity;
}

.mx_UseCaseSelection_slideInDelayed {
animation-delay: 1500ms;
animation-duration: 300ms;
animation-timing-function: cubic-bezier(0, 0, 0.58, 1);
animation-name: mx_UseCaseSelection_slideInShort;
animation-fill-mode: backwards;
will-change: transform, opacity;
}

.mx_UseCaseSelection_selected {
.mx_UseCaseSelection_slideIn, .mx_UseCaseSelection_slideInDelayed {
animation-delay: 800ms;
animation-duration: 300ms;
animation-fill-mode: forwards;
animation-name: mx_UseCaseSelection_fadeOut;
will-change: opacity;
}
}

@keyframes mx_UseCaseSelection_slideInLong {
0% {
transform: translate(0, 20px);
opacity: 0;
}
100% {
transform: translate(0, 0);
opacity: 1;
}
}

@keyframes mx_UseCaseSelection_slideInShort {
0% {
transform: translate(0, 8px);
opacity: 0;
}
100% {
transform: translate(0, 0);
opacity: 1;
}
}

@keyframes mx_UseCaseSelection_fadeOut {
0% {
opacity: 1;
}
100% {
opacity: 0;
}
}
104 changes: 104 additions & 0 deletions res/css/views/elements/_UseCaseSelectionButton.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_UseCaseSelectionButton {
display: flex;
flex-direction: column;
align-items: center;
padding: $spacing-24 $spacing-16;
background: $background;
border: 1px solid $quinary-content;
border-radius: 8px;
text-align: center;
position: relative;
transition-property: box-shadow, transform;
transition-duration: 300ms;

.mx_UseCaseSelectionButton_icon {
/* workaround: design expects a layering of two colors */
background: linear-gradient(0deg, rgba(172, 59, 168, 0.15), rgba(172, 59, 168, 0.15)), #FFFFFF;
border-radius: 14px;
padding: $spacing-8;
margin-bottom: $spacing-16;

&::before {
content: "";
display: block;
/* this has to remain the same color across all themes,
as its background has a fixed color as well */
background: #1E1E1E;
mask-position: center;
mask-repeat: no-repeat;
mask-size: contain;
width: 22px;
height: 22px;
}

&.mx_UseCaseSelectionButton_messaging::before {
mask-image: url('$(res)/img/element-icons/chat-bubble.svg');
}

&.mx_UseCaseSelectionButton_work::before {
mask-image: url('$(res)/img/element-icons/view-community.svg');
}

&.mx_UseCaseSelectionButton_community::before {
mask-image: url('$(res)/img/globe.svg');
}
}

&:hover, &:focus {
box-shadow: 0 $spacing-4 $spacing-8 rgba(0, 0, 0, 0.08);
transform: translate(0, -$spacing-8);
}

.mx_UseCaseSelectionButton_selectedIcon {
right: -12px;
top: -12px;
position: absolute;
border-radius: 24px;
background: $accent;
padding: 6px;
transition-property: opacity, transform;
transition-duration: 150ms;
opacity: 0;
transform: scale(0.6);

&::before {
content: "";
display: block;
background: $background;
mask-position: center;
mask-repeat: no-repeat;
mask-size: contain;
width: 12px;
height: 12px;

mask-image: url('$(res)/img/element-icons/check-white.svg');
}
}

&.mx_UseCaseSelectionButton_selected {
border: 2px solid $accent;
padding: calc($spacing-24 - 1px) calc($spacing-16 - 1px);
box-shadow: 0 $spacing-4 $spacing-8 rgba(0, 0, 0, 0.08);

.mx_UseCaseSelectionButton_selectedIcon {
opacity: 1;
transform: scale(1);
}
}
}
3 changes: 3 additions & 0 deletions res/img/element-icons/chat-bubble.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 2 additions & 7 deletions res/img/element-icons/group-members.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading