roko.li/sharee.bike-App
4
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2024-05-11 04:26:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 3.0.374

Browse source
This commit is contained in:
Anja 2023-09-28 15:37:44 +02:00
parent 06428d96d9
commit 63aa608216
21 changed files with 243 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
View file

@ -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 -->

4
LastenradBayern/TINK.iOS/Info.plist
View file

@ -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>

3
Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
View file

@ -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>

2
Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
View file

@ -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 -->

4
Meinkonrad/TINK.iOS/Info.plist
View file

@ -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>

2
Meinkonrad/TINK/View/Contact/ContactPage.xaml
View file

@ -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" />

136
ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml
View file

@ -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,13 +89,17 @@
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
</Frame.Triggers>
<StackLayout
Orientation="Horizontal"
HorizontalOptions="Center"
VerticalOptions="Center">
<Label
Text="{x:Static resources:AppResources.MarkingRentalProcessCloseLockFirstStep}"
TextColor="White">
<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">
<MultiTrigger.Conditions>
@ -103,7 +107,7 @@
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
</MultiTrigger.Conditions>
<Setter Property="Text" Value="{x:Static resources:AppResources.MarkingRentalProcessCloseLockFirstStepFinished}"/>
</MultiTrigger>
</MultiTrigger>
<MultiTrigger TargetType="Label">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
@ -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">
<!--2nd step-->
<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,15 +243,21 @@
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
</Frame.Triggers>
<StackLayout
Orientation="Horizontal"
HorizontalOptions="Center"
VerticalOptions="Center">
<Label
Text="{x:Static resources:AppResources.MarkingRentalProcessCloseLockSecondStep}"
TextColor="White"/>
<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
IsVisible="False">
Grid.Column="1"
Grid.Row="0"
IsVisible="False">
<Image.Triggers>
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
<Setter Property="IsVisible" Value="True" />
@ -262,7 +272,7 @@
<FontImageSource
Glyph="{StaticResource check}"
FontFamily="FA-S"
Size="Small"
Size="Default"
Color="White"/>
</Setter.Value>
</Setter>
@ -277,47 +287,47 @@
<FontImageSource
Glyph="{StaticResource xmark}"
FontFamily="FA-S"
Size="Small"
Size="Default"
Color="White"/>
</Setter.Value>
</Setter>
</MultiTrigger>
</Image.Triggers>
</Image>
</StackLayout>
</Grid>
</Frame>
<Polygon
<Polygon
Grid.Column="1"
Grid.Row="1"
Points="0,0 20,0 10,10"
IsVisible="False"
HorizontalOptions="Center">
<Polygon.Triggers>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" />
</MultiTrigger>
</Polygon.Triggers>
</Polygon>
</Grid>
<Polygon.Triggers>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" />
</MultiTrigger>
</Polygon.Triggers>
</Polygon>
</Grid>

266
ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml
View file

@ -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,57 +195,55 @@
<FontImageSource
Glyph="{StaticResource xmark}"
FontFamily="FA-S"
Size="Small"
Size="Default"
Color="White"/>
</Setter.Value>
</Setter>
</MultiTrigger>
</Image.Triggers>
</Image>
</StackLayout>
</Grid>
</Frame>
<Polygon
<Polygon
Grid.Column="0"
Grid.Row="1"
Points="0,0 20,0 10,10"
IsVisible="False"
HorizontalOptions="Center">
<Polygon.Triggers>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" />
</MultiTrigger>
</Polygon.Triggers>
</Polygon>
</Grid>
<Polygon.Triggers>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" />
</MultiTrigger>
</Polygon.Triggers>
</Polygon>
<!--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,57 +355,55 @@
<FontImageSource
Glyph="{StaticResource xmark}"
FontFamily="FA-S"
Size="Small"
Size="Default"
Color="White"/>
</Setter.Value>
</Setter>
</MultiTrigger>
</Image.Triggers>
</Image>
</StackLayout>
</Grid>
</Frame>
<Polygon
<Polygon
Grid.Column="1"
Grid.Row="1"
Points="0,0 20,0 10,10"
IsVisible="False"
HorizontalOptions="Center">
<Polygon.Triggers>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" />
</MultiTrigger>
</Polygon.Triggers>
</Polygon>
</Grid>
<Polygon.Triggers>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" />
</MultiTrigger>
</Polygon.Triggers>
</Polygon>
<!--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">
<Label
Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalThirdStep}"
TextColor="White"/>
<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,47 +482,47 @@
<FontImageSource
Glyph="{StaticResource xmark}"
FontFamily="FA-S"
Size="Small"
Size="Default"
Color="White"/>
</Setter.Value>
</Setter>
</MultiTrigger>
</Image.Triggers>
</Image>
</StackLayout>
</Grid>
</Frame>
<Polygon
<Polygon
Grid.Column="2"
Grid.Row="1"
Points="0,0 20,0 10,10"
IsVisible="False"
HorizontalOptions="Center">
<Polygon.Triggers>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" />
</MultiTrigger>
</Polygon.Triggers>
</Polygon>
</Grid>
<Polygon.Triggers>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger>
<MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" />
</MultiTrigger>
</Polygon.Triggers>
</Polygon>
</Grid>

3
ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml
View file

@ -15,7 +15,8 @@
Padding="20"
Margin="0,5,0,5"
HorizontalOptions="FillAndExpand"
BackgroundColor="White">
BackgroundColor="White"
HasShadow="False">
<Grid
ColumnDefinitions="Auto,*"

2
ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedClosedEndRental.xaml
View file

@ -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"

2
ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedOpenCloseLock.xaml
View file

@ -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"

2
TINK/TINK.Android/Properties/AndroidManifest.xml
View file

@ -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 -->

3
TINK/TINK.Android/TINK.Android.csproj
View file

@ -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>

4
TINK/TINK.iOS/Info.plist
View file

@ -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>

2
TINK/TINK/View/Contact/ContactPage.xaml
View file

@ -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" />

4
TINKLib/Model/WhatsNew.cs
View file

@ -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 }
},
};

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

@ -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 &quot;Account&quot;..
/// </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);
}
}

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

@ -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>

2
TINKLib/MultilingualResources/AppResources.resx
View file

@ -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>

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

@ -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>

6
TINKLib/ViewModel/Login/LoginPageViewModel.cs
View file

@ -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)
{