mirror of
https://github.com/bitwarden/android.git
synced 2024-12-29 04:18:33 +03:00
2e8824ce05
* Account Switching (#1720) * Account switching * WIP * wip * wip * updates to send test logic * fixed Send tests * fixes for theme handling on account switching and re-adding existing account * switch fixes * fixes * fixes * cleanup * vault timeout fixes * account list status enhancements * logout fixes and token handling improvements * merge latest (#1727) * remove duplicate dependency * fix for initial login token storage paradox (#1730) * Fix avatar color update toolbar item issue on iOS for account switching (#1735) * Updated account switching menu UI (#1733) * updated account switching menu UI * additional changes * add key suffix to constant * GetFirstLetters method tweaks * Fix crash on account switching when logging out when having more than user at a time (#1740) * single account migration to multi-account on app update (#1741) * Account Switching Tap to dismiss (#1743) * Added tap to dismiss on the Account switching overlay and improved a bit the code * Fix account switching overlay background transparent on the proper place * Fixed transparent background and the shadow on the account switching overlay * Fix iOS top space on Account switching list overlay after modal (#1746) * Fix top space added to Account switching list overlay after closing modal * Fix top space added to Account switching list overlay after closing modal on lock, login and home views just in case we add modals in the future there as well * Usability: dismiss account list on certain events (#1748) * dismiss account list on certain events * use new FireAndForget method for back button logic * Create and use Account Switching overlay control (#1753) * Added Account switching overlay control and its own ViewModel and refactored accordingly * Fix account switching Accounts list binding update * Implemented dismiss account switching overlay when changing tabs and when selecting the same tab. Also updated the deprecated listener on CustomTabbedRenderer on Android (#1755) * Overriden Equals on AvatarImageSource so it doesn't get set multiple times when it's the same image thus producing blinking on tab chaged (#1756) * Usability improvements for logout on vault timeout (#1781) * accountswitching fixes (#1784) * Fix for invalid PIN lock state when switching accounts (#1792) * fix for pin lock flow * named tuple values and updated async * clear send service cache on account switch (#1796) * Global theme and account removal (#1793) * Global theme and account removal * remove redundant call to hide account list overlay * cleanup and additional tweaks * add try/catch to remove account dialog flow Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
135 lines
4.5 KiB
C#
135 lines
4.5 KiB
C#
using Bit.App.Effects;
|
|
using Bit.App.Models;
|
|
using Bit.App.Resources;
|
|
using Bit.Core.Abstractions;
|
|
using Bit.Core.Models.Data;
|
|
using Bit.Core.Utilities;
|
|
using Xamarin.Forms;
|
|
|
|
namespace Bit.App.Pages
|
|
{
|
|
public class TabsPage : TabbedPage
|
|
{
|
|
private readonly IMessagingService _messagingService;
|
|
private readonly IKeyConnectorService _keyConnectorService;
|
|
|
|
private NavigationPage _groupingsPage;
|
|
private NavigationPage _sendGroupingsPage;
|
|
private NavigationPage _generatorPage;
|
|
|
|
public TabsPage(AppOptions appOptions = null, PreviousPageInfo previousPage = null)
|
|
{
|
|
_messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
|
|
_keyConnectorService = ServiceContainer.Resolve<IKeyConnectorService>("keyConnectorService");
|
|
|
|
_groupingsPage = new NavigationPage(new GroupingsPage(true, previousPage: previousPage))
|
|
{
|
|
Title = AppResources.MyVault,
|
|
IconImageSource = "lock.png"
|
|
};
|
|
Children.Add(_groupingsPage);
|
|
|
|
_sendGroupingsPage = new NavigationPage(new SendGroupingsPage(true, null, null, appOptions))
|
|
{
|
|
Title = AppResources.Send,
|
|
IconImageSource = "send.png",
|
|
};
|
|
Children.Add(_sendGroupingsPage);
|
|
|
|
_generatorPage = new NavigationPage(new GeneratorPage(true, null, this))
|
|
{
|
|
Title = AppResources.Generator,
|
|
IconImageSource = "generate.png"
|
|
};
|
|
Children.Add(_generatorPage);
|
|
|
|
var settingsPage = new NavigationPage(new SettingsPage(this))
|
|
{
|
|
Title = AppResources.Settings,
|
|
IconImageSource = "cog_settings.png"
|
|
};
|
|
Children.Add(settingsPage);
|
|
|
|
if (Device.RuntimePlatform == Device.Android)
|
|
{
|
|
Effects.Add(new TabBarEffect());
|
|
|
|
Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetToolbarPlacement(this,
|
|
Xamarin.Forms.PlatformConfiguration.AndroidSpecific.ToolbarPlacement.Bottom);
|
|
Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSwipePagingEnabled(this, false);
|
|
Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSmoothScrollEnabled(this, false);
|
|
}
|
|
|
|
if (appOptions?.GeneratorTile ?? false)
|
|
{
|
|
appOptions.GeneratorTile = false;
|
|
ResetToGeneratorPage();
|
|
}
|
|
else if (appOptions?.MyVaultTile ?? false)
|
|
{
|
|
appOptions.MyVaultTile = false;
|
|
}
|
|
else if (appOptions?.CreateSend != null)
|
|
{
|
|
ResetToSendPage();
|
|
}
|
|
}
|
|
|
|
protected override async void OnAppearing()
|
|
{
|
|
base.OnAppearing();
|
|
if (await _keyConnectorService.UserNeedsMigration())
|
|
{
|
|
_messagingService.Send("convertAccountToKeyConnector");
|
|
}
|
|
}
|
|
|
|
public void ResetToVaultPage()
|
|
{
|
|
CurrentPage = _groupingsPage;
|
|
}
|
|
|
|
public void ResetToGeneratorPage()
|
|
{
|
|
CurrentPage = _generatorPage;
|
|
}
|
|
|
|
public void ResetToSendPage()
|
|
{
|
|
CurrentPage = _sendGroupingsPage;
|
|
}
|
|
|
|
protected async override void OnCurrentPageChanged()
|
|
{
|
|
if (CurrentPage is NavigationPage navPage)
|
|
{
|
|
if (_groupingsPage?.RootPage is GroupingsPage groupingsPage)
|
|
{
|
|
await groupingsPage.HideAccountSwitchingOverlayAsync();
|
|
}
|
|
|
|
_messagingService.Send("updatedTheme");
|
|
if (navPage.RootPage is GroupingsPage)
|
|
{
|
|
// Load something?
|
|
}
|
|
else if (navPage.RootPage is GeneratorPage genPage)
|
|
{
|
|
await genPage.InitAsync();
|
|
}
|
|
else if (navPage.RootPage is SettingsPage settingsPage)
|
|
{
|
|
await settingsPage.InitAsync();
|
|
}
|
|
}
|
|
}
|
|
|
|
public void OnPageReselected()
|
|
{
|
|
if (_groupingsPage?.RootPage is GroupingsPage groupingsPage)
|
|
{
|
|
groupingsPage.HideAccountSwitchingOverlayAsync().FireAndForget();
|
|
}
|
|
}
|
|
}
|
|
}
|