From eefd56dd289a91f2e246c22d7aa486b6095b6590 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Thu, 11 Mar 2021 13:49:29 +0100 Subject: [PATCH] fix(Communities): ensure app remembers hidden community intro banners Fixes #1960 --- ui/app/AppLayouts/Chat/CommunityColumn.qml | 2 +- .../Chat/CommunityComponents/CommunityWelcomeBanner.qml | 4 +++- ui/app/AppMain.qml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/app/AppLayouts/Chat/CommunityColumn.qml b/ui/app/AppLayouts/Chat/CommunityColumn.qml index ad1462c77b..11f3f7430f 100644 --- a/ui/app/AppLayouts/Chat/CommunityColumn.qml +++ b/ui/app/AppLayouts/Chat/CommunityColumn.qml @@ -128,7 +128,7 @@ Item { CommunityWelcomeBanner { id: emptyViewAndSuggestions - visible: chatsModel.communities.activeCommunity.admin + visible: !appSettings.hiddenCommunityWelcomeBanners.includes(chatsModel.communities.activeCommunity.id) && chatsModel.communities.activeCommunity.admin width: parent.width anchors.top: channelList.bottom anchors.topMargin: Style.current.padding diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityWelcomeBanner.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityWelcomeBanner.qml index 3a4b6d4a98..50aa3b0c13 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityWelcomeBanner.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityWelcomeBanner.qml @@ -46,7 +46,9 @@ Rectangle { icon.width: 20 iconColor: Style.current.darkGrey onClicked: { - // TODO make this saved in the settings + let hiddenBannerIds = appSettings.hiddenCommunityWelcomeBanners + hiddenBannerIds.push(chatsModel.communities.activeCommunity.id) + appSettings.hiddenCommunityWelcomeBanners = hiddenBannerIds root.visible = false } } diff --git a/ui/app/AppMain.qml b/ui/app/AppMain.qml index 6cbd2f0f48..507e5a13cb 100644 --- a/ui/app/AppMain.qml +++ b/ui/app/AppMain.qml @@ -91,6 +91,7 @@ RowLayout { property bool timelineEnabled: true property string locale: "en" property var recentEmojis: [] + property var hiddenCommunityWelcomeBanners: [] property real volume: 0.2 property int notificationSetting: Constants.notifyAllMessages property bool notificationSoundsEnabled: true