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

Version 3.0.365

Browse source
This commit is contained in:
Anja 2023-05-11 17:39:28 +02:00
parent 0b9196a78d
commit 0eb7362cb8
64 changed files with 1423 additions and 1045 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TINKLib/Model/Connector/Command/Command.cs
View file

@ -42,17 +42,17 @@ namespace TINK.Model.Connector
{
if (string.IsNullOrEmpty(mail))
{
throw new ArgumentNullException("Can not loging user. Mail address must not be null or empty.");
throw new ArgumentNullException("Can not login user. Mail address must not be null or empty.");
}
if (string.IsNullOrEmpty(password))
{
throw new ArgumentNullException("Can not loging user. Password must not be null or empty.");
throw new ArgumentNullException("Can not login user. Password must not be null or empty.");
}
if (string.IsNullOrEmpty(deviceId))
{
throw new ArgumentNullException("Can not loging user. Device not be null or empty.");
throw new ArgumentNullException("Can not login user. Device not be null or empty.");
}
AuthorizationResponse response;
@ -103,7 +103,7 @@ namespace TINK.Model.Connector
/// <param name="bike">Bike to book.</param>
public async Task CalculateAuthKeys(Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable bike)
{
Log.ForContext<Command>().Error("Unexpected request to get authenticatin keys detected. No user logged in.");
Log.ForContext<Command>().Error("Unexpected request to get authentication keys detected. No user logged in.");
await Task.CompletedTask;
}

12
TINKLib/Model/Connector/Command/CommandLoggedIn.cs
View file

@ -41,7 +41,7 @@ namespace TINK.Model.Connector
{
if (string.IsNullOrEmpty(mail))
{
throw new ArgumentNullException("Can not loging user. Mail address must not be null or empty.");
throw new ArgumentNullException("Can not login user. Mail address must not be null or empty.");
}
throw new Exception($"Fehler beim Anmelden von unter {mail}. Benutzer {Mail} ist bereits angemeldet.");
@ -90,7 +90,7 @@ namespace TINK.Model.Connector
}
catch (Exception)
{
// Exception was not expected or too many subsequent excepitons detected.
// Exception was not expected or too many subsequent exceptions detected.
throw;
}
@ -114,7 +114,7 @@ namespace TINK.Model.Connector
}
catch (Exception)
{
// Exception was not expected or too many subsequent excepitons detected.
// Exception was not expected or too many subsequent exceptions detected.
throw;
}
@ -148,7 +148,7 @@ namespace TINK.Model.Connector
}
catch (Exception)
{
// Exception was not expected or too many subsequent excepitons detected.
// Exception was not expected or too many subsequent exceptions detected.
throw;
}
@ -178,7 +178,7 @@ namespace TINK.Model.Connector
}
catch (Exception)
{
// Exception was not expected or too many subsequent excepitons detected.
// Exception was not expected or too many subsequent exceptions detected.
throw;
}
@ -231,7 +231,7 @@ namespace TINK.Model.Connector
}
catch (Exception)
{
// Exception was not expected or too many subsequent excepitons detected.
// Exception was not expected or too many subsequent exceptions detected.
throw;
}
}

2
TINKLib/Model/Connector/Query/CachedQuery.cs
View file

@ -25,7 +25,7 @@ namespace TINK.Model.Connector
server = copriServer as ICachedCopriServer;
if (server == null)
{
throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
throw new ArgumentException($"Copri server is not of expected type. Type detected is {copriServer.GetType()}.");
}
}

2
TINKLib/Model/Connector/Query/Query.cs
View file

@ -24,7 +24,7 @@ namespace TINK.Model.Connector
server = copriServer as ICopriServer;
if (server == null)
{
throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
throw new ArgumentException($"Copri server is not of expected type. Type detected is {copriServer.GetType()}.");
}
}

2
TINKLib/Model/Connector/Query/QueryLoggedIn.cs
View file

@ -26,7 +26,7 @@ namespace TINK.Model.Connector
server = copriServer as ICopriServer;
if (server == null)
{
throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
throw new ArgumentException($"Copri server is not of expected type. Type detected is {copriServer.GetType()}.");
}
server = copriServer as ICopriServer;

8
TINKLib/Model/State/StateInfo.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
namespace TINK.Model.State
{
@ -24,7 +24,7 @@ namespace TINK.Model.State
Reserved,
/// <summary>
/// Bike is booked. Corresponding COPRI statie is "occupied".
/// Bike is booked. Corresponding COPRI state is "occupied".
/// </summary>
Booked
}
@ -40,7 +40,7 @@ namespace TINK.Model.State
/// <summary>
/// Constructs a state info object when state is available.
/// </summary>
/// <param name="isFeedbackPending">Specifieds whether feedback is pending or not.</param>
/// <param name="isFeedbackPending">Specifies whether feedback is pending or not.</param>
public StateInfo(bool isFeedbackPending = false)
{
_InUseState = isFeedbackPending
@ -54,7 +54,7 @@ namespace TINK.Model.State
/// <param name="requestedAt">Date time when bike was requested</param>
/// <param name="mailAddress">Mail address of user which requested bike.</param>
/// <param name="code">Booking code.</param>
/// <param name="dateTimeNowProvider">Date time provider to calculate reaining time.</param>
/// <param name="dateTimeNowProvider">Date time provider to calculate remaining time.</param>
public StateInfo(
Func<DateTime> dateTimeNowProvider,
DateTime requestedAt,

2
TINKLib/Model/State/StateInfoMutable.cs
View file

@ -12,7 +12,7 @@ namespace TINK.Model.State
public class StateInfoMutable : INotifyPropertyChanged, IStateInfoMutable
{
/// <summary>
/// Provider for current date time to calculate remainig time on demand for state of type reserved.
/// Provider for current date time to calculate remaining time on demand for state of type reserved.
/// </summary>
private readonly Func<DateTime> _DateTimeNowProvider;

4
TINKLib/Model/WhatsNew.cs
View file

@ -688,8 +688,8 @@ namespace TINK.Model
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
},
{
new Version(3, 0, 364),
AppResources.ChangeLog_MinorImprovements,
new Version(3, 0, 365),
AppResources.ChangeLog_3_0_365_MK_SB,
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
},
};

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

@ -97,7 +97,7 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to Feedback about the app.
/// Looks up a localized string similar to Sent e-mail.
/// </summary>
public static string ActionContactMailAppReleated {
get {
@ -793,6 +793,15 @@ namespace TINK.MultilingualResources {
}
}
/// <summary>
/// Looks up a localized string similar to Minor design and performance improvements..
/// </summary>
public static string ChangeLog_3_0_365_MK_SB {
get {
return ResourceManager.GetString("ChangeLog_3_0_365_MK_SB", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to We have fixed some bugs. Enjoy the ride!.
/// </summary>
@ -2093,6 +2102,15 @@ namespace TINK.MultilingualResources {
}
}
/// <summary>
/// Looks up a localized string similar to Bike ID including prefix.
/// </summary>
public static string MarkingFindBikeLabel {
get {
return ResourceManager.GetString("MarkingFindBikeLabel", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Menu.
/// </summary>
@ -2275,7 +2293,16 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to Bike is ok.
/// Looks up a localized string similar to Is bike okay?.
/// </summary>
public static string MarkingReturnBikeBikeIsStateOkQuestion {
get {
return ResourceManager.GetString("MarkingReturnBikeBikeIsStateOkQuestion", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to bike is ok.
/// </summary>
public static string MarkingReturnBikeBikeStateIsOK {
get {
@ -2284,7 +2311,7 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to Please describe condition/defect here..
/// Looks up a localized string similar to Please describe technical defect of bike here..
/// </summary>
public static string MarkingReturnBikeErrorDescriptionInputPlaceholder {
get {
@ -2310,6 +2337,15 @@ namespace TINK.MultilingualResources {
}
}
/// <summary>
/// Looks up a localized string similar to Search bike.
/// </summary>
public static string MarkingSearchBike {
get {
return ResourceManager.GetString("MarkingSearchBike", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Select Station.
/// </summary>
@ -2749,7 +2785,7 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to No bike with id {0} found..
/// Looks up a localized string similar to No bike with id {0} found. It may already be reserved by another user or it may be defective..
/// </summary>
public static string MessageErrorSelectBikeNoBikeFound {
get {
@ -2886,7 +2922,7 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to Are you enjoying the {0}-app?.
/// Looks up a localized string similar to Feedback to app development?.
/// </summary>
public static string MessageRateMail {
get {
@ -3003,7 +3039,7 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to Enter bike number here.
/// Looks up a localized string similar to Bike ID including prefix e.g. TR15.
/// </summary>
public static string PlaceholderFindBike {
get {

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

@ -158,7 +158,7 @@ Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformatio
<value>Fragen? Hinweise?</value>
</data>
<data name="MessageRateMail" xml:space="preserve">
<value>Gefällt Ihnen die {0}-App?</value>
<value>Rückmeldung an die App-Entwicklung?</value>
</data>
<data name="MessageWaring" xml:space="preserve">
<value>Warnung</value>
@ -734,7 +734,7 @@ Fehlerbehebung: Supportmails können wieder verschickt werden.</value>
{0}</value>
</data>
<data name="MessageErrorSelectBikeNoBikeFound" xml:space="preserve">
<value>Kein Rad mit ID {0} gefunden.</value>
<value>Kein Rad mit ID {0} gefunden. Möglicherweise ist es bereits durch einen anderen Nutzer / eine andere Nutzerin reserviert oder defekt.</value>
</data>
<data name="MessageErrorSelectBikeTitle" xml:space="preserve">
<value>Fehler beim Auswählen des Rads!</value>
@ -908,7 +908,7 @@ Kleinere Fehlerbehebungen.
<value>Rückmeldung geben</value>
</data>
<data name="ActionContactMailAppReleated" xml:space="preserve">
<value>Rückmeldung zur App</value>
<value>E-Mail senden</value>
</data>
<data name="MiscContactMailAppReleatedSubject" xml:space="preserve">
<value>{0}-App Anfrage</value>
@ -947,14 +947,8 @@ Kleinere Fehlerbehebungen.
<data name="MarkingDriveBatteryChargingLevelNotAvailable" xml:space="preserve">
<value>Ladestand: -</value>
</data>
<data name="MarkingReturnBikeBikeStateIsOK" xml:space="preserve">
<value>Rad ist in Ordnung</value>
</data>
<data name="MarkingReturnBikeErrorDescriptionInputPlaceholder" xml:space="preserve">
<value>Bitte Zustand/Defekt hier beschreiben.</value>
</data>
<data name="MarkingReturnBikeFeedbackInputPlaceholder" xml:space="preserve">
<value>Bei Bedarf bitte hier Rückmeldung eingeben.</value>
<value>Bitte technischen Defekt des Rads hier beschreiben.</value>
</data>
<data name="MarkingReturnBikeMainMessage" xml:space="preserve">
<value>Rad erfolgreich zurückgegeben!</value>
@ -1013,7 +1007,7 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
<value>Einwilligung</value>
</data>
<data name="PlaceholderFindBike" xml:space="preserve">
<value>Rad-Nummer hier eingeben</value>
<value>Rad-ID inklusive Präfix, z.B. TR15</value>
</data>
<data name="ChangeLog3_0_339_MK" xml:space="preserve">
<value>Die Lastenräder aus den Vororten zeigen nun ihre Heimatstation im Namen an. Diese Räder müssen dort wieder abgeben werden!
@ -1176,4 +1170,22 @@ Außerdem:&lt;br/&gt;
- Fehlerbehebungen&lt;br/&gt;
- Paketaktualisierungen</value>
</data>
<data name="MarkingFindBikeLabel" xml:space="preserve">
<value>Rad-ID inklusive Präfix</value>
</data>
<data name="MarkingSearchBike" xml:space="preserve">
<value>Rad suchen</value>
</data>
<data name="MarkingReturnBikeBikeIsStateOkQuestion" xml:space="preserve">
<value>Ist das Rad in Ordnung?</value>
</data>
<data name="MarkingReturnBikeBikeStateIsOK" xml:space="preserve">
<value>Rad ist in Ordnung</value>
</data>
<data name="MarkingReturnBikeFeedbackInputPlaceholder" xml:space="preserve">
<value>Bei Bedarf bitte hier Rückmeldung eingeben.</value>
</data>
<data name="ChangeLog_3_0_365_MK_SB" xml:space="preserve">
<value>Kleine Verbesserungen in Design und Performance.</value>
</data>
</root>

34
TINKLib/MultilingualResources/AppResources.resx
View file

@ -249,7 +249,7 @@ Please log in again.</value>
<value>Urgent questions?</value>
</data>
<data name="MessageRateMail" xml:space="preserve">
<value>Are you enjoying the {0}-app?</value>
<value>Feedback to app development?</value>
</data>
<data name="MessageWaring" xml:space="preserve">
<value>Warning</value>
@ -842,7 +842,7 @@ Bugfix: Sending support mails works again. </value>
{0}</value>
</data>
<data name="MessageErrorSelectBikeNoBikeFound" xml:space="preserve">
<value>No bike with id {0} found.</value>
<value>No bike with id {0} found. It may already be reserved by another user or it may be defective.</value>
</data>
<data name="MessageErrorSelectBikeTitle" xml:space="preserve">
<value>Error Selecting Bike!</value>
@ -1013,7 +1013,7 @@ Minor bugfixes.</value>
<value>Give feedback</value>
</data>
<data name="ActionContactMailAppReleated" xml:space="preserve">
<value>Feedback about the app</value>
<value>Sent e-mail</value>
</data>
<data name="MiscContactMailAppReleatedSubject" xml:space="preserve">
<value>{0}-app releated request</value>
@ -1052,14 +1052,8 @@ Minor bugfixes.</value>
<data name="MarkingDriveBatteryChargingLevelNotAvailable" xml:space="preserve">
<value>Charging level: -</value>
</data>
<data name="MarkingReturnBikeBikeStateIsOK" xml:space="preserve">
<value>Bike is ok</value>
</data>
<data name="MarkingReturnBikeErrorDescriptionInputPlaceholder" xml:space="preserve">
<value>Please describe condition/defect here.</value>
</data>
<data name="MarkingReturnBikeFeedbackInputPlaceholder" xml:space="preserve">
<value>Please enter feedback here if needed.</value>
<value>Please describe technical defect of bike here.</value>
</data>
<data name="MarkingReturnBikeMainMessage" xml:space="preserve">
<value>Rental successfully ended!</value>
@ -1118,7 +1112,7 @@ In addition: Small graphics let you see at a glance what type of bike it is.</va
<value>Consent</value>
</data>
<data name="PlaceholderFindBike" xml:space="preserve">
<value>Enter bike number here</value>
<value>Bike ID including prefix e.g. TR15</value>
</data>
<data name="ChangeLog3_0_339_MK" xml:space="preserve">
<value>The cargo bikes from the suburbs now show their home station in their name. These bikes must be returned there!
@ -1265,4 +1259,22 @@ Also:&lt;br/&gt;
- Bug fixes&lt;br/&gt;
- Package updates</value>
</data>
<data name="MarkingFindBikeLabel" xml:space="preserve">
<value>Bike ID including prefix</value>
</data>
<data name="MarkingSearchBike" xml:space="preserve">
<value>Search bike</value>
</data>
<data name="MarkingReturnBikeBikeIsStateOkQuestion" xml:space="preserve">
<value>Is bike okay?</value>
</data>
<data name="MarkingReturnBikeBikeStateIsOK" xml:space="preserve">
<value>bike is ok</value>
</data>
<data name="MarkingReturnBikeFeedbackInputPlaceholder" xml:space="preserve">
<value>Please enter feedback here if needed.</value>
</data>
<data name="ChangeLog_3_0_365_MK_SB" xml:space="preserve">
<value>Minor design and performance improvements.</value>
</data>
</root>

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

@ -203,8 +203,8 @@ Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformatio
<target state="translated">Fragen? Hinweise?</target>
</trans-unit>
<trans-unit id="MessageRateMail" translate="yes" xml:space="preserve">
<source>Are you enjoying the {0}-app?</source>
<target state="translated">Gefällt Ihnen die {0}-App?</target>
<source>Feedback to app development?</source>
<target state="translated">Rückmeldung an die App-Entwicklung?</target>
</trans-unit>
<trans-unit id="MessageWaring" translate="yes" xml:space="preserve">
<source>Warning</source>
@ -992,8 +992,8 @@ Fehlerbehebung: Supportmails können wieder verschickt werden.</target>
{0}</target>
</trans-unit>
<trans-unit id="MessageErrorSelectBikeNoBikeFound" translate="yes" xml:space="preserve">
<source>No bike with id {0} found.</source>
<target state="translated">Kein Rad mit ID {0} gefunden.</target>
<source>No bike with id {0} found. It may already be reserved by another user or it may be defective.</source>
<target state="translated">Kein Rad mit ID {0} gefunden. Möglicherweise ist es bereits durch einen anderen Nutzer / eine andere Nutzerin reserviert oder defekt.</target>
</trans-unit>
<trans-unit id="MessageErrorSelectBikeTitle" translate="yes" xml:space="preserve">
<source>Error Selecting Bike!</source>
@ -1235,9 +1235,8 @@ Kleinere Fehlerbehebungen.
<target state="translated">Rückmeldung geben</target>
</trans-unit>
<trans-unit id="ActionContactMailAppReleated" translate="yes" xml:space="preserve">
<source>Feedback about the app</source>
<target state="translated">Rückmeldung zur App</target>
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
<source>Sent e-mail</source>
<target state="translated">E-Mail senden</target>
</trans-unit>
<trans-unit id="MiscContactMailAppReleatedSubject" translate="yes" xml:space="preserve">
<source>{0}-app releated request</source>
@ -1289,17 +1288,9 @@ Kleinere Fehlerbehebungen.
<source>Charging level: -</source>
<target state="translated">Ladestand: -</target>
</trans-unit>
<trans-unit id="MarkingReturnBikeBikeStateIsOK" translate="yes" xml:space="preserve">
<source>Bike is ok</source>
<target state="translated">Rad ist in Ordnung</target>
</trans-unit>
<trans-unit id="MarkingReturnBikeErrorDescriptionInputPlaceholder" translate="yes" xml:space="preserve">
<source>Please describe condition/defect here.</source>
<target state="translated">Bitte Zustand/Defekt hier beschreiben.</target>
</trans-unit>
<trans-unit id="MarkingReturnBikeFeedbackInputPlaceholder" translate="yes" xml:space="preserve">
<source>Please enter feedback here if needed.</source>
<target state="translated">Bei Bedarf bitte hier Rückmeldung eingeben.</target>
<source>Please describe technical defect of bike here.</source>
<target state="translated">Bitte technischen Defekt des Rads hier beschreiben.</target>
</trans-unit>
<trans-unit id="MarkingReturnBikeMainMessage" translate="yes" xml:space="preserve">
<source>Rental successfully ended!</source>
@ -1382,8 +1373,8 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
<target state="translated">Einwilligung</target>
</trans-unit>
<trans-unit id="PlaceholderFindBike" translate="yes" xml:space="preserve">
<source>Enter bike number here</source>
<target state="translated">Rad-Nummer hier eingeben</target>
<source>Bike ID including prefix e.g. TR15</source>
<target state="translated">Rad-ID inklusive Präfix, z.B. TR15</target>
</trans-unit>
<trans-unit id="ChangeLog3_0_339_MK" translate="yes" xml:space="preserve">
<source>The cargo bikes from the suburbs now show their home station in their name. These bikes must be returned there!
@ -1628,6 +1619,30 @@ Außerdem:&lt;br/&gt;
- Fehlerbehebungen&lt;br/&gt;
- Paketaktualisierungen</target>
</trans-unit>
<trans-unit id="MarkingFindBikeLabel" translate="yes" xml:space="preserve">
<source>Bike ID including prefix</source>
<target state="translated">Rad-ID inklusive Präfix</target>
</trans-unit>
<trans-unit id="MarkingSearchBike" translate="yes" xml:space="preserve">
<source>Search bike</source>
<target state="translated">Rad suchen</target>
</trans-unit>
<trans-unit id="MarkingReturnBikeBikeIsStateOkQuestion" translate="yes" xml:space="preserve">
<source>Is bike okay?</source>
<target state="translated">Ist das Rad in Ordnung?</target>
</trans-unit>
<trans-unit id="MarkingReturnBikeBikeStateIsOK" translate="yes" xml:space="preserve">
<source>bike is ok</source>
<target state="translated">Rad ist in Ordnung</target>
</trans-unit>
<trans-unit id="MarkingReturnBikeFeedbackInputPlaceholder" translate="yes" xml:space="preserve">
<source>Please enter feedback here if needed.</source>
<target state="translated">Bei Bedarf bitte hier Rückmeldung eingeben.</target>
</trans-unit>
<trans-unit id="ChangeLog_3_0_365_MK_SB" translate="yes" xml:space="preserve">
<source>Minor design and performance improvements.</source>
<target state="translated">Kleine Verbesserungen in Design und Performance.</target>
</trans-unit>
</group>
</body>
</file>

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

@ -20,7 +20,7 @@
<Setter Property="WidthRequest" Value="400" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="BorderWidth" Value="1"/>
<Setter Property="BorderRadius" Value="10" />
<Setter Property="CornerRadius" Value="10" />
<Setter Property="FontSize" Value="Medium"/>
<Setter Property="TextColor" Value="White"/>
<Style.Triggers>
@ -44,7 +44,7 @@
<Setter Property="WidthRequest" Value="400" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="BorderWidth" Value="1"/>
<Setter Property="BorderRadius" Value="10" />
<Setter Property="CornerRadius" Value="10" />
<Setter Property="FontSize" Value="Medium"/>
<Setter Property="TextColor" Value="{DynamicResource Key=primary-back-title-color}"/>
<Style.Triggers>

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

@ -6,81 +6,6 @@
<!--Main color-->
<Color x:Key="primary-back-title-color">#009BDB</Color>
<!--Primary Button-->
<!--<<Style TargetType="Button">
<Setter Property="WidthRequest" Value="400" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="BorderWidth" Value="1"/>
<Setter Property="BorderRadius" Value="10" />
<Setter Property="FontSize" Value="Medium"/>
<Setter Property="TextColor" Value="White"/>
<Style.Triggers>
<Trigger TargetType="Button"
Property="IsEnabled"
Value="True">
<Setter Property="BorderColor" Value="{DynamicResource Key=primary-back-title-color}"/>
<Setter Property="BackgroundColor" Value="{DynamicResource Key=primary-back-title-color}"/>
</Trigger>
<Trigger TargetType="Button"
Property="IsEnabled"
Value="False">
<Setter Property="BorderColor" Value="LightGray"/>
<Setter Property="BackgroundColor" Value="LightGray"/>
</Trigger>
</Style.Triggers>
</Style>-->
<!--Sedondary Button-->
<!--<Style x:Key="SecondaryButton" TargetType="Button">
<Setter Property="WidthRequest" Value="400" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="BorderWidth" Value="1"/>
<Setter Property="BorderRadius" Value="10" />
<Setter Property="FontSize" Value="Medium"/>
<Setter Property="TextColor" Value="{DynamicResource Key=primary-back-title-color}"/>
<Style.Triggers>
<Trigger TargetType="Button"
Property="IsEnabled"
Value="True">
<Setter Property="BorderColor" Value="{DynamicResource Key=primary-back-title-color}"/>
<Setter Property="BackgroundColor" Value="White"/>
</Trigger>
<Trigger TargetType="Button"
Property="IsEnabled"
Value="False">
<Setter Property="BorderColor" Value="LightGray"/>
<Setter Property="BackgroundColor" Value="DimGray"/>
</Trigger>
</Style.Triggers>
</Style>-->
<!--Switch-->
<!--<Style TargetType="Switch">
<Style.Triggers>
<Trigger TargetType="Switch"
Property="IsToggled"
Value="True">
<Setter Property="ThumbColor" Value="{DynamicResource Key=primary-back-title-color}"/>
</Trigger>
<Trigger TargetType="Switch"
Property="IsToggled"
Value="False">
<Setter Property="ThumbColor" Value="DimGray"/>
</Trigger>
</Style.Triggers>
</Style>-->
<!--Slider-->
<!--<Style TargetType="Slider">
<Setter Property="ThumbColor" Value="{DynamicResource Key=primary-back-title-color}"/>
<Setter Property="Background" Value="LightGray"/>
</Style>-->
<!--Label-->
<!--<Style TargetType="Label">
<Setter Property="FontSize" Value="Default"/>
</Style>-->
<!--Flyout Item-->
<Style TargetType="FlyoutItem">
<Setter Property="Shell.BackgroundColor" Value="{DynamicResource Key=primary-back-title-color}" />
@ -88,9 +13,8 @@
<!--Navbar-->
<Style x:Key="Label-Navbar" TargetType="Label">
<Setter Property="FontSize" Value="20"/>
<!--<Setter Property="TextTransform" Value="Uppercase"/>-->
<Setter Property="TextColor" Value="White"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="TextColor" Value="White"/>
<Setter Property="VerticalOptions" Value="Center"/>
<Setter Property="HorizontalOptions" Value="Start"/>
<Setter Property="Grid.Column" Value="1"/>

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

@ -17,8 +17,9 @@
<Setter Property="WidthRequest" Value="400" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="BorderWidth" Value="1"/>
<Setter Property="BorderRadius" Value="10" />
<Setter Property="CornerRadius" Value="10" />
<Setter Property="FontSize" Value="Medium"/>
<Setter Property="FontFamily" Value="RobotoRegular"/>
<Setter Property="TextColor" Value="White"/>
<Style.Triggers>
<Trigger TargetType="Button"
@ -41,8 +42,9 @@
<Setter Property="WidthRequest" Value="400" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="BorderWidth" Value="1"/>
<Setter Property="BorderRadius" Value="10" />
<Setter Property="CornerRadius" Value="10" />
<Setter Property="FontSize" Value="Medium"/>
<Setter Property="FontFamily" Value="RobotoRegular"/>
<Setter Property="TextColor" Value="{DynamicResource Key=primary-back-title-color}"/>
<Style.Triggers>
<Trigger TargetType="Button"
@ -85,8 +87,15 @@
<!--Label-->
<Style TargetType="Label">
<Setter Property="FontSize" Value="Default"/>
<Setter Property="FontFamily" Value="RobotoRegular"/>
</Style>
<!--Entry-->
<Style TargetType="Entry">
<Setter Property="FontSize" Value="Default"/>
<Setter Property="FontFamily" Value="RobotoRegular"/>
</Style>
<!--Flyout Item-->
<Style TargetType="FlyoutItem">
<Setter Property="Shell.BackgroundColor" Value="{DynamicResource Key=primary-back-title-color}" />
@ -97,6 +106,7 @@
<Setter Property="FontSize" Value="20"/>
<!--<Setter Property="TextTransform" Value="Uppercase"/>-->
<Setter Property="TextColor" Value="White"/>
<Setter Property="FontFamily" Value="RobotoRegular"/>
<Setter Property="VerticalOptions" Value="Center"/>
<Setter Property="HorizontalOptions" Value="Start"/>
<Setter Property="Grid.Column" Value="1"/>