mirror of
https://github.com/bitwarden/android.git
synced 2024-12-20 00:02:58 +03:00
sort sites and folders
This commit is contained in:
parent
a732e8953b
commit
ae37c634ef
3 changed files with 4 additions and 3 deletions
|
@ -51,7 +51,7 @@ namespace Bit.App.Pages
|
||||||
private async Task LoadFoldersAsync()
|
private async Task LoadFoldersAsync()
|
||||||
{
|
{
|
||||||
var folders = await _folderService.GetAllAsync();
|
var folders = await _folderService.GetAllAsync();
|
||||||
var pageFolders = folders.Select(f => new SettingsFolderPageModel(f));
|
var pageFolders = folders.Select(f => new SettingsFolderPageModel(f)).OrderBy(f => f.Name);
|
||||||
Folders.ResetWithRange(pageFolders);
|
Folders.ResetWithRange(pageFolders);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -201,8 +201,8 @@ namespace Bit.App.Pages
|
||||||
var folders = await foldersTask;
|
var folders = await foldersTask;
|
||||||
var sites = await sitesTask;
|
var sites = await sitesTask;
|
||||||
|
|
||||||
Folders = folders.Select(f => new VaultListPageModel.Folder(f));
|
Folders = folders.Select(f => new VaultListPageModel.Folder(f)).OrderBy(s => s.Name);
|
||||||
Sites = sites.Select(s => new VaultListPageModel.Site(s));
|
Sites = sites.Select(s => new VaultListPageModel.Site(s)).OrderBy(s => s.Name).ThenBy(s => s.Username);
|
||||||
|
|
||||||
FilterResults(Search.Text);
|
FilterResults(Search.Text);
|
||||||
});
|
});
|
||||||
|
|
|
@ -100,6 +100,7 @@ namespace Bit.iOS.Extension
|
||||||
var siteModels = sites.Select(s => new SiteViewModel(s));
|
var siteModels = sites.Select(s => new SiteViewModel(s));
|
||||||
_tableItems = siteModels
|
_tableItems = siteModels
|
||||||
.Where(s => s.Domain != null && s.Domain.BaseDomain == _context.DomainName.BaseDomain)
|
.Where(s => s.Domain != null && s.Domain.BaseDomain == _context.DomainName.BaseDomain)
|
||||||
|
.OrderBy(s => s.Name).ThenBy(s => s.Username)
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue