mirror of
https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code
synced 2024-12-22 06:56:25 +01:00
Version 3.0.374
This commit is contained in:
parent
06428d96d9
commit
63aa608216
21 changed files with 243 additions and 214 deletions
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.373" android:versionCode="373">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.374" android:versionCode="374">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
@ -56,9 +56,9 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>LastenradBayern</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>373</string>
|
||||
<string>374</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.373</string>
|
||||
<string>3.0.374</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
</dict>
|
||||
|
|
|
@ -35,8 +35,7 @@
|
|||
<WarningLevel>0</WarningLevel>
|
||||
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
|
||||
<AndroidLinkMode>None</AndroidLinkMode>
|
||||
<AndroidSupportedAbis>
|
||||
</AndroidSupportedAbis>
|
||||
<AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
|
||||
<AotAssemblies>false</AotAssemblies>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.373" android:versionCode="373">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.374" android:versionCode="374">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
@ -56,9 +56,9 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>Mein konrad</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>373</string>
|
||||
<string>374</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.373</string>
|
||||
<string>3.0.374</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
</dict>
|
||||
|
|
|
@ -175,7 +175,7 @@
|
|||
x:Name="DiagnosticsButton"
|
||||
Style="{StaticResource NoOutlineButtonBackgroundColor}"
|
||||
Text="{x:Static resources:AppResources.ActionSendDiagnosis}"
|
||||
Command="{Binding OnMailToOperatorRequest}">
|
||||
Command="{Binding OnMailAppRelatedRequest}">
|
||||
<Button.Triggers>
|
||||
<DataTrigger TargetType="Button" Binding="{Binding IsSendMailAvailable}" Value="False">
|
||||
<Setter Property="TextColor" Value="DimGray" />
|
||||
|
|
|
@ -40,6 +40,8 @@
|
|||
<Grid
|
||||
Grid.Row="0"
|
||||
IsVisible="True"
|
||||
RowDefinitions="50,10"
|
||||
RowSpacing="0"
|
||||
ColumnDefinitions="*,*">
|
||||
|
||||
<Grid.Triggers>
|
||||
|
@ -53,14 +55,12 @@
|
|||
</Grid.Triggers>
|
||||
|
||||
<!--1st step-->
|
||||
<Grid
|
||||
Grid.Column="0"
|
||||
RowDefinitions="40,10"
|
||||
RowSpacing="0">
|
||||
<Frame
|
||||
Grid.Column="0"
|
||||
Grid.Row="0"
|
||||
BackgroundColor="{DynamicResource process-step-upcoming}"
|
||||
Padding="0">
|
||||
Padding="14,2,10,2"
|
||||
HasShadow="False">
|
||||
<Frame.Triggers>
|
||||
<MultiTrigger TargetType="Frame">
|
||||
<MultiTrigger.Conditions>
|
||||
|
@ -89,12 +89,16 @@
|
|||
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
|
||||
</MultiTrigger>
|
||||
</Frame.Triggers>
|
||||
<StackLayout
|
||||
Orientation="Horizontal"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center">
|
||||
<Grid
|
||||
ColumnDefinitions="*,Auto"
|
||||
RowDefinitions="Auto"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
VerticalOptions="CenterAndExpand">
|
||||
<Label
|
||||
Grid.Column="0"
|
||||
Text="{x:Static resources:AppResources.MarkingRentalProcessCloseLockFirstStep}"
|
||||
FontSize="Medium"
|
||||
FontAttributes="Bold"
|
||||
TextColor="White">
|
||||
<Label.Triggers>
|
||||
<MultiTrigger TargetType="Label">
|
||||
|
@ -113,6 +117,8 @@
|
|||
</Label.Triggers>
|
||||
</Label>
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
IsVisible="False">
|
||||
<Image.Triggers>
|
||||
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="1">
|
||||
|
@ -131,7 +137,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -145,7 +151,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -160,16 +166,17 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource xmark}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</MultiTrigger>
|
||||
</Image.Triggers>
|
||||
</Image>
|
||||
</StackLayout>
|
||||
</Grid>
|
||||
</Frame>
|
||||
<Polygon
|
||||
Grid.Column="0"
|
||||
Grid.Row="1"
|
||||
Points="0,0 20,0 10,10"
|
||||
IsVisible="False"
|
||||
|
@ -200,17 +207,14 @@
|
|||
</MultiTrigger>
|
||||
</Polygon.Triggers>
|
||||
</Polygon>
|
||||
</Grid>
|
||||
|
||||
<!--2nd step-->
|
||||
<Grid
|
||||
Grid.Column="1"
|
||||
RowDefinitions="40,10"
|
||||
RowSpacing="0">
|
||||
<Frame
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
BackgroundColor="{DynamicResource process-step-upcoming}"
|
||||
Padding="0">
|
||||
Padding="14,2,10,2"
|
||||
HasShadow="False">
|
||||
<Frame.Triggers>
|
||||
<MultiTrigger TargetType="Frame">
|
||||
<MultiTrigger.Conditions>
|
||||
|
@ -239,14 +243,20 @@
|
|||
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
|
||||
</MultiTrigger>
|
||||
</Frame.Triggers>
|
||||
<StackLayout
|
||||
Orientation="Horizontal"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center">
|
||||
<Grid
|
||||
ColumnDefinitions="*,Auto"
|
||||
RowDefinitions="Auto"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
VerticalOptions="CenterAndExpand">
|
||||
<Label
|
||||
Grid.Column="0"
|
||||
Text="{x:Static resources:AppResources.MarkingRentalProcessCloseLockSecondStep}"
|
||||
FontSize="Medium"
|
||||
FontAttributes="Bold"
|
||||
TextColor="White"/>
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
IsVisible="False">
|
||||
<Image.Triggers>
|
||||
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
|
||||
|
@ -262,7 +272,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -277,16 +287,17 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource xmark}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</MultiTrigger>
|
||||
</Image.Triggers>
|
||||
</Image>
|
||||
</StackLayout>
|
||||
</Grid>
|
||||
</Frame>
|
||||
<Polygon
|
||||
Grid.Column="1"
|
||||
Grid.Row="1"
|
||||
Points="0,0 20,0 10,10"
|
||||
IsVisible="False"
|
||||
|
@ -317,7 +328,6 @@
|
|||
</MultiTrigger>
|
||||
</Polygon.Triggers>
|
||||
</Polygon>
|
||||
</Grid>
|
||||
|
||||
</Grid>
|
||||
|
||||
|
|
|
@ -40,6 +40,8 @@
|
|||
<Grid
|
||||
Grid.Row="0"
|
||||
IsVisible="True"
|
||||
RowDefinitions="50,10"
|
||||
RowSpacing="0"
|
||||
ColumnDefinitions="*,*,*">
|
||||
|
||||
<Grid.Triggers>
|
||||
|
@ -53,14 +55,12 @@
|
|||
</Grid.Triggers>
|
||||
|
||||
<!--1st step-->
|
||||
<Grid
|
||||
Grid.Column="0"
|
||||
RowDefinitions="40,10"
|
||||
RowSpacing="0">
|
||||
<Frame
|
||||
Grid.Column="0"
|
||||
Grid.Row="0"
|
||||
BackgroundColor="{DynamicResource process-step-upcoming}"
|
||||
Padding="0">
|
||||
HasShadow="False"
|
||||
Padding="14,2,10,2">
|
||||
<Frame.Triggers>
|
||||
<MultiTrigger TargetType="Frame">
|
||||
<MultiTrigger.Conditions>
|
||||
|
@ -95,12 +95,16 @@
|
|||
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
|
||||
</MultiTrigger>
|
||||
</Frame.Triggers>
|
||||
<StackLayout
|
||||
Orientation="Horizontal"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center">
|
||||
<Grid
|
||||
ColumnDefinitions="*,Auto"
|
||||
RowDefinitions="Auto"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
VerticalOptions="CenterAndExpand">
|
||||
<Label
|
||||
Grid.Column="0"
|
||||
Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalFirstStep}"
|
||||
FontSize="Medium"
|
||||
FontAttributes="Bold"
|
||||
TextColor="White">
|
||||
<Label.Triggers>
|
||||
<MultiTrigger TargetType="Label">
|
||||
|
@ -125,6 +129,8 @@
|
|||
</Label.Triggers>
|
||||
</Label>
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
IsVisible="False">
|
||||
<Image.Triggers>
|
||||
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="1">
|
||||
|
@ -146,7 +152,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -160,7 +166,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -174,7 +180,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -189,16 +195,17 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource xmark}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</MultiTrigger>
|
||||
</Image.Triggers>
|
||||
</Image>
|
||||
</StackLayout>
|
||||
</Grid>
|
||||
</Frame>
|
||||
<Polygon
|
||||
Grid.Column="0"
|
||||
Grid.Row="1"
|
||||
Points="0,0 20,0 10,10"
|
||||
IsVisible="False"
|
||||
|
@ -229,17 +236,14 @@
|
|||
</MultiTrigger>
|
||||
</Polygon.Triggers>
|
||||
</Polygon>
|
||||
</Grid>
|
||||
|
||||
<!--2nd step-->
|
||||
<Grid
|
||||
Grid.Column="1"
|
||||
RowDefinitions="40,10"
|
||||
RowSpacing="0">
|
||||
<Frame
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
BackgroundColor="{DynamicResource process-step-upcoming}"
|
||||
Padding="0">
|
||||
HasShadow="False"
|
||||
Padding="14,2,10,2">
|
||||
<Frame.Triggers>
|
||||
<MultiTrigger TargetType="Frame">
|
||||
<MultiTrigger.Conditions>
|
||||
|
@ -274,12 +278,16 @@
|
|||
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
|
||||
</MultiTrigger>
|
||||
</Frame.Triggers>
|
||||
<StackLayout
|
||||
Orientation="Horizontal"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center">
|
||||
<Grid
|
||||
ColumnDefinitions="*,Auto"
|
||||
RowDefinitions="Auto"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
VerticalOptions="CenterAndExpand">
|
||||
<Label
|
||||
Grid.Column="0"
|
||||
Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalSecondStep}"
|
||||
FontSize="Medium"
|
||||
FontAttributes="Bold"
|
||||
TextColor="White">
|
||||
<Label.Triggers>
|
||||
<MultiTrigger TargetType="Label">
|
||||
|
@ -298,6 +306,8 @@
|
|||
</Label.Triggers>
|
||||
</Label>
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
IsVisible="False">
|
||||
<Image.Triggers>
|
||||
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
|
||||
|
@ -316,7 +326,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -330,7 +340,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -345,16 +355,17 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource xmark}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</MultiTrigger>
|
||||
</Image.Triggers>
|
||||
</Image>
|
||||
</StackLayout>
|
||||
</Grid>
|
||||
</Frame>
|
||||
<Polygon
|
||||
Grid.Column="1"
|
||||
Grid.Row="1"
|
||||
Points="0,0 20,0 10,10"
|
||||
IsVisible="False"
|
||||
|
@ -385,17 +396,14 @@
|
|||
</MultiTrigger>
|
||||
</Polygon.Triggers>
|
||||
</Polygon>
|
||||
</Grid>
|
||||
|
||||
<!--3rd step-->
|
||||
<Grid
|
||||
Grid.Column="2"
|
||||
RowDefinitions="40,10"
|
||||
RowSpacing="0">
|
||||
<Frame
|
||||
Grid.Column="2"
|
||||
Grid.Row="0"
|
||||
BackgroundColor="{DynamicResource process-step-upcoming}"
|
||||
Padding="0">
|
||||
HasShadow="False"
|
||||
Padding="14,2,10,2">
|
||||
<Frame.Triggers>
|
||||
<MultiTrigger TargetType="Frame">
|
||||
<MultiTrigger.Conditions>
|
||||
|
@ -430,14 +438,20 @@
|
|||
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
|
||||
</MultiTrigger>
|
||||
</Frame.Triggers>
|
||||
<StackLayout
|
||||
Orientation="Horizontal"
|
||||
HorizontalOptions="Center"
|
||||
VerticalOptions="Center">
|
||||
<Grid
|
||||
ColumnDefinitions="*,Auto"
|
||||
RowDefinitions="Auto"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
VerticalOptions="CenterAndExpand">
|
||||
<Label
|
||||
Grid.Column="0"
|
||||
Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalThirdStep}"
|
||||
FontSize="Medium"
|
||||
FontAttributes="Bold"
|
||||
TextColor="White"/>
|
||||
<Image
|
||||
Grid.Column="1"
|
||||
Grid.Row="0"
|
||||
IsVisible="False">
|
||||
<Image.Triggers>
|
||||
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="3">
|
||||
|
@ -453,7 +467,7 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource check}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
|
@ -468,16 +482,17 @@
|
|||
<FontImageSource
|
||||
Glyph="{StaticResource xmark}"
|
||||
FontFamily="FA-S"
|
||||
Size="Small"
|
||||
Size="Default"
|
||||
Color="White"/>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</MultiTrigger>
|
||||
</Image.Triggers>
|
||||
</Image>
|
||||
</StackLayout>
|
||||
</Grid>
|
||||
</Frame>
|
||||
<Polygon
|
||||
Grid.Column="2"
|
||||
Grid.Row="1"
|
||||
Points="0,0 20,0 10,10"
|
||||
IsVisible="False"
|
||||
|
@ -508,7 +523,6 @@
|
|||
</MultiTrigger>
|
||||
</Polygon.Triggers>
|
||||
</Polygon>
|
||||
</Grid>
|
||||
|
||||
</Grid>
|
||||
|
||||
|
|
|
@ -15,7 +15,8 @@
|
|||
Padding="20"
|
||||
Margin="0,5,0,5"
|
||||
HorizontalOptions="FillAndExpand"
|
||||
BackgroundColor="White">
|
||||
BackgroundColor="White"
|
||||
HasShadow="False">
|
||||
|
||||
<Grid
|
||||
ColumnDefinitions="Auto,*"
|
||||
|
|
|
@ -170,7 +170,7 @@
|
|||
|
||||
<!--Attention: Important info-->
|
||||
<Frame Grid.Row="2"
|
||||
Margin="0,20,0,60"
|
||||
Margin="0,20,0,20"
|
||||
Padding="10"
|
||||
HorizontalOptions="FillAndExpand"
|
||||
HasShadow="False"
|
||||
|
|
|
@ -161,7 +161,7 @@
|
|||
|
||||
<!--Attention: Important info-->
|
||||
<Frame Grid.Row="2"
|
||||
Margin="0,20,0,60"
|
||||
Margin="0,20,0,20"
|
||||
Padding="10"
|
||||
HorizontalOptions="FillAndExpand"
|
||||
HasShadow="False"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.373" android:versionCode="373">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.374" android:versionCode="374">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
@ -35,8 +35,7 @@
|
|||
<WarningLevel>0</WarningLevel>
|
||||
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
|
||||
<AndroidLinkMode>None</AndroidLinkMode>
|
||||
<AndroidSupportedAbis>
|
||||
</AndroidSupportedAbis>
|
||||
<AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
|
||||
<AotAssemblies>false</AotAssemblies>
|
||||
|
|
|
@ -56,9 +56,9 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>sharee.bike</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>373</string>
|
||||
<string>374</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.373</string>
|
||||
<string>3.0.374</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
</dict>
|
||||
|
|
|
@ -174,7 +174,7 @@
|
|||
x:Name="DiagnosticsButton"
|
||||
Style="{StaticResource NoOutlineButtonBackgroundColor}"
|
||||
Text="{x:Static resources:AppResources.ActionSendDiagnosis}"
|
||||
Command="{Binding OnMailToOperatorRequest}">
|
||||
Command="{Binding OnMailAppRelatedRequest}">
|
||||
<Button.Triggers>
|
||||
<DataTrigger TargetType="Button" Binding="{Binding IsSendMailAvailable}" Value="False">
|
||||
<Setter Property="TextColor" Value="DimGray" />
|
||||
|
|
|
@ -728,8 +728,8 @@ namespace TINK.Model
|
|||
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
|
||||
},
|
||||
{
|
||||
new Version(3, 0, 373),
|
||||
AppResources.ChangeLog_3_0_373_MK_SB,
|
||||
new Version(3, 0, 374),
|
||||
AppResources.ChangeLog_3_0_374_MK_SB,
|
||||
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
|
||||
},
|
||||
};
|
||||
|
|
|
@ -1461,9 +1461,9 @@ namespace TINK.MultilingualResources {
|
|||
/// <summary>
|
||||
/// Looks up a localized string similar to In your end-of-rental confirmation, you will now see the amount of rental costs that will be automatically debited from your deposited means of payment. Furthermore, you can view your past rentals and the costs incurred for them at any time under "Account"..
|
||||
/// </summary>
|
||||
public static string ChangeLog_3_0_373_MK_SB {
|
||||
public static string ChangeLog_3_0_374_MK_SB {
|
||||
get {
|
||||
return ResourceManager.GetString("ChangeLog_3_0_373_MK_SB", resourceCulture);
|
||||
return ResourceManager.GetString("ChangeLog_3_0_374_MK_SB", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1323,7 +1323,7 @@ Die Kosten werden in den nächsten Tagen automatisch abgebucht. Sorgen Sie für
|
|||
<data name="ErrorSelectBikeInputNotSufficent" xml:space="preserve">
|
||||
<value>Geben Sie die Fahrrad ID ein. Sie besteht aus Präfix und Nummer, z.B. TR15.</value>
|
||||
</data>
|
||||
<data name="ChangeLog_3_0_373_MK_SB" xml:space="preserve">
|
||||
<data name="ChangeLog_3_0_374_MK_SB" xml:space="preserve">
|
||||
<value>In Ihrer Mietende-Bestätigung steht nun welcher Betrag an Mietkosten automatisch von Ihrem hinterlegten Zahlungsmittel abgebucht werden. Weiterhin können Sie Ihre vergangenen Mieten und dafür anfallenden Kosten jederzeit unter "Konto" einsehen.</value>
|
||||
</data>
|
||||
</root>
|
|
@ -1415,7 +1415,7 @@ The costs will be debited automatically within the next days. Ensure sufficient
|
|||
<data name="ErrorSelectBikeInputNotSufficent" xml:space="preserve">
|
||||
<value>Enter the bike id. It consists of prefix and number, e.g. TR15.</value>
|
||||
</data>
|
||||
<data name="ChangeLog_3_0_373_MK_SB" xml:space="preserve">
|
||||
<data name="ChangeLog_3_0_374_MK_SB" xml:space="preserve">
|
||||
<value>In your end-of-rental confirmation, you will now see the amount of rental costs that will be automatically debited from your deposited means of payment. Furthermore, you can view your past rentals and the costs incurred for them at any time under "Account".</value>
|
||||
</data>
|
||||
</root>
|
|
@ -1829,7 +1829,7 @@ Die Kosten werden in den nächsten Tagen automatisch abgebucht. Sorgen Sie für
|
|||
<source>Enter the bike id. It consists of prefix and number, e.g. TR15.</source>
|
||||
<target state="translated">Geben Sie die Fahrrad ID ein. Sie besteht aus Präfix und Nummer, z.B. TR15.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="ChangeLog_3_0_373_MK_SB" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="ChangeLog_3_0_374_MK_SB" translate="yes" xml:space="preserve">
|
||||
<source>In your end-of-rental confirmation, you will now see the amount of rental costs that will be automatically debited from your deposited means of payment. Furthermore, you can view your past rentals and the costs incurred for them at any time under "Account".</source>
|
||||
<target state="translated">In Ihrer Mietende-Bestätigung steht nun welcher Betrag an Mietkosten automatisch von Ihrem hinterlegten Zahlungsmittel abgebucht werden. Weiterhin können Sie Ihre vergangenen Mieten und dafür anfallenden Kosten jederzeit unter "Konto" einsehen.</target>
|
||||
</trans-unit>
|
||||
|
|
|
@ -143,6 +143,8 @@ namespace TINK.ViewModel
|
|||
{
|
||||
l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsLoggedOut)));
|
||||
l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsLoginRequestAllowed)));
|
||||
l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(MailAddress)));
|
||||
l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(Password)));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -377,6 +379,10 @@ namespace TINK.ViewModel
|
|||
title,
|
||||
string.Format(AppResources.MessageLoginWelcome, TinkApp.ActiveUser.Mail),
|
||||
AppResources.MessageAnswerOk);
|
||||
|
||||
//clear MailAdress and Password user input
|
||||
MailAddress = string.Empty;
|
||||
Password = string.Empty;
|
||||
}
|
||||
catch (Exception p_oException)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue