From ac94428b110a12f0e2a28c5a3ced0cac6954bacc Mon Sep 17 00:00:00 2001 From: Arnfried Griesert Date: Wed, 30 Aug 2023 12:34:58 +0000 Subject: [PATCH 1/2] =?UTF-8?q?MESSENGER-4704=20UI=20Optimierungen=20Raum?= =?UTF-8?q?=C3=BCbersicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/BWIBuildSettings.swift | 3 ++ .../Contents.json | 15 ++++++++++ .../settings-filled.svg | 8 ++++++ Riot/Assets/de.lproj/Vector.strings | 2 +- Riot/Assets/en.lproj/Vector.strings | 2 +- .../Home/AllChats/AllChatsCoordinator.swift | 28 +++++++++++-------- .../AllChats/AllChatsViewController.swift | 9 ++++-- .../ServerDownTimeBadge.swift | 2 +- 8 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/Contents.json create mode 100644 Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/settings-filled.svg diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index 9df896f21..8a83f181a 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -660,5 +660,8 @@ class BWIBuildSettings: NSObject { // MARK: itunes var itunesAppLink = "" + + // MARK: itunes + var showAllChatsFilterMenu = false } diff --git a/Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/Contents.json b/Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/Contents.json new file mode 100644 index 000000000..b76053693 --- /dev/null +++ b/Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "settings-filled.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/settings-filled.svg b/Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/settings-filled.svg new file mode 100644 index 000000000..82adbb752 --- /dev/null +++ b/Riot/Assets/Images.xcassets/BWI/bwi_settings_filled.imageset/settings-filled.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings index d6a80382a..36706d4b3 100644 --- a/Riot/Assets/de.lproj/Vector.strings +++ b/Riot/Assets/de.lproj/Vector.strings @@ -2452,7 +2452,7 @@ // Mark: - All Chats -"all_chats_title" = "Alle Unterhaltungen"; +"all_chats_title" = "Unterhaltungen"; "all_chats_empty_view_title" = "%@\nsieht ein bisschen leer aus."; "all_chats_all_filter" = "Alle"; "all_chats_edit_layout_show_filters" = "Filter anzeigen"; diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index e22420771..82921b0c2 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -2279,7 +2279,7 @@ Tap the + to start adding people."; // MARK: - All Chats -"all_chats_title" = "All chats"; +"all_chats_title" = "Chats"; "all_chats_section_title" = "Chats"; "all_chats_edit_layout" = "Layout preferences"; "all_chats_edit_layout_recents" = "Recents"; diff --git a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift index 82d1e4fc2..85039cc73 100644 --- a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift +++ b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift @@ -388,7 +388,11 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol { let avatarInsets: UIEdgeInsets = .init(top: 7, left: 7, bottom: 7, right: 7) var button: UIButton = .init(frame: view.bounds) button.imageEdgeInsets = avatarInsets - button.setImage(Asset.Images.tabPeople.image, for: .normal) + + // bwi: 4704 - ui improvements + let gearshapeImage = Asset.Images.bwiSettingsFilled.image + button.setImage(gearshapeImage, for: .normal) + button.tintColor = ThemeService.shared().theme.tintColor if BWIBuildSettings.shared.enableSideMenu { button.menu = avatarMenu @@ -427,16 +431,18 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol { } private func updateAvatarButtonItem() { - MXLog.info("[AllChatsCoordinator] updating avatar button item.") - if let avatar = userAvatarViewData(from: currentMatrixSession) { - if avatarMenuView == nil { - MXLog.warning("[AllChatsCoordinator] updateAvatarButtonItem: avatarMenuView is nil.") - } - avatarMenuView?.fill(with: avatar) - avatarMenuButton?.setImage(nil, for: .normal) - } else { - avatarMenuButton?.setImage(Asset.Images.tabPeople.image, for: .normal) - } + // bwi: 4704 - ui improvements (disable view updates) + +// MXLog.info("[AllChatsCoordinator] updating avatar button item.") +// if let avatar = userAvatarViewData(from: currentMatrixSession) { +// if avatarMenuView == nil { +// MXLog.warning("[AllChatsCoordinator] updateAvatarButtonItem: avatarMenuView is nil.") +// } +// avatarMenuView?.fill(with: avatar) +// avatarMenuButton?.setImage(nil, for: .normal) +// } else { +// avatarMenuButton?.setImage(Asset.Images.tabPeople.image, for: .normal) +// } } private func showRoom(withId roomId: String, eventId: String? = nil) { diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift index 269b46aa5..4bfe90a31 100644 --- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift +++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift @@ -147,8 +147,8 @@ class AllChatsViewController: HomeViewController { updateUI() - navigationItem.largeTitleDisplayMode = .automatic - navigationController?.navigationBar.prefersLargeTitles = true + navigationItem.largeTitleDisplayMode = .never + navigationController?.navigationBar.prefersLargeTitles = false searchController.obscuresBackgroundDuringPresentation = false searchController.searchResultsUpdater = self @@ -619,7 +619,10 @@ class AllChatsViewController: HomeViewController { } private func updateRightNavigationItem(with menu: UIMenu) { - self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), menu: menu) + // bwi 4704 - hide right navigation bar button + if BWIBuildSettings.shared.showAllChatsFilterMenu { + self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), menu: menu) + } } private lazy var spacesButton: BadgedBarButtonItem = { diff --git a/bwi/ServerMaintenance/ServerDownTimeBadge.swift b/bwi/ServerMaintenance/ServerDownTimeBadge.swift index 90e72efcf..ec2a94303 100644 --- a/bwi/ServerMaintenance/ServerDownTimeBadge.swift +++ b/bwi/ServerMaintenance/ServerDownTimeBadge.swift @@ -21,7 +21,7 @@ import UIKit @objcMembers class ServerDowntimeBadge : NSObject { func applyBadgeToButton(button: UIButton, color: UIColor) -> UIButton { - let badge = UILabel.init(frame: CGRect.init(x: 15, y: 0, width: 15, height: 15)) + let badge = UILabel.init(frame: CGRect.init(x: 20, y: 0, width: 15, height: 15)) badge.backgroundColor = color badge.clipsToBounds = true badge.layer.cornerRadius = 7 From 16831653f077ffb0e521e7a1831543126ee75383 Mon Sep 17 00:00:00 2001 From: Frank Rotermund Date: Fri, 1 Sep 2023 14:50:43 +0200 Subject: [PATCH 2/2] MESSENGER-5047 Release Bundesmessenger --- CHANGES_BWI.md | 26 ++++++++++++++++++ Podfile | 2 +- Riot/Assets/new_features.html | 27 +++++++++++++++++++ ...ficationSelfVerifyWaitViewController.swift | 6 +++++ .../NotificationTimesView.swift | 5 ++++ 5 files changed, 65 insertions(+), 1 deletion(-) diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index d3c5dd9ae..469ce643a 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,29 @@ +Changes in BWI project 2.9.0 (2023-08-31) +=================================================== + +Upstream merge ✨: + +- v1.10.14 + +Features ✨: + +Improvements 🙌: +- Maintenance fixes (#4979, #4976) +- Maintenance ignore blocking (#4982) +- Maintenance adhoc messages (#4295) +- Maintenance time zone change (#5071) +- Huddle set correct rights (#5035, #4928) + +Bugfix 🐛: +- Crosssigning web + +Translations 🗣 : + +SDK API changes ⚠️: + +Build 🧱: + + Changes in BWI project 2.8.0 (2023-08-03) =================================================== diff --git a/Podfile b/Podfile index 4485d490e..5ad00a6d9 100644 --- a/Podfile +++ b/Podfile @@ -43,7 +43,7 @@ when String # specific MatrixSDK released version $matrixSDKVersionSpec = $matrixSDKVersion end -$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.9.0_rc3' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.9.0' } # Method to import the MatrixSDK def import_MatrixSDK diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index c5ce541de..931f8fb08 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -26,6 +26,33 @@ +
+

+ Version 2.9.0 +

+ +

+ Neue Funktionen +

    +
  • Detailierte Abstimmungsergebnisse von Umfragen können jetzt auch im Umfragenverlauf eingesehen werden. +
+

+ +

+ Verbesserungen +

    +
  • Wir haben die Schnittstelle für Wartungsfenster erweitert und können jetzt besser über kommende Ereignisse informieren. +
+

+ +

+ Behobene Bugs +

    +
  • Die Verifizierung von Websessions ist jetzt zuverlässiger. +
+

+
+

Version 2.8.0 diff --git a/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift b/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift index 7636c3c2e..7baaaf89a 100644 --- a/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift +++ b/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift @@ -75,10 +75,16 @@ final class KeyVerificationSelfVerifyWaitViewController: UIViewController { self.registerThemeServiceDidChangeThemeNotification() self.update(theme: self.theme) + } + + // BWI resend verificationrequest after cancling QR Code crosssigning + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) self.viewModel.viewDelegate = self self.viewModel.process(viewAction: .loadData) } + override var preferredStatusBarStyle: UIStatusBarStyle { return self.theme.statusBarStyle diff --git a/bwi/NotificationTimes/NotificationTimesView.swift b/bwi/NotificationTimes/NotificationTimesView.swift index 2f1e4d977..77de78285 100644 --- a/bwi/NotificationTimes/NotificationTimesView.swift +++ b/bwi/NotificationTimes/NotificationTimesView.swift @@ -36,6 +36,10 @@ struct NotificationTimesView: View { @AppStorage("NotificationTimes_selectedDay") var selectedDay: Int = 0 @State var weekdays: [NotificationTimesWeekday] @State var hasChanges = false + + // MARK: Private + + @Environment(\.theme) private var theme var session: MXSession? @@ -83,6 +87,7 @@ struct NotificationTimesView: View { .disabled(!hasChanges) } } + .background(theme.colors.background) } private func onDoneButton() {