diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index 80278a54c..6dafe3ae9 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,37 @@ +Changes in BWI project 2.10.0 (2023-09-26) +=================================================== + +Upstream merge ✨: +- v1.11.1 + +Features ✨: +- New WYSIWYG composer (#4941) + +Improvements 🙌: +- UI optimization room overview (#4704, #4806) +- Change date format for poll details (#4798) +- Add additional information to the developer menu for Beta app (#4565) +- Update huddle permissions for new rooms (#4928) +- Update element call permissions when resetting room permissions (#5035) +- Disable all WYSIWYG commands (#4955) +- Change date format for maintenance to ISO-8601 (#5071) +- Update notes room layout in room overview (#4802) +- Enable/disable notes room in settings (#4730) + +Bugfix 🐛: +- Crashfix for dm creation when WYSIWYG composer is enabled (#5133) +- Change permalink URL scheme (#4910) +- No popup for successful password change (#4951) + +Translations 🗣 : +- German translations voice message (#5017) +- German translations wrong password (#4857) +- Add special characters for password creation/resetting (#4952) + +SDK API changes ⚠️: + +Build 🧱: + Changes in BWI project 2.9.1 (2023-09-08) =================================================== diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index 01ab6e203..7a0669446 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -680,7 +680,7 @@ class BWIBuildSettings: NSObject { var showPasswordChangedConfirmation = true // MARK: Create Room Menu - var enableAllChatsToolbar = true + var enableAllChatsToolbar = false // MARK: App Config var avoidServerSelectionOnAppConfig = false diff --git a/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift b/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift index e5d0e31cf..bb6112246 100644 --- a/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift +++ b/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift @@ -37,7 +37,6 @@ extension BWIBuildSettings { enableNewSessionManagerByDefault = true showMaintenanceInfoMessageType = true ignoreBlockingMaintenance = true - enableAllChatsToolbar = false bwiUseWellKnownPrivacyPolicyLink = true itunesAppLink = "itms://itunes.apple.com/app/bundesmessenger-beta/id1617068656?mt=8" diff --git a/Podfile b/Podfile index 6be9cdf9c..6ae6b8b40 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.10.0_rc2' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.10.0' } # Method to import the MatrixSDK def import_MatrixSDK diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings index 818ff0ad0..42fa341ff 100644 --- a/Riot/Assets/de.lproj/Bwi.strings +++ b/Riot/Assets/de.lproj/Bwi.strings @@ -535,7 +535,7 @@ "bwi_settings_new_features_show_features" = "Neue Funktionen anzeigen"; "bwi_feature_banner_header" = "Neue Funktionen"; "bwi_feature_banner_show_more_button" = "Erfahre mehr"; -"bwi_feature_banner_advertisement_text" = "Mit dem neuen Feature Ruhezeiteneinstellung lassen sich Benachrichtigungen nach Wochentag und Uhrzeit ein- bzw stummschalten."; +"bwi_feature_banner_advertisement_text" = "Beim Schreiben von Nachrichten kannst Du jetzt sehr einfach Textformatierungen verwenden."; // MARK: - Onboarding "onboarding_splash_login_button_title" = "Loslegen"; diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings index e45e03506..6267f0522 100644 --- a/Riot/Assets/en.lproj/Bwi.strings +++ b/Riot/Assets/en.lproj/Bwi.strings @@ -444,7 +444,7 @@ "bwi_settings_new_features_show_features" = "Show new features"; "bwi_feature_banner_header" = "New Features"; "bwi_feature_banner_show_more_button" = "Learn more"; -"bwi_feature_banner_advertisement_text" = "A new feature for notifications times allows you to define time intervals for filtering incoming push notifications."; +"bwi_feature_banner_advertisement_text" = "You can now easily use text formatting when writing messages."; // MARK: - Onboarding "onboarding_splash_login_button_title" = "Let's go"; diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index a379e5e7d..91e227f30 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -26,6 +26,34 @@
++ Version 2.10.0 +
+ ++ Neue Funktionen +
+ Verbesserungen +
+ Behobene Bugs +
Version 2.9.1 diff --git a/Riot/Generated/BWIStrings.swift b/Riot/Generated/BWIStrings.swift index 2f62438b4..fc0327740 100644 --- a/Riot/Generated/BWIStrings.swift +++ b/Riot/Generated/BWIStrings.swift @@ -239,7 +239,7 @@ public class BWIL10n: NSObject { public static var bwiErrorRoomNotAvailableTitle: String { return BWIL10n.tr("Bwi", "bwi_error_room_not_available_title") } - /// Mit dem neuen Feature Ruhezeiteneinstellung lassen sich Benachrichtigungen nach Wochentag und Uhrzeit ein- bzw stummschalten. + /// Beim Schreiben von Nachrichten kannst Du jetzt sehr einfach Textformatierungen verwenden. public static var bwiFeatureBannerAdvertisementText: String { return BWIL10n.tr("Bwi", "bwi_feature_banner_advertisement_text") } @@ -535,10 +535,38 @@ public class BWIL10n: NSObject { public static var bwiSettingsDeveloperApplyOrigAppConfig: String { return BWIL10n.tr("Bwi", "bwi_settings_developer_apply_orig_app_config") } + /// Capabilities + public static var bwiSettingsDeveloperCapabilities: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_capabilities") + } /// Neuen Notizen-Raum Raum erstellen public static var bwiSettingsDeveloperCreateNewPersonalNotesRoom: String { return BWIL10n.tr("Bwi", "bwi_settings_developer_create_new_personal_notes_room") } + /// Key Backup + public static var bwiSettingsDeveloperKeyBackup: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_key_backup") + } + /// Algorithmus + public static var bwiSettingsDeveloperKeyBackupAlgorithm: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_key_backup_algorithm") + } + /// Gespeicherte Schlüssel + public static var bwiSettingsDeveloperKeyBackupCount: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_key_backup_count") + } + /// ETag + public static var bwiSettingsDeveloperKeyBackupEtag: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_key_backup_etag") + } + /// Version + public static var bwiSettingsDeveloperKeyBackupVersion: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_key_backup_version") + } + /// Maintenance + public static var bwiSettingsDeveloperMaintenance: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_maintenance") + } /// Der alte Notizen-Raum Raum wurde durch einen neuen ersetzt. public static var bwiSettingsDeveloperNewPersonalNotesRoomCreated: String { return BWIL10n.tr("Bwi", "bwi_settings_developer_new_personal_notes_room_created") @@ -579,6 +607,18 @@ public class BWIL10n: NSObject { public static var bwiSettingsDeveloperUnrestrictUser: String { return BWIL10n.tr("Bwi", "bwi_settings_developer_unrestrict_user") } + /// Account Data + public static var bwiSettingsDeveloperUserAccountData: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_user_account_data") + } + /// Type + public static var bwiSettingsDeveloperUserAccountDataType: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_user_account_data_type") + } + /// Well-Known + public static var bwiSettingsDeveloperWellKnown: String { + return BWIL10n.tr("Bwi", "bwi_settings_developer_well_known") + } /// Einen Raum für private Notizen anzeigen public static var bwiSettingsEnableNotesRoomSummary: String { return BWIL10n.tr("Bwi", "bwi_settings_enable_notes_room_summary") @@ -1607,6 +1647,10 @@ public class BWIL10n: NSObject { public static var settingsOther: String { return BWIL10n.tr("Bwi", "settings_other") } + /// Dein Passwort wurde erfolgreich geändert. + public static var settingsPasswordChanged: String { + return BWIL10n.tr("Bwi", "settings_password_changed") + } /// Regeln: Mindestlänge 8 Zeichen, mind. 1 Sonderzeichen, 1 Groß- und 1 Kleinbuchstaben und 1 Ziffer public static var settingsPasswordCondition: String { return BWIL10n.tr("Bwi", "settings_password_condition") @@ -1631,10 +1675,6 @@ public class BWIL10n: NSObject { public static var settingsPasswordTooShortMessage: String { return BWIL10n.tr("Bwi", "settings_password_too_short_message") } - /// Dein Passwort wurde aktualisiert - public static var settingsPasswordUpdated: String { - return BWIL10n.tr("Bwi", "settings_password_updated") - } /// Permalink Prefix public static var settingsPermalinkPrefixPickerTitle: String { return BWIL10n.tr("Bwi", "settings_permalink_prefix_picker_title") @@ -1775,7 +1815,7 @@ public class BWIL10n: NSObject { public static func voiceMessageRemainingRecordingTime(_ p1: String) -> String { return BWIL10n.tr("Bwi", "voice_message_remaining_recording_time", p1) } - /// Sliden zum Abbrechen + /// Wischen zum Abbrechen public static var voiceMessageSlideToCancel: String { return BWIL10n.tr("Bwi", "voice_message_slide_to_cancel") } diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index ce6d62fd6..b446b0823 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -215,7 +215,7 @@ public class VectorL10n: NSObject { public static var allChatsSectionTitle: String { return VectorL10n.tr("Vector", "all_chats_section_title") } - /// All chats + /// Chats public static var allChatsTitle: String { return VectorL10n.tr("Vector", "all_chats_title") } diff --git a/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift b/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift index 2b03d0bb6..2ef2da675 100644 --- a/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift +++ b/Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift @@ -117,6 +117,7 @@ class RoomActionProvider: RoomActionProviderProtocol { title: BWIL10n.homeContextMenuPersonalNotes, image: UIImage(systemName: "star.slash")) { _ in PersonalNotesSettings().personalNotesVisible = false + NotificationCenter.default.post(name: AllChatsLayoutSettingsManager.didUpdateSettings, object: self) } } diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index 9e33cee1d..a714b0a4e 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -4108,8 +4108,10 @@ static CGSize kThreadListBarButtonItemImageSize; [self cancelEventSelection]; }]]; } - - if (!isJitsiCallEvent && !selectedEvent.isTimelinePollEvent && + + // bwi: #5160 disable quote function for new wysiwyg composer because it does not work + if (!([RoomViewController mainToolbarClass] == WysiwygInputToolbarView.class) && + !isJitsiCallEvent && !selectedEvent.isTimelinePollEvent && selectedEvent.eventType != MXEventTypeBeaconInfo) { [self.eventMenuBuilder addItemWithType:EventMenuItemTypeQuote diff --git a/RiotSwiftUI/Modules/Room/Composer/CreateActionList/View/ComposerCreateActionList.swift b/RiotSwiftUI/Modules/Room/Composer/CreateActionList/View/ComposerCreateActionList.swift index 706c2f1d9..d2852cd77 100644 --- a/RiotSwiftUI/Modules/Room/Composer/CreateActionList/View/ComposerCreateActionList.swift +++ b/RiotSwiftUI/Modules/Room/Composer/CreateActionList/View/ComposerCreateActionList.swift @@ -39,7 +39,7 @@ struct ComposerCreateActionList: View { HStack(spacing: 16) { Image(action.icon) .renderingMode(.template) - .foregroundColor(theme.colors.accent) + .foregroundColor(Color(ThemeService.shared().theme.tintColor)) // bwi: #5160 color changes Text(action.title) .foregroundColor(theme.colors.primaryContent) .font(theme.fonts.body) @@ -58,7 +58,7 @@ struct ComposerCreateActionList: View { HStack(spacing: 16) { Image(textFormattingIcon) .renderingMode(.template) - .foregroundColor(theme.colors.accent) + .foregroundColor(Color(ThemeService.shared().theme.tintColor)) // bwi: #5160 color changes Text(VectorL10n.wysiwygComposerStartActionTextFormatting) .foregroundColor(theme.colors.primaryContent) .font(theme.fonts.body) @@ -66,7 +66,7 @@ struct ComposerCreateActionList: View { Spacer() Toggle("", isOn: $viewModel.textFormattingEnabled) .labelsHidden() - .toggleStyle(SwitchToggleStyle(tint: theme.colors.accent)) + .toggleStyle(SwitchToggleStyle(tint: Color(ThemeService.shared().theme.tintColor))) // bwi: #5160 color changes .onChange(of: viewModel.textFormattingEnabled) { isOn in viewModel.send(viewAction: .toggleTextFormatting(isOn)) }