From a58c33f005bf62e028d904635f8e95bc8e52289f Mon Sep 17 00:00:00 2001 From: Oliver Hauff Date: Tue, 20 Jul 2021 23:06:09 +0200 Subject: [PATCH] Contact page shows operator specific info --- .../Properties/AndroidManifest.xml | 2 +- TINK/TINK.iOS/Info.plist | 4 +- TINK/TINK/TINK.projitems | 1 + .../BikesAtStation/BikesAtStationPage.xaml | 42 ++- TINK/TINK/View/BoolInverterConverter.cs | 19 ++ TINK/TINK/View/Contact/ContactPage.xaml | 52 +++- TINK/TINK/View/Contact/ContactPage.xaml.cs | 1 + TINK/TINK/View/RootFlyout/RootPage.xaml.cs | 14 +- TINK/TINK/View/RootShell/AppShell.xaml.cs | 2 - .../Settings/PermissionToVisibleConverter.cs | 4 - .../StringNotNullOrEmptyToVisibleConverter.cs | 4 +- TINK/TINK/View/ViewTypesTypeProvider.cs | 5 +- TINKLib/Model/Connector/TextToTypeHelper.cs | 4 +- .../Model/Connector/Updater/UpdaterJSON.cs | 39 ++- TINKLib/Model/Station/IStation.cs | 4 + TINKLib/Model/Station/NullStation.cs | 4 + TINKLib/Model/Station/Operator/Data.cs | 36 +++ TINKLib/Model/Station/Operator/IData.cs | 22 ++ TINKLib/Model/Station/Station.cs | 30 +- TINKLib/Model/TinkApp.cs | 2 +- TINKLib/Model/WhatsNew.cs | 4 + .../AppResources.Designer.cs | 47 ++- .../AppResources.de.resx | 17 +- .../MultilingualResources/AppResources.resx | 17 +- TINKLib/MultilingualResources/TINKLib.de.xlf | 24 +- TINKLib/Repository/CopriCallsHttps.cs | 4 +- TINKLib/Repository/CopriCallsMemory.cs | 284 +++++++++++++++++- TINKLib/Repository/CopriCallsMonkeyStore.cs | 16 +- TINKLib/Repository/ICopriServer.cs | 2 +- ...sponse.cs => StationsAvailableResponse.cs} | 30 +- .../Services/CopriApi/CopriProviderHttps.cs | 10 +- .../CopriApi/CopriProviderMonkeyStore.cs | 2 +- .../Services/CopriApi/ICachedCopriServer.cs | 4 +- TINKLib/Services/CopriApi/ICopriCache.cs | 2 +- .../BikesAtStationPageViewModel.cs | 69 +++-- .../ViewModel/Contact/ContactPageViewModel.cs | 55 ++-- TINKLib/ViewTypes.cs | 5 +- .../Model/Connector/TestCopriProviderHttps.cs | 16 +- .../Model/Connector/TestUpdaterJSON.cs | 120 ++++++++ TestShareeLib/Model/Station/TestData.cs | 61 ++++ .../Repository/TestCopriCallsMonkeyStore.cs | 2 +- .../Connector/CopriCallsHttpReference.cs | 4 +- .../Connector/Query/TestCachedQuery.cs | 18 +- .../Query/TestCachedQueryLoggedIn.cs | 26 +- .../ObjectTests/Connector/Query/TestQuery.cs | 2 +- .../Connector/Query/TestQueryLoggedIn.cs | 2 +- .../Connector/TestTextToTypeHelper.cs | 6 +- .../ObjectTests/Station/TestNullStation.cs | 15 +- .../ObjectTests/Station/TestStation.cs | 8 + .../Mocks/Connector/CopriCallsCacheMemory.cs | 4 +- .../Mocks/Connector/ExceptionServer.cs | 2 +- 51 files changed, 948 insertions(+), 221 deletions(-) create mode 100644 TINK/TINK/View/BoolInverterConverter.cs create mode 100644 TINKLib/Model/Station/Operator/Data.cs create mode 100644 TINKLib/Model/Station/Operator/IData.cs rename TINKLib/Repository/Response/{StationsAllResponse.cs => StationsAvailableResponse.cs} (56%) create mode 100644 TestShareeLib/Model/Station/TestData.cs diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml index 744dca1..522ded0 100644 --- a/TINK/TINK.Android/Properties/AndroidManifest.xml +++ b/TINK/TINK.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist index af5b72a..ffa6ace 100644 --- a/TINK/TINK.iOS/Info.plist +++ b/TINK/TINK.iOS/Info.plist @@ -49,8 +49,8 @@ CFBundleDisplayName sharee.bike CFBundleVersion - 240 + 241 CFBundleShortVersionString - 3.0.240 + 3.0.241 diff --git a/TINK/TINK/TINK.projitems b/TINK/TINK/TINK.projitems index 6704967..20154bf 100644 --- a/TINK/TINK/TINK.projitems +++ b/TINK/TINK/TINK.projitems @@ -29,6 +29,7 @@ ILockItBike.xaml Code + FeedbackPopup.xaml Code diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml index 9508b1d..d443aab 100644 --- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml +++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml @@ -1,9 +1,10 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" + x:Class="TINK.View.BikesAtStation.BikesAtStationPage" + xmlns:local_bike="clr-namespace:TINK.View.Bike" + xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" + Title="{Binding Title}"> @@ -11,7 +12,8 @@ - + - -