Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add build setting to hide feedback #7104

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add build setting to hide feedback #7104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33789c1
Add build setting to hide feedback
langleyd Nov 23, 2022
3c901b8
Use just one BuildSetting for manual feedback and bug reporting
langleyd Nov 23, 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
9 changes: 5 additions & 4 deletions Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,11 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
self.showInviteFriends(from: self.avatarMenuButton)
})
}

subMenuActions.append(UIAction(title: VectorL10n.sideMenuActionFeedback, image: UIImage(systemName: "questionmark.circle")) { [weak self] action in
self?.showBugReport()
})
if BuildSettings.allowBugReportingAndFeedbackManually {
subMenuActions.append(UIAction(title: VectorL10n.sideMenuActionFeedback, image: UIImage(systemName: "questionmark.circle")) { [weak self] action in
self?.showBugReport()
})
}

actions.append(UIMenu(title: "", options: .displayInline, children: subMenuActions))
actions.append(UIMenu(title: "", options: .displayInline, children: [
Expand Down
2 changes: 1 addition & 1 deletion Riot/Modules/Settings/SettingsViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ - (void)updateSections
}
[sectionAdvanced addRowWithTag:ADVANCED_MARK_ALL_AS_READ_INDEX];
[sectionAdvanced addRowWithTag:ADVANCED_CLEAR_CACHE_INDEX];
if (BuildSettings.settingsScreenAllowBugReportingManually)
if (BuildSettings.allowBugReportingAndFeedbackManually)
{
[sectionAdvanced addRowWithTag:ADVANCED_REPORT_BUG_INDEX];
}
Expand Down
7 changes: 5 additions & 2 deletions Riot/Modules/SideMenu/SideMenuViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,13 @@ final class SideMenuViewModel: SideMenuViewModelType {
}

sideMenuItems += [
.settings,
.feedback
.settings
]

if BuildSettings.allowBugReportingAndFeedbackManually {
sideMenuItems += [.feedback]
}

// Hide app version
let appVersion: String? = nil

Expand Down
1 change: 1 addition & 0 deletions changelog.d/7102.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add BuildSetting to hide feedback in the side-menu