roko.li/sharee.bike-App
5
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2025-06-21 21:46:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

3.0.275

Browse source
This commit is contained in:
Oliver Hauff 2022-01-22 18:28:01 +01:00
parent f38b516d25
commit 578fcee611
70 changed files with 6828 additions and 9625 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TINKLib/Model/Connector/Updater/UpdaterJSON.cs
View file

@ -90,7 +90,8 @@ namespace TINK.Model.Connector
response.merchant_message,
response.TryGetCopriVersion(out Version copriVersion)
? new Version(0,0)
: copriVersion);
: copriVersion,
new ResourceUrls(response.tariff_info_html, response.bike_info_html, response.agb_html, response.privacy_html, response.impress_html));
/// <summary> Gets account object from login response.</summary>
/// <param name="merchantId">Needed to extract cookie from autorization response.</param>

18
TINKLib/Model/ITinkApp.cs
View file

@ -100,6 +100,22 @@ namespace TINK.Model
string ExternalFolder { get; }
/// <summary> Holds the stations availalbe. </summary>
IEnumerable<IStation> Stations {get; set;}
IEnumerable<IStation> Stations { get; set; }
IResourceUrls ResourceUrls { get; set; }
}
public interface IResourceUrls
{
string FeesResourcePath { get; }
string BikesResourcePath { get; }
string AgbResourcePath { get; }
string PrivacyResourcePath { get; }
string ImpressResourcePath { get; }
}
}

29
TINKLib/Model/ResourceUrls.cs Normal file
View file

@ -0,0 +1,29 @@
namespace TINK.Model
{
public class ResourceUrls : IResourceUrls
{
public ResourceUrls(
string feesResourcePath = null,
string bikesResourcePath = null,
string agbResourcePath = null,
string privacyResourcePath = null,
string impressResourcePath = null)
{
FeesResourcePath = !string.IsNullOrEmpty(feesResourcePath) ? feesResourcePath : "site/tariff_info_1.html";
BikesResourcePath = !string.IsNullOrEmpty(bikesResourcePath) ? bikesResourcePath : "site/bike_info.html";
AgbResourcePath = !string.IsNullOrEmpty(agbResourcePath) ? agbResourcePath : "site/agb.html";
PrivacyResourcePath = !string.IsNullOrEmpty(privacyResourcePath) ? privacyResourcePath : "site/privacy.html";
ImpressResourcePath = !string.IsNullOrEmpty(impressResourcePath) ? impressResourcePath : "site/impress.html";
}
public string FeesResourcePath { get; }
public string BikesResourcePath { get; }
public string AgbResourcePath { get; }
public string PrivacyResourcePath { get; }
public string ImpressResourcePath { get; }
}
}

2
TINKLib/Model/TinkApp.cs
View file

@ -344,6 +344,8 @@ namespace TINK.Model
/// <summary> Holds the stations availalbe. </summary>
public IEnumerable<IStation> Stations { get; set; } = new List<Station.Station>();
public IResourceUrls ResourceUrls { get; set; } = new ResourceUrls();
/// <summary> Action to post to GUI thread.</summary>
public Action<SendOrPostCallback, object> PostAction { get; }

2
TINKLib/Model/WhatsNew.cs
View file

@ -476,7 +476,7 @@ namespace TINK.Model
AppResources.ChangeLog3_0_266
},
{
new Version(3, 0, 271),
new Version(3, 0, 274),
AppResources.ChangeLog3_0_231 // Minor improvements.
}
};