mirror of
https://github.com/bitwarden/android.git
synced 2024-12-25 02:18:27 +03:00
support loginSearchSegue when no service ids
This commit is contained in:
parent
df1a65e6a3
commit
2cc331b136
2 changed files with 23 additions and 2 deletions
|
@ -85,7 +85,14 @@ namespace Bit.iOS.Autofill
|
||||||
PerformSegue("lockPasswordSegue", this);
|
PerformSegue("lockPasswordSegue", this);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
PerformSegue("loginListSegue", this);
|
if(_context.ServiceIdentifiers == null || _context.ServiceIdentifiers.Length == 0)
|
||||||
|
{
|
||||||
|
PerformSegue("loginSearchSegue", this);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
PerformSegue("loginListSegue", this);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -177,6 +184,7 @@ namespace Bit.iOS.Autofill
|
||||||
if(navController != null)
|
if(navController != null)
|
||||||
{
|
{
|
||||||
var listLoginController = navController.TopViewController as LoginListViewController;
|
var listLoginController = navController.TopViewController as LoginListViewController;
|
||||||
|
var listSearchController = navController.TopViewController as LoginSearchViewController;
|
||||||
var fingerprintViewController = navController.TopViewController as LockFingerprintViewController;
|
var fingerprintViewController = navController.TopViewController as LockFingerprintViewController;
|
||||||
var pinViewController = navController.TopViewController as LockPinViewController;
|
var pinViewController = navController.TopViewController as LockPinViewController;
|
||||||
var passwordViewController = navController.TopViewController as LockPasswordViewController;
|
var passwordViewController = navController.TopViewController as LockPasswordViewController;
|
||||||
|
@ -187,6 +195,11 @@ namespace Bit.iOS.Autofill
|
||||||
listLoginController.Context = _context;
|
listLoginController.Context = _context;
|
||||||
listLoginController.CPViewController = this;
|
listLoginController.CPViewController = this;
|
||||||
}
|
}
|
||||||
|
else if(listSearchController != null)
|
||||||
|
{
|
||||||
|
listSearchController.Context = _context;
|
||||||
|
listSearchController.CPViewController = this;
|
||||||
|
}
|
||||||
else if(fingerprintViewController != null)
|
else if(fingerprintViewController != null)
|
||||||
{
|
{
|
||||||
fingerprintViewController.CPViewController = this;
|
fingerprintViewController.CPViewController = this;
|
||||||
|
@ -220,7 +233,14 @@ namespace Bit.iOS.Autofill
|
||||||
PerformSegue("setupSegue", this);
|
PerformSegue("setupSegue", this);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
PerformSegue("loginListSegue", this);
|
if (_context.ServiceIdentifiers == null || _context.ServiceIdentifiers.Length == 0)
|
||||||
|
{
|
||||||
|
PerformSegue("loginSearchSegue", this);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
PerformSegue("loginListSegue", this);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@ namespace Bit.iOS.Autofill
|
||||||
base.ViewDidLoad();
|
base.ViewDidLoad();
|
||||||
NavItem.Title = AppResources.SearchVault;
|
NavItem.Title = AppResources.SearchVault;
|
||||||
CancelBarButton.Title = AppResources.Cancel;
|
CancelBarButton.Title = AppResources.Cancel;
|
||||||
|
SearchBar.Placeholder = AppResources.Search;
|
||||||
|
|
||||||
TableView.RowHeight = UITableView.AutomaticDimension;
|
TableView.RowHeight = UITableView.AutomaticDimension;
|
||||||
TableView.EstimatedRowHeight = 44;
|
TableView.EstimatedRowHeight = 44;
|
||||||
|
|
Loading…
Reference in a new issue