From 6371343dc51db3c1bb936fbac1633275f5f9f55b Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 26 Jul 2016 19:21:57 -0400 Subject: [PATCH] Fixed perf issues with IEnumerable. Fixed rate link and row heights for settings. --- src/App/Pages/Settings/SettingsPage.cs | 8 +------- src/App/Pages/Vault/VaultAddSitePage.cs | 3 ++- src/App/Pages/Vault/VaultEditSitePage.cs | 3 ++- src/iOS.Extension/SiteListViewController.cs | 6 ++++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/App/Pages/Settings/SettingsPage.cs b/src/App/Pages/Settings/SettingsPage.cs index 93b3eb985..2a3adbcb7 100644 --- a/src/App/Pages/Settings/SettingsPage.cs +++ b/src/App/Pages/Settings/SettingsPage.cs @@ -184,12 +184,6 @@ namespace Bit.App.Pages } }; - if(Device.OS == TargetPlatform.iOS) - { - table.RowHeight = -1; - table.EstimatedRowHeight = 44; - } - var rateLabel = new Label { LineBreakMode = LineBreakMode.WordWrap, @@ -279,7 +273,7 @@ namespace Bit.App.Pages if(Device.OS == TargetPlatform.iOS) { var appStoreId = "1137397744"; - Device.OpenUri(new Uri($"tms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id={appStoreId}&onlyLatestVersion=true&pageNumber=0&sortOrdering=1&type=Purple+Software")); + Device.OpenUri(new Uri($"itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id={appStoreId}&onlyLatestVersion=true&pageNumber=0&sortOrdering=1&type=Purple+Software")); } } diff --git a/src/App/Pages/Vault/VaultAddSitePage.cs b/src/App/Pages/Vault/VaultAddSitePage.cs index 6e559dce7..81a9fa029 100644 --- a/src/App/Pages/Vault/VaultAddSitePage.cs +++ b/src/App/Pages/Vault/VaultAddSitePage.cs @@ -45,7 +45,8 @@ namespace Bit.App.Pages var nameCell = new FormEntryCell(AppResources.Name, nextElement: uriCell.Entry); var folderOptions = new List { AppResources.FolderNone }; - var folders = _folderService.GetAllAsync().GetAwaiter().GetResult().OrderBy(f => f.Name?.Decrypt()); + var folders = _folderService.GetAllAsync().GetAwaiter().GetResult() + .OrderBy(f => f.Name?.Decrypt()).ToList(); foreach(var folder in folders) { folderOptions.Add(folder.Name.Decrypt()); diff --git a/src/App/Pages/Vault/VaultEditSitePage.cs b/src/App/Pages/Vault/VaultEditSitePage.cs index 3911ea2bd..3841fc0a1 100644 --- a/src/App/Pages/Vault/VaultEditSitePage.cs +++ b/src/App/Pages/Vault/VaultEditSitePage.cs @@ -65,7 +65,8 @@ namespace Bit.App.Pages generateCell.Tapped += GenerateCell_Tapped; ; var folderOptions = new List { AppResources.FolderNone }; - var folders = _folderService.GetAllAsync().GetAwaiter().GetResult().OrderBy(f => f.Name?.Decrypt()); + var folders = _folderService.GetAllAsync().GetAwaiter().GetResult() + .OrderBy(f => f.Name?.Decrypt()).ToList(); int selectedIndex = 0; int i = 0; foreach(var folder in folders) diff --git a/src/iOS.Extension/SiteListViewController.cs b/src/iOS.Extension/SiteListViewController.cs index 01b5ad98f..b52bc03e6 100644 --- a/src/iOS.Extension/SiteListViewController.cs +++ b/src/iOS.Extension/SiteListViewController.cs @@ -42,7 +42,9 @@ namespace Bit.iOS.Extension var siteService = Resolver.Resolve(); var sites = await siteService.GetAllAsync(); var siteModels = sites.Select(s => new SiteViewModel(s)); - filteredSiteModels = siteModels.Where(s => s.Domain != null && s.Domain.BaseDomain == Context.DomainName.BaseDomain); + filteredSiteModels = siteModels + .Where(s => s.Domain != null && s.Domain.BaseDomain == Context.DomainName.BaseDomain) + .ToList(); } Debug.WriteLine("BW LOG, Filtered sites at " + sw.ElapsedMilliseconds + "ms."); @@ -126,6 +128,7 @@ namespace Bit.iOS.Extension { Debug.WriteLine("BW Log, Make new cell for list."); cell = new UITableViewCell(UITableViewCellStyle.Subtitle, CellIdentifier); + cell.DetailTextLabel.TextColor = cell.DetailTextLabel.TintColor = new UIColor(red: 0.47f, green: 0.47f, blue: 0.47f, alpha: 1.0f); } return cell; } @@ -140,7 +143,6 @@ namespace Bit.iOS.Extension var item = _tableItems.ElementAt(indexPath.Row); cell.TextLabel.Text = item.Name; cell.DetailTextLabel.Text = item.Username; - cell.DetailTextLabel.TextColor = cell.DetailTextLabel.TintColor = new UIColor(red: 0.47f, green: 0.47f, blue: 0.47f, alpha: 1.0f); } public override void RowSelected(UITableView tableView, NSIndexPath indexPath)