From 29637e15a751688ab32a2fb908a82959ad12ba75 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 29 Jun 2021 13:03:57 +0100 Subject: [PATCH 1/5] Fix theming in ShareViewController and FallbackViewController. --- .../Modules/Fallback/FallbackViewController.m | 1 + RiotShareExtension/Modules/Share/ShareViewController.m | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/RiotShareExtension/Modules/Fallback/FallbackViewController.m b/RiotShareExtension/Modules/Fallback/FallbackViewController.m index da7ebc5f1..ce5774a69 100644 --- a/RiotShareExtension/Modules/Fallback/FallbackViewController.m +++ b/RiotShareExtension/Modules/Fallback/FallbackViewController.m @@ -36,6 +36,7 @@ { [super viewDidLoad]; + self.view.backgroundColor = ThemeService.shared.theme.backgroundColor; self.titleLabel.textColor = ThemeService.shared.theme.textSecondaryColor; self.titleLabel.text = NSLocalizedStringFromTable(@"share_extension_auth_prompt", @"Vector", nil); self.logoImageView.tintColor = ThemeService.shared.theme.tintColor; diff --git a/RiotShareExtension/Modules/Share/ShareViewController.m b/RiotShareExtension/Modules/Share/ShareViewController.m index 5d8aa81fd..8e36d5697 100644 --- a/RiotShareExtension/Modules/Share/ShareViewController.m +++ b/RiotShareExtension/Modules/Share/ShareViewController.m @@ -21,6 +21,9 @@ #import "ShareDataSource.h" #import "ShareExtensionManager.h" +#import "ThemeService.h" +#import "RiotShareExtension-Swift.h" + @interface ShareViewController () @@ -44,6 +47,10 @@ { [super viewDidLoad]; + self.view.tintColor = ThemeService.shared.theme.tintColor; + self.tittleLabel.textColor = ThemeService.shared.theme.textPrimaryColor; + self.masterContainerView.backgroundColor = ThemeService.shared.theme.baseColor; + self.shareExtensionManagerDidUpdateAccountDataObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kShareExtensionManagerDidUpdateAccountDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) { [self configureViews]; From 50d85be6e3d17b35fbc4fb80eb44ecb45487e19e Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 29 Jun 2021 13:47:44 +0100 Subject: [PATCH 2/5] Fix typo. --- RiotShareExtension/Modules/Share/ShareViewController.m | 8 ++++---- RiotShareExtension/Modules/Share/ShareViewController.xib | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RiotShareExtension/Modules/Share/ShareViewController.m b/RiotShareExtension/Modules/Share/ShareViewController.m index 8e36d5697..54976634b 100644 --- a/RiotShareExtension/Modules/Share/ShareViewController.m +++ b/RiotShareExtension/Modules/Share/ShareViewController.m @@ -28,7 +28,7 @@ @interface ShareViewController () @property (weak, nonatomic) IBOutlet UIView *masterContainerView; -@property (weak, nonatomic) IBOutlet UILabel *tittleLabel; +@property (weak, nonatomic) IBOutlet UILabel *titleLabel; @property (weak, nonatomic) IBOutlet UIView *contentView; @property (nonatomic) SegmentedViewController *segmentedViewController; @@ -48,7 +48,7 @@ [super viewDidLoad]; self.view.tintColor = ThemeService.shared.theme.tintColor; - self.tittleLabel.textColor = ThemeService.shared.theme.textPrimaryColor; + self.titleLabel.textColor = ThemeService.shared.theme.textPrimaryColor; self.masterContainerView.backgroundColor = ThemeService.shared.theme.baseColor; self.shareExtensionManagerDidUpdateAccountDataObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kShareExtensionManagerDidUpdateAccountDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) { @@ -103,14 +103,14 @@ if ([ShareExtensionManager sharedManager].userAccount) { - self.tittleLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"send_to", @"Vector", nil), @""]; + self.titleLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"send_to", @"Vector", nil), @""]; [self configureSegmentedViewController]; } else { NSDictionary *infoDictionary = [NSBundle mainBundle].infoDictionary; NSString *bundleDisplayName = infoDictionary[@"CFBundleDisplayName"]; - self.tittleLabel.text = bundleDisplayName; + self.titleLabel.text = bundleDisplayName; [self configureFallbackViewController]; } } diff --git a/RiotShareExtension/Modules/Share/ShareViewController.xib b/RiotShareExtension/Modules/Share/ShareViewController.xib index 517dbd282..4d79e9491 100644 --- a/RiotShareExtension/Modules/Share/ShareViewController.xib +++ b/RiotShareExtension/Modules/Share/ShareViewController.xib @@ -14,7 +14,7 @@ - + From 76aea1f2f158ec4549483dd2a9202bd367e57ae2 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 29 Jun 2021 14:17:49 +0100 Subject: [PATCH 3/5] Fix theming in RoomsListViewController and RecentRoomTableViewCell. --- .../Modules/Share/Listing/RoomsListViewController.m | 2 ++ .../Share/Listing/Views/RecentRoomTableViewCell.m | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m index 52ccd3af3..777249a6e 100644 --- a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m +++ b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m @@ -75,6 +75,7 @@ { [super viewDidLoad]; + self.recentsTableView.backgroundColor = ThemeService.shared.theme.backgroundColor; [self.recentsTableView registerNib:[RecentRoomTableViewCell nib] forCellReuseIdentifier:[RecentRoomTableViewCell defaultReuseIdentifier]]; [self configureSearchBar]; @@ -97,6 +98,7 @@ self.recentsSearchBar.searchBarStyle = UISearchBarStyleMinimal; self.recentsSearchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil); self.recentsSearchBar.tintColor = ThemeService.shared.theme.tintColor; + self.recentsSearchBar.backgroundColor = ThemeService.shared.theme.baseColor; _tableSearchBar.tintColor = self.recentsSearchBar.tintColor; } diff --git a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m index c6c81052a..14a16a68f 100644 --- a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m +++ b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m @@ -17,6 +17,8 @@ #import "RecentRoomTableViewCell.h" #import "MXRoomSummary+Riot.h" +#import "ThemeService.h" +#import "RiotShareExtension-Swift.h" @interface RecentRoomTableViewCell () @@ -44,6 +46,14 @@ return nil; } +- (void)awakeFromNib +{ + [super awakeFromNib]; + + self.roomTitleLabel.textColor = ThemeService.shared.theme.textPrimaryColor; + self.contentView.backgroundColor = ThemeService.shared.theme.backgroundColor; +} + - (void)layoutSubviews { [super layoutSubviews]; From 9b7bc04740c0557b5609f82b7cb7608363082c95 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 29 Jun 2021 14:23:20 +0100 Subject: [PATCH 4/5] Update CHANGES.rst. --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 679b2f8f0..c1213379a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,6 +9,7 @@ Changes to be released in next version 🐛 Bugfix * SSO: Handle login callback URL with HTML entities (#4129). + * Share extension: Fix theme in dark mode (#4486). ⚠️ API Changes * From 7866fc0fc0b0042ef44512438a7d093b483bafce Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 30 Jun 2021 10:28:15 +0100 Subject: [PATCH 5/5] Remove overlay view from Share extension. --- .../Modules/Share/ShareViewController.xib | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/RiotShareExtension/Modules/Share/ShareViewController.xib b/RiotShareExtension/Modules/Share/ShareViewController.xib index 4d79e9491..04a1316c8 100644 --- a/RiotShareExtension/Modules/Share/ShareViewController.xib +++ b/RiotShareExtension/Modules/Share/ShareViewController.xib @@ -1,12 +1,9 @@ - - - - + + - - + @@ -23,10 +20,6 @@ - - - - @@ -34,7 +27,7 @@ - - - @@ -94,7 +84,6 @@ -