diff --git a/LastenradBayern/TINK/App.xaml.cs b/LastenradBayern/TINK/App.xaml.cs index b5d306d..a9dd07a 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; @@ -93,7 +93,7 @@ namespace TINK JsonSettingsDictionary.GetConnectTimeout(settingsJSON), JsonSettingsDictionary.GetActiveGeolocationService(settingsJSON), JsonSettingsDictionary.GetCenterMapToCurrentLocation(settingsJSON), - Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(49.30881083492271, 11.358449625922889), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(2.9)), + Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(48.945396, 11.395330), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(250)), JsonSettingsDictionary.GetLogToExternalFolder(settingsJSON), JsonSettingsDictionary.GetIsSiteCachingOn(settingsJSON), JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.LastenradBayern).Name); diff --git a/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml b/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml index ea50a15..de6b02e 100644 --- a/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml +++ b/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml @@ -10,30 +10,6 @@ - - - - - - - - - - - - @@ -57,4 +33,28 @@ + + + + + + + + + + + + diff --git a/LastenradBayern/TINK/View/RootShell/AppShell.xaml b/LastenradBayern/TINK/View/RootShell/AppShell.xaml index c2ae6fe..a63083e 100644 --- a/LastenradBayern/TINK/View/RootShell/AppShell.xaml +++ b/LastenradBayern/TINK/View/RootShell/AppShell.xaml @@ -73,7 +73,6 @@ diff --git a/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs b/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs index 747ab86..cbfe8f4 100644 --- a/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs +++ b/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; using TINK.MultilingualResources; using TINK.Services; using TINK.Services.CopriApi.ServerUris; @@ -18,7 +18,6 @@ namespace TINK.ViewModel.RootShell PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible))); - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible))); }; // Update flyout view model whenever theme is switched. @@ -63,9 +62,6 @@ namespace TINK.ViewModel.RootShell public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn; - public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri() - || App.ModelRoot.ActiveUser.IsLoggedIn; - public string TabbedPageIngoTitle => AppResources.MarkingAbout; } diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs index be1867c..9993364 100644 --- a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs +++ b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs @@ -131,7 +131,7 @@ namespace TINK.Services.BluetoothLock.BLE } catch (System.Exception exception) { - Log.ForContext().Error("Can not connect to device by name. {Exception}", exception); + Log.ForContext().Error("Can not connect to device by name. Name: {deviceName}, rssi: {deviceRssi}, state: {state}. {Exception}", bleDevice?.Name, bleDevice?.Rssi, bleDevice?.State, exception); if (exception is TaskCanceledException) { // A timeout occurred. @@ -208,7 +208,7 @@ namespace TINK.Services.BluetoothLock.BLE } catch (System.Exception exception) { - Log.ForContext().Error("Can not connect to lock. {Exception}", exception); + Log.ForContext().Error("Can not connect to lock. Name: {deviceName}, rssi: {deviceRssi}, state: {state}. {Exception}", device?.Name, device?.Rssi, device?.State, exception); continue; } diff --git a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml index 14e621d..9f456f9 100644 --- a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml +++ b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml @@ -11,26 +11,6 @@ - - - - - - - - @@ -51,4 +31,24 @@ + + + + + + + + diff --git a/Meinkonrad/TINK/View/RootShell/AppShell.xaml b/Meinkonrad/TINK/View/RootShell/AppShell.xaml index 7392d4a..4bc67e5 100644 --- a/Meinkonrad/TINK/View/RootShell/AppShell.xaml +++ b/Meinkonrad/TINK/View/RootShell/AppShell.xaml @@ -61,7 +61,6 @@ diff --git a/Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs b/Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs index 0aa79bf..cd87382 100644 --- a/Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs +++ b/Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; using TINK.MultilingualResources; using TINK.Services; using TINK.Services.CopriApi.ServerUris; @@ -18,7 +18,6 @@ namespace TINK.ViewModel.RootShell PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible))); - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible))); }; // Update flyout view model whenever theme is switched. @@ -63,9 +62,6 @@ namespace TINK.ViewModel.RootShell public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn; - public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri() - || App.ModelRoot.ActiveUser.IsLoggedIn; - public string TabbedPageIngoTitle => AppResources.MarkingAbout; } diff --git a/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml b/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml index 76a169a..a4aff29 100644 --- a/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml +++ b/TINK/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml @@ -10,29 +10,6 @@ - - - - - - - - - - - @@ -56,4 +33,27 @@ + + + + + + + + + + + diff --git a/TINK/TINK/View/RootShell/AppShell.xaml b/TINK/TINK/View/RootShell/AppShell.xaml index c726958..2f27f03 100644 --- a/TINK/TINK/View/RootShell/AppShell.xaml +++ b/TINK/TINK/View/RootShell/AppShell.xaml @@ -73,7 +73,6 @@ diff --git a/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs b/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs index 0aa79bf..cd87382 100644 --- a/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs +++ b/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; using TINK.MultilingualResources; using TINK.Services; using TINK.Services.CopriApi.ServerUris; @@ -18,7 +18,6 @@ namespace TINK.ViewModel.RootShell PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible))); - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible))); }; // Update flyout view model whenever theme is switched. @@ -63,9 +62,6 @@ namespace TINK.ViewModel.RootShell public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn; - public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri() - || App.ModelRoot.ActiveUser.IsLoggedIn; - public string TabbedPageIngoTitle => AppResources.MarkingAbout; } diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs index 8e2f5f4..77423e1 100644 --- a/TINKLib/Model/WhatsNew.cs +++ b/TINKLib/Model/WhatsNew.cs @@ -604,6 +604,16 @@ namespace TINK.Model new Version(3, 0, 344), AppResources.ChangeLog_MinorBugFixes, new List { AppFlavor.ShareeBike } + }, + { + new Version(3, 0, 345), + AppResources.ChangeLog_3_0_345_SB_MK, + new List { AppFlavor.ShareeBike, AppFlavor.MeinKonrad } + }, + { + new Version(3, 0, 345), + AppResources.ChangeLog_3_0_345_LB, + new List { AppFlavor.LastenradBayern } } }; diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs index c9d786a..f6509ab 100644 --- a/TINKLib/MultilingualResources/AppResources.Designer.cs +++ b/TINKLib/MultilingualResources/AppResources.Designer.cs @@ -645,6 +645,29 @@ namespace TINK.MultilingualResources { } } + /// + /// Looks up a localized string similar to Minor improvements: + ///- Map is centered on Bavaria. + ///- Settings are available even if no user is logged in. + ///- Order of tabs on instructions page were switched.. + /// + public static string ChangeLog_3_0_345_LB { + get { + return ResourceManager.GetString("ChangeLog_3_0_345_LB", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Minor improvements: + ///- Settings are available even if no user is logged in. + ///- Order of tabs on instructions page were switched.. + /// + public static string ChangeLog_3_0_345_SB_MK { + get { + return ResourceManager.GetString("ChangeLog_3_0_345_SB_MK", resourceCulture); + } + } + /// /// Looks up a localized string similar to We have fixed some bugs. Enjoy the ride!. /// diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx index 9c97efc..8fb5403 100644 --- a/TINKLib/MultilingualResources/AppResources.de.resx +++ b/TINKLib/MultilingualResources/AppResources.de.resx @@ -1052,4 +1052,15 @@ Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben: Es wurden ein paar Kleinigkeiten im Design verändert und einige Fehler behoben. Genießen Sie die Fahrt! + + Kleinere Verbesserungen: +- Karte is auf Bayern zentriert. +- Einstellungen sind auch ohne Anmeldung verfügbar. +- Die Reihenfolge der Karteikarten auf der Seite Bedienung wurde getauscht. + + + Kleinere Verbesserungen: +- Einstellungen sind auch ohne Anmeldung verfügbar. +- Die Reihenfolge der Karteikarten auf der Seite Bedienung wurde getauscht. + \ No newline at end of file diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx index 7bb1740..f1106ab 100644 --- a/TINKLib/MultilingualResources/AppResources.resx +++ b/TINKLib/MultilingualResources/AppResources.resx @@ -1144,4 +1144,15 @@ You can now see at a glance which app version you have installed: in the menu at A few small things have been changed in the design and some bugs were fixed. Enjoy the ride! - + + Minor improvements: +- Map is centered on Bavaria. +- Settings are available even if no user is logged in. +- Order of tabs on instructions page were switched. + + + Minor improvements: +- Settings are available even if no user is logged in. +- Order of tabs on instructions page were switched. + + \ No newline at end of file diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf index 392b10a..e812bee 100644 --- a/TINKLib/MultilingualResources/TINKLib.de.xlf +++ b/TINKLib/MultilingualResources/TINKLib.de.xlf @@ -1428,6 +1428,24 @@ Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben: A few small things have been changed in the design and some bugs were fixed. Enjoy the ride! Es wurden ein paar Kleinigkeiten im Design verändert und einige Fehler behoben. Genießen Sie die Fahrt! + + Minor improvements: +- Map is centered on Bavaria. +- Settings are available even if no user is logged in. +- Order of tabs on instructions page were switched. + Kleinere Verbesserungen: +- Karte is auf Bayern zentriert. +- Einstellungen sind auch ohne Anmeldung verfügbar. +- Die Reihenfolge der Karteikarten auf der Seite Bedienung wurde getauscht. + + + Minor improvements: +- Settings are available even if no user is logged in. +- Order of tabs on instructions page were switched. + Kleinere Verbesserungen: +- Einstellungen sind auch ohne Anmeldung verfügbar. +- Die Reihenfolge der Karteikarten auf der Seite Bedienung wurde getauscht. + diff --git a/TINKLib/ViewModel/Map/MapPageViewModel.cs b/TINKLib/ViewModel/Map/MapPageViewModel.cs index c22dd43..b64ada8 100644 --- a/TINKLib/ViewModel/Map/MapPageViewModel.cs +++ b/TINKLib/ViewModel/Map/MapPageViewModel.cs @@ -211,7 +211,7 @@ namespace TINK.ViewModel.Map continue; } - var l_oPin = new Pin + var pin = new Pin { Position = new Xamarin.Forms.GoogleMaps.Position(station.Position.Latitude, station.Position.Longitude), @@ -223,7 +223,7 @@ namespace TINK.ViewModel.Map IsVisible = false, // Set to false to prevent showing default icons (flickering). }; - Pins.Add(l_oPin); + Pins.Add(pin); } } @@ -244,14 +244,14 @@ namespace TINK.ViewModel.Map var colorPartPrefix = GetRessourceNameColorPart(stationsColorList[pinIndex]); - var l_iName = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}"; + var name = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}"; try { - Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(l_iName); + Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(name); } - catch (Exception l_oException) + catch (Exception excption) { - Log.ForContext().Error("Station icon {l_strName} can not be loaded. {@l_oException}.", l_oException); + Log.ForContext().Error("Station icon {name} can not be loaded. {@excption}.", name, excption); Pins[pinIndex].Label = stationId.ToString(); Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]); }