From 0eb7362cb8d3f194d495dcd28dcf95e6103bc87d Mon Sep 17 00:00:00 2001 From: Anja Date: Thu, 11 May 2023 17:39:28 +0200 Subject: [PATCH] Version 3.0.365 --- .../LastenradBayern.Android.csproj | 1 - .../Properties/AndroidManifest.xml | 2 +- .../TINK.Android/Properties/AssemblyInfo.cs | 4 +- LastenradBayern/TINK.iOS/Info.plist | 4 +- .../TINK.iOS/LastenradBayern.iOS.csproj | 1 - LastenradBayern/TINK/App.xaml.cs | 6 +- .../TINK/LastenradBayern.projitems | 5 + .../Fonts}/Font Awesome 5 Free-Solid-900.otf | Bin .../TINK/View/Bike/ILockItBike.xaml | 8 +- .../TINK/View/Contact/ContactPage.xaml | 16 +- LastenradBayern/TINK/View/Map/MapPage.xaml | 4 +- .../TINK.Android/Meinkonrad.Android.csproj | 1 - .../Properties/AndroidManifest.xml | 2 +- .../TINK.Android/Properties/AssemblyInfo.cs | 4 +- Meinkonrad/TINK.iOS/Info.plist | 4 +- Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj | 1 - Meinkonrad/TINK/App.xaml.cs | 6 +- Meinkonrad/TINK/Meinkonrad.projitems | 6 + .../Fonts}/Font Awesome 5 Free-Solid-900.otf | Bin Meinkonrad/TINK/View/Account/AccountPage.xaml | 72 ++-- Meinkonrad/TINK/View/Bike/ILockItBike.xaml | 3 +- Meinkonrad/TINK/View/Contact/ContactPage.xaml | 175 +++++----- .../TINK/View/Contact/SelectStationPage.xaml | 4 +- Meinkonrad/TINK/View/FeedbackPopup.xaml | 180 ++++++---- Meinkonrad/TINK/View/FeedbackPopup.xaml.cs | 4 +- .../TINK/View/FindBike/FindBikePage.xaml | 43 ++- Meinkonrad/TINK/View/Login/LoginPage.xaml | 206 +++++++----- .../TINK/View/Settings/SettingsPage.xaml | 301 ++++++++++------- .../Properties/AndroidManifest.xml | 2 +- TINK/TINK.Android/Properties/AssemblyInfo.cs | 2 - TINK/TINK.Android/TINK.Android.csproj | 1 - TINK/TINK.iOS/Info.plist | 4 +- TINK/TINK.iOS/TINK.iOS.csproj | 1 - TINK/TINK/App.xaml | 11 +- TINK/TINK/App.xaml.cs | 7 +- .../Fonts/Font Awesome 5 Free-Solid-900.otf | Bin 0 -> 591768 bytes TINK/TINK/Resources/Fonts/Roboto-Regular.ttf | Bin 0 -> 129584 bytes TINK/TINK/Resources2/Info.html | 36 -- TINK/TINK/TINK.projitems | 10 + TINK/TINK/View/Account/AccountPage.xaml | 70 ++-- TINK/TINK/View/Bike/ILockItBike.xaml | 10 +- TINK/TINK/View/Contact/ContactPage.xaml | 169 ++++++---- TINK/TINK/View/Contact/SelectStationPage.xaml | 6 +- TINK/TINK/View/FeedbackPopup.xaml | 189 ++++++----- TINK/TINK/View/FeedbackPopup.xaml.cs | 4 +- TINK/TINK/View/FindBike/FindBikePage.xaml | 43 ++- TINK/TINK/View/Login/LoginPage.xaml | 206 +++++++----- TINK/TINK/View/Settings/SettingsPage.xaml | 309 +++++++++++------- TINKLib/Model/Connector/Command/Command.cs | 8 +- .../Connector/Command/CommandLoggedIn.cs | 12 +- TINKLib/Model/Connector/Query/CachedQuery.cs | 2 +- TINKLib/Model/Connector/Query/Query.cs | 2 +- .../Model/Connector/Query/QueryLoggedIn.cs | 2 +- TINKLib/Model/State/StateInfo.cs | 8 +- TINKLib/Model/State/StateInfoMutable.cs | 2 +- TINKLib/Model/WhatsNew.cs | 4 +- .../AppResources.Designer.cs | 48 ++- .../AppResources.de.resx | 34 +- .../MultilingualResources/AppResources.resx | 34 +- TINKLib/MultilingualResources/TINKLib.de.xlf | 53 +-- TINKLib/View/Themes/Konrad.xaml | 4 +- TINKLib/View/Themes/LastenradBayern.xaml | 80 +---- TINKLib/View/Themes/ShareeBike.xaml | 14 +- .../Model/State/TestStateRequestedInfo.cs | 18 +- 64 files changed, 1423 insertions(+), 1045 deletions(-) rename {TINK/TINK.Android/Resources => LastenradBayern/TINK/Resources/Fonts}/Font Awesome 5 Free-Solid-900.otf (100%) rename {TINK/TINK.iOS/Resources => Meinkonrad/TINK/Resources/Fonts}/Font Awesome 5 Free-Solid-900.otf (100%) create mode 100644 TINK/TINK/Resources/Fonts/Font Awesome 5 Free-Solid-900.otf create mode 100644 TINK/TINK/Resources/Fonts/Roboto-Regular.ttf delete mode 100644 TINK/TINK/Resources2/Info.html diff --git a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj index 14c7457..26a68e4 100644 --- a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj +++ b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj @@ -237,7 +237,6 @@ - diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml index 26fd540..a3ad8f8 100644 --- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml +++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/LastenradBayern/TINK.Android/Properties/AssemblyInfo.cs b/LastenradBayern/TINK.Android/Properties/AssemblyInfo.cs index d1885d5..e9b3ef5 100644 --- a/LastenradBayern/TINK.Android/Properties/AssemblyInfo.cs +++ b/LastenradBayern/TINK.Android/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using Xamarin.Forms; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("LastenradBayern.Android")] -[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyCopyright("Copyright © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] @@ -41,5 +41,3 @@ using Xamarin.Forms; #endif [assembly: MetaData("com.google.android.geo.API_KEY", Value = "000000000000000000000000000000000000000")] - -[assembly: ExportFont("Font Awesome 5 Free-Solid-900.otf", Alias = "FA-S")] diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist index 6f397c6..f8595ae 100644 --- a/LastenradBayern/TINK.iOS/Info.plist +++ b/LastenradBayern/TINK.iOS/Info.plist @@ -56,8 +56,8 @@ CFBundleDisplayName LastenradBayern CFBundleVersion - 364 + 365 CFBundleShortVersionString - 3.0.364 + 3.0.365 diff --git a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj index b3c3b1c..dc77437 100644 --- a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj +++ b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj @@ -241,7 +241,6 @@ - diff --git a/LastenradBayern/TINK/App.xaml.cs b/LastenradBayern/TINK/App.xaml.cs index 2070c5d..9224fb6 100644 --- a/LastenradBayern/TINK/App.xaml.cs +++ b/LastenradBayern/TINK/App.xaml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -29,6 +29,10 @@ using Arendi.BleLibrary.Local; // Required for support of binding package, see https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings. [assembly: XamlCompilation(XamlCompilationOptions.Compile)] + +// Add ExportFont attribute +[assembly: ExportFont("Font Awesome 5 Free-Solid-900.otf", Alias = "FA-S")] + namespace TINK { public partial class App : Application diff --git a/LastenradBayern/TINK/LastenradBayern.projitems b/LastenradBayern/TINK/LastenradBayern.projitems index fa904d5..93b0c15 100644 --- a/LastenradBayern/TINK/LastenradBayern.projitems +++ b/LastenradBayern/TINK/LastenradBayern.projitems @@ -330,4 +330,9 @@ MSBuild:UpdateDesignTimeXaml + + + MSBuild:Compile + + \ No newline at end of file diff --git a/TINK/TINK.Android/Resources/Font Awesome 5 Free-Solid-900.otf b/LastenradBayern/TINK/Resources/Fonts/Font Awesome 5 Free-Solid-900.otf similarity index 100% rename from TINK/TINK.Android/Resources/Font Awesome 5 Free-Solid-900.otf rename to LastenradBayern/TINK/Resources/Fonts/Font Awesome 5 Free-Solid-900.otf diff --git a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml index 8f433c8..d7e44fb 100644 --- a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml +++ b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml @@ -56,12 +56,12 @@ Text="{x:Static resources:AppResources.StatusTextCopriLock}" FontSize="Small" IsVisible="{Binding IsBikeWithCopriLock}"/> - + - + @@ -84,7 +84,7 @@ - +