added image option to form entry cell. Added clear option to extended entry

src/App/Controls/ExtendedEntry.cs

@@ -45,6 +45,7 @@ namespace Bit.App.Controls
         public ReturnType? ReturnType { get; set; }
         public bool? Autocorrect { get; set; }
         public bool DisableAutocapitalize { get; set; }
+        public bool AllowClear { get; set; }
 
         // Need to overwrite default handler because we cant Invoke otherwise
         public new event EventHandler Completed;

src/App/Controls/FormEntryCell.cs

@@ -5,7 +5,13 @@ namespace Bit.App.Controls
 {
     public class FormEntryCell : ExtendedViewCell
     {
-        public FormEntryCell(string labelText, Keyboard entryKeyboard = null, bool IsPassword = false, VisualElement nextElement = null, bool useLabelAsPlaceholder = false)
+        public FormEntryCell(
+            string labelText,
+            Keyboard entryKeyboard = null,
+            bool IsPassword = false,
+            VisualElement nextElement = null,
+            bool useLabelAsPlaceholder = false,
+            string imageSource = null)
         {
             if(!useLabelAsPlaceholder)
             {
@@ -14,7 +20,8 @@ namespace Bit.App.Controls
                     Text = labelText,
                     FontSize = Device.GetNamedSize(NamedSize.Small, typeof(Label)),
                     VerticalOptions = LayoutOptions.Start,
-                    Style = (Style)Application.Current.Resources["text-muted"]
+                    Style = (Style)Application.Current.Resources["text-muted"],
+                    HorizontalOptions = LayoutOptions.FillAndExpand
                 };
             }
 
@@ -23,7 +30,9 @@ namespace Bit.App.Controls
                 Keyboard = entryKeyboard,
                 HasBorder = false,
                 VerticalOptions = LayoutOptions.CenterAndExpand,
-                IsPassword = IsPassword
+                IsPassword = IsPassword,
+                AllowClear = true,
+                HorizontalOptions = LayoutOptions.FillAndExpand
             };
 
             if(useLabelAsPlaceholder)
@@ -37,22 +46,53 @@ namespace Bit.App.Controls
                 Entry.Completed += (object sender, EventArgs e) => { nextElement.Focus(); };
             }
 
-            var stackLayout = new StackLayout
+            var imageStackLayout = new StackLayout
             {
-                Padding = new Thickness(15, 10)
+                Padding = new Thickness(15, 10),
+                Orientation = StackOrientation.Horizontal,
+                Spacing = 10,
+                HorizontalOptions = LayoutOptions.FillAndExpand,
+                VerticalOptions = LayoutOptions.FillAndExpand
             };
 
-            if(!useLabelAsPlaceholder)
+            if(imageSource != null)
             {
-                stackLayout.Children.Add(Label);
+                var tgr = new TapGestureRecognizer();
+                tgr.Tapped += Tgr_Tapped;
+
+                var theImage = new Image
+                {
+                    Source = imageSource,
+                    HorizontalOptions = LayoutOptions.Start,
+                    VerticalOptions = LayoutOptions.Center
+                };
+                theImage.GestureRecognizers.Add(tgr);
+
+                imageStackLayout.Children.Add(theImage);
             }
 
-            stackLayout.Children.Add(Entry);
+            var formStackLayout = new StackLayout
+            {
+                HorizontalOptions = LayoutOptions.FillAndExpand,
+                VerticalOptions = LayoutOptions.FillAndExpand
+            };
+            if(!useLabelAsPlaceholder)
+            {
+                formStackLayout.Children.Add(Label);
+            }
 
-            View = stackLayout;
+            formStackLayout.Children.Add(Entry);
+            imageStackLayout.Children.Add(formStackLayout);
+
+            View = imageStackLayout;
         }
 
         public Label Label { get; private set; }
         public ExtendedEntry Entry { get; private set; }
+
+        private void Tgr_Tapped(object sender, EventArgs e)
+        {
+            Entry.Focus();
+        }
     }
 }

src/App/Pages/LoginPage.cs

@@ -36,8 +36,10 @@ namespace Bit.App.Pages
 
         private void Init()
         {
-            PasswordCell = new FormEntryCell(AppResources.MasterPassword, IsPassword: true, useLabelAsPlaceholder: true);
-            EmailCell = new FormEntryCell(AppResources.EmailAddress, nextElement: PasswordCell.Entry, entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true);
+            PasswordCell = new FormEntryCell(AppResources.MasterPassword, IsPassword: true,
+                useLabelAsPlaceholder: true, imageSource: "lock");
+            EmailCell = new FormEntryCell(AppResources.EmailAddress, nextElement: PasswordCell.Entry,
+                entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true, imageSource: "envelope");
 
             PasswordCell.Entry.ReturnType = Enums.ReturnType.Go;
             PasswordCell.Entry.Completed += Entry_Completed;

src/App/Pages/RegisterPage.cs

@@ -34,11 +34,11 @@ namespace Bit.App.Pages
 
         private void Init()
         {
-            PasswordHintCell = new FormEntryCell("Master Password Hint (optional)", useLabelAsPlaceholder: true);
-            ConfirmPasswordCell = new FormEntryCell("Re-type Master Password", IsPassword: true, nextElement: PasswordHintCell.Entry, useLabelAsPlaceholder: true);
-            PasswordCell = new FormEntryCell(AppResources.MasterPassword, IsPassword: true, nextElement: ConfirmPasswordCell.Entry, useLabelAsPlaceholder: true);
-            NameCell = new FormEntryCell("Your Name", nextElement: PasswordCell.Entry, useLabelAsPlaceholder: true);
-            EmailCell = new FormEntryCell(AppResources.EmailAddress, nextElement: NameCell.Entry, entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true);
+            PasswordHintCell = new FormEntryCell("Master Password Hint (optional)", useLabelAsPlaceholder: true, imageSource: "lightbulb-o");
+            ConfirmPasswordCell = new FormEntryCell("Re-type Master Password", IsPassword: true, nextElement: PasswordHintCell.Entry, useLabelAsPlaceholder: true, imageSource: "lock");
+            PasswordCell = new FormEntryCell(AppResources.MasterPassword, IsPassword: true, nextElement: ConfirmPasswordCell.Entry, useLabelAsPlaceholder: true, imageSource: "lock");
+            NameCell = new FormEntryCell("Your Name", nextElement: PasswordCell.Entry, useLabelAsPlaceholder: true, imageSource: "user");
+            EmailCell = new FormEntryCell(AppResources.EmailAddress, nextElement: NameCell.Entry, entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true, imageSource: "envelope");
 
             PasswordHintCell.Entry.ReturnType = Enums.ReturnType.Done;
             PasswordHintCell.Entry.Completed += Entry_Completed;
@@ -54,7 +54,10 @@ namespace Bit.App.Pages
                     new TableSection()
                     {
                         EmailCell,
-                        NameCell,
+                        NameCell
+                    },
+                    new TableSection()
+                    {
                         PasswordCell,
                         ConfirmPasswordCell,
                         PasswordHintCell

src/iOS/Controls/ExtendedEntryRenderer.cs

@@ -25,6 +25,11 @@ namespace Bit.iOS.Controls
                 SetMaxLength(view);
                 UpdateKeyboard();
 
+                if(view.AllowClear)
+                {
+                    Control.ClearButtonMode = UITextFieldViewMode.WhileEditing;
+                }
+
                 if(view.DisableAutocapitalize)
                 {
                     Control.AutocapitalizationType = UITextAutocapitalizationType.None;

src/iOS/iOS.csproj

@@ -400,6 +400,42 @@
   <ItemGroup>
     <BundleResource Include="Resources\eye_slash%402x.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\envelope.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\envelope%402x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\envelope%403x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\lock%403x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\lock%402x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\lock.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\lightbulb-o.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\lightbulb-o%402x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\lightbulb-o%403x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\user.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\user%402x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\user%403x.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>