roko.li/sharee.bike-App
5
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2024-12-22 06:56:25 +01:00
Code Issues Projects Releases Packages 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"?> <?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" /> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<!-- Google Maps related permissions --> <!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services --> <!-- Permission to receive remote notifications from Google Play Services -->

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

@ -56,9 +56,9 @@
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>LastenradBayern</string> <string>LastenradBayern</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>373</string> <string>374</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.373</string> <string>3.0.374</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
</dict> </dict>

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

@ -35,8 +35,7 @@
<WarningLevel>0</WarningLevel> <WarningLevel>0</WarningLevel>
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime> <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
<AndroidLinkMode>None</AndroidLinkMode> <AndroidLinkMode>None</AndroidLinkMode>
<AndroidSupportedAbis> <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
</AndroidSupportedAbis>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<JavaMaximumHeapSize>2G</JavaMaximumHeapSize> <JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
<AotAssemblies>false</AotAssemblies> <AotAssemblies>false</AotAssemblies>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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" /> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<!-- Google Maps related permissions --> <!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services --> <!-- Permission to receive remote notifications from Google Play Services -->

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

@ -56,9 +56,9 @@
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>Mein konrad</string> <string>Mein konrad</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>373</string> <string>374</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.373</string> <string>3.0.374</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
</dict> </dict>

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

@ -175,7 +175,7 @@
x:Name="DiagnosticsButton" x:Name="DiagnosticsButton"
Style="{StaticResource NoOutlineButtonBackgroundColor}" Style="{StaticResource NoOutlineButtonBackgroundColor}"
Text="{x:Static resources:AppResources.ActionSendDiagnosis}" Text="{x:Static resources:AppResources.ActionSendDiagnosis}"
Command="{Binding OnMailToOperatorRequest}"> Command="{Binding OnMailAppRelatedRequest}">
<Button.Triggers> <Button.Triggers>
<DataTrigger TargetType="Button" Binding="{Binding IsSendMailAvailable}" Value="False"> <DataTrigger TargetType="Button" Binding="{Binding IsSendMailAvailable}" Value="False">
<Setter Property="TextColor" Value="DimGray" /> <Setter Property="TextColor" Value="DimGray" />

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

@ -40,6 +40,8 @@
<Grid <Grid
Grid.Row="0" Grid.Row="0"
IsVisible="True" IsVisible="True"
RowDefinitions="50,10"
RowSpacing="0"
ColumnDefinitions="*,*"> ColumnDefinitions="*,*">
<Grid.Triggers> <Grid.Triggers>
@ -53,14 +55,12 @@
</Grid.Triggers> </Grid.Triggers>
<!--1st step--> <!--1st step-->
<Grid
Grid.Column="0"
RowDefinitions="40,10"
RowSpacing="0">
<Frame <Frame
Grid.Column="0"
Grid.Row="0" Grid.Row="0"
BackgroundColor="{DynamicResource process-step-upcoming}" BackgroundColor="{DynamicResource process-step-upcoming}"
Padding="0"> Padding="14,2,10,2"
HasShadow="False">
<Frame.Triggers> <Frame.Triggers>
<MultiTrigger TargetType="Frame"> <MultiTrigger TargetType="Frame">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
@ -89,13 +89,17 @@
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" /> <Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
</Frame.Triggers> </Frame.Triggers>
<StackLayout <Grid
Orientation="Horizontal" ColumnDefinitions="*,Auto"
HorizontalOptions="Center" RowDefinitions="Auto"
VerticalOptions="Center"> HorizontalOptions="CenterAndExpand"
<Label VerticalOptions="CenterAndExpand">
Text="{x:Static resources:AppResources.MarkingRentalProcessCloseLockFirstStep}" <Label
TextColor="White"> Grid.Column="0"
Text="{x:Static resources:AppResources.MarkingRentalProcessCloseLockFirstStep}"
FontSize="Medium"
FontAttributes="Bold"
TextColor="White">
<Label.Triggers> <Label.Triggers>
<MultiTrigger TargetType="Label"> <MultiTrigger TargetType="Label">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
@ -103,7 +107,7 @@
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" /> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="Text" Value="{x:Static resources:AppResources.MarkingRentalProcessCloseLockFirstStepFinished}"/> <Setter Property="Text" Value="{x:Static resources:AppResources.MarkingRentalProcessCloseLockFirstStepFinished}"/>
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Label"> <MultiTrigger TargetType="Label">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
@ -113,6 +117,8 @@
</Label.Triggers> </Label.Triggers>
</Label> </Label>
<Image <Image
Grid.Column="1"
Grid.Row="0"
IsVisible="False"> IsVisible="False">
<Image.Triggers> <Image.Triggers>
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="1"> <DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="1">
@ -131,7 +137,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -145,7 +151,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -160,16 +166,17 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource xmark}" Glyph="{StaticResource xmark}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</MultiTrigger> </MultiTrigger>
</Image.Triggers> </Image.Triggers>
</Image> </Image>
</StackLayout> </Grid>
</Frame> </Frame>
<Polygon <Polygon
Grid.Column="0"
Grid.Row="1" Grid.Row="1"
Points="0,0 20,0 10,10" Points="0,0 20,0 10,10"
IsVisible="False" IsVisible="False"
@ -200,17 +207,14 @@
</MultiTrigger> </MultiTrigger>
</Polygon.Triggers> </Polygon.Triggers>
</Polygon> </Polygon>
</Grid>
<!--2nd step--> <!--2nd step-->
<Grid
Grid.Column="1"
RowDefinitions="40,10"
RowSpacing="0">
<Frame <Frame
Grid.Column="1"
Grid.Row="0" Grid.Row="0"
BackgroundColor="{DynamicResource process-step-upcoming}" BackgroundColor="{DynamicResource process-step-upcoming}"
Padding="0"> Padding="14,2,10,2"
HasShadow="False">
<Frame.Triggers> <Frame.Triggers>
<MultiTrigger TargetType="Frame"> <MultiTrigger TargetType="Frame">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
@ -239,15 +243,21 @@
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" /> <Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
</Frame.Triggers> </Frame.Triggers>
<StackLayout <Grid
Orientation="Horizontal" ColumnDefinitions="*,Auto"
HorizontalOptions="Center" RowDefinitions="Auto"
VerticalOptions="Center"> HorizontalOptions="CenterAndExpand"
<Label VerticalOptions="CenterAndExpand">
Text="{x:Static resources:AppResources.MarkingRentalProcessCloseLockSecondStep}" <Label
TextColor="White"/> Grid.Column="0"
Text="{x:Static resources:AppResources.MarkingRentalProcessCloseLockSecondStep}"
FontSize="Medium"
FontAttributes="Bold"
TextColor="White"/>
<Image <Image
IsVisible="False"> Grid.Column="1"
Grid.Row="0"
IsVisible="False">
<Image.Triggers> <Image.Triggers>
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2"> <DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
@ -262,7 +272,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -277,47 +287,47 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource xmark}" Glyph="{StaticResource xmark}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</MultiTrigger> </MultiTrigger>
</Image.Triggers> </Image.Triggers>
</Image> </Image>
</StackLayout> </Grid>
</Frame> </Frame>
<Polygon <Polygon
Grid.Column="1"
Grid.Row="1" Grid.Row="1"
Points="0,0 20,0 10,10" Points="0,0 20,0 10,10"
IsVisible="False" IsVisible="False"
HorizontalOptions="Center"> HorizontalOptions="Center">
<Polygon.Triggers> <Polygon.Triggers>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" /> <Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" /> <Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</MultiTrigger> </MultiTrigger>
</Polygon.Triggers> </Polygon.Triggers>
</Polygon> </Polygon>
</Grid>
</Grid> </Grid>

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

@ -40,6 +40,8 @@
<Grid <Grid
Grid.Row="0" Grid.Row="0"
IsVisible="True" IsVisible="True"
RowDefinitions="50,10"
RowSpacing="0"
ColumnDefinitions="*,*,*"> ColumnDefinitions="*,*,*">
<Grid.Triggers> <Grid.Triggers>
@ -53,14 +55,12 @@
</Grid.Triggers> </Grid.Triggers>
<!--1st step--> <!--1st step-->
<Grid
Grid.Column="0"
RowDefinitions="40,10"
RowSpacing="0">
<Frame <Frame
Grid.Column="0"
Grid.Row="0" Grid.Row="0"
BackgroundColor="{DynamicResource process-step-upcoming}" BackgroundColor="{DynamicResource process-step-upcoming}"
Padding="0"> HasShadow="False"
Padding="14,2,10,2">
<Frame.Triggers> <Frame.Triggers>
<MultiTrigger TargetType="Frame"> <MultiTrigger TargetType="Frame">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
@ -95,12 +95,16 @@
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" /> <Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
</Frame.Triggers> </Frame.Triggers>
<StackLayout <Grid
Orientation="Horizontal" ColumnDefinitions="*,Auto"
HorizontalOptions="Center" RowDefinitions="Auto"
VerticalOptions="Center"> HorizontalOptions="CenterAndExpand"
VerticalOptions="CenterAndExpand">
<Label <Label
Grid.Column="0"
Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalFirstStep}" Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalFirstStep}"
FontSize="Medium"
FontAttributes="Bold"
TextColor="White"> TextColor="White">
<Label.Triggers> <Label.Triggers>
<MultiTrigger TargetType="Label"> <MultiTrigger TargetType="Label">
@ -125,6 +129,8 @@
</Label.Triggers> </Label.Triggers>
</Label> </Label>
<Image <Image
Grid.Column="1"
Grid.Row="0"
IsVisible="False"> IsVisible="False">
<Image.Triggers> <Image.Triggers>
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="1"> <DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="1">
@ -146,7 +152,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -160,7 +166,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -174,7 +180,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -189,57 +195,55 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource xmark}" Glyph="{StaticResource xmark}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</MultiTrigger> </MultiTrigger>
</Image.Triggers> </Image.Triggers>
</Image> </Image>
</StackLayout> </Grid>
</Frame> </Frame>
<Polygon <Polygon
Grid.Column="0"
Grid.Row="1" Grid.Row="1"
Points="0,0 20,0 10,10" Points="0,0 20,0 10,10"
IsVisible="False" IsVisible="False"
HorizontalOptions="Center"> HorizontalOptions="Center">
<Polygon.Triggers> <Polygon.Triggers>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" /> <Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" /> <Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</MultiTrigger> </MultiTrigger>
</Polygon.Triggers> </Polygon.Triggers>
</Polygon> </Polygon>
</Grid>
<!--2nd step--> <!--2nd step-->
<Grid
Grid.Column="1"
RowDefinitions="40,10"
RowSpacing="0">
<Frame <Frame
Grid.Column="1"
Grid.Row="0" Grid.Row="0"
BackgroundColor="{DynamicResource process-step-upcoming}" BackgroundColor="{DynamicResource process-step-upcoming}"
Padding="0"> HasShadow="False"
Padding="14,2,10,2">
<Frame.Triggers> <Frame.Triggers>
<MultiTrigger TargetType="Frame"> <MultiTrigger TargetType="Frame">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
@ -274,12 +278,16 @@
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" /> <Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
</Frame.Triggers> </Frame.Triggers>
<StackLayout <Grid
Orientation="Horizontal" ColumnDefinitions="*,Auto"
HorizontalOptions="Center" RowDefinitions="Auto"
VerticalOptions="Center"> HorizontalOptions="CenterAndExpand"
VerticalOptions="CenterAndExpand">
<Label <Label
Grid.Column="0"
Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalSecondStep}" Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalSecondStep}"
FontSize="Medium"
FontAttributes="Bold"
TextColor="White"> TextColor="White">
<Label.Triggers> <Label.Triggers>
<MultiTrigger TargetType="Label"> <MultiTrigger TargetType="Label">
@ -298,6 +306,8 @@
</Label.Triggers> </Label.Triggers>
</Label> </Label>
<Image <Image
Grid.Column="1"
Grid.Row="0"
IsVisible="False"> IsVisible="False">
<Image.Triggers> <Image.Triggers>
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2"> <DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
@ -316,7 +326,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -330,7 +340,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -345,57 +355,55 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource xmark}" Glyph="{StaticResource xmark}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</MultiTrigger> </MultiTrigger>
</Image.Triggers> </Image.Triggers>
</Image> </Image>
</StackLayout> </Grid>
</Frame> </Frame>
<Polygon <Polygon
Grid.Column="1"
Grid.Row="1" Grid.Row="1"
Points="0,0 20,0 10,10" Points="0,0 20,0 10,10"
IsVisible="False" IsVisible="False"
HorizontalOptions="Center"> HorizontalOptions="Center">
<Polygon.Triggers> <Polygon.Triggers>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" /> <Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" /> <Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</MultiTrigger> </MultiTrigger>
</Polygon.Triggers> </Polygon.Triggers>
</Polygon> </Polygon>
</Grid>
<!--3rd step--> <!--3rd step-->
<Grid
Grid.Column="2"
RowDefinitions="40,10"
RowSpacing="0">
<Frame <Frame
Grid.Column="2"
Grid.Row="0" Grid.Row="0"
BackgroundColor="{DynamicResource process-step-upcoming}" BackgroundColor="{DynamicResource process-step-upcoming}"
Padding="0"> HasShadow="False"
Padding="14,2,10,2">
<Frame.Triggers> <Frame.Triggers>
<MultiTrigger TargetType="Frame"> <MultiTrigger TargetType="Frame">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
@ -430,14 +438,20 @@
<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" /> <Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
</Frame.Triggers> </Frame.Triggers>
<StackLayout <Grid
Orientation="Horizontal" ColumnDefinitions="*,Auto"
HorizontalOptions="Center" RowDefinitions="Auto"
VerticalOptions="Center"> HorizontalOptions="CenterAndExpand"
<Label VerticalOptions="CenterAndExpand">
Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalThirdStep}" <Label
TextColor="White"/> Grid.Column="0"
Text="{x:Static resources:AppResources.MarkingRentalProcessEndRentalThirdStep}"
FontSize="Medium"
FontAttributes="Bold"
TextColor="White"/>
<Image <Image
Grid.Column="1"
Grid.Row="0"
IsVisible="False"> IsVisible="False">
<Image.Triggers> <Image.Triggers>
<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="3"> <DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="3">
@ -453,7 +467,7 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource check}" Glyph="{StaticResource check}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -468,47 +482,47 @@
<FontImageSource <FontImageSource
Glyph="{StaticResource xmark}" Glyph="{StaticResource xmark}"
FontFamily="FA-S" FontFamily="FA-S"
Size="Small" Size="Default"
Color="White"/> Color="White"/>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</MultiTrigger> </MultiTrigger>
</Image.Triggers> </Image.Triggers>
</Image> </Image>
</StackLayout> </Grid>
</Frame> </Frame>
<Polygon <Polygon
Grid.Column="2"
Grid.Row="1" Grid.Row="1"
Points="0,0 20,0 10,10" Points="0,0 20,0 10,10"
IsVisible="False" IsVisible="False"
HorizontalOptions="Center"> HorizontalOptions="Center">
<Polygon.Triggers> <Polygon.Triggers>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-active}" /> <Setter Property="Fill" Value="{DynamicResource process-step-active}" />
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
<Setter Property="Fill" Value="{DynamicResource process-step-failed}" /> <Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
</MultiTrigger> </MultiTrigger>
<MultiTrigger TargetType="Polygon"> <MultiTrigger TargetType="Polygon">
<MultiTrigger.Conditions> <MultiTrigger.Conditions>
<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" /> <BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/> <BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</MultiTrigger> </MultiTrigger>
</Polygon.Triggers> </Polygon.Triggers>
</Polygon> </Polygon>
</Grid>
</Grid> </Grid>

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

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

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

@ -170,7 +170,7 @@
<!--Attention: Important info--> <!--Attention: Important info-->
<Frame Grid.Row="2" <Frame Grid.Row="2"
Margin="0,20,0,60" Margin="0,20,0,20"
Padding="10" Padding="10"
HorizontalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"
HasShadow="False" HasShadow="False"

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

@ -161,7 +161,7 @@
<!--Attention: Important info--> <!--Attention: Important info-->
<Frame Grid.Row="2" <Frame Grid.Row="2"
Margin="0,20,0,60" Margin="0,20,0,20"
Padding="10" Padding="10"
HorizontalOptions="FillAndExpand" HorizontalOptions="FillAndExpand"
HasShadow="False" HasShadow="False"

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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" /> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<!-- Google Maps related permissions --> <!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services --> <!-- 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> <WarningLevel>0</WarningLevel>
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime> <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
<AndroidLinkMode>None</AndroidLinkMode> <AndroidLinkMode>None</AndroidLinkMode>
<AndroidSupportedAbis> <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
</AndroidSupportedAbis>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<JavaMaximumHeapSize>2G</JavaMaximumHeapSize> <JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
<AotAssemblies>false</AotAssemblies> <AotAssemblies>false</AotAssemblies>

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

@ -56,9 +56,9 @@
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>sharee.bike</string> <string>sharee.bike</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>373</string> <string>374</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.373</string> <string>3.0.374</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
</dict> </dict>

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

@ -174,7 +174,7 @@
x:Name="DiagnosticsButton" x:Name="DiagnosticsButton"
Style="{StaticResource NoOutlineButtonBackgroundColor}" Style="{StaticResource NoOutlineButtonBackgroundColor}"
Text="{x:Static resources:AppResources.ActionSendDiagnosis}" Text="{x:Static resources:AppResources.ActionSendDiagnosis}"
Command="{Binding OnMailToOperatorRequest}"> Command="{Binding OnMailAppRelatedRequest}">
<Button.Triggers> <Button.Triggers>
<DataTrigger TargetType="Button" Binding="{Binding IsSendMailAvailable}" Value="False"> <DataTrigger TargetType="Button" Binding="{Binding IsSendMailAvailable}" Value="False">
<Setter Property="TextColor" Value="DimGray" /> <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 List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
}, },
{ {
new Version(3, 0, 373), new Version(3, 0, 374),
AppResources.ChangeLog_3_0_373_MK_SB, AppResources.ChangeLog_3_0_374_MK_SB,
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike } new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
}, },
}; };

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

@ -1461,9 +1461,9 @@ namespace TINK.MultilingualResources {
/// <summary> /// <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;.. /// 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> /// </summary>
public static string ChangeLog_3_0_373_MK_SB { public static string ChangeLog_3_0_374_MK_SB {
get { 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"> <data name="ErrorSelectBikeInputNotSufficent" xml:space="preserve">
<value>Geben Sie die Fahrrad ID ein. Sie besteht aus Präfix und Nummer, z.B. TR15.</value> <value>Geben Sie die Fahrrad ID ein. Sie besteht aus Präfix und Nummer, z.B. TR15.</value>
</data> </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> <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> </data>
</root> </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"> <data name="ErrorSelectBikeInputNotSufficent" xml:space="preserve">
<value>Enter the bike id. It consists of prefix and number, e.g. TR15.</value> <value>Enter the bike id. It consists of prefix and number, e.g. TR15.</value>
</data> </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> <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> </data>
</root> </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> <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> <target state="translated">Geben Sie die Fahrrad ID ein. Sie besteht aus Präfix und Nummer, z.B. TR15.</target>
</trans-unit> </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> <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> <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> </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(IsLoggedOut)));
l_oPropertyChanged(this, new PropertyChangedEventArgs(nameof(IsLoginRequestAllowed))); 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, title,
string.Format(AppResources.MessageLoginWelcome, TinkApp.ActiveUser.Mail), string.Format(AppResources.MessageLoginWelcome, TinkApp.ActiveUser.Mail),
AppResources.MessageAnswerOk); AppResources.MessageAnswerOk);
//clear MailAdress and Password user input
MailAddress = string.Empty;
Password = string.Empty;
} }
catch (Exception p_oException) catch (Exception p_oException)
{ {