Version 3.0.363

This commit is contained in:
Anja 2023-04-19 12:14:14 +02:00
parent 4ff3307997
commit 91d42552c7
212 changed files with 1799 additions and 1318 deletions

View file

@ -1,6 +1,6 @@
using Xamarin.Forms;
using TINK.View;
using TINK.Model.Station;
using TINK.Model.Stations;
using System;
using System.Linq;
using TINK.Model.Bikes;
@ -39,7 +39,7 @@ namespace TINK.ViewModel.Map
private static bool WasMerchantMessageAlreadyShown { get; set; } = false;
/// <summary> Holds the count of custom icons availalbe.</summary>
/// <summary> Holds the count of custom icons centered.</summary>
private const int CUSTOM_ICONS_COUNT = 30;
/// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
@ -67,7 +67,7 @@ namespace TINK.ViewModel.Map
/// <summary> Object to manage update of view model objects from Copri.</summary>
private IPollingUpdateTaskManager m_oViewUpdateManager;
/// <summary>Holds whether to poll or not and the periode leght is polling is on.</summary>
/// <summary>Holds whether to poll or not and the period length is polling is on.</summary>
private PollingParameters Polling { get; set; }
/// <summary> Reference on the tink app instance. </summary>
@ -228,8 +228,8 @@ namespace TINK.ViewModel.Map
{
if (station.Position == null)
{
// There should be no reason for a position object to be null but this alreay occurred in past.
Log.ForContext<MapPageViewModel>().Error("Postion object of station {@l_oStation} is null.", station);
// There should be no reason for a position object to be null but this already occurred in past.
Log.ForContext<MapPageViewModel>().Error("Position object of station {@l_oStation} is null.", station);
continue;
}
@ -355,7 +355,7 @@ namespace TINK.ViewModel.Map
Polling = TinkApp.Polling;
Log.ForContext<MapPageViewModel>().Information(
$"{(Polling != null && Polling.IsActivated ? $"Map page is appearing. Update periode is {Polling.Periode.TotalSeconds} sec." : "Map page is appearing. Polling is off.")}" +
$"{(Polling != null && Polling.IsActivated ? $"Map page is appearing. Update period is {Polling.Periode.TotalSeconds} sec." : "Map page is appearing. Polling is off.")}" +
$"Current UI language is {Thread.CurrentThread.CurrentUICulture.Name}.");
// Update map page filter
@ -516,13 +516,13 @@ namespace TINK.ViewModel.Map
if (Pins.Count > 0 && Pins.Count != stations.Count)
{
// Either
// - user logged in/ logged out which might lead to more/ less stations beeing available
// - user logged in/ logged out which might lead to more/ less stations being available
// - new stations were added/ existing ones remove
Pins.Clear();
}
// Check if there are alreay any pins to the map
// i.e detecte first call of member OnAppearing after construction
// Check if there are already any pins to the map
// i.e detects first call of member OnAppearing after construction
if (Pins.Count <= 0)
{
Log.ForContext<MapPageViewModel>().Debug($"{(ActiveFilterMap.GetGroup().Any() ? $"Active map filter is {string.Join(",", ActiveFilterMap.GetGroup())}." : "Map filter is off.")}");
@ -657,8 +657,8 @@ namespace TINK.ViewModel.Map
// Load MyBikes Count -> MyBikes Icon/Button
GetMyBikesCount(resultStationsAndBikes.Response.Bikes);
// Check if there are alreay any pins to the map.
// If no initialze pins.
// Check if there are already any pins to the map.
// If no initialize pins.
if (Pins.Count <= 0)
{
// Set pins to their positions on map.
@ -725,7 +725,7 @@ namespace TINK.ViewModel.Map
IsMapPageEnabled = false;
TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
?? new Model.Stations.StationNS.Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updated in background task.
#if TRYNOTBACKSTYLE
m_oNavigation.ShowPage(
@ -771,7 +771,7 @@ namespace TINK.ViewModel.Map
if (bikesAll == null)
{
// If object is null an error occurred querrying bikes availalbe or bikes occpied which results in an unknown state.
// If object is null an error occurred querying bikes centered or bikes occupied which results in an unknown state.
Log.ForContext<MapPageViewModel>().Error("No bikes available to determine pins color.");
return new List<Color>(stationsId.Select(x => Color.Blue));
}