From 3d146348ac8005544626f221f32493034097e1b3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 2 Sep 2020 15:08:35 +1000 Subject: [PATCH 1/5] reduce shadow of avatar upload --- stylesheets/_modal.scss | 4 +++- stylesheets/_session.scss | 1 - stylesheets/themes.scss | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stylesheets/_modal.scss b/stylesheets/_modal.scss index a0c314bb4..6f154ded3 100644 --- a/stylesheets/_modal.scss +++ b/stylesheets/_modal.scss @@ -206,7 +206,9 @@ position: relative; .module-avatar { - box-shadow: 0 0 23px 0 rgba($session-color-black, 0.78); + @include themify($themes) { + box-shadow: 0px 0px 13px 0.5px themed('sessionShadowColor'); + } } .qr-view-button { diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 2a186d566..a56d9ac9b 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -922,7 +922,6 @@ label { height: 80px; border-radius: 100%; background-color: rgba($session-color-black, 0.72); - box-shadow: 0px 0px 3px 0.5px rgba(0, 0, 0, 0.75); opacity: 0; transition: $session-transition-duration; diff --git a/stylesheets/themes.scss b/stylesheets/themes.scss index ca7c5ebae..070d34596 100644 --- a/stylesheets/themes.scss +++ b/stylesheets/themes.scss @@ -34,6 +34,7 @@ $themes: ( receivedMessageText: $black, sentMessageText: $black, sessionShadow: 0 0 4px 0 rgba($black, 0.37), + sessionShadowColor: rgba($black, 0.37), // left pane conversationList: $white, conversationItemHasUnread: #fcfcfc, @@ -83,6 +84,7 @@ $themes: ( receivedMessageText: $white, sentMessageText: $white, sessionShadow: 0 0 4px 0 rgba($white, 0.2), + sessionShadowColor: rgba($white, 0.2), // left pane conversationList: #1b1b1b, conversationItemHasUnread: #2c2c2c, From b38299edcbad2b81e7dbf55f9b743764e7152e8f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 2 Sep 2020 15:08:51 +1000 Subject: [PATCH 2/5] reduce size of session logo on empty screen --- stylesheets/_session_left_pane.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index 790b473f6..45b3160c2 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -348,7 +348,7 @@ $session-compose-margin: 20px; margin: auto; .session-brand-logo { - height: 215px; + height: 180px; filter: brightness(0) saturate(100%) invert(75%) sepia(84%) saturate(3272%) hue-rotate(103deg) brightness(106%) contrast(103%); } From 66dcfdfe6e067b5765c512d87439b87e1030f8ab Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 2 Sep 2020 15:24:50 +1000 Subject: [PATCH 3/5] show message when no blocked contact in settings --- _locales/en/messages.json | 4 ++++ .../session/settings/SessionSettings.tsx | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 3dfdd9c35..c19d175ca 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2175,5 +2175,9 @@ "closedGroupMaxSize": { "message": "A closed group cannot have more than 10 members", "androidKey": "activity_create_closed_group_too_many_group_members_error" + }, + "noBlockedContacts": { + "message": "No blocked contacts", + "androidKey": "blocked_contacts_fragment__no_blocked_contacts" } } diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx index e6562a8db..5a3928e89 100644 --- a/ts/components/session/settings/SessionSettings.tsx +++ b/ts/components/session/settings/SessionSettings.tsx @@ -613,6 +613,25 @@ export class SettingsView extends React.Component { confirmationDialogParams: undefined, }); } + + if (blockedNumbers.length === 0) { + return [ + { + id: 'noBlockedContacts', + title: '', + description: window.i18n('noBlockedContacts'), + type: undefined, + category: SessionSettingCategory.Blocked, + content: undefined, + comparisonValue: undefined, + setFn: undefined, + hidden: false, + onClick: undefined, + confirmationDialogParams: undefined, + }, + ]; + } + return results; } From 0b54fb2f0a8846ff683b0603560af358b9eb9e7f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 2 Sep 2020 15:25:29 +1000 Subject: [PATCH 4/5] minor ui fix --- stylesheets/_conversation.scss | 2 +- stylesheets/_session_signin.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index 1e1c3b739..2c0ce17fc 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -429,7 +429,7 @@ display: flex; flex-direction: row; align-items: center; - margin-bottom: 8px; + margin-bottom: 7px; padding: 0px 15px; .send-message { diff --git a/stylesheets/_session_signin.scss b/stylesheets/_session_signin.scss index b07c9ddaa..786b39ce6 100644 --- a/stylesheets/_session_signin.scss +++ b/stylesheets/_session_signin.scss @@ -160,7 +160,7 @@ &__unique-session-id { @include registration-label-mixin; - padding-top: 3em; + padding-top: 1em; text-align: center; } From 0721d469db768ea5e1a3abdd94297b3d90470f6b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 2 Sep 2020 15:49:43 +1000 Subject: [PATCH 5/5] increase timeout allowed for joining open group --- ts/components/session/LeftPaneMessageSection.tsx | 5 +++-- ts/session/types/OpenGroup.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx index a64486754..e66eb8e56 100644 --- a/ts/components/session/LeftPaneMessageSection.tsx +++ b/ts/components/session/LeftPaneMessageSection.tsx @@ -467,6 +467,7 @@ export class LeftPaneMessageSection extends React.Component { id: 'connectToServer', type: 'success', }); + this.setState({ loading: true }); await OpenGroup.join(serverUrl, async () => { if (await OpenGroup.serverExists(serverUrl)) { ToastUtils.push({ @@ -474,9 +475,8 @@ export class LeftPaneMessageSection extends React.Component { id: 'connectToServer', type: 'success', }); - - this.setState({ loading: true }); } + this.setState({ loading: false }); }); const openGroupConversation = await OpenGroup.getConversation(serverUrl); @@ -498,6 +498,7 @@ export class LeftPaneMessageSection extends React.Component { id: 'connectToServer', type: 'error', }); + this.setState({ loading: false }); } finally { this.setState({ loading: false, diff --git a/ts/session/types/OpenGroup.ts b/ts/session/types/OpenGroup.ts index 4666bdefa..e8fd0f2e2 100644 --- a/ts/session/types/OpenGroup.ts +++ b/ts/session/types/OpenGroup.ts @@ -129,7 +129,7 @@ export class OpenGroup { conversation = await PromiseUtils.timeout( window.attemptConnection(prefixedServer, channel), - 5000 + 15000 ); if (!conversation) { throw new Error(window.i18n('connectToServerFail'));