From 3ac2580742bb9862490dc6e709cae6753054d7d0 Mon Sep 17 00:00:00 2001
From: Jacob Fink <jfink@bitwarden.com>
Date: Thu, 17 Feb 2022 11:26:14 -0500
Subject: [PATCH 1/2] add toolbar icons

---
 .../Authenticator/AuthenticatorPage.xaml      | 107 ++++++++++++++----
 .../Authenticator/AuthenticatorPage.xaml.cs   |  98 ++++++++--------
 .../AuthenticatorPageViewModel.cs             |   5 +-
 src/App/Pages/TabsPage.cs                     |   2 +-
 4 files changed, 135 insertions(+), 77 deletions(-)

diff --git a/src/App/Pages/Authenticator/AuthenticatorPage.xaml b/src/App/Pages/Authenticator/AuthenticatorPage.xaml
index 6632216c8..fde715061 100644
--- a/src/App/Pages/Authenticator/AuthenticatorPage.xaml
+++ b/src/App/Pages/Authenticator/AuthenticatorPage.xaml
@@ -2,38 +2,95 @@
 <pages:BaseContentPage 
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.Authenticator.AuthenticatorPage"
+    x:Class="Bit.App.Pages.AuthenticatorPage"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    xmlns:effects="clr-namespace:Bit.App.Effects"
     xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:authenticator="clr-namespace:Bit.App.Pages.Authenticator"
     xmlns:controls="clr-namespace:Bit.App.Controls"
-    x:DataType="authenticator:AuthenticatorPageViewModel"
+    x:DataType="pages:AuthenticatorPageViewModel"
     Title="{Binding PageTitle}">
 
-    <StackLayout>
-        <RefreshView
-        IsVisible="{Binding ShowList}"
-        IsRefreshing="{Binding Refreshing}"
-        Command="{Binding RefreshCommand}">
-            <controls:ExtendedCollectionView
-                ItemsSource="{Binding Items}"
-                VerticalOptions="FillAndExpand"
-                SelectionMode="Single"
-                SelectionChanged="RowSelected"
-                StyleClass="list, list-platform">
-                <controls:ExtendedCollectionView.ItemTemplate>
-                    <DataTemplate>
-                        <controls:AuthenticatorViewCell />
-                    </DataTemplate>
-                </controls:ExtendedCollectionView.ItemTemplate>
+    <ContentPage.BindingContext>
+        <pages:AuthenticatorPageViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
+                     AutomationProperties.IsInAccessibleTree="True"
+                     AutomationProperties.Name="{u:I18n Search}" />
+    </ContentPage.ToolbarItems>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+
+            <ToolbarItem x:Name="_aboutIconItem" x:Key="aboutIconItem" Icon="info.png"
+                         Clicked="About_Clicked" Order="Primary" Priority="-1"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n AboutSend}" />
+            <ToolbarItem x:Name="_syncItem" x:Key="syncItem" Text="{u:I18n Sync}"
+                         Clicked="Sync_Clicked" Order="Secondary" />
+            <ToolbarItem x:Name="_lockItem" x:Key="lockItem" Text="{u:I18n Lock}"
+                         Clicked="Lock_Clicked" Order="Secondary" />
+            <ToolbarItem x:Name="_aboutTextItem" x:Key="aboutTextItem" Text="{u:I18n AboutSend}"
+                         Clicked="About_Clicked" Order="Secondary" />
+            <ToolbarItem x:Name="_addItem" x:Key="addItem" Icon="plus.png"
+                         Clicked="AddButton_Clicked" Order="Primary"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n AddItem}" />
+
+            <DataTemplate x:Key="authenticatorTemplate"
+                          x:DataType="pages:SendGroupingsPageListItem">
+                <controls:AuthenticatorViewCell />
+            </DataTemplate>
+
+            <StackLayout x:Key="mainLayout" x:Name="_mainLayout">
+                <RefreshView
+                IsVisible="{Binding ShowList}"
+                IsRefreshing="{Binding Refreshing}"
+                Command="{Binding RefreshCommand}">
+                    <controls:ExtendedCollectionView
+                        ItemsSource="{Binding Items}"
+                        ItemTemplate="{StaticResource authenticatorTemplate}"
+                        VerticalOptions="FillAndExpand"
+                        SelectionMode="Single"
+                        SelectionChanged="RowSelected"
+                        StyleClass="list, list-platform">
 
 
-            </controls:ExtendedCollectionView>
-        </RefreshView>
+                    </controls:ExtendedCollectionView>
+                </RefreshView>
 
-        <StackLayout
-            IsVisible="{Binding ShowList}">
+                <StackLayout
+                    IsVisible="{Binding ShowList}">
 
-        </StackLayout>
-    </StackLayout>
+                </StackLayout>
+            </StackLayout>
+        </ResourceDictionary>
+    </ContentPage.Resources>
+
+
+    <AbsoluteLayout
+        x:Name="_absLayout"
+        VerticalOptions="FillAndExpand"
+        HorizontalOptions="FillAndExpand">
+        <ContentView
+            x:Name="_mainContent"
+            AbsoluteLayout.LayoutFlags="All"
+            AbsoluteLayout.LayoutBounds="0, 0, 1, 1" />
+        <Button
+            x:Name="_fab"
+            Image="plus.png"
+            Clicked="AddButton_Clicked"
+            Style="{StaticResource btn-fab}"
+            AbsoluteLayout.LayoutFlags="PositionProportional"
+            AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n AddItem}">
+            <Button.Effects>
+                <effects:FabShadowEffect />
+            </Button.Effects>
+        </Button>
+    </AbsoluteLayout>
 
 </pages:BaseContentPage>
diff --git a/src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs b/src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs
index 9df5aad5a..f21e464b1 100644
--- a/src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs
+++ b/src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs
@@ -7,7 +7,7 @@ using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
 using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
 
-namespace Bit.App.Pages.Authenticator
+namespace Bit.App.Pages
 {
     public partial class AuthenticatorPage : BaseContentPage
     {
@@ -30,30 +30,19 @@ namespace Bit.App.Pages.Authenticator
             //_vm.Page = this;
             //_fromTabPage = fromTabPage;
             //_selectAction = selectAction;
-            //var isIos = Device.RuntimePlatform == Device.iOS;
-            //if (selectAction != null)
-            //{
-            //    if (isIos)
-            //    {
-            //        ToolbarItems.Add(_closeItem);
-            //    }
-            //    ToolbarItems.Add(_selectItem);
-            //}
-            //else
-            //{
-            //    if (isIos)
-            //    {
-            //        ToolbarItems.Add(_moreItem);
-            //    }
-            //    else
-            //    {
-            //        ToolbarItems.Add(_historyItem);
-            //    }
-            //}
-            //if (isIos)
-            //{
-            //    _typePicker.On<iOS>().SetUpdateMode(UpdateMode.WhenFinished);
-            //}
+
+            if (Device.RuntimePlatform == Device.iOS)
+            {
+                _absLayout.Children.Remove(_fab);
+                ToolbarItems.Add(_aboutIconItem);
+                ToolbarItems.Add(_addItem);
+            }
+            else
+            {
+                ToolbarItems.Add(_syncItem);
+                ToolbarItems.Add(_lockItem);
+                ToolbarItems.Add(_aboutTextItem);
+            }
         }
 
         public async Task InitAsync()
@@ -80,26 +69,44 @@ namespace Bit.App.Pages.Authenticator
             //});
         }
         
-        protected override void OnDisappearing()
+
+        private async void Search_Clicked(object sender, EventArgs e)
         {
-            base.OnDisappearing();
-            //_broadcasterService.Unsubscribe(nameof(GeneratorPage));
+            if (DoOnce())
+            {
+                // var page = new SendsPage(_vm.Filter, _vm.Type != null);
+                // await Navigation.PushModalAsync(new NavigationPage(page));
+            }
+        }
+
+        private async void Sync_Clicked(object sender, EventArgs e)
+        {
+            // await _vm.SyncAsync();
+        }
+
+        private async void Lock_Clicked(object sender, EventArgs e)
+        {
+            // await _vaultTimeoutService.LockAsync(true, true);
+        }
+        
+        private void About_Clicked(object sender, EventArgs e)
+        {
+            // _vm.ShowAbout();
+        }
+
+        private async void AddButton_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                // var page = new SendAddEditPage(null, null, _vm.Type);
+                // await Navigation.PushModalAsync(new NavigationPage(page));
+            }
         }
 
         private async void RowSelected(object sender, SelectionChangedEventArgs e)
         {
         }
 
-        protected override bool OnBackButtonPressed()
-        {
-            if (Device.RuntimePlatform == Device.Android && _tabsPage != null)
-            {
-                _tabsPage.ResetToVaultPage();
-                return true;
-            }
-            return base.OnBackButtonPressed();
-        }
-
         private async void Copy_Clicked(object sender, EventArgs e)
         {
             //await _vm.CopyAsync();
@@ -120,20 +127,11 @@ namespace Bit.App.Pages.Authenticator
             //}
         }
 
-        private void Select_Clicked(object sender, EventArgs e)
+        protected override void OnDisappearing()
         {
-            //_selectAction?.Invoke(_vm.Password);
+            base.OnDisappearing();
+            //_broadcasterService.Unsubscribe(nameof(GeneratorPage));
         }
-
-
-        private async void Close_Clicked(object sender, EventArgs e)
-        {
-            if (DoOnce())
-            {
-                await Navigation.PopModalAsync();
-            }
-        }
-
         
     }
 }
diff --git a/src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs b/src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs
index 1876f8980..49f12075a 100644
--- a/src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs
+++ b/src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Threading.Tasks;
+using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
-namespace Bit.App.Pages.Authenticator
+namespace Bit.App.Pages
 {
     public class AuthenticatorPageViewModel : BaseViewModel
     {
@@ -24,6 +25,8 @@ namespace Bit.App.Pages.Authenticator
         {
             _userService = ServiceContainer.Resolve<IUserService>("userService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+
+            PageTitle = AppResources.Authenticator;
         }
 
         #endregion
diff --git a/src/App/Pages/TabsPage.cs b/src/App/Pages/TabsPage.cs
index e6685839c..0a7f5304f 100644
--- a/src/App/Pages/TabsPage.cs
+++ b/src/App/Pages/TabsPage.cs
@@ -30,7 +30,7 @@ namespace Bit.App.Pages
 
             Children.Add(_groupingsPage);
 
-            _authenticatorPage = new NavigationPage(new Authenticator.AuthenticatorPage(true, null, this))
+            _authenticatorPage = new NavigationPage(new AuthenticatorPage(true, null, this))
             {
                 Title = AppResources.Authenticator,
                 IconImageSource = "info.png"

From 0b626cedc7405ab7a20950159bd6b13f9a1202e3 Mon Sep 17 00:00:00 2001
From: Jacob Fink <jfink@bitwarden.com>
Date: Fri, 4 Mar 2022 16:44:22 -0500
Subject: [PATCH 2/2] got the countdown working

---
 .../AuthenticatorViewCell.xaml                |  86 ++++++++++--
 .../AuthenticatorViewCell.xaml.cs             |  98 +++++++++----
 .../AuthenticatorViewCellViewModel.cs         |  36 ++++-
 .../Authenticator/AuthenticatorPage.xaml      |  25 ++--
 .../Authenticator/AuthenticatorPage.xaml.cs   |  43 +++++-
 .../AuthenticatorPageListItem.cs              | 129 ++++++++++++++++++
 .../AuthenticatorPageViewModel.cs             |  85 +++++++++++-
 7 files changed, 442 insertions(+), 60 deletions(-)
 create mode 100644 src/App/Pages/Authenticator/AuthenticatorPageListItem.cs

diff --git a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
index 4d4e82554..2c5a31042 100644
--- a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
+++ b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
@@ -3,35 +3,92 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Bit.App.Controls.AuthenticatorViewCell"
     xmlns:controls="clr-namespace:Bit.App.Controls"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
     xmlns:u="clr-namespace:Bit.App.Utilities"
     xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
     xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
     StyleClass="list-row, list-row-platform"
     RowSpacing="0"
     ColumnSpacing="0"
-    x:DataType="controls:AuthenticatorViewCellViewModel">
+    x:DataType="pages:AuthenticatorPageListItem">
+
+    <Grid.Resources>
+          <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
+          <u:IconImageConverter x:Key="iconImageConverter"/>
+          <u:InverseBoolConverter x:Key="inverseBool" />
+          <u:StringHasValueConverter x:Key="stringHasValueConverter" />
+    </Grid.Resources>
 
     <Grid.RowDefinitions>
         <RowDefinition Height="Auto" />
-        <RowDefinition Height="*" />
     </Grid.RowDefinitions>
 
     <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="40" />
         <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="60" />
     </Grid.ColumnDefinitions>
 
-    <Label
-        Text="Figma"
-        StyleClass="box-label"
-        Grid.Row="0"
-        Grid.Column="0" />
-    <controls:MonoLabel
-        Text="{Binding TotpCodeFormatted, Mode=OneWay}"
-        StyleClass="box-value"
-        Grid.Row="1"
-        Grid.Column="0" />
+    <controls:IconLabel
+        Grid.Column="0"
+        HorizontalOptions="Center"
+        VerticalOptions="Center"
+        StyleClass="list-icon, list-icon-platform"
+        IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
+        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
+        AutomationProperties.IsInAccessibleTree="False" />
+
+    <ff:CachedImage
+        Grid.Column="0"
+        BitmapOptimizations="True"
+        ErrorPlaceholder="login.png"
+        LoadingPlaceholder="login.png"
+        HorizontalOptions="Center"
+        VerticalOptions="Center"
+        WidthRequest="22"
+        HeightRequest="22"
+        IsVisible="{Binding ShowIconImage}"
+        Source="{Binding IconImageSource, Mode=OneTime}"
+        AutomationProperties.IsInAccessibleTree="False" />
+
+    <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center" Padding="0, 7">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <controls:MonoLabel
+            LineBreakMode="TailTruncation"
+            Grid.Column="0"
+            Grid.Row="0"
+            Grid.ColumnSpan="3"
+            StyleClass="list-title, list-title-platform"
+            Text="{Binding TotpCodeFormatted, Mode=OneWay}" />
+        <Label 
+            LineBreakMode="TailTruncation"
+            Grid.Column="0"
+            Grid.Row="1"
+            StyleClass="list-subtitle, list-subtitle-platform"
+            Text="{Binding Cipher.Name}" />
+        <controls:IconLabel
+            Grid.Column="1"
+            Grid.Row="1"
+            HorizontalOptions="Start"
+            VerticalOptions="Center"
+            StyleClass="list-title-icon"
+            Margin="5, 0, 0, 0"
+            Text="{Binding Source={x:Static core:BitwardenIcons.Collection}}"
+            IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
+            AutomationProperties.IsInAccessibleTree="True"
+            AutomationProperties.Name="{u:I18n Shared}" />
+    </Grid>
+
     <Label
         Text="{Binding TotpSec, Mode=OneWay}"
         Style="{DynamicResource textTotp}"
@@ -50,6 +107,7 @@
         Grid.Row="0"
         Grid.Column="2"
         Grid.RowSpan="2"
+        Padding="0,0,1,0"
         AutomationProperties.IsInAccessibleTree="True"
         AutomationProperties.Name="{u:I18n CopyTotp}" />
 </controls:ExtendedGrid>
\ No newline at end of file
diff --git a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs
index 871c8a424..08a96fb72 100644
--- a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs
+++ b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml.cs
@@ -1,5 +1,7 @@
 using System;
+using Bit.App.Utilities;
 using Bit.Core.Models.View;
+using Bit.Core.Utilities;
 using Xamarin.Forms;
 
 namespace Bit.App.Controls
@@ -7,64 +9,112 @@ namespace Bit.App.Controls
     public partial class AuthenticatorViewCell : ExtendedGrid
     {
         public static readonly BindableProperty CipherProperty = BindableProperty.Create(
-            nameof(Cipher), typeof(CipherView), typeof(AuthenticatorViewCell), default(CipherView), BindingMode.OneWay);
+            nameof(Cipher), typeof(CipherView), typeof(AuthenticatorViewCell), default(CipherView), BindingMode.TwoWay);
 
         public static readonly BindableProperty WebsiteIconsEnabledProperty = BindableProperty.Create(
             nameof(WebsiteIconsEnabled), typeof(bool?), typeof(AuthenticatorViewCell));
 
-        public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
-            nameof(ButtonCommand), typeof(Command<CipherView>), typeof(AuthenticatorViewCell));
+        public static readonly BindableProperty TotpSecProperty = BindableProperty.Create(
+            nameof(TotpSec), typeof(long), typeof(AuthenticatorViewCell));
+
+        //public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
+        //    nameof(ButtonCommand), typeof(Command<CipherView>), typeof(AuthenticatorViewCell));
 
         public AuthenticatorViewCell()
         {
             InitializeComponent();
         }
 
+        public Command CopyCommand { get; set; }
+
+        public CipherView Cipher
+        {
+            get => GetValue(CipherProperty) as CipherView;
+            set => SetValue(CipherProperty, value);
+        }
+
         public bool? WebsiteIconsEnabled
         {
             get => (bool)GetValue(WebsiteIconsEnabledProperty);
             set => SetValue(WebsiteIconsEnabledProperty, value);
         }
 
-        public CipherView Cipher
+        public long TotpSec
         {
-            get => GetValue(CipherProperty) as CipherView;
-            set => SetValue(CipherProperty, value);
+            get => (long)GetValue(TotpSecProperty);
+            set => SetValue(TotpSecProperty, value);
         }
 
-        public Command<CipherView> ButtonCommand
+        public bool ShowIconImage
         {
-            get => GetValue(ButtonCommandProperty) as Command<CipherView>;
-            set => SetValue(ButtonCommandProperty, value);
+            get => WebsiteIconsEnabled ?? false
+                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
+                && IconImageSource != null;
         }
 
-        protected override void OnPropertyChanged(string propertyName = null)
+        private string _iconImageSource = string.Empty;
+        public string IconImageSource
         {
-            base.OnPropertyChanged(propertyName);
-            if (propertyName == CipherProperty.PropertyName)
+            get
             {
-                if (Cipher == null)
+                if (_iconImageSource == string.Empty) // default value since icon source can return null
                 {
-                    return;
+                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
                 }
-                BindingContext = new AuthenticatorViewCellViewModel(Cipher, WebsiteIconsEnabled ?? false);
-            }
-            else if (propertyName == WebsiteIconsEnabledProperty.PropertyName)
-            {
-                if (Cipher == null)
-                {
-                    return;
-                }
-                ((AuthenticatorViewCellViewModel)BindingContext).WebsiteIconsEnabled = WebsiteIconsEnabled ?? false;
+                return _iconImageSource;
             }
+
         }
 
+        private string _totpCodeFormatted = "938 928";
+        public string TotpCodeFormatted
+        {
+            get => _totpCodeFormatted;
+            set => _totpCodeFormatted = value;
+        }
+
+
+        //public Command<CipherView> ButtonCommand
+        //{
+        //    get => GetValue(ButtonCommandProperty) as Command<CipherView>;
+        //    set => SetValue(ButtonCommandProperty, value);
+        //}
+
+        //protected override void OnPropertyChanged(string propertyName = null)
+        //{
+        //    base.OnPropertyChanged(propertyName);
+        //    if (propertyName == CipherProperty.PropertyName)
+        //    {
+        //        if (Cipher == null)
+        //        {
+        //            return;
+        //        }
+        //        _cipherLabel.Text = Cipher.Name;
+        //    }
+        //    else if (propertyName == WebsiteIconsEnabledProperty.PropertyName)
+        //    {
+        //        if (Cipher == null)
+        //        {
+        //            return;
+        //        }
+        //        ((AuthenticatorViewCellViewModel)BindingContext).WebsiteIconsEnabled = WebsiteIconsEnabled ?? false;
+        //    }
+        //    else if (propertyName == TotpSecProperty.PropertyName)
+        //    {
+        //        if (Cipher == null)
+        //        {
+        //            return;
+        //        }
+        //        ((AuthenticatorViewCellViewModel)BindingContext).UpdateTotpSec(TotpSec);
+        //    }
+        //}
+
         private void MoreButton_Clicked(object sender, EventArgs e)
         {
             var cipher = ((sender as MiButton)?.BindingContext as AuthenticatorViewCellViewModel)?.Cipher;
             if (cipher != null)
             {
-                ButtonCommand?.Execute(cipher);
+                //ButtonCommand?.Execute(cipher);
             }
         }
     }
diff --git a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCellViewModel.cs b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCellViewModel.cs
index 0010e6a3b..ad1aaf5e2 100644
--- a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCellViewModel.cs
+++ b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCellViewModel.cs
@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using Bit.App.Utilities;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
@@ -8,7 +9,7 @@ namespace Bit.App.Controls
     public class AuthenticatorViewCellViewModel : ExtendedViewModel
     {
         private CipherView _cipher;
-        private string _totpCodeFormatted = "938928";
+        private string _totpCodeFormatted = "938 928";
         private string _totpSec;
         private bool _websiteIconsEnabled;
         private string _iconImageSource = string.Empty;
@@ -64,6 +65,39 @@ namespace Bit.App.Controls
             }
 
         }
+
+        public void UpdateTotpSec(long totpSec)
+        {
+            _totpSec = totpSec.ToString();
+        }
+
+        //private async Task TotpUpdateCodeAsync()
+        //{
+        //    if (Cipher == null || Cipher.Type != Core.Enums.CipherType.Login || Cipher.Login.Totp == null)
+        //    {
+        //        _totpInterval = null;
+        //        return;
+        //    }
+        //    _totpCode = await _totpService.GetCodeAsync(Cipher.Login.Totp);
+        //    if (_totpCode != null)
+        //    {
+        //        if (_totpCode.Length > 4)
+        //        {
+        //            var half = (int)Math.Floor(_totpCode.Length / 2M);
+        //            TotpCodeFormatted = string.Format("{0} {1}", _totpCode.Substring(0, half),
+        //                _totpCode.Substring(half));
+        //        }
+        //        else
+        //        {
+        //            TotpCodeFormatted = _totpCode;
+        //        }
+        //    }
+        //    else
+        //    {
+        //        TotpCodeFormatted = null;
+        //        _totpInterval = null;
+        //    }
+        //}
     }
 }
 
diff --git a/src/App/Pages/Authenticator/AuthenticatorPage.xaml b/src/App/Pages/Authenticator/AuthenticatorPage.xaml
index fde715061..9eb346a34 100644
--- a/src/App/Pages/Authenticator/AuthenticatorPage.xaml
+++ b/src/App/Pages/Authenticator/AuthenticatorPage.xaml
@@ -8,7 +8,8 @@
     xmlns:pages="clr-namespace:Bit.App.Pages"
     xmlns:controls="clr-namespace:Bit.App.Controls"
     x:DataType="pages:AuthenticatorPageViewModel"
-    Title="{Binding PageTitle}">
+    Title="{Binding PageTitle}"
+    x:Name="_page">
 
     <ContentPage.BindingContext>
         <pages:AuthenticatorPageViewModel />
@@ -40,31 +41,31 @@
                          AutomationProperties.Name="{u:I18n AddItem}" />
 
             <DataTemplate x:Key="authenticatorTemplate"
-                          x:DataType="pages:SendGroupingsPageListItem">
-                <controls:AuthenticatorViewCell />
+                          x:DataType="pages:AuthenticatorPageListItem">
+                <controls:AuthenticatorViewCell 
+                    Cipher="{Binding Cipher}"
+                    WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}"
+                    TotpSec="{Binding TotpSec}"/>
             </DataTemplate>
 
             <StackLayout x:Key="mainLayout" x:Name="_mainLayout">
-                <RefreshView
-                IsVisible="{Binding ShowList}"
-                IsRefreshing="{Binding Refreshing}"
-                Command="{Binding RefreshCommand}">
+                <RefreshView>
                     <controls:ExtendedCollectionView
                         ItemsSource="{Binding Items}"
-                        ItemTemplate="{StaticResource authenticatorTemplate}"
                         VerticalOptions="FillAndExpand"
                         SelectionMode="Single"
                         SelectionChanged="RowSelected"
                         StyleClass="list, list-platform">
 
+                        <controls:ExtendedCollectionView.ItemTemplate>
+                            <DataTemplate x:DataType="pages:AuthenticatorPageListItem">
+                                <controls:AuthenticatorViewCell />
+                            </DataTemplate>
+                        </controls:ExtendedCollectionView.ItemTemplate>
 
                     </controls:ExtendedCollectionView>
                 </RefreshView>
 
-                <StackLayout
-                    IsVisible="{Binding ShowList}">
-
-                </StackLayout>
             </StackLayout>
         </ResourceDictionary>
     </ContentPage.Resources>
diff --git a/src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs b/src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs
index f21e464b1..2ca8971eb 100644
--- a/src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs
+++ b/src/App/Pages/Authenticator/AuthenticatorPage.xaml.cs
@@ -1,5 +1,6 @@
 using Bit.App.Resources;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
@@ -14,6 +15,8 @@ namespace Bit.App.Pages
         #region Members
 
         private readonly IBroadcasterService _broadcasterService;
+        private readonly ISyncService _syncService;
+        private readonly ICipherService _cipherService;
         private AuthenticatorPageViewModel _vm;
         private readonly bool _fromTabPage;
         private readonly Action<string> _selectAction;
@@ -26,6 +29,8 @@ namespace Bit.App.Pages
             //_tabsPage = tabsPage;
             InitializeComponent();
             //_broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
+            _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
+            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
             _vm = BindingContext as AuthenticatorPageViewModel;
             //_vm.Page = this;
             //_fromTabPage = fromTabPage;
@@ -47,7 +52,7 @@ namespace Bit.App.Pages
 
         public async Task InitAsync()
         {
-            await _vm.InitAsync();
+            await _vm.LoadAsync();
         }
 
         protected async override void OnAppearing()
@@ -67,7 +72,36 @@ namespace Bit.App.Pages
             //        });
             //    }
             //});
+
+            await LoadOnAppearedAsync(_mainLayout, false, async () =>
+            {
+                if (!_syncService.SyncInProgress || (await _cipherService.GetAllAsync()).Any())
+                {
+                    try
+                    {
+                        await _vm.LoadAsync();
+                    }
+                    catch (Exception e) when (e.Message.Contains("No key."))
+                    {
+                        await Task.Delay(1000);
+                        await _vm.LoadAsync();
+                    }
+                }
+                else
+                {
+                    await Task.Delay(5000);
+                    if (!_vm.Loaded)
+                    {
+                        await _vm.LoadAsync();
+                    }
+                }
+
+                AdjustToolbar();
+                //await CheckAddRequest();
+            }, _mainContent);
+
         }
+
         
 
         private async void Search_Clicked(object sender, EventArgs e)
@@ -132,6 +166,11 @@ namespace Bit.App.Pages
             base.OnDisappearing();
             //_broadcasterService.Unsubscribe(nameof(GeneratorPage));
         }
-        
+
+        private void AdjustToolbar()
+        {
+            //_addItem.IsEnabled = !_vm.Deleted;
+            //_addItem.IconImageSource = _vm.Deleted ? null : "plus.png";
+        }
     }
 }
diff --git a/src/App/Pages/Authenticator/AuthenticatorPageListItem.cs b/src/App/Pages/Authenticator/AuthenticatorPageListItem.cs
new file mode 100644
index 000000000..5475a9a90
--- /dev/null
+++ b/src/App/Pages/Authenticator/AuthenticatorPageListItem.cs
@@ -0,0 +1,129 @@
+using System;
+using System.Threading.Tasks;
+using Bit.App.Resources;
+using Bit.App.Utilities;
+using Bit.Core;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Models.View;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class AuthenticatorPageListItem : ExtendedViewModel
+    {
+        //private string _totpCode;
+        private readonly ITotpService _totpService;
+
+        //public CipherView Cipher { get; set; }
+        //public CipherType? Type { get; set; }
+        //public int interval { get; set; }
+        //public long TotpSec { get; set; }
+        //private DateTime? _totpInterval = null;
+
+        private CipherView _cipher;
+            
+        private bool _websiteIconsEnabled;
+        private string _iconImageSource = string.Empty;
+
+        public int interval { get; set; }
+        private string _totpSec;
+
+        private string _totpCode;
+        private string _totpCodeFormatted = "938 928";
+
+
+        public AuthenticatorPageListItem(CipherView cipherView, bool websiteIconsEnabled)
+        {
+            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
+
+            Cipher = cipherView;
+            WebsiteIconsEnabled = websiteIconsEnabled;
+            interval = _totpService.GetTimeInterval(Cipher.Login.Totp);
+        }
+
+        
+        public Command CopyCommand { get; set; }
+
+        public CipherView Cipher
+        {
+            get => _cipher;
+            set => SetProperty(ref _cipher, value);
+        }
+
+        public string TotpCodeFormatted
+        {
+            get => _totpCodeFormatted;
+            set => SetProperty(ref _totpCodeFormatted, value);
+        }
+
+        public string TotpSec
+        {
+            get => _totpSec;
+            set => SetProperty(ref _totpSec, value);
+        }
+
+        public bool WebsiteIconsEnabled
+        {
+            get => _websiteIconsEnabled;
+            set => SetProperty(ref _websiteIconsEnabled, value);
+        }
+
+        public bool ShowIconImage
+        {
+            get => WebsiteIconsEnabled
+                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
+                && IconImageSource != null;
+        }
+
+        public string IconImageSource
+        {
+            get
+            {
+                if (_iconImageSource == string.Empty) // default value since icon source can return null
+                {
+                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
+                }
+                return _iconImageSource;
+            }
+
+        }
+
+        public async Task TotpTickAsync()
+        {
+            var epoc = CoreHelpers.EpocUtcNow() / 1000;
+            var mod = epoc % interval;
+            var totpSec = interval - mod;
+            TotpSec = totpSec.ToString();
+            //TotpLow = totpSec < 7;
+            if (mod == 0)
+            {
+                await TotpUpdateCodeAsync();
+            }
+
+        }
+
+        public async Task TotpUpdateCodeAsync()
+        {
+            _totpCode = await _totpService.GetCodeAsync(Cipher.Login.Totp);
+            if (_totpCode != null)
+            {
+                if (_totpCode.Length > 4)
+                {
+                    var half = (int)Math.Floor(_totpCode.Length / 2M);
+                    TotpCodeFormatted = string.Format("{0} {1}", _totpCode.Substring(0, half),
+                        _totpCode.Substring(half));
+                }
+                else
+                {
+                    TotpCodeFormatted = _totpCode;
+                }
+            }
+            else
+            {
+                TotpCodeFormatted = null;
+            }
+        }
+    }
+}
diff --git a/src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs b/src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs
index 49f12075a..ffda90d0b 100644
--- a/src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs
+++ b/src/App/Pages/Authenticator/AuthenticatorPageViewModel.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Threading.Tasks;
+using System.Linq;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
+using Bit.Core.Models.View;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 
@@ -12,29 +14,35 @@ namespace Bit.App.Pages
         #region Members
 
         private readonly IClipboardService _clipboardService;
-        private bool _showList = true;
-        private bool _refreshing;
+        private readonly ITotpService _totpService;
         private readonly IUserService _userService;
         private readonly IVaultTimeoutService _vaultTimeoutService;
+        private readonly ICipherService _cipherService;
 
+        private bool _showList = true;
+        private bool _refreshing;
+        private bool _loaded;
+        private bool _websiteIconsEnabled = true;
+        //private long _totpSec;
         #endregion
 
         #region Ctor
 
         public AuthenticatorPageViewModel()
         {
+            _cipherService = ServiceContainer.Resolve<ICipherService>("cipherService");
             _userService = ServiceContainer.Resolve<IUserService>("userService");
             _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
+            _totpService = ServiceContainer.Resolve<ITotpService>("totpService");
 
             PageTitle = AppResources.Authenticator;
+            Items = new ExtendedObservableCollection<AuthenticatorPageListItem>();
         }
 
         #endregion
 
         #region Methods
 
-        public async Task InitAsync() { }
-
         public async Task CopyAsync()
         {
             //await _clipboardService.CopyTextAsync(Password);
@@ -54,15 +62,61 @@ namespace Bit.App.Pages
                 return;
             }
 
-            this.ShowList = true;
-            this.Refreshing = false;
+            try
+            {
+                await LoadDataAsync();
+            }
+            finally
+            {
+                ShowList = true;
+                Refreshing = false;
+            }
+        }
+
+        private async Task LoadDataAsync()
+        {
+            var _allCiphers = await _cipherService.GetAllDecryptedAsync();
+            _allCiphers = _allCiphers.Where(c => c.Type == Core.Enums.CipherType.Login && c.Login.Totp != null).ToList();
+            var filteredCiphers = _allCiphers.Select(c => new AuthenticatorPageListItem(c, WebsiteIconsEnabled)).ToList();
+            Items.ResetWithRange(filteredCiphers);
+
+            foreach (AuthenticatorPageListItem item in Items)
+            {
+                item.TotpUpdateCodeAsync();
+            }
+
+            //await TotpUpdateCodeAsync();
+            //    var interval = _totpService.GetTimeInterval(Cipher.Login.Totp);
+            //    await TotpTickAsync(interval);
+            //    _totpInterval = DateTime.UtcNow;
+            Device.StartTimer(new TimeSpan(0, 0, 1), () =>
+            {
+                foreach(AuthenticatorPageListItem item in Items)
+                {
+                    item.TotpTickAsync();
+                }
+                return true;
+            });
+            //}
+
+            //private async Task TotpTickAsync(int intervalSeconds)
+            //{
+            //    var epoc = CoreHelpers.EpocUtcNow() / 1000;
+            //    var mod = epoc % intervalSeconds;
+            //    var totpSec = intervalSeconds - mod;
+            //    TotpSec = totpSec.ToString();
+            //    TotpLow = totpSec < 7;
+            //    if (mod == 0)
+            //    {
+            //        await TotpUpdateCodeAsync();
+            //    }
         }
 
         #endregion
 
         #region Properties
 
-        public ExtendedObservableCollection<GroupingsPageListGroup> Items { get; set; }
+        public ExtendedObservableCollection<AuthenticatorPageListItem> Items { get; set; }
         public Command RefreshCommand { get; set; }
 
         public bool ShowList
@@ -77,6 +131,23 @@ namespace Bit.App.Pages
             set => SetProperty(ref _refreshing, value);
         }
 
+        public bool WebsiteIconsEnabled
+        {
+            get => _websiteIconsEnabled;
+            set => SetProperty(ref _websiteIconsEnabled, value);
+        }
+
+        public bool Loaded
+        {
+            get => _loaded;
+            set => SetProperty(ref _loaded, value);
+        }
+        //public long TotpSec
+        //{
+        //    get => _totpSec;
+        //    set => SetProperty(ref _totpSec, value);
+        //}
+
         #endregion
     }
 }