diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml index a50a376..66c4ca1 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 3ad9e81..e286159 100644 --- a/LastenradBayern/TINK.iOS/Info.plist +++ b/LastenradBayern/TINK.iOS/Info.plist @@ -55,8 +55,8 @@ CFBundleDisplayName LastenradBayern CFBundleVersion - 340 + 341 CFBundleShortVersionString - 3.0.340 + 3.0.341 diff --git a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml index 271c423..29d9c63 100644 --- a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml +++ b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml @@ -4,7 +4,9 @@ x:Class="TINK.View.BikesAtStation.BikesAtStationPage" xmlns:local_bike="clr-namespace:TINK.View.Bike" xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" - xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"> + xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View" + Shell.FlyoutBehavior="Disabled" + Shell.NavBarIsVisible="{Binding IsIdle}"> diff --git a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs index 5cf8817..8e89fdf 100644 --- a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs +++ b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs @@ -1,4 +1,4 @@ - + using TINK.Model.Bikes.BikeInfoNS.BluetoothLock; using Xamarin.Forms; using Xamarin.Forms.Xaml; @@ -150,6 +150,12 @@ namespace TINK.View.BikesAtStation #endif } + /// + /// Handeles pressing of the Android hardware back button. + /// + /// + protected override bool OnBackButtonPressed() => !m_oViewModel.IsIdle; + /// Displays alert message. /// Title of message. /// Message to display. @@ -245,4 +251,4 @@ namespace TINK.View.BikesAtStation public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); #endif } -} \ No newline at end of file +} diff --git a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml index 0af7499..81b4d1d 100644 --- a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml +++ b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml @@ -4,7 +4,8 @@ x:Class="TINK.View.MyBikes.MyBikesPage" xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View" - xmlns:local_bike="clr-namespace:TINK.View.Bike"> + xmlns:local_bike="clr-namespace:TINK.View.Bike" + Shell.FlyoutBehavior="{Binding FlyoutBehavior}"> diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml index 462ba1b..ab6569b 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 b632d4f..ec43ffd 100644 --- a/Meinkonrad/TINK.iOS/Info.plist +++ b/Meinkonrad/TINK.iOS/Info.plist @@ -55,8 +55,8 @@ CFBundleDisplayName Mein konrad CFBundleVersion - 340 + 341 CFBundleShortVersionString - 3.0.340 + 3.0.341 diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml index 80282da..e6c7433 100644 --- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml +++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml @@ -4,7 +4,9 @@ x:Class="TINK.View.BikesAtStation.BikesAtStationPage" xmlns:local_bike="clr-namespace:TINK.View.Bike" xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" - xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"> + xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View" + Shell.FlyoutBehavior="Disabled" + Shell.NavBarIsVisible="{Binding IsIdle}"> diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs index 2ac65a4..e876315 100644 --- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs +++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs @@ -1,4 +1,4 @@ - + using TINK.Model.Bikes.BikeInfoNS.BluetoothLock; using Xamarin.Forms; using Xamarin.Forms.Xaml; @@ -151,6 +151,12 @@ namespace TINK.View.BikesAtStation #endif } + /// + /// Handeles pressing of the Android hardware back button. + /// + /// + protected override bool OnBackButtonPressed() => !m_oViewModel.IsIdle; + /// Displays alert message. /// Title of message. /// Message to display. @@ -246,4 +252,4 @@ namespace TINK.View.BikesAtStation public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); #endif } -} \ No newline at end of file +} diff --git a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml index 0af7499..81b4d1d 100644 --- a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml +++ b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml @@ -4,7 +4,8 @@ x:Class="TINK.View.MyBikes.MyBikesPage" xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View" - xmlns:local_bike="clr-namespace:TINK.View.Bike"> + xmlns:local_bike="clr-namespace:TINK.View.Bike" + Shell.FlyoutBehavior="{Binding FlyoutBehavior}"> diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml index a4ffe24..a76e3b5 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 105ac37..9f6656b 100644 --- a/TINK/TINK.iOS/Info.plist +++ b/TINK/TINK.iOS/Info.plist @@ -55,8 +55,8 @@ CFBundleDisplayName sharee.bike CFBundleVersion - 340 + 341 CFBundleShortVersionString - 3.0.340 + 3.0.341 diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml index 5ddffd4..4a14114 100644 --- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml +++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml @@ -5,7 +5,9 @@ x:Class="TINK.View.BikesAtStation.BikesAtStationPage" xmlns:local_bike="clr-namespace:TINK.View.Bike" xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" - xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"> + xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View" + Shell.FlyoutBehavior="Disabled" + Shell.NavBarIsVisible="{Binding IsIdle}"> diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs index 2ac65a4..e876315 100644 --- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs +++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs @@ -1,4 +1,4 @@ - + using TINK.Model.Bikes.BikeInfoNS.BluetoothLock; using Xamarin.Forms; using Xamarin.Forms.Xaml; @@ -151,6 +151,12 @@ namespace TINK.View.BikesAtStation #endif } + /// + /// Handeles pressing of the Android hardware back button. + /// + /// + protected override bool OnBackButtonPressed() => !m_oViewModel.IsIdle; + /// Displays alert message. /// Title of message. /// Message to display. @@ -246,4 +252,4 @@ namespace TINK.View.BikesAtStation public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving)); #endif } -} \ No newline at end of file +} diff --git a/TINK/TINK/View/MyBikes/MyBikesPage.xaml b/TINK/TINK/View/MyBikes/MyBikesPage.xaml index 2f2ccbd..d97aab9 100644 --- a/TINK/TINK/View/MyBikes/MyBikesPage.xaml +++ b/TINK/TINK/View/MyBikes/MyBikesPage.xaml @@ -5,7 +5,8 @@ x:Class="TINK.View.MyBikes.MyBikesPage" xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View" - xmlns:local_bike="clr-namespace:TINK.View.Bike"> + xmlns:local_bike="clr-namespace:TINK.View.Bike" + Shell.FlyoutBehavior="{Binding FlyoutBehavior}"> diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs index 8e849fd..e3605ba 100644 --- a/TINKLib/Model/WhatsNew.cs +++ b/TINKLib/Model/WhatsNew.cs @@ -596,12 +596,12 @@ namespace TINK.Model new List { AppFlavor.MeinKonrad } }, { - new Version(3, 0, 340), + new Version(3, 0, 341), AppResources.ChangeLog_MinorDesignImprovements, new List { AppFlavor.LastenradBayern, AppFlavor.MeinKonrad } }, { - new Version(3, 0, 340), + new Version(3, 0, 341), AppResources.ChangeLog_MinorBugFixes, new List { AppFlavor.ShareeBike } } diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs index 6c759e9..c2d59ac 100644 --- a/TINKLib/MultilingualResources/AppResources.Designer.cs +++ b/TINKLib/MultilingualResources/AppResources.Designer.cs @@ -250,7 +250,7 @@ namespace TINK.MultilingualResources { } /// - /// Looks up a localized string similar to Checking state permissions.... + /// Looks up a localized string similar to Checking state and permissions.... /// public static string ActivityTextCheckBluetoothState { get { @@ -1792,6 +1792,15 @@ namespace TINK.MultilingualResources { } } + /// + /// Looks up a localized string similar to <font color="gray"><u>Contact</u></font> {0}.. + /// + public static string MarkingContactSupportBusy { + get { + return ResourceManager.GetString("MarkingContactSupportBusy", resourceCulture); + } + } + /// /// Looks up a localized string similar to Charging level: {0}/{1} bars. /// diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx index 2c1bca0..2f612ab 100644 --- a/TINKLib/MultilingualResources/AppResources.de.resx +++ b/TINKLib/MultilingualResources/AppResources.de.resx @@ -1034,4 +1034,7 @@ Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben: Es wurden ein paar Kleinigkeiten im Design verändert. + + {0} <font color="gray"><u>kontaktieren</u></font>. + \ No newline at end of file diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx index 3e9a650..d501e21 100644 --- a/TINKLib/MultilingualResources/AppResources.resx +++ b/TINKLib/MultilingualResources/AppResources.resx @@ -1,4 +1,4 @@ - +