mirror of
https://github.com/bitwarden/mobile
synced 2026-01-19 08:53:17 +00:00
[EC-528] Refactor Custom Fields into separate components (#1662)
* Refactored CustomFields to stop using RepeaterView and use BindableLayout and divided the different types on different files and added a factory to create them * Fix formatting
This commit is contained in:
committed by
GitHub
parent
2016eadb0d
commit
b7048de2a1
@@ -0,0 +1,49 @@
|
||||
using System.Windows.Input;
|
||||
using Bit.Core.Models.View;
|
||||
using Bit.Core.Utilities;
|
||||
using Xamarin.Forms;
|
||||
|
||||
namespace Bit.App.Lists.ItemViewModels.CustomFields
|
||||
{
|
||||
public abstract class BaseCustomFieldItemViewModel : ExtendedViewModel, ICustomFieldItemViewModel
|
||||
{
|
||||
protected FieldView _field;
|
||||
protected bool _isEditing;
|
||||
private string[] _additionalFieldProperties = new string[]
|
||||
{
|
||||
nameof(ValueText),
|
||||
nameof(ShowCopyButton)
|
||||
};
|
||||
|
||||
public BaseCustomFieldItemViewModel(FieldView field, bool isEditing, ICommand fieldOptionsCommand)
|
||||
{
|
||||
_field = field;
|
||||
_isEditing = isEditing;
|
||||
FieldOptionsCommand = new Command(() => fieldOptionsCommand?.Execute(this));
|
||||
}
|
||||
|
||||
public FieldView Field
|
||||
{
|
||||
get => _field;
|
||||
set => SetProperty(ref _field, value,
|
||||
additionalPropertyNames: new string[]
|
||||
{
|
||||
nameof(ValueText),
|
||||
nameof(ShowCopyButton),
|
||||
});
|
||||
}
|
||||
|
||||
public bool IsEditing => _isEditing;
|
||||
|
||||
public virtual bool ShowCopyButton => false;
|
||||
|
||||
public virtual string ValueText => _field.Value;
|
||||
|
||||
public ICommand FieldOptionsCommand { get; }
|
||||
|
||||
public void TriggerFieldChanged()
|
||||
{
|
||||
TriggerPropertyChanged(nameof(Field), _additionalFieldProperties);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
using System.Windows.Input;
|
||||
using Bit.Core.Models.View;
|
||||
|
||||
namespace Bit.App.Lists.ItemViewModels.CustomFields
|
||||
{
|
||||
public class BooleanCustomFieldItemViewModel : BaseCustomFieldItemViewModel
|
||||
{
|
||||
public BooleanCustomFieldItemViewModel(FieldView field, bool isEditing, ICommand fieldOptionsCommand)
|
||||
: base(field, isEditing, fieldOptionsCommand)
|
||||
{
|
||||
}
|
||||
|
||||
public bool BooleanValue
|
||||
{
|
||||
get => bool.TryParse(Field.Value, out var boolVal) && boolVal;
|
||||
set
|
||||
{
|
||||
Field.Value = value.ToString().ToLower();
|
||||
TriggerPropertyChanged(nameof(BooleanValue));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
using System;
|
||||
using System.Windows.Input;
|
||||
using Bit.App.Utilities;
|
||||
using Bit.Core.Abstractions;
|
||||
using Bit.Core.Enums;
|
||||
using Bit.Core.Models.View;
|
||||
|
||||
namespace Bit.App.Lists.ItemViewModels.CustomFields
|
||||
{
|
||||
public interface ICustomFieldItemFactory
|
||||
{
|
||||
ICustomFieldItemViewModel CreateCustomFieldItem(FieldView field,
|
||||
bool isEditing,
|
||||
CipherView cipher,
|
||||
IPasswordPromptable passwordPromptable,
|
||||
ICommand copyFieldCommand,
|
||||
ICommand fieldOptionsCommand);
|
||||
}
|
||||
|
||||
public class CustomFieldItemFactory : ICustomFieldItemFactory
|
||||
{
|
||||
readonly II18nService _i18nService;
|
||||
readonly IEventService _eventService;
|
||||
|
||||
public CustomFieldItemFactory(II18nService i18nService, IEventService eventService)
|
||||
{
|
||||
_i18nService = i18nService;
|
||||
_eventService = eventService;
|
||||
}
|
||||
|
||||
public ICustomFieldItemViewModel CreateCustomFieldItem(FieldView field,
|
||||
bool isEditing,
|
||||
CipherView cipher,
|
||||
IPasswordPromptable passwordPromptable,
|
||||
ICommand copyFieldCommand,
|
||||
ICommand fieldOptionsCommand)
|
||||
{
|
||||
switch (field.Type)
|
||||
{
|
||||
case FieldType.Text:
|
||||
return new TextCustomFieldItemViewModel(field, isEditing, fieldOptionsCommand, copyFieldCommand);
|
||||
case FieldType.Boolean:
|
||||
return new BooleanCustomFieldItemViewModel(field, isEditing, fieldOptionsCommand);
|
||||
case FieldType.Hidden:
|
||||
return new HiddenCustomFieldItemViewModel(field, isEditing, fieldOptionsCommand, cipher, passwordPromptable, _eventService, copyFieldCommand);
|
||||
case FieldType.Linked:
|
||||
return new LinkedCustomFieldItemViewModel(field, isEditing, fieldOptionsCommand, cipher, _i18nService);
|
||||
default:
|
||||
throw new NotImplementedException("There is no custom field item for field type " + field.Type);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Input;
|
||||
using Bit.App.Utilities;
|
||||
using Bit.Core.Abstractions;
|
||||
using Bit.Core.Models.View;
|
||||
using Xamarin.CommunityToolkit.ObjectModel;
|
||||
using Xamarin.Forms;
|
||||
|
||||
namespace Bit.App.Lists.ItemViewModels.CustomFields
|
||||
{
|
||||
public class HiddenCustomFieldItemViewModel : BaseCustomFieldItemViewModel
|
||||
{
|
||||
private readonly CipherView _cipher;
|
||||
private readonly IPasswordPromptable _passwordPromptable;
|
||||
private readonly IEventService _eventService;
|
||||
private bool _showHiddenValue;
|
||||
|
||||
public HiddenCustomFieldItemViewModel(FieldView field,
|
||||
bool isEditing,
|
||||
ICommand fieldOptionsCommand,
|
||||
CipherView cipher,
|
||||
IPasswordPromptable passwordPromptable,
|
||||
IEventService eventService,
|
||||
ICommand copyFieldCommand)
|
||||
: base(field, isEditing, fieldOptionsCommand)
|
||||
{
|
||||
_cipher = cipher;
|
||||
_passwordPromptable = passwordPromptable;
|
||||
_eventService = eventService;
|
||||
|
||||
CopyFieldCommand = new Command(() => copyFieldCommand?.Execute(Field));
|
||||
ToggleHiddenValueCommand = new AsyncCommand(ToggleHiddenValueAsync, (Func<bool>)null, ex =>
|
||||
{
|
||||
#if !FDROID
|
||||
Microsoft.AppCenter.Crashes.Crashes.TrackError(ex);
|
||||
#endif
|
||||
});
|
||||
}
|
||||
|
||||
public ICommand CopyFieldCommand { get; }
|
||||
|
||||
public ICommand ToggleHiddenValueCommand { get; set; }
|
||||
|
||||
public bool ShowHiddenValue
|
||||
{
|
||||
get => _showHiddenValue;
|
||||
set => SetProperty(ref _showHiddenValue, value);
|
||||
}
|
||||
|
||||
public bool ShowViewHidden => _cipher.ViewPassword || (_isEditing && _field.NewField);
|
||||
|
||||
public override bool ShowCopyButton => !_isEditing && _cipher.ViewPassword && !string.IsNullOrWhiteSpace(Field.Value);
|
||||
|
||||
public async Task ToggleHiddenValueAsync()
|
||||
{
|
||||
if (!_isEditing && !await _passwordPromptable.PromptPasswordAsync())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
ShowHiddenValue = !ShowHiddenValue;
|
||||
if (ShowHiddenValue && (!_isEditing || _cipher?.Id != null))
|
||||
{
|
||||
await _eventService.CollectAsync(
|
||||
Core.Enums.EventType.Cipher_ClientToggledHiddenFieldVisible, _cipher.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
using Bit.Core.Models.View;
|
||||
|
||||
namespace Bit.App.Lists.ItemViewModels.CustomFields
|
||||
{
|
||||
public interface ICustomFieldItemViewModel
|
||||
{
|
||||
FieldView Field { get; set; }
|
||||
|
||||
bool ShowCopyButton { get; }
|
||||
|
||||
void TriggerFieldChanged();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Windows.Input;
|
||||
using Bit.Core;
|
||||
using Bit.Core.Abstractions;
|
||||
using Bit.Core.Enums;
|
||||
using Bit.Core.Models.View;
|
||||
|
||||
namespace Bit.App.Lists.ItemViewModels.CustomFields
|
||||
{
|
||||
public class LinkedCustomFieldItemViewModel : BaseCustomFieldItemViewModel
|
||||
{
|
||||
private readonly CipherView _cipher;
|
||||
private readonly II18nService _i18nService;
|
||||
private int _linkedFieldOptionSelectedIndex;
|
||||
|
||||
public LinkedCustomFieldItemViewModel(FieldView field, bool isEditing, ICommand fieldOptionsCommand, CipherView cipher, II18nService i18nService)
|
||||
: base(field, isEditing, fieldOptionsCommand)
|
||||
{
|
||||
_cipher = cipher;
|
||||
_i18nService = i18nService;
|
||||
|
||||
LinkedFieldOptionSelectedIndex = Field.LinkedId.HasValue
|
||||
? LinkedFieldOptions.FindIndex(lfo => lfo.Value == Field.LinkedId.Value)
|
||||
: 0;
|
||||
|
||||
if (isEditing && Field.LinkedId is null)
|
||||
{
|
||||
field.LinkedId = LinkedFieldOptions[0].Value;
|
||||
}
|
||||
}
|
||||
|
||||
public override string ValueText
|
||||
{
|
||||
get
|
||||
{
|
||||
var i18nKey = _cipher.LinkedFieldI18nKey(Field.LinkedId.GetValueOrDefault());
|
||||
return $"{BitwardenIcons.Link} {_i18nService.T(i18nKey)}";
|
||||
}
|
||||
}
|
||||
|
||||
public int LinkedFieldOptionSelectedIndex
|
||||
{
|
||||
get => _linkedFieldOptionSelectedIndex;
|
||||
set
|
||||
{
|
||||
if (SetProperty(ref _linkedFieldOptionSelectedIndex, value))
|
||||
{
|
||||
LinkedFieldValueChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<KeyValuePair<string, LinkedIdType>> LinkedFieldOptions
|
||||
{
|
||||
get => _cipher.LinkedFieldOptions
|
||||
.Select(kvp => new KeyValuePair<string, LinkedIdType>(_i18nService.T(kvp.Key), kvp.Value))
|
||||
.ToList();
|
||||
}
|
||||
|
||||
private void LinkedFieldValueChanged()
|
||||
{
|
||||
if (Field != null && LinkedFieldOptionSelectedIndex > -1)
|
||||
{
|
||||
Field.LinkedId = LinkedFieldOptions.Find(lfo =>
|
||||
lfo.Value == LinkedFieldOptions[LinkedFieldOptionSelectedIndex].Value).Value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
using System.Windows.Input;
|
||||
using Bit.Core.Models.View;
|
||||
using Xamarin.Forms;
|
||||
|
||||
namespace Bit.App.Lists.ItemViewModels.CustomFields
|
||||
{
|
||||
public class TextCustomFieldItemViewModel : BaseCustomFieldItemViewModel
|
||||
{
|
||||
public TextCustomFieldItemViewModel(FieldView field, bool isEditing, ICommand fieldOptionsCommand, ICommand copyFieldCommand)
|
||||
: base(field, isEditing, fieldOptionsCommand)
|
||||
{
|
||||
CopyFieldCommand = new Command(() => copyFieldCommand?.Execute(Field));
|
||||
}
|
||||
|
||||
public override bool ShowCopyButton => !_isEditing && !string.IsNullOrWhiteSpace(Field.Value);
|
||||
|
||||
public ICommand CopyFieldCommand { get; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user