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

Version 3.0.372

Browse source
This commit is contained in:
Anja 2023-09-14 12:28:59 +02:00
parent 6d22dbf40b
commit f1cbab1d0a
97 changed files with 20446 additions and 17572 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TINKLib/Model/WhatsNew.cs
View file

@ -722,6 +722,11 @@ namespace TINK.Model
AppResources.ChangeLog_3_0_371_MK,
new List<AppFlavor> { AppFlavor.MeinKonrad}
},
{
new Version(3, 0, 372),
string.Format("{0} <br /> {1}", AppResources.ChangeLog_PackageUpdates, AppResources.ChangeLog_MinorBugFixes),
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
},
};
/// <summary> Manges the whats new information.</summary>

5
TINKLib/MultilingualResources/AppResources.Designer.cs generated
View file

@ -1452,6 +1452,9 @@ namespace TINK.MultilingualResources {
}
}
/// <summary>
/// Looks up a localized string similar to Changes in the return process: FIRST you must always complete the &quot;Close lock&quot; process. Only THEN you can finish the rental! If your rental was successfully ended, you will see a confirmation dialog..
/// </summary>
public static string ChangeLog_3_0_367_MK_SB {
get {
return ResourceManager.GetString("ChangeLog_3_0_367_MK_SB", resourceCulture);
@ -1836,7 +1839,7 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to Position of lock bolt is unknown. Lock could be closed or open. Please try again!.
/// Looks up a localized string similar to Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again..
/// </summary>
public static string ErrorOpenLockStatusUnknown {
get {

2
TINKLib/MultilingualResources/AppResources.de.resx
View file

@ -966,7 +966,7 @@ Probieren Sie es aus!</value>
<value>- Kleine Verbesserungen.</value>
</data>
<data name="ErrorOpenLockStatusUnknown" xml:space="preserve">
<value>Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Bitte versuchen Sie es erneut!</value>
<value>Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Stellen Sie sicher, dass keine Speiche gegen den Bügel drückt und versuchen Sie es erneut.</value>
</data>
<data name="ErrorOpenLockTitle" xml:space="preserve">
<value>Schloss konnte nicht geöffnet werden!</value>

2
TINKLib/MultilingualResources/AppResources.resx
View file

@ -631,7 +631,7 @@ Error handling improved.</value>
<value>Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.</value>
</data>
<data name="ErrorOpenLockStatusUnknown" xml:space="preserve">
<value>Position of lock bolt is unknown. Lock could be closed or open. Please try again!</value>
<value>Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again.</value>
</data>
<data name="ChangeLog_3_0_236" xml:space="preserve">
<value>Stations names instead descriptions shown on page title.

4
TINKLib/MultilingualResources/TINKLib.de.xlf
View file

@ -1326,8 +1326,8 @@ Probieren Sie es aus!</target>
<target state="translated">- Kleine Verbesserungen.</target>
</trans-unit>
<trans-unit id="ErrorOpenLockStatusUnknown" translate="yes" xml:space="preserve">
<source>Position of lock bolt is unknown. Lock could be closed or open. Please try again!</source>
<target state="translated">Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Bitte versuchen Sie es erneut!</target>
<source>Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again.</source>
<target state="translated">Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Stellen Sie sicher, dass keine Speiche gegen den Bügel drückt und versuchen Sie es erneut.</target>
</trans-unit>
<trans-unit id="ErrorOpenLockTitle" translate="yes" xml:space="preserve">
<source>Lock could not be opened!</source>

4
TINKLib/TINKLib.csproj
View file

@ -49,8 +49,8 @@
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="Xam.Plugin.Connectivity" Version="3.2.0" />
<PackageReference Include="Xam.Plugins.Messaging" Version="5.2.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
<PackageReference Include="Xamarin.Forms.GoogleMaps" Version="5.0.0" />
</ItemGroup>
<ItemGroup>

2
TINKLib/View/Themes/Konrad.xaml
View file

@ -141,7 +141,7 @@
<Setter Property="Padding" Value="0,12,0,12"/>
</Style>
<Style x:Key="Image-Navbar" TargetType="Image">
<Setter Property="Source" Value="swk_theme.png"/>
<Setter Property="Source" Value="navbar_theme.png"/>
<Setter Property="Aspect" Value="AspectFill"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style>

2
TINKLib/View/Themes/LastenradBayern.xaml
View file

@ -20,7 +20,7 @@
<Setter Property="Grid.Column" Value="1"/>
</Style>
<Style x:Key="Image-Navbar" TargetType="Image">
<Setter Property="Source" Value="swk_theme.png"/>
<Setter Property="Source" Value="navbar_theme.png"/>
<Setter Property="Aspect" Value="AspectFill"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style>

2
TINKLib/View/Themes/ShareeBike.xaml
View file

@ -159,7 +159,7 @@
<Setter Property="Padding" Value="0,12,0,12"/>
</Style>
<Style x:Key="Image-Navbar" TargetType="Image">
<Setter Property="Source" Value="swk_theme.png"/>
<Setter Property="Source" Value="navbar_theme.png"/>
<Setter Property="Aspect" Value="AspectFill"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style>

11
TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs
View file

@ -121,18 +121,21 @@ namespace TINK.ViewModel.Contact
UpdateUrlsAction(urls); // Update main model to prevent duplicate queries.
}
//set font size for html content (necessary for iOS)
string headerString = "<header><meta name='viewport' content='width=device-width, intial-scale=2.0, maximum-scale=5.0, minimum-scale=1.0, user-scalable=no'></header>";
RentBikeText = new HtmlWebViewSource
{
Html = !string.IsNullOrEmpty(FeesResourcePath)
? await ViewModelHelper.GetSource($"https://{HostName}/{FeesResourcePath}", IsSiteCachingOn)
: await Task.FromResult(ViewModelHelper.FromBody("No fees resource available. Resource path is null or empty."))
? headerString + await ViewModelHelper.GetSource($"https://{HostName}/{FeesResourcePath}", IsSiteCachingOn)
: headerString + await Task.FromResult(ViewModelHelper.FromBody("No fees resource available. Resource path is null or empty."))
};
TypesOfBikesText = new HtmlWebViewSource
{
Html = !string.IsNullOrEmpty(BikesResourcePath)
? await ViewModelHelper.GetSource($"https://{HostName}/{BikesResourcePath}" /*"site/bike_info.html"*/, IsSiteCachingOn)
: await Task.FromResult(ViewModelHelper.FromBody("No bikes instruction resource available. Resource path is null or empty."))
? headerString + await ViewModelHelper.GetSource($"https://{HostName}/{BikesResourcePath}" /*"site/bike_info.html"*/, IsSiteCachingOn)
: headerString + await Task.FromResult(ViewModelHelper.FromBody("No bikes instruction resource available. Resource path is null or empty."))
};
FAQ = new HtmlWebViewSource

18
TINKLib/ViewModel/Info/InfoPageViewModel.cs
View file

@ -139,6 +139,9 @@ namespace TINK.ViewModel.Info
UpdateUrlsAction(urls); // Update main model to prevent duplicate queries.
}
//set font size for html content (necessary for iOS)
string headerString = "<header><meta name='viewport' content='width=device-width, intial-scale=2.0, maximum-scale=5.0, minimum-scale=1.0, user-scalable=no'></header>";
// Gets privacy info from server.
async Task<HtmlWebViewSource> GetInfoPrivacy()
{
@ -150,7 +153,7 @@ namespace TINK.ViewModel.Info
// Information to access resource is missing
return new HtmlWebViewSource
{
Html = await Task.FromResult(ViewModelHelper.FromBody("No privacy resource available. Resource path is null or empty."))
Html = headerString + await Task.FromResult(ViewModelHelper.FromBody("No privacy resource available. Resource path is null or empty."))
};
}
@ -158,7 +161,7 @@ namespace TINK.ViewModel.Info
return new HtmlWebViewSource
{
Html = await ViewModelHelper.GetSource(
Html = headerString + await ViewModelHelper.GetSource(
GetUriText(), // "site/privacy.html"
IsSiteCachingOn)
};
@ -175,7 +178,7 @@ namespace TINK.ViewModel.Info
// Information to access resource is missing
return new HtmlWebViewSource
{
Html = await Task.FromResult(ViewModelHelper.FromBody("No impress resource available. Resource path is null or empty."))
Html = headerString + await Task.FromResult(ViewModelHelper.FromBody("No impress resource available. Resource path is null or empty."))
};
}
@ -183,7 +186,7 @@ namespace TINK.ViewModel.Info
return new HtmlWebViewSource
{
Html = await ViewModelHelper.GetSource(
Html = headerString + await ViewModelHelper.GetSource(
GetUriText(), // "site/privacy.html"
IsSiteCachingOn)
};
@ -210,11 +213,14 @@ namespace TINK.ViewModel.Info
string GetUriText()
=> $"https://{hostName}/{agbResourcePath}";
//set font size for html content (necessary for iOS)
string headerString = "<header><meta name='viewport' content='width=device-width, intial-scale=2.0, maximum-scale=5.0, minimum-scale=1.0, user-scalable=no'></header>";
if (string.IsNullOrEmpty(agbResourcePath))
{
return new HtmlWebViewSource
{
Html = await Task.FromResult(ViewModelHelper.FromBody("No terms resource available. Resource path is null or empty."))
Html = headerString + await Task.FromResult(ViewModelHelper.FromBody("No terms resource available. Resource path is null or empty."))
};
}
@ -222,7 +228,7 @@ namespace TINK.ViewModel.Info
return new HtmlWebViewSource
{
Html = await ViewModelHelper.GetSource(
Html = headerString + await ViewModelHelper.GetSource(
GetUriText(), // "agb.html"
isSiteCachingOn)
};