From 96aedeaf62e96ac6f401075be76eec4ea9f218cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Fri, 15 Feb 2019 22:25:33 +0000 Subject: [PATCH 01/24] Translated using Weblate (French) Currently translated at 100.0% (614 of 614 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/ --- Riot/Assets/fr.lproj/Vector.strings | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings index ae9f29fad..97ca1a803 100644 --- a/Riot/Assets/fr.lproj/Vector.strings +++ b/Riot/Assets/fr.lproj/Vector.strings @@ -662,3 +662,10 @@ "sign_out_key_backup_in_progress_alert_title" = "Sauvegarde de clés en cours. Si vous vous déconnectez maintenant vous n'aurez plus accès à vos messages chiffrés."; "sign_out_key_backup_in_progress_alert_discard_key_backup_action" = "Je ne veux plus de mes messages chiffrés"; "sign_out_key_backup_in_progress_alert_cancel_action" = "Je vais patienter"; +// Key backup wrong version +"e2e_key_backup_wrong_version_title" = "Nouvelle sauvegarde de clés"; +"e2e_key_backup_wrong_version" = "Une nouvelle sauvegarde de clés de messages sécurisés a été détectée.\n\nSi cela ne vient pas de vous, définissez une nouvelle phrase de passe dans les paramètres."; +"e2e_key_backup_wrong_version_button_settings" = "Paramètres"; +"e2e_key_backup_wrong_version_button_wasme" = "Ça vient de moi"; +"key_backup_setup_intro_manual_export_info" = "(Avancé)"; +"key_backup_setup_intro_manual_export_action" = "Exporter les clés manuellement"; From ae9a22a7d2805f795d371c97afd50385fa65bd80 Mon Sep 17 00:00:00 2001 From: Osoitz Date: Sun, 17 Feb 2019 13:05:02 +0000 Subject: [PATCH 02/24] Translated using Weblate (Basque) Currently translated at 100.0% (614 of 614 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/ --- Riot/Assets/eu.lproj/Vector.strings | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Riot/Assets/eu.lproj/Vector.strings b/Riot/Assets/eu.lproj/Vector.strings index f30779b9f..c8a433c96 100644 --- a/Riot/Assets/eu.lproj/Vector.strings +++ b/Riot/Assets/eu.lproj/Vector.strings @@ -401,7 +401,7 @@ "settings_sign_out_e2e_warn" = "Zure muturretik muturrerako zifratze gakoak galduko dituzu. Horrek esan nahi du ezin izango dituzula mezu zaharrak gehiago irakurri zifratutako geletan gailu honetatik."; "settings_global_settings_info" = "Jakinarazpen orokorren ezarpenak eskuragarri daude zure %@ web bezeroan"; "settings_on_denied_notification" = "Jakinarazpenak ukatu dira %@(e)n, baimendu zure gailuaren ezarpenetan"; -"room_details_history_section_prompt_msg" = "Historiala nork irakurri dezakeen aldatzea gelak honetara aurrerantzean bidalitako mezuei besterik ez zaie aplikatuako. Badagoen historialaren ikusgaitasuna ez da aldatuko."; +"room_details_history_section_prompt_msg" = "Historiala nork irakurri dezakeen aldatzea gelak honetara aurrerantzean bidalitako mezuei besterik ez zaie aplikatuko. Badagoen historialaren ikusgaitasuna ez da aldatuko."; // Call "call_incoming_voice_prompt" = "%@ erabiltzailearen deia jasotzen"; "call_incoming_video_prompt" = "%@ erabiltzailearen bideo-deia jasotzen"; @@ -639,3 +639,21 @@ "settings_key_backup_info_trust_signature_valid_device_verified" = "Gailuak %@ gailuaren baliozko sinadura bat du"; "settings_key_backup_info_trust_signature_valid_device_unverified" = "Babes kopiak %@ gailuaren sinadura du"; "settings_key_backup_info_trust_signature_invalid_device_verified" = "Babes-kopiak %@ gailuaren baliogabeko sinadura bat du"; +"settings_key_backup_info_trust_signature_invalid_device_unverified" = "Babes-kopiak %@ gailuaren sinadura baliogabe bat du"; +"settings_key_backup_delete_confirmation_prompt_msg" = "Ziur al zaude? Zifratutako mezuak galduko dituzu zure gakoak ez badira behar bezala gordetzen."; +"room_does_not_exist" = "Ez da %@ existitzen"; +// Key backup wrong version +"e2e_key_backup_wrong_version_title" = "Gakoen babes-kopia berria"; +"e2e_key_backup_wrong_version" = "Mezu seguruen gakoen babes-kopia berri bat antzeman da.\n\nZu izan ez bazara, ezarri pasaesaldi berria ezarpenetan."; +"e2e_key_backup_wrong_version_button_settings" = "Ezarpenak"; +"e2e_key_backup_wrong_version_button_wasme" = "Ni izan naiz"; +"key_backup_setup_title" = "Gakoen babes-kopia"; +"key_backup_setup_skip_alert_title" = "Ziur al zaude?"; +"key_backup_setup_skip_alert_message" = "Mezu seguruak galdu zenitzake saioa amaitzen baduzu edo gailua galtzen baduzu."; +"key_backup_setup_skip_alert_skip_action" = "Jauzi"; +"key_backup_setup_intro_title" = "Ez galdu inoiz zifratutako mezuak"; +"key_backup_setup_intro_info" = "Zifratutako geletako mezuak muturretik muturrerako zifratzearekin babestuta daude. Hartzaileak edo hartzaileek eta zuk dituzue mezu hauek irakurtzeko gakoek, beste inork ez.\n\nEgin gakoen babes-kopia segurua hauek ez galtzeko."; +"key_backup_setup_intro_setup_action_without_existing_backup" = "Hasi gakoen babes-kopia erabiltzen"; +"key_backup_setup_intro_setup_action_with_existing_backup" = "Erabili gakoen-babes-kopia"; +"key_backup_setup_intro_manual_export_info" = "(Aurreratua)"; +"key_backup_setup_intro_manual_export_action" = "Esportatu gakoak eskuz"; From 6d5279a4d5f8b9f4b9b1f4a4b84041ea2934c006 Mon Sep 17 00:00:00 2001 From: manuroe Date: Mon, 18 Feb 2019 10:59:36 +0100 Subject: [PATCH 03/24] Reskin: Fix text color in room preview --- Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m index fc4f74a7b..1752e94c9 100644 --- a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m +++ b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m @@ -71,7 +71,7 @@ self.roomMembers.textColor = ThemeService.shared.theme.tintColor; - self.previewLabel.textColor = ThemeService.shared.theme.baseTextSecondaryColor; + self.previewLabel.textColor = ThemeService.shared.theme.textPrimaryColor; self.previewLabel.numberOfLines = 0; self.subNoticeLabel.textColor = ThemeService.shared.theme.textSecondaryColor; From 08fd2b013f0026f4909dde6d64f663c5f79dd5ec Mon Sep 17 00:00:00 2001 From: manuroe Date: Mon, 18 Feb 2019 10:59:57 +0100 Subject: [PATCH 04/24] Reskin: Fix navigation bar background after accepting an invite --- Riot/Modules/Room/Views/Title/RoomTitleView.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Riot/Modules/Room/Views/Title/RoomTitleView.m b/Riot/Modules/Room/Views/Title/RoomTitleView.m index 7b38994ae..898103702 100644 --- a/Riot/Modules/Room/Views/Title/RoomTitleView.m +++ b/Riot/Modules/Room/Views/Title/RoomTitleView.m @@ -137,8 +137,7 @@ { [super customizeViewRendering]; - // Use same color as navigation bar - self.backgroundColor = ThemeService.shared.theme.baseColor; + self.backgroundColor = UIColor.clearColor; self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? ThemeService.shared.theme.baseTextPrimaryColor : ThemeService.shared.theme.textSecondaryColor); } From 2182a4558f002d292954baf06819cfb003664c08 Mon Sep 17 00:00:00 2001 From: manuroe Date: Mon, 18 Feb 2019 12:31:32 +0100 Subject: [PATCH 05/24] Reskin: CHANGES.rst --- CHANGES.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 96d6b7fc7..1e8306636 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,10 @@ +Changes in 0.8.1 (2019-02-) +=============================================== + +Bug fix: + * Fix text color in room preview (PR #2261) + * Fix navigation bar background after accepting an invite (PR #2261) + Changes in 0.8.0 (2019-02-15) =============================================== From f2dc2552e999464db4da8513ffc1fa9a6f592055 Mon Sep 17 00:00:00 2001 From: manuroe Date: Mon, 18 Feb 2019 12:36:49 +0100 Subject: [PATCH 06/24] PULL_REQUEST_TEMPLATE: add "UI change has been tested on both light and dark themes" --- .github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 11896f805..ce2bb7aaa 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,6 +2,7 @@ +* [ ] UI change has been tested on both light and dark themes * [ ] Pull request is based on the develop branch * [ ] Pull request updates [CHANGES.rst](https://github.com/vector-im/riot-ios/blob/develop/CHANGES.rst) * [ ] Pull request includes screenshots or videos of UI changes From b09c0c5f19e5f87c6122a5a98ee75d4734968c7d Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 18 Feb 2019 12:53:13 +0100 Subject: [PATCH 07/24] Apply new lineBreakColor where needed --- Riot/Modules/Authentication/AuthenticationViewController.h | 1 + Riot/Modules/Authentication/AuthenticationViewController.m | 3 +++ .../Modules/Authentication/AuthenticationViewController.xib | 5 +++-- Riot/Modules/Authentication/Views/AuthInputsView.m | 6 ++++++ .../Modules/Authentication/Views/ForgotPasswordInputsView.m | 4 ++++ Riot/Modules/Common/Recents/RecentsViewController.m | 1 + Riot/Modules/Communities/Home/GroupHomeViewController.m | 2 +- .../Communities/Members/GroupParticipantsViewController.m | 1 + Riot/Modules/Communities/Rooms/GroupRoomsViewController.m | 1 + Riot/Modules/Contacts/ContactsTableViewController.m | 1 + .../Modules/Contacts/Details/ContactDetailsViewController.m | 1 + .../GlobalSearch/Files/HomeFilesSearchViewController.m | 1 + .../Messages/HomeMessagesSearchViewController.m | 1 + Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m | 1 + Riot/Modules/MediaPicker/MediaPickerViewController.m | 1 + Riot/Modules/Room/Files/RoomFilesViewController.m | 1 + .../Room/Members/Detail/RoomMemberDetailsViewController.m | 1 + Riot/Modules/Room/Members/RoomParticipantsViewController.m | 1 + Riot/Modules/Room/RoomViewController.m | 1 + .../Room/Search/Files/RoomFilesSearchViewController.m | 1 + .../Room/Search/Messages/RoomMessagesSearchViewController.m | 1 + Riot/Modules/Room/Settings/RoomSettingsViewController.m | 1 + Riot/Modules/Room/Views/Activities/RoomActivitiesView.m | 2 +- .../Views/BubbleCells/RoomMembershipExpandedBubbleCell.m | 2 +- .../Room/Views/InputToolbar/DisabledRoomInputToolbarView.m | 2 +- Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m | 2 +- .../DirectoryPicker/DirectoryServerPickerViewController.m | 1 + .../Settings/Language/LanguagePickerViewController.m | 1 + .../Settings/PhoneCountry/CountryPickerViewController.m | 1 + Riot/Modules/Settings/SettingsViewController.m | 1 + Riot/Modules/StartChat/StartChatViewController.m | 1 + Riot/Modules/UserDevices/UsersDevicesViewController.m | 1 + 32 files changed, 44 insertions(+), 7 deletions(-) diff --git a/Riot/Modules/Authentication/AuthenticationViewController.h b/Riot/Modules/Authentication/AuthenticationViewController.h index 67b3b0463..5358f20f6 100644 --- a/Riot/Modules/Authentication/AuthenticationViewController.h +++ b/Riot/Modules/Authentication/AuthenticationViewController.h @@ -20,6 +20,7 @@ @interface AuthenticationViewController : MXKAuthenticationViewController @property (weak, nonatomic) IBOutlet UINavigationBar *navigationBar; +@property (weak, nonatomic) IBOutlet UIView *navigationBarSeparatorView; @property (weak, nonatomic) IBOutlet UINavigationItem *mainNavigationItem; @property (weak, nonatomic) IBOutlet UIBarButtonItem *rightBarButtonItem; diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m index 4efb30d30..3449cca21 100644 --- a/Riot/Modules/Authentication/AuthenticationViewController.m +++ b/Riot/Modules/Authentication/AuthenticationViewController.m @@ -132,6 +132,7 @@ - (void)userInterfaceThemeDidChange { [ThemeService.shared.theme applyStyleOnNavigationBar:self.navigationBar]; + self.navigationBarSeparatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor; // This view controller is not part of a navigation controller // so that applyStyleOnNavigationBar does not fully work. @@ -173,9 +174,11 @@ [self.customServersTickButton setAttributedTitle:serverOptionsTitle forState:UIControlStateNormal]; [self.customServersTickButton setAttributedTitle:serverOptionsTitle forState:UIControlStateHighlighted]; + self.homeServerSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; self.homeServerTextField.textColor = ThemeService.shared.theme.textPrimaryColor; self.homeServerLabel.textColor = ThemeService.shared.theme.textSecondaryColor; + self.identityServerSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; self.identityServerTextField.textColor = ThemeService.shared.theme.textPrimaryColor; self.identityServerLabel.textColor = ThemeService.shared.theme.textSecondaryColor; diff --git a/Riot/Modules/Authentication/AuthenticationViewController.xib b/Riot/Modules/Authentication/AuthenticationViewController.xib index 95b4eb970..c87bea248 100644 --- a/Riot/Modules/Authentication/AuthenticationViewController.xib +++ b/Riot/Modules/Authentication/AuthenticationViewController.xib @@ -1,11 +1,11 @@ - + - + @@ -35,6 +35,7 @@ + diff --git a/Riot/Modules/Authentication/Views/AuthInputsView.m b/Riot/Modules/Authentication/Views/AuthInputsView.m index c8b11a933..09ddcb3b3 100644 --- a/Riot/Modules/Authentication/Views/AuthInputsView.m +++ b/Riot/Modules/Authentication/Views/AuthInputsView.m @@ -112,6 +112,12 @@ self.messageLabel.textColor = ThemeService.shared.theme.textSecondaryColor; self.messageLabel.numberOfLines = 0; + + self.userLoginSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; + self.emailSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; + self.phoneSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; + self.passwordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; + self.repeatPasswordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; if (self.userLoginTextField.placeholder) { diff --git a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m index 6f16f2533..812106638 100644 --- a/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m +++ b/Riot/Modules/Authentication/Views/ForgotPasswordInputsView.m @@ -108,6 +108,10 @@ self.passWordTextField.textColor = ThemeService.shared.theme.textPrimaryColor; self.repeatPasswordTextField.textColor = ThemeService.shared.theme.textPrimaryColor; + self.emailSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; + self.passwordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; + self.repeatPasswordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor; + self.messageLabel.numberOfLines = 0; [self.nextStepButton.layer setCornerRadius:5]; diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m index fa95b06f2..1fd5962de 100644 --- a/Riot/Modules/Common/Recents/RecentsViewController.m +++ b/Riot/Modules/Common/Recents/RecentsViewController.m @@ -165,6 +165,7 @@ // Use the primary bg color for the recents table view in plain style. self.recentsTableView.backgroundColor = ThemeService.shared.theme.backgroundColor; + self.recentsTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; topview.backgroundColor = ThemeService.shared.theme.headerBackgroundColor; self.view.backgroundColor = ThemeService.shared.theme.backgroundColor; diff --git a/Riot/Modules/Communities/Home/GroupHomeViewController.m b/Riot/Modules/Communities/Home/GroupHomeViewController.m index b488c7102..2acae23b5 100644 --- a/Riot/Modules/Communities/Home/GroupHomeViewController.m +++ b/Riot/Modules/Communities/Home/GroupHomeViewController.m @@ -128,7 +128,7 @@ self.inviteLabel.textColor = ThemeService.shared.theme.baseTextSecondaryColor; self.inviteLabel.numberOfLines = 0; - self.separatorView.backgroundColor = ThemeService.shared.theme.headerBackgroundColor; + self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor; [self.leftButton.layer setCornerRadius:5]; self.leftButton.clipsToBounds = YES; diff --git a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m index fc5ec787e..33dcbc2a4 100644 --- a/Riot/Modules/Communities/Members/GroupParticipantsViewController.m +++ b/Riot/Modules/Communities/Members/GroupParticipantsViewController.m @@ -156,6 +156,7 @@ // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; // Update the gradient view above the screen CGFloat white = 1.0; diff --git a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m index 9eb349d5b..20cb7c448 100644 --- a/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m +++ b/Riot/Modules/Communities/Rooms/GroupRoomsViewController.m @@ -137,6 +137,7 @@ // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.tableView.dataSource) { diff --git a/Riot/Modules/Contacts/ContactsTableViewController.m b/Riot/Modules/Contacts/ContactsTableViewController.m index 558813569..c6671e364 100644 --- a/Riot/Modules/Contacts/ContactsTableViewController.m +++ b/Riot/Modules/Contacts/ContactsTableViewController.m @@ -111,6 +111,7 @@ // Check the table view style to select its bg color. self.contactsTableView.backgroundColor = ((self.contactsTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.contactsTableView.backgroundColor; + self.contactsTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.contactsTableView.dataSource) { diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m index dedcb530a..9dd380180 100644 --- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m +++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m @@ -242,6 +242,7 @@ // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.tableView.dataSource) { diff --git a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m index 612297f11..7630f10ab 100644 --- a/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m +++ b/Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m @@ -78,6 +78,7 @@ // Check the table view style to select its bg color. self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.searchTableView.backgroundColor; + self.searchTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; self.noResultsLabel.textColor = ThemeService.shared.theme.backgroundColor; diff --git a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m index dc55572a9..d5b20a9d2 100644 --- a/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m +++ b/Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m @@ -85,6 +85,7 @@ // Check the table view style to select its bg color. self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.searchTableView.backgroundColor; + self.searchTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; self.noResultsLabel.textColor = ThemeService.shared.theme.backgroundColor; diff --git a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m index d4c420694..52a93451c 100644 --- a/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m +++ b/Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m @@ -78,6 +78,7 @@ // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.tableView.dataSource) { diff --git a/Riot/Modules/MediaPicker/MediaPickerViewController.m b/Riot/Modules/MediaPicker/MediaPickerViewController.m index ff48c46b0..9e3f46144 100644 --- a/Riot/Modules/MediaPicker/MediaPickerViewController.m +++ b/Riot/Modules/MediaPicker/MediaPickerViewController.m @@ -191,6 +191,7 @@ static void *RecordingContext = &RecordingContext; self.userAlbumsTableView.backgroundColor = ThemeService.shared.theme.backgroundColor; self.view.backgroundColor = ThemeService.shared.theme.backgroundColor; + self.userAlbumsTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; } - (UIStatusBarStyle)preferredStatusBarStyle diff --git a/Riot/Modules/Room/Files/RoomFilesViewController.m b/Riot/Modules/Room/Files/RoomFilesViewController.m index 4fb62f934..ff922a33e 100644 --- a/Riot/Modules/Room/Files/RoomFilesViewController.m +++ b/Riot/Modules/Room/Files/RoomFilesViewController.m @@ -117,6 +117,7 @@ // Check the table view style to select its bg color. self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.bubblesTableView.backgroundColor; + self.bubblesTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.bubblesTableView.dataSource) { diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m index 7837018ee..1fcb9985c 100644 --- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m +++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m @@ -231,6 +231,7 @@ // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.tableView.dataSource) { diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m index 14b54210f..09582da19 100644 --- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m +++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m @@ -168,6 +168,7 @@ // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; // Update the gradient view above the screen CGFloat white = 1.0; diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index 3b7a6d701..7fd848e9a 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -454,6 +454,7 @@ // Check the table view style to select its bg color. self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); + self.bubblesTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; self.view.backgroundColor = self.bubblesTableView.backgroundColor; if (self.bubblesTableView.dataSource) diff --git a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m index 51c74d6a1..b9cbac836 100644 --- a/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m +++ b/Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m @@ -79,6 +79,7 @@ // Check the table view style to select its bg color. self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.searchTableView.backgroundColor; + self.searchTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; self.noResultsLabel.textColor = ThemeService.shared.theme.backgroundColor; diff --git a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m index a13185f45..1adfc6c84 100644 --- a/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m +++ b/Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m @@ -80,6 +80,7 @@ // Check the table view style to select its bg color. self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.searchTableView.backgroundColor; + self.searchTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; self.noResultsLabel.textColor = ThemeService.shared.theme.backgroundColor; diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m index 706a75f4f..bd287fae9 100644 --- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m +++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m @@ -273,6 +273,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.tableView.dataSource) { diff --git a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m index e5b959ec4..2f2e05053 100644 --- a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m +++ b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m @@ -112,7 +112,7 @@ { [super customizeViewRendering]; - self.separatorView.backgroundColor = ThemeService.shared.theme.headerBackgroundColor; + self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor; if (self.messageLabel.textColor != ThemeService.shared.theme.warningColor) { self.messageLabel.textColor = ThemeService.shared.theme.textSecondaryColor; diff --git a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m index 8cf27a17f..709d7d1b5 100644 --- a/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m +++ b/Riot/Modules/Room/Views/BubbleCells/RoomMembershipExpandedBubbleCell.m @@ -38,7 +38,7 @@ NSString *const kRoomMembershipExpandedBubbleCellTapOnCollapseButton = @"kRoomMe { [super customizeTableViewCellRendering]; - self.separatorView.backgroundColor = ThemeService.shared.theme.headerBackgroundColor; + self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor; [self.collapseButton setTintColor:ThemeService.shared.theme.tintColor]; self.collapseButton.titleLabel.font = [UIFont systemFontOfSize:14]; diff --git a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m index d3dce27e5..3c10a800f 100644 --- a/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m +++ b/Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m @@ -48,7 +48,7 @@ // Remove default toolbar background color self.backgroundColor = [UIColor clearColor]; - self.separatorView.backgroundColor = ThemeService.shared.theme.headerTextSecondaryColor; + self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor; self.disabledReasonTextView.font = [UIFont systemFontOfSize:15]; self.disabledReasonTextView.textColor = ThemeService.shared.theme.textPrimaryColor; diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m index 577592a41..6db9905ed 100644 --- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m +++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m @@ -87,7 +87,7 @@ // Remove default toolbar background color self.backgroundColor = [UIColor clearColor]; - self.separatorView.backgroundColor = ThemeService.shared.theme.headerTextSecondaryColor; + self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor; // Custom the growingTextView display growingTextView.layer.cornerRadius = 0; diff --git a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m index a72c3d372..9559ee9d0 100644 --- a/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m +++ b/Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m @@ -127,6 +127,7 @@ // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.tableView.dataSource) { diff --git a/Riot/Modules/Settings/Language/LanguagePickerViewController.m b/Riot/Modules/Settings/Language/LanguagePickerViewController.m index 915de9864..12a51252b 100644 --- a/Riot/Modules/Settings/Language/LanguagePickerViewController.m +++ b/Riot/Modules/Settings/Language/LanguagePickerViewController.m @@ -77,6 +77,7 @@ // Use the primary bg color for the table view in plain style. self.tableView.backgroundColor = ThemeService.shared.theme.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; topview.backgroundColor = ThemeService.shared.theme.backgroundColor; if (self.tableView.dataSource) diff --git a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m index ef7943c5f..0f52ba2e5 100644 --- a/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m +++ b/Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m @@ -80,6 +80,7 @@ // Use the primary bg color for the table view in plain style. self.tableView.backgroundColor = ThemeService.shared.theme.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; topview.backgroundColor = ThemeService.shared.theme.backgroundColor; self.searchDisplayController.searchResultsTableView.backgroundColor = self.tableView.backgroundColor; diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m index 7df4871e3..a955504a6 100644 --- a/Riot/Modules/Settings/SettingsViewController.m +++ b/Riot/Modules/Settings/SettingsViewController.m @@ -370,6 +370,7 @@ SignOutAlertPresenterDelegate> // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.tableView.dataSource) { diff --git a/Riot/Modules/StartChat/StartChatViewController.m b/Riot/Modules/StartChat/StartChatViewController.m index cbc7dabf4..d72abda68 100644 --- a/Riot/Modules/StartChat/StartChatViewController.m +++ b/Riot/Modules/StartChat/StartChatViewController.m @@ -154,6 +154,7 @@ // Check the table view style to select its bg color. self.contactsTableView.backgroundColor = ((self.contactsTableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.contactsTableView.backgroundColor; + self.contactsTableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.contactsTableView.dataSource) { diff --git a/Riot/Modules/UserDevices/UsersDevicesViewController.m b/Riot/Modules/UserDevices/UsersDevicesViewController.m index 132627553..886c8a915 100644 --- a/Riot/Modules/UserDevices/UsersDevicesViewController.m +++ b/Riot/Modules/UserDevices/UsersDevicesViewController.m @@ -89,6 +89,7 @@ // Check the table view style to select its bg color. self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? ThemeService.shared.theme.backgroundColor : ThemeService.shared.theme.headerBackgroundColor); self.view.backgroundColor = self.tableView.backgroundColor; + self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor; if (self.tableView.dataSource) { From a30e6dedb098014812ea3ae787d62c8012047f39 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 18 Feb 2019 15:31:56 +0100 Subject: [PATCH 08/24] Fix header tint color issue in SegmentedViewController. Fix #2260. --- .../SegmentedViewController.m | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m index 7823d8c67..b49384752 100644 --- a/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m +++ b/Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m @@ -127,6 +127,24 @@ return viewControllers; } +- (void)setSectionHeaderTintColor:(UIColor *)sectionHeaderTintColor +{ + if (_sectionHeaderTintColor != sectionHeaderTintColor) + { + _sectionHeaderTintColor = sectionHeaderTintColor; + + if (selectedMarkerView) + { + selectedMarkerView.backgroundColor = sectionHeaderTintColor; + } + + for (UILabel *label in sectionLabels) + { + label.textColor = sectionHeaderTintColor; + } + } +} + #pragma mark - - (void)finalizeInit From ec1fd236b8ea1a8611277e530dab6a7b45add80c Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 18 Feb 2019 15:34:21 +0100 Subject: [PATCH 09/24] Update changes --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 1e8306636..cc1d8d505 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ Changes in 0.8.1 (2019-02-) Bug fix: * Fix text color in room preview (PR #2261) * Fix navigation bar background after accepting an invite (PR #2261) + * Tabs at the top of Room Details are hard to see in dark theme (#2260). Changes in 0.8.0 (2019-02-15) =============================================== From 1f64b5b5d1c3a1b7ce6ffdb8babfb91a32ff2ac0 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Mon, 18 Feb 2019 16:07:11 +0100 Subject: [PATCH 10/24] update copyright years --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d3d338b91..34b54eeaf 100644 --- a/README.rst +++ b/README.rst @@ -43,7 +43,7 @@ Copyright & License Copyright (c) 2014-2017 OpenMarket Ltd Copyright (c) 2017 Vector Creations Ltd -Copyright (c) 2017-2018 New Vector Ltd +Copyright (c) 2017-2019 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the LICENSE file, or at: From 99439360d4fc1ebac9951e857812788e62c6863a Mon Sep 17 00:00:00 2001 From: manuroe Date: Mon, 18 Feb 2019 18:25:50 +0100 Subject: [PATCH 11/24] Key backup: avoid to refresh the home room list on every backup state change A possible mitigation for #2265 --- CHANGES.rst | 7 +++++-- .../Recents/DataSources/RecentsDataSource.m | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1e8306636..7880378a7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,9 +1,12 @@ Changes in 0.8.1 (2019-02-) =============================================== +Improvements: + * Key backup: avoid to refresh the home room list on every backup state change (#2265). + Bug fix: - * Fix text color in room preview (PR #2261) - * Fix navigation bar background after accepting an invite (PR #2261) + * Fix text color in room preview (PR #2261). + * Fix navigation bar background after accepting an invite (PR #2261). Changes in 0.8.0 (2019-02-15) =============================================== diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m index 846ab732e..5f4b2707f 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m @@ -165,10 +165,13 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou - (void)keyBackupStateDidChangeNotification:(NSNotification*)notification { - [self forceRefresh]; + if ([self updateKeyBackupBanner]) + { + [self forceRefresh]; + } } -- (void)updateKeyBackupBanner +- (BOOL)updateKeyBackupBanner { KeyBackupBanner keyBackupBanner = KeyBackupBannerNone; @@ -207,8 +210,12 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou break; } } - + + BOOL updated = (self.keyBackupBanner != keyBackupBanner); + self.keyBackupBanner = keyBackupBanner; + + return updated; } - (void)hideKeyBackupBanner:(KeyBackupBanner)keyBackupBanner @@ -1227,6 +1234,8 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou - (void)refreshRoomsSections { + NSDate *startDate = [NSDate date]; + [invitesCellDataArray removeAllObjects]; [favoriteCellDataArray removeAllObjects]; [peopleCellDataArray removeAllObjects]; @@ -1240,8 +1249,6 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou keyBackupBannerSection = directorySection = favoritesSection = peopleSection = conversationSection = lowPrioritySection = serverNoticeSection = invitesSection = -1; - [self updateKeyBackupBanner]; - if (displayedRecentsDataSourceArray.count > 0) { // FIXME manage multi accounts @@ -1485,6 +1492,8 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou }]; } } + + NSLog(@"[RecentsDataSource] refreshRoomsSections: Done in %.0fms", [[NSDate date] timeIntervalSinceDate:startDate] * 1000); } - (void)dataSource:(MXKDataSource*)dataSource didCellChange:(id)changes From 464507dc04ddd5391c90ab14567f581aec52d0f6 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 19 Feb 2019 09:36:43 +0100 Subject: [PATCH 12/24] Update dark theme colors --- Riot/Managers/Theme/Themes/DarkTheme.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift index 89d3cc92b..1f556f662 100644 --- a/Riot/Managers/Theme/Themes/DarkTheme.swift +++ b/Riot/Managers/Theme/Themes/DarkTheme.swift @@ -23,15 +23,15 @@ class DarkTheme: NSObject, Theme { var backgroundColor: UIColor = UIColor(rgb: 0x181B21) - var baseColor: UIColor = UIColor(rgb: 0x1B1F25) + var baseColor: UIColor = UIColor(rgb: 0x15171B) var baseTextPrimaryColor: UIColor = UIColor(rgb: 0xEDF3FF) var baseTextSecondaryColor: UIColor = UIColor(rgb: 0xEDF3FF) var searchBackgroundColor: UIColor = UIColor(rgb: 0x181B21) var searchPlaceholderColor: UIColor = UIColor(rgb: 0x61708B) - var headerBackgroundColor: UIColor = UIColor(rgb: 0x22262E) - var headerBorderColor: UIColor = UIColor(rgb: 0x181B21) + var headerBackgroundColor: UIColor = UIColor(rgb: 0x15171B) + var headerBorderColor: UIColor = UIColor(rgb: 0x22262E) var headerTextPrimaryColor: UIColor = UIColor(rgb: 0xA1B2D1) var headerTextSecondaryColor: UIColor = UIColor(rgb: 0xC8C8CD) From ed28ad922b42eb4552e65acdd09cc06e19a20d04 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 19 Feb 2019 09:39:01 +0100 Subject: [PATCH 13/24] Add style method for UITabBar on Theme protocol. Update themes and make UITabBar non translucent. --- Riot/Managers/Theme/Theme.swift | 5 +++++ Riot/Managers/Theme/Themes/DarkTheme.swift | 6 ++++++ Riot/Managers/Theme/Themes/DefaultTheme.swift | 6 ++++++ Riot/Modules/TabBar/MasterTabBarController.m | 3 +-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Riot/Managers/Theme/Theme.swift b/Riot/Managers/Theme/Theme.swift index 839f4641c..50970fed0 100644 --- a/Riot/Managers/Theme/Theme.swift +++ b/Riot/Managers/Theme/Theme.swift @@ -80,6 +80,11 @@ import UIKit // MARK: - Customisation methods + + /// Apply the theme on a button. + /// + /// - Parameter tabBar: The tabBar to customise. + func applyStyle(onTabBar tabBar: UITabBar) /// Apply the theme on a navigation bar /// diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift index 1f556f662..501f100d0 100644 --- a/Riot/Managers/Theme/Themes/DarkTheme.swift +++ b/Riot/Managers/Theme/Themes/DarkTheme.swift @@ -60,6 +60,12 @@ class DarkTheme: NSObject, Theme { var selectedBackgroundColor: UIColor? = UIColor.black var overlayBackgroundColor: UIColor = UIColor(white: 0.7, alpha: 0.5) var matrixSearchBackgroundImageTintColor: UIColor = UIColor(rgb: 0x7E7E7E) + + func applyStyle(onTabBar tabBar: UITabBar) { + tabBar.tintColor = self.tintColor; + tabBar.barTintColor = self.headerBackgroundColor; + tabBar.isTranslucent = false; + } func applyStyle(onNavigationBar navigationBar: UINavigationBar) { navigationBar.tintColor = self.baseTextPrimaryColor; diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift index 3a14b3f95..d400fa6c8 100644 --- a/Riot/Managers/Theme/Themes/DefaultTheme.swift +++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift @@ -60,6 +60,12 @@ class DefaultTheme: NSObject, Theme { var selectedBackgroundColor: UIColor? = nil // Use the default selection color var overlayBackgroundColor: UIColor = UIColor(white: 0.7, alpha: 0.5) var matrixSearchBackgroundImageTintColor: UIColor = UIColor(rgb: 0xE7E7E7) + + func applyStyle(onTabBar tabBar: UITabBar) { + tabBar.tintColor = self.tintColor; + tabBar.barTintColor = self.headerBackgroundColor; + tabBar.isTranslucent = false; + } func applyStyle(onNavigationBar navigationBar: UINavigationBar) { navigationBar.tintColor = self.baseTextPrimaryColor; diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m index d926c8781..b7290b760 100644 --- a/Riot/Modules/TabBar/MasterTabBarController.m +++ b/Riot/Modules/TabBar/MasterTabBarController.m @@ -116,8 +116,7 @@ { [ThemeService.shared.theme applyStyleOnNavigationBar:self.navigationController.navigationBar]; - self.tabBar.tintColor = ThemeService.shared.theme.tintColor; - self.tabBar.barTintColor = ThemeService.shared.theme.headerBackgroundColor; + [ThemeService.shared.theme applyStyleOnTabBar:self.tabBar]; self.view.backgroundColor = ThemeService.shared.theme.backgroundColor; From 69eccb9c906a4801ac219837e9dcca690e0d6c33 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 19 Feb 2019 09:39:40 +0100 Subject: [PATCH 14/24] Handle UISearchBar cancel button color in ThemeService --- Riot/Managers/Theme/ThemeService.m | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Riot/Managers/Theme/ThemeService.m b/Riot/Managers/Theme/ThemeService.m index 2c54ec5ad..0cbe1bd97 100644 --- a/Riot/Managers/Theme/ThemeService.m +++ b/Riot/Managers/Theme/ThemeService.m @@ -51,8 +51,8 @@ NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChan - (void)setTheme:(id _Nonnull)theme { _theme = theme; - - [UIScrollView appearance].indicatorStyle = self.theme.scrollBarStyle; + + [self updateAppearance]; [[NSNotificationCenter defaultCenter] postNotificationName:kThemeServiceDidChangeThemeNotification object:nil]; } @@ -112,5 +112,15 @@ NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChan } } +- (void)updateAppearance +{ + [UIScrollView appearance].indicatorStyle = self.theme.scrollBarStyle; + + // Define the navigation bar text color + [[UINavigationBar appearance] setTintColor:self.theme.tintColor]; + + // Define the UISearchBar cancel button color + [[UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UISearchBar class]]] setTitleTextAttributes:@{ NSForegroundColorAttributeName : self.theme.searchPlaceholderColor } forState: UIControlStateNormal]; +} @end From 45f5ead7c50c6a8b2ebcdd36b8e0498596cb96ad Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 19 Feb 2019 09:40:38 +0100 Subject: [PATCH 15/24] Remove UISearchBar border color --- Riot/Managers/Theme/Themes/DarkTheme.swift | 4 +--- Riot/Managers/Theme/Themes/DefaultTheme.swift | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift index 501f100d0..8e50e1b7b 100644 --- a/Riot/Managers/Theme/Themes/DarkTheme.swift +++ b/Riot/Managers/Theme/Themes/DarkTheme.swift @@ -81,9 +81,7 @@ class DarkTheme: NSObject, Theme { func applyStyle(onSearchBar searchBar: UISearchBar) { searchBar.barStyle = .black searchBar.tintColor = self.searchPlaceholderColor; - searchBar.barTintColor = self.headerBackgroundColor; - searchBar.layer.borderWidth = 1; - searchBar.layer.borderColor = self.headerBorderColor.cgColor; + searchBar.barTintColor = self.headerBackgroundColor; } func applyStyle(onTextField texField: UITextField) { diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift index d400fa6c8..fb43f1fec 100644 --- a/Riot/Managers/Theme/Themes/DefaultTheme.swift +++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift @@ -82,8 +82,6 @@ class DefaultTheme: NSObject, Theme { searchBar.barStyle = .default searchBar.tintColor = self.searchPlaceholderColor; searchBar.barTintColor = self.headerBackgroundColor; - searchBar.layer.borderWidth = 1; - searchBar.layer.borderColor = self.headerBorderColor.cgColor; } func applyStyle(onTextField texField: UITextField) { From 260ffdea09049e98ff7b21aa6ccb4fbfab848038 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 19 Feb 2019 09:51:35 +0100 Subject: [PATCH 16/24] Remove UINavigationBar appearance update from AppDelegate --- Riot/AppDelegate.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m index df6253dc8..de048f57a 100644 --- a/Riot/AppDelegate.m +++ b/Riot/AppDelegate.m @@ -429,8 +429,6 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN [NSBundle mxk_setLanguage:language]; [NSBundle mxk_setFallbackLanguage:@"en"]; - // Define the navigation bar text color - [[UINavigationBar appearance] setTintColor:ThemeService.shared.theme.tintColor]; // Customize the localized string table [NSBundle mxk_customizeLocalizedStringTableName:@"Vector"]; From 6409fd421f06b87babcce372b995e725bc98de0b Mon Sep 17 00:00:00 2001 From: Besnik Bleta Date: Sat, 16 Feb 2019 11:23:31 +0000 Subject: [PATCH 17/24] Translated using Weblate (Albanian) Currently translated at 99.5% (611 of 614 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/ --- Riot/Assets/sq.lproj/Vector.strings | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Riot/Assets/sq.lproj/Vector.strings b/Riot/Assets/sq.lproj/Vector.strings index 31538a2ad..5f613d1ed 100644 --- a/Riot/Assets/sq.lproj/Vector.strings +++ b/Riot/Assets/sq.lproj/Vector.strings @@ -658,3 +658,10 @@ "sign_out_key_backup_in_progress_alert_title" = "Kopjeruajtja e kyçeve po kryhet. Nëse dilni tani nga llogaria, do të humbni hyrjen te mesazhet tuaj të fshehtëzuar."; "sign_out_key_backup_in_progress_alert_discard_key_backup_action" = "Nuk i dua mesazhet e mia të fshehtëzuar"; "sign_out_key_backup_in_progress_alert_cancel_action" = "Do të pres"; +// Key backup wrong version +"e2e_key_backup_wrong_version_title" = "Kopjeruajtje e Re Kyçesh"; +"e2e_key_backup_wrong_version" = "U pikas një kopjeruajtje e re kyçesh mesazhesh të sigurt.\n\nNëse s’qe prej jush, caktoni një frazëkalim të ri te Rregullimet."; +"e2e_key_backup_wrong_version_button_settings" = "Rregullime"; +"e2e_key_backup_wrong_version_button_wasme" = "Prej meje qe"; +"key_backup_setup_intro_manual_export_info" = "(Të mëtejshme)"; +"key_backup_setup_intro_manual_export_action" = "Eksportoni kyçe dorazi"; From 373ad59d7334201fffc0a1ed2b255ecb51b718f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= Date: Sun, 17 Feb 2019 11:50:05 +0000 Subject: [PATCH 18/24] Translated using Weblate (Finnish) Currently translated at 4.5% (28 of 614 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fi/ --- Riot/Assets/fi.lproj/Vector.strings | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Riot/Assets/fi.lproj/Vector.strings b/Riot/Assets/fi.lproj/Vector.strings index 713e12ab2..6ae6798fd 100644 --- a/Riot/Assets/fi.lproj/Vector.strings +++ b/Riot/Assets/fi.lproj/Vector.strings @@ -27,3 +27,5 @@ "camera" = "Kamera"; "voice" = "Ääni"; "video" = "Video"; +// Room Details +"room_details_title" = "Huoneen tiedot"; From ea176ac8429b73e94d451c0d3a50a8bc387793d5 Mon Sep 17 00:00:00 2001 From: sergio Date: Mon, 18 Feb 2019 12:45:28 +0000 Subject: [PATCH 19/24] Translated using Weblate (Russian) Currently translated at 100.0% (614 of 614 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ru/ --- Riot/Assets/ru.lproj/Vector.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Riot/Assets/ru.lproj/Vector.strings b/Riot/Assets/ru.lproj/Vector.strings index f295b9993..213b8ea87 100644 --- a/Riot/Assets/ru.lproj/Vector.strings +++ b/Riot/Assets/ru.lproj/Vector.strings @@ -103,7 +103,7 @@ "room_recents_people_section" = "ЛЮДИ"; "room_recents_conversations_section" = "КОМНАТЫ"; "room_recents_no_conversation" = "Нет комнат"; -"room_recents_low_priority_section" = "НИЗКИЙ ПРИОРИТЕТ"; +"room_recents_low_priority_section" = "МАЛОВАЖНЫЕ"; "room_recents_invites_section" = "ПРИГЛАШЕНИЯ"; "room_recents_start_chat_with" = "Начать чат"; "room_recents_create_empty_room" = "Создать комнату"; @@ -294,7 +294,7 @@ "room_details_room_name" = "Название комнаты"; "room_details_topic" = "Тема"; "room_details_favourite_tag" = "Избранное"; -"room_details_low_priority_tag" = "Низкий приоритет"; +"room_details_low_priority_tag" = "Маловажные"; "room_details_mute_notifs" = "Отключить оповещения"; "room_details_access_section" = "Кто может получить доступ к этой комнате?"; "room_details_access_section_invited_only" = "Только приглашенные люди"; From 5ba30e591341fe9fd9aa455203a18afbdff10ec4 Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 19 Feb 2019 14:51:47 +0100 Subject: [PATCH 20/24] Key backup: Fix crash when switching tabs if there is a banner on the home tab This is a regression made in #2265 (Key backup: avoid to refresh the home room list on every backup state change). On other tabs than `self.keyBackupBanner` must be reset to `KeyBackupBannerNone` so that there is no banner section. --- Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m index 5f4b2707f..058fab9b5 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m @@ -126,7 +126,8 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou { [self unregisterKeyBackupStateDidChangeNotification]; } - + + [self updateKeyBackupBanner]; [self forceRefresh]; } From b47fb508f015726d4dd9166cd1ad48c4f402b5bf Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 19 Feb 2019 15:56:17 +0100 Subject: [PATCH 21/24] Fix expanded header color in RoomViewController --- Riot/Modules/Room/RoomViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index 7fd848e9a..d43224cf6 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -445,7 +445,7 @@ self.jumpToLastUnreadLabel.attributedText = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_jump_to_first_unread", @"Vector", nil) attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle), NSUnderlineColorAttributeName: ThemeService.shared.theme.textPrimaryColor, NSForegroundColorAttributeName: ThemeService.shared.theme.textPrimaryColor}]; - self.expandedHeaderContainer.backgroundColor = ThemeService.shared.theme.headerBackgroundColor; + self.expandedHeaderContainer.backgroundColor = ThemeService.shared.theme.baseColor; self.previewHeaderContainer.backgroundColor = ThemeService.shared.theme.headerBackgroundColor; missedDiscussionsBadgeLabel.textColor = ThemeService.shared.theme.backgroundColor; From e129570c264170bfd421eaa32e1f0d1812288222 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Tue, 19 Feb 2019 16:55:58 +0100 Subject: [PATCH 22/24] Update jump to last unread banner separator color in RoomViewController --- Riot/Modules/Room/RoomViewController.h | 1 + Riot/Modules/Room/RoomViewController.m | 1 + Riot/Modules/Room/RoomViewController.xib | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Riot/Modules/Room/RoomViewController.h b/Riot/Modules/Room/RoomViewController.h index 9d79bf0fe..6161189bd 100644 --- a/Riot/Modules/Room/RoomViewController.h +++ b/Riot/Modules/Room/RoomViewController.h @@ -43,6 +43,7 @@ @property (weak, nonatomic) IBOutlet UIButton *jumpToLastUnreadButton; @property (weak, nonatomic) IBOutlet UILabel *jumpToLastUnreadLabel; @property (weak, nonatomic) IBOutlet UIButton *resetReadMarkerButton; +@property (weak, nonatomic) IBOutlet UIView *jumpToLastUnreadBannerSeparatorView; /** Force the display of the expanded header. diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index d43224cf6..73627f544 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -443,6 +443,7 @@ // Prepare jump to last unread banner self.jumpToLastUnreadBannerContainer.backgroundColor = ThemeService.shared.theme.backgroundColor; self.jumpToLastUnreadLabel.attributedText = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_jump_to_first_unread", @"Vector", nil) attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle), NSUnderlineColorAttributeName: ThemeService.shared.theme.textPrimaryColor, NSForegroundColorAttributeName: ThemeService.shared.theme.textPrimaryColor}]; + self.jumpToLastUnreadBannerSeparatorView.backgroundColor = ThemeService.shared.theme.headerBorderColor; self.expandedHeaderContainer.backgroundColor = ThemeService.shared.theme.baseColor; diff --git a/Riot/Modules/Room/RoomViewController.xib b/Riot/Modules/Room/RoomViewController.xib index 58c917eed..0a8a14425 100644 --- a/Riot/Modules/Room/RoomViewController.xib +++ b/Riot/Modules/Room/RoomViewController.xib @@ -1,12 +1,11 @@ - + - - + @@ -19,6 +18,7 @@ + @@ -80,7 +80,7 @@ - - + + From ac3918fb14bcc0fd2a0d4d6e26a8b7ace2cd06ce Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 19 Feb 2019 12:30:42 +0000 Subject: [PATCH 23/24] Translated using Weblate (Bulgarian) Currently translated at 96.9% (595 of 614 strings) Translation: Riot iOS/Riot iOS Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/bg/ --- Riot/Assets/bg.lproj/Vector.strings | 50 ++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/Riot/Assets/bg.lproj/Vector.strings b/Riot/Assets/bg.lproj/Vector.strings index 02f38588e..ff0b78f1f 100644 --- a/Riot/Assets/bg.lproj/Vector.strings +++ b/Riot/Assets/bg.lproj/Vector.strings @@ -556,15 +556,15 @@ "room_resource_usage_limit_reached_message_2" = "някои потребители няма да могат да влязат."; "room_resource_usage_limit_reached_message_contact_3" = " за да увеличите този лимит."; "auth_accept_policies" = "Моля, прегледайте и приемете политиките на този сървър:"; -"settings_key_backup" = "ЗАЩИТЕНО ВЪЗСТАНОВЯВАНЕ НА СЪОБЩЕНИЯ"; +"settings_key_backup" = "РЕЗЕРВНО КОПИЕ НА КЛЮЧОВЕТЕ"; "settings_key_backup_info_checking" = "Проверка..."; -"settings_key_backup_info_none" = "Възстановяването на Защитени Съобщения все още не е настроено."; +"settings_key_backup_info_none" = "Не се прави резервно копие на ключовете Ви от това устройство."; "settings_key_backup_info_version" = "Версия на резервното копие на ключовете: %@"; "settings_key_backup_info_algorithm" = "Алгоритъм: %@"; -"settings_key_backup_info_valid" = "Възстановяване на Защитени Съобщения беше настроено за това устройство."; -"settings_key_backup_info_not_valid" = "Възстановяването на Защитени Съобщения не е активно на това устройство."; +"settings_key_backup_info_valid" = "Това устройство прави резервно копие на ключовете Ви."; +"settings_key_backup_info_not_valid" = "Това устройство не прави резервно копие на ключовете Ви."; "settings_key_backup_info_progress" = "Правене на резервно копие на %@ ключа..."; -"settings_key_backup_info_progress_done" = "Беше направено резервно копие на всички ключове"; +"settings_key_backup_info_progress_done" = "Има резервно копие на всички ключове"; "settings_key_backup_info_not_trusted_from_verifiable_device_fix_action" = "За да използвате Възстановяване на Защитени Съобщения на това устройство, потвърдете %@ сега."; "settings_key_backup_info_not_trusted_fix_action" = "За да използвате Възстановяване на Защитени Съобщения на това устройство, въведете паролата си или ключа за възстановяване."; "settings_key_backup_info_trust_signature_unknown" = "Резервното копие има подпис от устройство с идентификатор: %@"; @@ -573,22 +573,22 @@ "settings_key_backup_info_trust_signature_valid_device_unverified" = "Резервното копие има валиден подпис от %@"; "settings_key_backup_info_trust_signature_invalid_device_verified" = "Резервното копие има невалиден подпис от %@"; "settings_key_backup_info_trust_signature_invalid_device_unverified" = "Резервното копие има невалиден подпис от %@"; -"settings_key_backup_button_create" = "Настройка на Възстановяване на Защитени Съобщения"; -"settings_key_backup_button_restore" = "Възстанови резервното копие"; +"settings_key_backup_button_create" = "Настрой създаването на резервни копия на ключовете"; +"settings_key_backup_button_restore" = "Възстанови от резервното копие"; "settings_key_backup_button_delete" = "Изтрий резервното копие"; "settings_key_backup_button_verify" = "Потвърди"; "settings_key_backup_delete_confirmation_prompt_title" = "Изтриване на резервно копие"; -"settings_key_backup_delete_confirmation_prompt_msg" = "Да се изтрие ли резервното копие на ключовете за шифроване от сървъра? Вече няма да може да използвате ключа за възстановяване за да прочетете шифрованата история на съобщенията"; +"settings_key_backup_delete_confirmation_prompt_msg" = "Сигурни ли сте? Ако нямате резервно копие на ключовете, ще загубите достъпа до шифрованите съобщения."; "room_does_not_exist" = "%@ не съществува"; -"key_backup_setup_title" = "Възстановяване на Съобщения"; +"key_backup_setup_title" = "Резервно копие на ключовете"; "key_backup_setup_skip_action" = "Пропусни"; "key_backup_setup_skip_alert_title" = "Сигурни ли сте?"; "key_backup_setup_skip_alert_message" = "Може да загубите защитени съобщения, ако излезете от профила или загубите устройството си."; "key_backup_setup_skip_alert_skip_action" = "Пропусни"; "key_backup_setup_intro_title" = "Никога не губете шифровани съобщения"; -"key_backup_setup_intro_info" = "Настройте Възстановяване на Защитени Съобщения за да си помогнете, ако излезете от профила или загубите това устройство."; +"key_backup_setup_intro_info" = "Съобщения в шифровани стаи са защитени с шифроване от край до край. Само Вие и получателят (получателите) имате ключовете за прочитането им.\n\nПравете резервно копие на ключовете, за да не ги загубите."; "key_backup_setup_intro_setup_action" = "Настрой"; -"key_backup_setup_passphrase_info" = "Защитете историята на шифрованите съобщения посредством парола за възстановяване.\n\nЩе Ви е необходима, ако излезете от профила си или загубите достъп до това устройство."; +"key_backup_setup_passphrase_info" = "Ще съхраним резервно копие на ключовете Ви на сървъра. Защитете резервното копие с парола.\n\nЗа максимална защита, паролата е добре да е различна от тази за акаунта Ви."; "key_backup_setup_passphrase_passphrase_title" = "Въвеждане"; "key_backup_setup_passphrase_passphrase_placeholder" = "Въведете парола"; "key_backup_setup_passphrase_passphrase_valid" = "Чудесно!"; @@ -597,7 +597,7 @@ "key_backup_setup_passphrase_confirm_passphrase_placeholder" = "Въведете паролата отново"; "key_backup_setup_passphrase_confirm_passphrase_valid" = "Чудесно!"; "key_backup_setup_passphrase_confirm_passphrase_invalid" = "Паролите не съвпадат"; -"key_backup_setup_passphrase_set_passphrase_action" = "Настрой парола за възстановяване"; +"key_backup_setup_passphrase_set_passphrase_action" = "Настрой парола"; "key_backup_setup_recovery_key_info" = "Направете копие на ключа за възстановяване и го пазете на безопасно място.\n\nАко в бъдеще забравите паролата, може да използвате ключа вместо нея, за да възстановите шифрованите съобщения."; "key_backup_setup_recovery_key_recovery_key_title" = "Ключ за възстановяване"; "key_backup_setup_recovery_key_make_copy_action" = "Направи копие"; @@ -623,3 +623,29 @@ "key_backup_setup_banner_title_part2" = " за да не губите шифровани съобщения"; "key_backup_recover_banner_title_part1" = "Стартирайте Възстановяване на Защитени Съобщения"; "key_backup_recover_banner_title_part2" = " за да четете шифрованата история на съобщенията на това устройство"; +"settings_key_backup_info" = "Шифрованите съобщения са защитени с шифроване от край до край. Само Вие и получателят (получателите) имате ключове за прочитането им."; +"settings_key_backup_info_signout_warning" = "Направете копие на ключовете преди да излезете от профила, за да не ги загубите."; +"settings_key_backup_button_use" = "Настрой резервно копие на ключовете"; +// Key backup wrong version +"e2e_key_backup_wrong_version_title" = "Ново резервно копие на ключовете"; +"e2e_key_backup_wrong_version" = "Беше открит нов метод за резервно копиране на ключовете.\n\nАко това не е породено от Ваше действие, настройте нова парола в Настройки."; +"e2e_key_backup_wrong_version_button_settings" = "Настройки"; +"e2e_key_backup_wrong_version_button_wasme" = "Бях аз"; +"key_backup_setup_intro_setup_action_without_existing_backup" = "Започни използването на резервни копия на ключовете"; +"key_backup_setup_intro_setup_action_with_existing_backup" = "Настрой създаването на резервни копия на ключовете"; +"key_backup_setup_intro_manual_export_info" = "(Разширени)"; +"key_backup_setup_intro_manual_export_action" = "Ръчно експортиране на ключовете"; +"key_backup_setup_passphrase_title" = "Защитете резервното копие с парола"; +"key_backup_setup_passphrase_setup_recovery_key_info" = "Или защитете резервното копие с ключ за възстановяване, който ще трябва да пазите на безопасно място."; +"key_backup_setup_passphrase_setup_recovery_key_action" = "(За напреднали) Настройка с ключ за възстановяване"; +"key_backup_setup_success_title" = "Успешно!"; +// Success from passphrase +"key_backup_setup_success_from_passphrase_info" = "Прави се резервно копие на ключовете Ви.\n\nКлючът за възстановяване е допълнителна застраховка - ако забравите паролата, може да използвате ключа за да възстановите достъпа до шифрованите съобщения.\n\nПазете ключа за възстановяване на много безопасно място, например в password manager програма (или сейф)."; +"key_backup_setup_success_from_passphrase_save_recovery_key_action" = "Запази ключа за възстановяване"; +"key_backup_setup_success_from_passphrase_done_action" = "Готово"; +// Success from recovery key +"key_backup_setup_success_from_recovery_key_info" = "Прави се резервно копие на ключовете Ви.\n\nНаправете копие на ключът за възстановяване и го пазете на сигурно място."; +"key_backup_setup_success_from_recovery_key_recovery_key_title" = "Ключ за възстановяване"; +"key_backup_setup_success_from_recovery_key_make_copy_action" = "Направи копие"; +"key_backup_setup_success_from_recovery_key_made_copy_action" = "Направих копие"; +"key_backup_recover_invalid_passphrase_title" = "Неправилна парола за възстановяване"; From 3d04cc9ac82afec24f74d140835bb7d0077260ae Mon Sep 17 00:00:00 2001 From: manuroe Date: Tue, 19 Feb 2019 17:23:14 +0100 Subject: [PATCH 24/24] version++ --- CHANGES.rst | 4 ++-- Riot/SupportingFiles/Info.plist | 4 ++-- RiotShareExtension/SupportingFiles/Info.plist | 4 ++-- SiriIntents/Info.plist | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2c26660f4..f756255ec 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,11 +1,11 @@ -Changes in 0.8.1 (2019-02-) +Changes in 0.8.1 (2019-02-19) =============================================== Improvements: * Key backup: avoid to refresh the home room list on every backup state change (#2265). Bug fix: - * Fix text color in room preview (PR #2261) + * Fix text color in room preview (PR #2261). * Fix navigation bar background after accepting an invite (PR #2261) * Tabs at the top of Room Details are hard to see in dark theme (#2260). diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist index 5a506aeca..cd20e7e79 100644 --- a/Riot/SupportingFiles/Info.plist +++ b/Riot/SupportingFiles/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.0 + 0.8.1 CFBundleSignature ???? CFBundleVersion - 0.8.0 + 0.8.1 ITSAppUsesNonExemptEncryption ITSEncryptionExportComplianceCode diff --git a/RiotShareExtension/SupportingFiles/Info.plist b/RiotShareExtension/SupportingFiles/Info.plist index 50340428b..6eff42362 100644 --- a/RiotShareExtension/SupportingFiles/Info.plist +++ b/RiotShareExtension/SupportingFiles/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.8.0 + 0.8.1 CFBundleVersion - 0.8.0 + 0.8.1 NSExtension NSExtensionAttributes diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist index 7c7581001..623b6d3ed 100644 --- a/SiriIntents/Info.plist +++ b/SiriIntents/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.8.0 + 0.8.1 CFBundleVersion - 0.8.0 + 0.8.1 NSExtension NSExtensionAttributes