From 63aa6082166d0a26a1a5fed649637b7babf692df Mon Sep 17 00:00:00 2001 From: Anja Date: Thu, 28 Sep 2023 15:37:44 +0200 Subject: [PATCH] Version 3.0.374 --- .../Properties/AndroidManifest.xml | 2 +- LastenradBayern/TINK.iOS/Info.plist | 4 +- .../TINK.Android/Meinkonrad.Android.csproj | 3 +- .../Properties/AndroidManifest.xml | 2 +- Meinkonrad/TINK.iOS/Info.plist | 4 +- Meinkonrad/TINK/View/Contact/ContactPage.xaml | 2 +- .../RentalProcess/RentalProcess2StepsBar.xaml | 136 ++++----- .../RentalProcess/RentalProcess3StepsBar.xaml | 266 +++++++++--------- .../RentalProcess/RentalProcessBikeInfo.xaml | 3 +- .../RentalProcessBookedClosedEndRental.xaml | 2 +- .../RentalProcessBookedOpenCloseLock.xaml | 2 +- .../Properties/AndroidManifest.xml | 2 +- TINK/TINK.Android/TINK.Android.csproj | 3 +- TINK/TINK.iOS/Info.plist | 4 +- TINK/TINK/View/Contact/ContactPage.xaml | 2 +- TINKLib/Model/WhatsNew.cs | 4 +- .../AppResources.Designer.cs | 4 +- .../AppResources.de.resx | 2 +- .../MultilingualResources/AppResources.resx | 2 +- TINKLib/MultilingualResources/TINKLib.de.xlf | 2 +- TINKLib/ViewModel/Login/LoginPageViewModel.cs | 6 + 21 files changed, 243 insertions(+), 214 deletions(-) diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml index abaca4e..1ddc8c0 100644 --- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml +++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist index 7655542..748b38c 100644 --- a/LastenradBayern/TINK.iOS/Info.plist +++ b/LastenradBayern/TINK.iOS/Info.plist @@ -56,9 +56,9 @@ CFBundleDisplayName LastenradBayern CFBundleVersion - 373 + 374 CFBundleShortVersionString - 3.0.373 + 3.0.374 ITSAppUsesNonExemptEncryption diff --git a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj index d5aafd4..f98b1aa 100644 --- a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj +++ b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj @@ -35,8 +35,7 @@ 0 true None - - + armeabi-v7a;x86;x86_64;arm64-v8a AnyCPU 2G false diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml index 683daef..bea3694 100644 --- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml +++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist index 362e330..66b35a2 100644 --- a/Meinkonrad/TINK.iOS/Info.plist +++ b/Meinkonrad/TINK.iOS/Info.plist @@ -56,9 +56,9 @@ CFBundleDisplayName Mein konrad CFBundleVersion - 373 + 374 CFBundleShortVersionString - 3.0.373 + 3.0.374 ITSAppUsesNonExemptEncryption diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml b/Meinkonrad/TINK/View/Contact/ContactPage.xaml index a1589be..141100e 100644 --- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml +++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml @@ -175,7 +175,7 @@ x:Name="DiagnosticsButton" Style="{StaticResource NoOutlineButtonBackgroundColor}" Text="{x:Static resources:AppResources.ActionSendDiagnosis}" - Command="{Binding OnMailToOperatorRequest}"> + Command="{Binding OnMailAppRelatedRequest}"> diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml index 0d19e76..48ed48a 100644 --- a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml +++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml @@ -40,6 +40,8 @@ @@ -53,14 +55,12 @@ - + Padding="14,2,10,2" + HasShadow="False"> @@ -89,13 +89,17 @@ - - @@ -145,7 +151,7 @@ @@ -160,16 +166,17 @@ - + - - - + + Padding="14,2,10,2" + HasShadow="False"> @@ -239,15 +243,21 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml index d48c353..9e331b5 100644 --- a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml +++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml @@ -40,6 +40,8 @@ @@ -53,14 +55,12 @@ - + HasShadow="False" + Padding="14,2,10,2"> @@ -95,12 +95,16 @@ - + @@ -146,7 +152,7 @@ @@ -160,7 +166,7 @@ @@ -174,7 +180,7 @@ @@ -189,57 +195,55 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + HasShadow="False" + Padding="14,2,10,2"> @@ -274,12 +278,16 @@ - + @@ -316,7 +326,7 @@ @@ -330,7 +340,7 @@ @@ -345,57 +355,55 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + HasShadow="False" + Padding="14,2,10,2"> @@ -430,14 +438,20 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml index 825e5a5..178d2ce 100644 --- a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml +++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml @@ -15,7 +15,8 @@ Padding="20" Margin="0,5,0,5" HorizontalOptions="FillAndExpand" - BackgroundColor="White"> + BackgroundColor="White" + HasShadow="False"> - + diff --git a/TINK/TINK.Android/TINK.Android.csproj b/TINK/TINK.Android/TINK.Android.csproj index d539d4b..8173515 100644 --- a/TINK/TINK.Android/TINK.Android.csproj +++ b/TINK/TINK.Android/TINK.Android.csproj @@ -35,8 +35,7 @@ 0 true None - - + armeabi-v7a;x86;x86_64;arm64-v8a AnyCPU 2G false diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist index 9823808..9d8d3d7 100644 --- a/TINK/TINK.iOS/Info.plist +++ b/TINK/TINK.iOS/Info.plist @@ -56,9 +56,9 @@ CFBundleDisplayName sharee.bike CFBundleVersion - 373 + 374 CFBundleShortVersionString - 3.0.373 + 3.0.374 ITSAppUsesNonExemptEncryption diff --git a/TINK/TINK/View/Contact/ContactPage.xaml b/TINK/TINK/View/Contact/ContactPage.xaml index 124b737..ddd9145 100644 --- a/TINK/TINK/View/Contact/ContactPage.xaml +++ b/TINK/TINK/View/Contact/ContactPage.xaml @@ -174,7 +174,7 @@ x:Name="DiagnosticsButton" Style="{StaticResource NoOutlineButtonBackgroundColor}" Text="{x:Static resources:AppResources.ActionSendDiagnosis}" - Command="{Binding OnMailToOperatorRequest}"> + Command="{Binding OnMailAppRelatedRequest}"> diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs index a2612b2..c951e71 100644 --- a/TINKLib/Model/WhatsNew.cs +++ b/TINKLib/Model/WhatsNew.cs @@ -728,8 +728,8 @@ namespace TINK.Model new List { 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.MeinKonrad, AppFlavor.ShareeBike } }, }; diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs index 4c3dcdf..f150e75 100644 --- a/TINKLib/MultilingualResources/AppResources.Designer.cs +++ b/TINKLib/MultilingualResources/AppResources.Designer.cs @@ -1461,9 +1461,9 @@ namespace TINK.MultilingualResources { /// /// 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".. /// - 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); } } diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx index de28646..cedde29 100644 --- a/TINKLib/MultilingualResources/AppResources.de.resx +++ b/TINKLib/MultilingualResources/AppResources.de.resx @@ -1323,7 +1323,7 @@ Die Kosten werden in den nächsten Tagen automatisch abgebucht. Sorgen Sie für Geben Sie die Fahrrad ID ein. Sie besteht aus Präfix und Nummer, z.B. TR15. - + 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. \ No newline at end of file diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx index 55789e2..8566337 100644 --- a/TINKLib/MultilingualResources/AppResources.resx +++ b/TINKLib/MultilingualResources/AppResources.resx @@ -1415,7 +1415,7 @@ The costs will be debited automatically within the next days. Ensure sufficient Enter the bike id. It consists of prefix and number, e.g. TR15. - + 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". \ No newline at end of file diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf index 4b90abd..3c38c27 100644 --- a/TINKLib/MultilingualResources/TINKLib.de.xlf +++ b/TINKLib/MultilingualResources/TINKLib.de.xlf @@ -1829,7 +1829,7 @@ Die Kosten werden in den nächsten Tagen automatisch abgebucht. Sorgen Sie für Enter the bike id. It consists of prefix and number, e.g. TR15. Geben Sie die Fahrrad ID ein. Sie besteht aus Präfix und Nummer, z.B. TR15. - + 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". 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. diff --git a/TINKLib/ViewModel/Login/LoginPageViewModel.cs b/TINKLib/ViewModel/Login/LoginPageViewModel.cs index 7c7b3a9..be05360 100644 --- a/TINKLib/ViewModel/Login/LoginPageViewModel.cs +++ b/TINKLib/ViewModel/Login/LoginPageViewModel.cs @@ -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) {