From 06428d96d9e1ed1a2130eb51af16c4fb07e61369 Mon Sep 17 00:00:00 2001 From: Anja Date: Fri, 22 Sep 2023 11:38:42 +0200 Subject: [PATCH] Version 3.0.373 --- .../Properties/AndroidManifest.xml | 2 +- LastenradBayern/TINK.iOS/Info.plist | 4 +- .../TINK/View/Account/AccountPage.xaml.cs | 2 +- .../BikesAtStation/BikesAtStationPage.xaml.cs | 3 +- .../TINK/View/Contact/ContactPage.xaml.cs | 2 +- .../View/Contact/SelectStationPage.xaml.cs | 2 +- .../TINK/View/FindBike/FindBikePage.xaml.cs | 3 +- .../BikeInfo/BikeInfoCarouselPage.xaml.cs | 2 +- .../TINK/View/Login/LoginPage.xaml.cs | 2 +- LastenradBayern/TINK/View/Map/MapPage.xaml.cs | 2 +- .../View/MiniSurvey/MiniSurveyPage.xaml.cs | 2 +- .../TINK/View/MyBikes/MyBikesPage.xaml.cs | 2 +- .../TINK/View/Settings/SettingsPage.xaml.cs | 2 +- .../TINK/View/WhatsNew/Agb/AgbPage.xaml.cs | 2 +- .../TINK/View/WhatsNew/WhatsNewPage.xaml.cs | 2 +- .../Properties/AndroidManifest.xml | 2 +- Meinkonrad/TINK.iOS/Info.plist | 4 +- .../TINK/View/Account/AccountPage.xaml.cs | 2 +- Meinkonrad/TINK/View/Bike/ILockItBike.xaml | 11 +- .../BikesAtStation/BikesAtStationPage.xaml | 18 +- .../BikesAtStation/BikesAtStationPage.xaml.cs | 3 +- Meinkonrad/TINK/View/Contact/ContactPage.xaml | 84 ++- .../TINK/View/Contact/ContactPage.xaml.cs | 2 +- .../View/Contact/SelectStationPage.xaml.cs | 2 +- .../View/FeesAndBikes/FeesAndBikesPage.xaml | 2 +- .../TINK/View/FindBike/FindBikePage.xaml | 17 +- .../TINK/View/FindBike/FindBikePage.xaml.cs | 3 +- .../BikeInfo/BikeInfoCarouselPage.xaml.cs | 2 +- Meinkonrad/TINK/View/Login/LoginPage.xaml | 197 +++--- Meinkonrad/TINK/View/Login/LoginPage.xaml.cs | 2 +- Meinkonrad/TINK/View/Map/MapPage.xaml.cs | 2 +- .../View/MiniSurvey/MiniSurveyPage.xaml.cs | 2 +- Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml | 18 +- .../TINK/View/MyBikes/MyBikesPage.xaml.cs | 2 +- .../TINK/View/Settings/SettingsPage.xaml.cs | 2 +- .../TINK/View/WhatsNew/Agb/AgbPage.xaml.cs | 2 +- .../TINK/View/WhatsNew/WhatsNewPage.xaml.cs | 2 +- .../RentalProcess/RentalProcess2StepsBar.xaml | 35 +- .../RentalProcess/RentalProcess3StepsBar.xaml | 78 ++- .../RentalProcess/RentalProcessBikeInfo.xaml | 2 +- .../Properties/AndroidManifest.xml | 2 +- TINK/TINK.iOS/Info.plist | 4 +- TINK/TINK/View/Account/AccountPage.xaml.cs | 2 +- TINK/TINK/View/Bike/ILockItBike.xaml | 1 + .../BikesAtStation/BikesAtStationPage.xaml | 18 +- .../BikesAtStation/BikesAtStationPage.xaml.cs | 3 +- TINK/TINK/View/Contact/ContactPage.xaml | 78 ++- TINK/TINK/View/Contact/ContactPage.xaml.cs | 2 +- .../View/Contact/SelectStationPage.xaml.cs | 2 +- .../View/FeesAndBikes/FeesAndBikesPage.xaml | 2 +- TINK/TINK/View/FindBike/FindBikePage.xaml | 14 +- TINK/TINK/View/FindBike/FindBikePage.xaml.cs | 3 +- .../BikeInfo/BikeInfoCarouselPage.xaml.cs | 2 +- TINK/TINK/View/Login/LoginPage.xaml | 206 +++--- TINK/TINK/View/Login/LoginPage.xaml.cs | 2 +- TINK/TINK/View/Map/MapPage.xaml.cs | 2 +- .../View/MiniSurvey/MiniSurveyPage.xaml.cs | 2 +- TINK/TINK/View/MyBikes/MyBikesPage.xaml | 18 +- TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs | 2 +- TINK/TINK/View/Settings/SettingsPage.xaml.cs | 2 +- TINK/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs | 2 +- TINK/TINK/View/WhatsNew/WhatsNewPage.xaml.cs | 2 +- TINKLib/Model/BookingFinishedModel.cs | 6 + .../Updater/BookingFinishedModelFactory.cs | 6 +- TINKLib/Model/IBookingFinishedModel.cs | 6 + TINKLib/Model/WhatsNew.cs | 5 + .../AppResources.Designer.cs | 633 +++++++++++------- .../AppResources.de.resx | 77 ++- .../MultilingualResources/AppResources.resx | 81 ++- TINKLib/MultilingualResources/TINKLib.de.xlf | 123 +++- .../Repository/Response/DoReturnResponse.cs | 25 + TINKLib/View/IViewService.cs | 4 +- TINKLib/View/Themes/Konrad.xaml | 119 ++-- TINKLib/View/Themes/ShareeBike.xaml | 85 +-- .../BluetoothLock/EndRentalActionViewModel.cs | 20 +- .../RequestHandler/FeedbackPending.cs | 3 +- .../ViewModel/Contact/ContactPageViewModel.cs | 193 +++--- .../FindBike/FindBikePageViewModel.cs | 326 ++++----- TINKLib/ViewModel/Login/LoginPageViewModel.cs | 283 ++++---- .../TestBookingFinishedModelFactory.cs | 32 +- .../RequestHandler/TestBookedOpen.cs | 16 +- .../RequestHandler/TestBookedUnknown.cs | 12 +- .../RequestHandler/TestDisposableOpen.cs | 10 +- .../RequestHandler/TestReservedOpen.cs | 16 +- .../RequestHandler/TestReservedUnknown.cs | 12 +- .../TestCloseLockActionViewModel.cs | 4 +- .../RequestHandler/TestFeedbackPending.cs | 6 +- 87 files changed, 1796 insertions(+), 1208 deletions(-) diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml index 54a86b7..abaca4e 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 87b4f74..7655542 100644 --- a/LastenradBayern/TINK.iOS/Info.plist +++ b/LastenradBayern/TINK.iOS/Info.plist @@ -56,9 +56,9 @@ CFBundleDisplayName LastenradBayern CFBundleVersion - 372 + 373 CFBundleShortVersionString - 3.0.372 + 3.0.373 ITSAppUsesNonExemptEncryption diff --git a/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs b/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs index 273a178..a19c048 100644 --- a/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs +++ b/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs @@ -150,7 +150,7 @@ namespace TINK.View.Account #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif } } diff --git a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs index b6a1239..d95dc3b 100644 --- a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs +++ b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs @@ -249,9 +249,8 @@ namespace TINK.View.BikesAtStation public async Task DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync(new FeedbackPopup()); #else /// Displays user feedback popup. - /// Co2 saving information. /// User feedback. - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif } } diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs b/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs index 5707962..f32703a 100644 --- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs +++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs @@ -123,7 +123,7 @@ namespace TINK.View.Contact #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif #if USEFLYOUT diff --git a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs index f4b04f9..001b6c3 100644 --- a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs +++ b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs @@ -116,7 +116,7 @@ namespace TINK.View.Contact #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif #if USEFLYOUT diff --git a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs index 47827cf..c6e3265 100644 --- a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs +++ b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs @@ -46,6 +46,7 @@ namespace TINK.View.FindBike m_oViewModel = new FindBikePageViewModel( model.ActiveUser, + model, App.PermissionsService, App.BluetoothService, Device.RuntimePlatform, @@ -181,7 +182,7 @@ namespace TINK.View.FindBike /// Displays user feedback popup. /// Co2 saving information. /// User feedback. - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif } } diff --git a/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs b/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs index d20bf33..8a5df28 100644 --- a/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs +++ b/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs @@ -123,7 +123,7 @@ namespace TINK.View.Info.BikeInfo #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif } } diff --git a/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs b/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs index 59fc351..1d2a652 100644 --- a/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs +++ b/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs @@ -117,7 +117,7 @@ namespace TINK.View.Login #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif } } diff --git a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs index e5f5d84..c93ae1e 100644 --- a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs +++ b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs @@ -121,7 +121,7 @@ namespace TINK.View.Map #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif #if USEFLYOUT diff --git a/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs b/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs index be38a16..51b61b8 100644 --- a/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs +++ b/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs @@ -94,7 +94,7 @@ namespace TINK.View.MiniSurvey /// Displays user feedback popup. /// Co2 saving information. /// User feedback. - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif } } diff --git a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs index 4bc4681..b6c8214 100644 --- a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs +++ b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs @@ -181,7 +181,7 @@ namespace TINK.View.MyBikes /// Displays user feedback popup. /// Co2 saving information. /// User feedback. - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif } } diff --git a/LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs b/LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs index 6a849dc..b493551 100644 --- a/LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs +++ b/LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs @@ -150,7 +150,7 @@ namespace TINK.View.Settings /// Displays user feedback popup. /// Co2 saving information. /// User feedback. - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif #if USERFEEDBACKDLG_TRYOUT diff --git a/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs b/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs index c4b2d62..ec7581a 100644 --- a/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs +++ b/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs @@ -77,7 +77,7 @@ namespace TINK.View.WhatsNew.Agb #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif } } diff --git a/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs b/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs index 9f570c4..7b1d72d 100644 --- a/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs +++ b/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs @@ -80,7 +80,7 @@ namespace TINK.View.WhatsNew #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif /// diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml index ba1e99f..683daef 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 36ff03f..362e330 100644 --- a/Meinkonrad/TINK.iOS/Info.plist +++ b/Meinkonrad/TINK.iOS/Info.plist @@ -56,9 +56,9 @@ CFBundleDisplayName Mein konrad CFBundleVersion - 372 + 373 CFBundleShortVersionString - 3.0.372 + 3.0.373 ITSAppUsesNonExemptEncryption diff --git a/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs b/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs index 273a178..a19c048 100644 --- a/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs +++ b/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs @@ -150,7 +150,7 @@ namespace TINK.View.Account #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif } } diff --git a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml index b759204..3de15ec 100644 --- a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml +++ b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml @@ -20,11 +20,12 @@ + Padding="10" + Margin="0,10,0,5" + HasShadow="False" + HorizontalOptions="FillAndExpand" + VerticalOptions="FillAndExpand" + BackgroundColor="White"> - - diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs index 3f5a7d7..a5241a6 100644 --- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs +++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs @@ -248,9 +248,8 @@ namespace TINK.View.BikesAtStation public async Task DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync(new FeedbackPopup()); #else /// Displays user feedback popup. - /// Co2 saving information. /// User feedback. - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif } } diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml b/Meinkonrad/TINK/View/Contact/ContactPage.xaml index 1fabfd4..a1589be 100644 --- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml +++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml @@ -107,29 +107,43 @@ + Spacing="5" + Margin="0,10,0,0"> diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs b/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs index c316f02..2256631 100644 --- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs +++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs @@ -124,7 +124,7 @@ namespace TINK.View.Contact #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif #if USEFLYOUT diff --git a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs index 0feb477..e1bb26d 100644 --- a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs +++ b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs @@ -118,7 +118,7 @@ namespace TINK.View.Contact #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif #if USEFLYOUT diff --git a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml index d8d0aba..ffb201f 100644 --- a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml +++ b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml @@ -8,7 +8,7 @@ - + diff --git a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml index 1922bae..62a6cf2 100644 --- a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml +++ b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml @@ -10,7 +10,8 @@ xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View" xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib" xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess" - BackgroundColor="{DynamicResource background-color}"> + BackgroundColor="{DynamicResource background-color}" + Shell.NavBarIsVisible="{Binding IsIdle}"> @@ -112,8 +113,15 @@ Grid.Row="1" WidthRequest="100" Text="{x:Static resources:AppResources.MarkingFindBikeButton}" - IsEnabled="{Binding IsSelectBikeEnabled}" - Command="{Binding OnSelectBikeRequest}"/> + Command="{Binding OnSelectBikeRequest}"> + + + + + + + + @@ -141,7 +149,8 @@ DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync(new FeedbackPopup()); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif } } diff --git a/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs b/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs index d20bf33..8a5df28 100644 --- a/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs +++ b/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs @@ -123,7 +123,7 @@ namespace TINK.View.Info.BikeInfo #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif } } diff --git a/Meinkonrad/TINK/View/Login/LoginPage.xaml b/Meinkonrad/TINK/View/Login/LoginPage.xaml index 742928b..6f4d17e 100644 --- a/Meinkonrad/TINK/View/Login/LoginPage.xaml +++ b/Meinkonrad/TINK/View/Login/LoginPage.xaml @@ -28,119 +28,118 @@ Grid.Row="0"> + Padding="10" + Margin="0,10,0,5" + HorizontalOptions="FillAndExpand" + BackgroundColor="White"> - + - + - + - + - + - + - + - + - + - + - + diff --git a/TINK/TINK/View/Contact/ContactPage.xaml.cs b/TINK/TINK/View/Contact/ContactPage.xaml.cs index b091b3a..2b020da 100644 --- a/TINK/TINK/View/Contact/ContactPage.xaml.cs +++ b/TINK/TINK/View/Contact/ContactPage.xaml.cs @@ -125,7 +125,7 @@ namespace TINK.View.Contact #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif #if USEFLYOUT diff --git a/TINK/TINK/View/Contact/SelectStationPage.xaml.cs b/TINK/TINK/View/Contact/SelectStationPage.xaml.cs index 25d551c..b45f8b3 100644 --- a/TINK/TINK/View/Contact/SelectStationPage.xaml.cs +++ b/TINK/TINK/View/Contact/SelectStationPage.xaml.cs @@ -117,7 +117,7 @@ namespace TINK.View.Contact #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif #if USEFLYOUT diff --git a/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml b/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml index 77f2628..afeeb77 100644 --- a/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml +++ b/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml @@ -8,7 +8,7 @@ - + diff --git a/TINK/TINK/View/FindBike/FindBikePage.xaml b/TINK/TINK/View/FindBike/FindBikePage.xaml index c63d3a0..54f1e9c 100644 --- a/TINK/TINK/View/FindBike/FindBikePage.xaml +++ b/TINK/TINK/View/FindBike/FindBikePage.xaml @@ -83,8 +83,15 @@ Grid.Row="1" WidthRequest="100" Text="{x:Static resources:AppResources.MarkingFindBikeButton}" - IsEnabled="{Binding IsSelectBikeEnabled}" - Command="{Binding OnSelectBikeRequest}"/> + Command="{Binding OnSelectBikeRequest}"> + + + + + + + + @@ -112,7 +119,8 @@ Displays user feedback popup. /// Co2 saving information. /// User feedback. - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif } } diff --git a/TINK/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs b/TINK/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs index d20bf33..8a5df28 100644 --- a/TINK/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs +++ b/TINK/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs @@ -123,7 +123,7 @@ namespace TINK.View.Info.BikeInfo #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif } } diff --git a/TINK/TINK/View/Login/LoginPage.xaml b/TINK/TINK/View/Login/LoginPage.xaml index dcd146a..39af771 100644 --- a/TINK/TINK/View/Login/LoginPage.xaml +++ b/TINK/TINK/View/Login/LoginPage.xaml @@ -23,125 +23,125 @@ - + - + - + - + - + - + - + - + - - - - - + - + - + + + - + - - + + diff --git a/TINK/TINK/View/Login/LoginPage.xaml.cs b/TINK/TINK/View/Login/LoginPage.xaml.cs index c00656e..fff33e1 100644 --- a/TINK/TINK/View/Login/LoginPage.xaml.cs +++ b/TINK/TINK/View/Login/LoginPage.xaml.cs @@ -121,7 +121,7 @@ namespace TINK.View.Login #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif } } diff --git a/TINK/TINK/View/Map/MapPage.xaml.cs b/TINK/TINK/View/Map/MapPage.xaml.cs index c695296..4807f9a 100644 --- a/TINK/TINK/View/Map/MapPage.xaml.cs +++ b/TINK/TINK/View/Map/MapPage.xaml.cs @@ -121,7 +121,7 @@ namespace TINK.View.Map #if USCSHARP9 public Task DisplayUserFeedbackPopup() => throw new NotSupportedException(); #else - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => throw new NotSupportedException(); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException(); #endif #if USEFLYOUT diff --git a/TINK/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs b/TINK/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs index d967724..14fbd67 100644 --- a/TINK/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs +++ b/TINK/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs @@ -93,7 +93,7 @@ namespace TINK.View.MiniSurvey /// Displays user feedback popup. /// Co2 saving information. /// User feedback. - public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); + public async Task DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery)); #endif } } diff --git a/TINK/TINK/View/MyBikes/MyBikesPage.xaml b/TINK/TINK/View/MyBikes/MyBikesPage.xaml index 50f7188..35d20d1 100644 --- a/TINK/TINK/View/MyBikes/MyBikesPage.xaml +++ b/TINK/TINK/View/MyBikes/MyBikesPage.xaml @@ -64,17 +64,11 @@ - -