Version 3.0.338

This commit is contained in:
Anja Müller-Meißner 2022-09-06 16:08:19 +02:00 committed by Anja
parent 573fe77e12
commit 0468955d49
751 changed files with 62747 additions and 60672 deletions

View file

@ -9,102 +9,102 @@ using Xamarin.Forms.Xaml;
namespace ShareeSharedGuiLib.View
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class BarLevelInputView : ContentView
{
private BarLevelInputViewModel _LocalViewModel;
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class BarLevelInputView : ContentView
{
private BarLevelInputViewModel _LocalViewModel;
public BarLevelInputView()
{
InitializeComponent();
public BarLevelInputView()
{
InitializeComponent();
_LocalViewModel = new BarLevelInputViewModel();
_LocalViewModel = new BarLevelInputViewModel();
_LocalViewModel.PropertyChanged += (sender, args) =>
{
// Update Current property from view model on user input.
if (args.PropertyName != nameof(BarLevelInputViewModel.Current))
return;
_LocalViewModel.PropertyChanged += (sender, args) =>
{
// Update Current property from view model on user input.
if (args.PropertyName != nameof(BarLevelInputViewModel.Current))
return;
var viewModel = sender as BarLevelInputViewModel;
Current = viewModel?.Current != null
? viewModel?.Current.Value.ToString()
: String.Empty;
};
var viewModel = sender as BarLevelInputViewModel;
Current = viewModel?.Current != null
? viewModel?.Current.Value.ToString()
: String.Empty;
};
// Do not bind entire control to local view model. Doing this would break binding of BatteryView control.
this.BarLevelElement.BindingContext = _LocalViewModel;
this.BarLevelStepper.BindingContext = _LocalViewModel;
}
// Do not bind entire control to local view model. Doing this would break binding of BatteryView control.
this.BarLevelElement.BindingContext = _LocalViewModel;
this.BarLevelStepper.BindingContext = _LocalViewModel;
}
/// <summary>
/// Create bindable property to to allow "Maximum"- proptery to act as a valid target for data binding.
/// </summary>
public static readonly BindableProperty MaximumProperty = BindableProperty.Create(
"Maximum",
typeof(string),
typeof(BarLevelInputView),
"7",
propertyChanged: OnMaximumChanged);
/// <summary>
/// Create bindable property to to allow "Maximum"- proptery to act as a valid target for data binding.
/// </summary>
public static readonly BindableProperty MaximumProperty = BindableProperty.Create(
"Maximum",
typeof(string),
typeof(BarLevelInputView),
"7",
propertyChanged: OnMaximumChanged);
/// <summary>
/// Holds the count of bars wich represent charing level full.
/// </summary>
public string Maximum
{
get => (string)GetValue(MaximumProperty);
set => SetValue(MaximumProperty, value);
}
/// <summary>
/// Holds the count of bars wich represent charing level full.
/// </summary>
public string Maximum
{
get => (string)GetValue(MaximumProperty);
set => SetValue(MaximumProperty, value);
}
/// <summary>
/// Notifies when value changes. Is required to make binding work.
/// </summary>
static void OnMaximumChanged(BindableObject bindable, object oldValue, object newValue)
{
if (newValue != oldValue)
{
var batteryView = bindable as BarLevelInputView;
batteryView?.SetMaximum(int.TryParse(newValue.ToString(), out int maximum) ? (int?)maximum : null);
}
}
/// <summary>
/// Notifies when value changes. Is required to make binding work.
/// </summary>
static void OnMaximumChanged(BindableObject bindable, object oldValue, object newValue)
{
if (newValue != oldValue)
{
var batteryView = bindable as BarLevelInputView;
batteryView?.SetMaximum(int.TryParse(newValue.ToString(), out int maximum) ? (int?)maximum : null);
}
}
public void SetMaximum(int? maximum) => _LocalViewModel.Maximum = maximum;
public void SetMaximum(int? maximum) => _LocalViewModel.Maximum = maximum;
/// <summary>
/// Create bindable property to to allow "Current"- proptery to act as a valid target for data binding.
/// </summary>
public static readonly BindableProperty CurrentProperty = BindableProperty.Create(
"Current",
typeof(string),
typeof(BarLevelInputView),
"7",
BindingMode.TwoWay,
propertyChanged: OnCurrentChanged);
/// <summary>
/// Create bindable property to to allow "Current"- proptery to act as a valid target for data binding.
/// </summary>
public static readonly BindableProperty CurrentProperty = BindableProperty.Create(
"Current",
typeof(string),
typeof(BarLevelInputView),
"7",
BindingMode.TwoWay,
propertyChanged: OnCurrentChanged);
/// <summary>
/// Holds the count of bars wich represent the current charing level.
/// </summary>
public string Current
{
get => (string)GetValue(CurrentProperty);
set => SetValue(CurrentProperty, value);
}
/// <summary>
/// Holds the count of bars wich represent the current charing level.
/// </summary>
public string Current
{
get => (string)GetValue(CurrentProperty);
set => SetValue(CurrentProperty, value);
}
/// <summary>
/// Notifies when value changes. Is required to make binding work.
/// </summary>
static void OnCurrentChanged(BindableObject bindable, object oldValue, object newValue)
{
if (newValue != oldValue)
{
var batteryView = bindable as BarLevelInputView;
int current;
batteryView?.SetCurrent(int.TryParse(newValue.ToString(), out current) ? (int?)current : null);
}
}
/// <summary>
/// Notifies when value changes. Is required to make binding work.
/// </summary>
static void OnCurrentChanged(BindableObject bindable, object oldValue, object newValue)
{
if (newValue != oldValue)
{
var batteryView = bindable as BarLevelInputView;
int current;
batteryView?.SetCurrent(int.TryParse(newValue.ToString(), out current) ? (int?)current : null);
}
}
public void SetCurrent(int? current) => _LocalViewModel.Current = current;
public void SetCurrent(int? current) => _LocalViewModel.Current = current;
}
}
}

View file

@ -9,86 +9,86 @@ using Xamarin.Forms.Xaml;
namespace ShareeSharedGuiLib.View
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class BarLevelView : ContentView
{
private BarLevelViewModel _LocalViewModel = new BarLevelViewModel();
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class BarLevelView : ContentView
{
private BarLevelViewModel _LocalViewModel = new BarLevelViewModel();
public BarLevelView()
{
InitializeComponent();
public BarLevelView()
{
InitializeComponent();
// Do not bind entire control to local view model. Doing this would break binding of BatteryView control.
this.BarLevelLabel.BindingContext = _LocalViewModel;
this.BarLevelImage.BindingContext = _LocalViewModel;
}
// Do not bind entire control to local view model. Doing this would break binding of BatteryView control.
this.BarLevelLabel.BindingContext = _LocalViewModel;
this.BarLevelImage.BindingContext = _LocalViewModel;
}
/// <summary>
/// Create bindable property to to allow "Maximum"- proptery to act as a valid target for data binding.
/// </summary>
public static readonly BindableProperty MaximumProperty = BindableProperty.Create(
"Maximum",
typeof(string),
typeof(BarLevelView),
"", // Default value must match default value of view model object. Otherwise there might be an update issue.
propertyChanged: OnMaximumChanged);
/// <summary>
/// Create bindable property to to allow "Maximum"- proptery to act as a valid target for data binding.
/// </summary>
public static readonly BindableProperty MaximumProperty = BindableProperty.Create(
"Maximum",
typeof(string),
typeof(BarLevelView),
"", // Default value must match default value of view model object. Otherwise there might be an update issue.
propertyChanged: OnMaximumChanged);
/// <summary>
/// Holds the count of bars wich represent charing level full.
/// </summary>
public string Maximum
{
get => (string)GetValue(MaximumProperty);
set => SetValue(MaximumProperty, value);
}
/// <summary>
/// Holds the count of bars wich represent charing level full.
/// </summary>
public string Maximum
{
get => (string)GetValue(MaximumProperty);
set => SetValue(MaximumProperty, value);
}
/// <summary>
/// Notifies when value changes. Is required to make binding work.
/// </summary>
static void OnMaximumChanged(BindableObject bindable, object oldValue, object newValue)
{
if (newValue != oldValue)
{
var batteryView = bindable as BarLevelView;
batteryView?.SetMaximum(int.TryParse(newValue.ToString(), out int maximum) ? (int?)maximum : null);
}
}
/// <summary>
/// Notifies when value changes. Is required to make binding work.
/// </summary>
static void OnMaximumChanged(BindableObject bindable, object oldValue, object newValue)
{
if (newValue != oldValue)
{
var batteryView = bindable as BarLevelView;
batteryView?.SetMaximum(int.TryParse(newValue.ToString(), out int maximum) ? (int?)maximum : null);
}
}
public void SetMaximum(int? maximum) => _LocalViewModel.Maximum = maximum;
public void SetMaximum(int? maximum) => _LocalViewModel.Maximum = maximum;
/// <summary>
/// Create bindable property to to allow "Current"- proptery to act as a valid target for data binding.
/// </summary>
public static readonly BindableProperty CurrentProperty = BindableProperty.Create(
"Current",
typeof(string),
typeof(BarLevelView),
"", // Default value must match default value of view model object. Otherwise there might be an update issue.
propertyChanged: OnCurrentChanged);
/// <summary>
/// Create bindable property to to allow "Current"- proptery to act as a valid target for data binding.
/// </summary>
public static readonly BindableProperty CurrentProperty = BindableProperty.Create(
"Current",
typeof(string),
typeof(BarLevelView),
"", // Default value must match default value of view model object. Otherwise there might be an update issue.
propertyChanged: OnCurrentChanged);
/// <summary>
/// Holds the count of bars wich represent the current charing level.
/// </summary>
public string Current
{
get => (string)GetValue(CurrentProperty);
set => SetValue(CurrentProperty, value);
}
/// <summary>
/// Holds the count of bars wich represent the current charing level.
/// </summary>
public string Current
{
get => (string)GetValue(CurrentProperty);
set => SetValue(CurrentProperty, value);
}
/// <summary>
/// Notifies when value changes. Is required to make binding work.
/// </summary>
static void OnCurrentChanged(BindableObject bindable, object oldValue, object newValue)
{
if (newValue != oldValue)
{
var batteryView = bindable as BarLevelView;
int current;
batteryView?.SetCurrent(int.TryParse(newValue.ToString(), out current) ? (int?)current : null);
}
}
/// <summary>
/// Notifies when value changes. Is required to make binding work.
/// </summary>
static void OnCurrentChanged(BindableObject bindable, object oldValue, object newValue)
{
if (newValue != oldValue)
{
var batteryView = bindable as BarLevelView;
int current;
batteryView?.SetCurrent(int.TryParse(newValue.ToString(), out current) ? (int?)current : null);
}
}
public void SetCurrent(int? current) => _LocalViewModel.Current = current;
}
public void SetCurrent(int? current) => _LocalViewModel.Current = current;
}
}

View file

@ -4,34 +4,34 @@ using System.Text;
namespace ShareeSharedGuiLib.ViewModel
{
public enum ChargingState
{
Loaded,
Empty
}
public enum ChargingState
{
Loaded,
Empty
}
public class Bar
{
public Bar(ChargingState? state = null)
{
State = state;
}
public class Bar
{
public Bar(ChargingState? state = null)
{
State = state;
}
/// <summary>
/// Gets a value indicating whether bar is charged or not. Null if state is unknown.
/// </summary>
public ChargingState? State { get; private set; } = null;
/// <summary>
/// Gets a value indicating whether bar is charged or not. Null if state is unknown.
/// </summary>
public ChargingState? State { get; private set; } = null;
public string Text
{
get
{
if (State == null)
return string.Empty;
public string Text
{
get
{
if (State == null)
return string.Empty;
return State == ChargingState.Loaded ? " + " : " - ";
}
return State == ChargingState.Loaded ? " + " : " - ";
}
}
}
}
}
}

View file

@ -7,61 +7,61 @@ using Xamarin.Forms;
namespace ShareeSharedGuiLib.ViewModel
{
/// <summary>
/// Bar based filling level view which shows filling level and allows to edit this level.
/// </summary>
public class BarLevelInputViewModel : INotifyPropertyChanged
{
public new event PropertyChangedEventHandler PropertyChanged;
/// <summary>
/// Bar based filling level view which shows filling level and allows to edit this level.
/// </summary>
public class BarLevelInputViewModel : INotifyPropertyChanged
{
public new event PropertyChangedEventHandler PropertyChanged;
public int? _Maximum = null;
public int? _Maximum = null;
public int? Maximum
{
get => _Maximum;
set
{
if (_Maximum == value)
{
// Nothing to do because nothing changed.
return;
}
public int? Maximum
{
get => _Maximum;
set
{
if (_Maximum == value)
{
// Nothing to do because nothing changed.
return;
}
_Maximum = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MaximumText)));
}
}
_Maximum = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MaximumText)));
}
}
public string MaximumText => Maximum != null
? Maximum.Value.ToString()
: string.Empty;
public string MaximumText => Maximum != null
? Maximum.Value.ToString()
: string.Empty;
public int? _Current = null;
public int? _Current = null;
public int? Current
{
get => _Current;
set
{
if (_Current == value)
{
// Nothing to do because nothing changed.
return;
}
public int? Current
{
get => _Current;
set
{
if (_Current == value)
{
// Nothing to do because nothing changed.
return;
}
_Current = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Current)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentText)));
}
}
_Current = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Current)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentText)));
}
}
public string CurrentText
{
get => Current != null
? Current.Value.ToString()
: string.Empty;
public string CurrentText
{
get => Current != null
? Current.Value.ToString()
: string.Empty;
set => Current = int.TryParse(value, out int newCurrent) ? (int?)newCurrent : null;
}
}
set => Current = int.TryParse(value, out int newCurrent) ? (int?)newCurrent : null;
}
}
}

View file

@ -3,87 +3,87 @@ using TINK.MultilingualResources;
namespace ShareeSharedGuiLib.ViewModel
{
/// <summary>
/// Bar based filling level indicator view.
/// </summary>
public class BarLevelViewModel : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
/// <summary>
/// Bar based filling level indicator view.
/// </summary>
public class BarLevelViewModel : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
public int? _Maximum = null;
public int? _Maximum = null;
/// <summary>
/// Holds the maximum count of bars.
/// </summary>
public int? Maximum
{
get => _Maximum;
set
{
if (_Maximum == value)
{
// Nothing to do because nothing changed.
return;
}
/// <summary>
/// Holds the maximum count of bars.
/// </summary>
public int? Maximum
{
get => _Maximum;
set
{
if (_Maximum == value)
{
// Nothing to do because nothing changed.
return;
}
_Maximum = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelLabelVisible)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelBarsText)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelImageSourceString)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelImageVisible)));
}
}
_Maximum = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelLabelVisible)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelBarsText)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelImageSourceString)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelImageVisible)));
}
}
public int? _Current = null;
public int? _Current = null;
/// <summary>
/// Holds the current count of bars.
/// </summary>
public int? Current
{
get => _Current;
set
{
if (_Current == value)
{
// Nothing to do because nothing changed.
return;
}
/// <summary>
/// Holds the current count of bars.
/// </summary>
public int? Current
{
get => _Current;
set
{
if (_Current == value)
{
// Nothing to do because nothing changed.
return;
}
_Current = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelLabelVisible)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelBarsText)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelImageSourceString)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelImageVisible)));
}
}
_Current = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelLabelVisible)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelBarsText)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BatteryChargeLevelImageSourceString)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsBatteryChargeLevelImageVisible)));
}
}
/// <summary>
/// Gets the battery filling level or pedelecs.
/// </summary>
public string BatteryChargeLevelBarsText => Maximum != null
? string.Format(
AppResources.MarkingDriveBatteryChargingLevel,
Current != null ? Current.ToString() : "-",
Maximum != null ? Maximum.ToString() : "-")
: AppResources.MarkingDriveBatteryChargingLevelNotAvailable;
/// <summary>
/// Gets the battery filling level or pedelecs.
/// </summary>
public string BatteryChargeLevelBarsText => Maximum != null
? string.Format(
AppResources.MarkingDriveBatteryChargingLevel,
Current != null ? Current.ToString() : "-",
Maximum != null ? Maximum.ToString() : "-")
: AppResources.MarkingDriveBatteryChargingLevelNotAvailable;
/// <summary>
/// Gets a value indicating whether battery label is visible or not.
/// </summary>
public bool IsBatteryChargeLevelLabelVisible => Maximum.HasValue && Maximum.Value != 5;
/// <summary>
/// Gets a value indicating whether battery label is visible or not.
/// </summary>
public bool IsBatteryChargeLevelLabelVisible => Maximum.HasValue && Maximum.Value != 5;
/// <summary>
/// Gets name of battery image ressource.
/// </summary>
public string BatteryChargeLevelImageSourceString => Current.HasValue && Maximum.HasValue && Maximum.Value == 5
? $"battery_{Current.Value}_{Maximum.Value}.png"
: "battery_undefined.png";
/// <summary>
/// Gets name of battery image ressource.
/// </summary>
public string BatteryChargeLevelImageSourceString => Current.HasValue && Maximum.HasValue && Maximum.Value == 5
? $"battery_{Current.Value}_{Maximum.Value}.png"
: "battery_undefined.png";
/// <summary>
/// Gets a value indicating whether battery image is visible or not.
/// </summary>
public bool IsBatteryChargeLevelImageVisible => Maximum.HasValue && Maximum.Value == 5;
/// <summary>
/// Gets a value indicating whether battery image is visible or not.
/// </summary>
public bool IsBatteryChargeLevelImageVisible => Maximum.HasValue && Maximum.Value == 5;
}
}
}