mirror of
https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code
synced 2024-12-22 06:56:25 +01:00
Version 3.0.341
This commit is contained in:
parent
bad07e1ec9
commit
d852ccef4c
26 changed files with 108 additions and 45 deletions
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.340" android:versionCode="340">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.341" android:versionCode="341">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
@ -55,8 +55,8 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>LastenradBayern</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>340</string>
|
||||
<string>341</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.340</string>
|
||||
<string>3.0.341</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
@ -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}">
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handeles pressing of the Android hardware back button.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
protected override bool OnBackButtonPressed() => !m_oViewModel.IsIdle;
|
||||
|
||||
/// <summary> Displays alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
|
@ -245,4 +251,4 @@ namespace TINK.View.BikesAtStation
|
|||
public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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}">
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.340" android:versionCode="340">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.341" android:versionCode="341">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
@ -55,8 +55,8 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>Mein konrad</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>340</string>
|
||||
<string>341</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.340</string>
|
||||
<string>3.0.341</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
@ -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}">
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handeles pressing of the Android hardware back button.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
protected override bool OnBackButtonPressed() => !m_oViewModel.IsIdle;
|
||||
|
||||
/// <summary> Displays alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
|
@ -246,4 +252,4 @@ namespace TINK.View.BikesAtStation
|
|||
public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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}">
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.340" android:versionCode="340">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.341" android:versionCode="341">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
@ -55,8 +55,8 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>sharee.bike</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>340</string>
|
||||
<string>341</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.340</string>
|
||||
<string>3.0.341</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
@ -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}">
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handeles pressing of the Android hardware back button.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
protected override bool OnBackButtonPressed() => !m_oViewModel.IsIdle;
|
||||
|
||||
/// <summary> Displays alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
|
@ -246,4 +252,4 @@ namespace TINK.View.BikesAtStation
|
|||
public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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}">
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
|
|
|
@ -596,12 +596,12 @@ namespace TINK.Model
|
|||
new List<AppFlavor> { AppFlavor.MeinKonrad }
|
||||
},
|
||||
{
|
||||
new Version(3, 0, 340),
|
||||
new Version(3, 0, 341),
|
||||
AppResources.ChangeLog_MinorDesignImprovements,
|
||||
new List<AppFlavor> { AppFlavor.LastenradBayern, AppFlavor.MeinKonrad }
|
||||
},
|
||||
{
|
||||
new Version(3, 0, 340),
|
||||
new Version(3, 0, 341),
|
||||
AppResources.ChangeLog_MinorBugFixes,
|
||||
new List<AppFlavor> { AppFlavor.ShareeBike }
|
||||
}
|
||||
|
|
|
@ -250,7 +250,7 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Checking state permissions....
|
||||
/// Looks up a localized string similar to Checking state and permissions....
|
||||
/// </summary>
|
||||
public static string ActivityTextCheckBluetoothState {
|
||||
get {
|
||||
|
@ -1792,6 +1792,15 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to <font color="gray"><u>Contact</u></font> {0}..
|
||||
/// </summary>
|
||||
public static string MarkingContactSupportBusy {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingContactSupportBusy", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Charging level: {0}/{1} bars.
|
||||
/// </summary>
|
||||
|
|
|
@ -1034,4 +1034,7 @@ Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben:
|
|||
<data name="ChangeLog_MinorDesignImprovements" xml:space="preserve">
|
||||
<value>Es wurden ein paar Kleinigkeiten im Design verändert.</value>
|
||||
</data>
|
||||
<data name="MarkingContactSupportBusy" xml:space="preserve">
|
||||
<value>{0} <font color="gray"><u>kontaktieren</u></font>.</value>
|
||||
</data>
|
||||
</root>
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
@ -701,7 +701,7 @@ Layout of bike names and id display improved.</value>
|
|||
<value>Select Bike</value>
|
||||
</data>
|
||||
<data name="ActivityTextCheckBluetoothState" xml:space="preserve">
|
||||
<value>Checking state permissions...</value>
|
||||
<value>Checking state and permissions...</value>
|
||||
</data>
|
||||
<data name="ActivityTextFindBikeLoadingBikes" xml:space="preserve">
|
||||
<value>Loading Bikes...</value>
|
||||
|
@ -1126,4 +1126,7 @@ You can now see at a glance which app version you have installed: in the menu at
|
|||
<data name="ChangeLog_MinorDesignImprovements" xml:space="preserve">
|
||||
<value>A few small things have been changed in the design.</value>
|
||||
</data>
|
||||
</root>
|
||||
<data name="MarkingContactSupportBusy" xml:space="preserve">
|
||||
<value><font color="gray"><u>Contact</u></font> {0}.</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
|
||||
<file datatype="xml" source-language="en-GB" target-language="de" original="TINKLIB/MULTILINGUALRESOURCES/APPRESOURCES.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
|
||||
<header>
|
||||
|
@ -802,7 +802,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
|
|||
<target state="translated">Rad auswählen</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="ActivityTextCheckBluetoothState" translate="yes" xml:space="preserve">
|
||||
<source>Checking state permissions...</source>
|
||||
<source>Checking state and permissions...</source>
|
||||
<target state="translated">Prüfe Status und Berechtigungen...</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="ActivityTextFindBikeLoadingBikes" translate="yes" xml:space="preserve">
|
||||
|
@ -1404,7 +1404,11 @@ Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben:
|
|||
<source>A few small things have been changed in the design.</source>
|
||||
<target state="translated">Es wurden ein paar Kleinigkeiten im Design verändert.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingContactSupportBusy" translate="yes" xml:space="preserve">
|
||||
<source><bpt id="1"><font color="gray"></bpt><bpt id="2"><u></bpt>Contact<ept id="2"></u></ept><ept id="1"></font></ept> {0}.</source>
|
||||
<target state="translated">{0} <bpt id="1"><font color="gray"></bpt><bpt id="2"><u></bpt>kontaktieren<ept id="2"></u></ept><ept id="1"></font></ept>.</target>
|
||||
</trans-unit>
|
||||
</group>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
</xliff>
|
||||
|
|
|
@ -277,7 +277,7 @@ namespace TINK.Repository.Request
|
|||
: string.Empty;
|
||||
|
||||
private static string GetVersionInfoParameter(IVersionInfo versionInfo) => versionInfo?.FirmwareVersion > 0 || versionInfo?.HardwareVersion > 0 || versionInfo?.LockVersion > 0
|
||||
? $"&firmware=HW%20{versionInfo.HardwareVersion};FW%20{versionInfo.FirmwareVersion};Lock%20{versionInfo.LockVersion}"
|
||||
? $"&firmware=HW%20{versionInfo.HardwareVersion}%3BFW%20{versionInfo.FirmwareVersion}%3BLock%20{versionInfo.LockVersion}"
|
||||
: string.Empty;
|
||||
|
||||
/// <summary> Gets the geolocation parameter. </summary>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Specialized;
|
||||
using System.ComponentModel;
|
||||
|
@ -112,7 +112,7 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
: AppResources.MarkingLoginRequiredToRerserve;
|
||||
|
||||
public string ContactSupportHintText
|
||||
=> string.Format(AppResources.MarkingContactSupport, Station.OperatorData?.Name ?? "Operator");
|
||||
=> string.Format(IsIdle ? AppResources.MarkingContactSupport : AppResources.MarkingContactSupportBusy, Station.OperatorData?.Name ?? "Operator");
|
||||
|
||||
/// <summary>
|
||||
/// Returns if info about the fact that user did not request or book any bikes is visible or not.
|
||||
|
@ -185,6 +185,12 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
{
|
||||
try
|
||||
{
|
||||
if (!IsIdle)
|
||||
{
|
||||
// Prevent navigation when app is not idle because this might lead to aborting return bike workflow.
|
||||
return;
|
||||
}
|
||||
|
||||
// Switch to map page
|
||||
|
||||
#if USEFLYOUT
|
||||
|
@ -211,7 +217,7 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
{
|
||||
Log.ForContext<BikesAtStationPageViewModel>().Information($"Bikes at station {Station.StationName} is appearing, either due to tap on a station or to app being shown again.");
|
||||
|
||||
ActionText = "Einen Moment bitte...";
|
||||
ActionText = AppResources.ActivityTextOneMomentPlease;
|
||||
|
||||
// Stop polling before getting bikes info.
|
||||
await m_oViewUpdateManager.StopUpdatePeridically();
|
||||
|
@ -225,7 +231,7 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
var bikesAtStation = bikesAll.Response.GetAtStation(Station.Id);
|
||||
var lockIdList = bikesAtStation
|
||||
.GetLockIt()
|
||||
.Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
|
||||
.Cast<BikeInfo>()
|
||||
.Select(x => x.LockInfo)
|
||||
.ToList();
|
||||
|
||||
|
@ -234,7 +240,7 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
serviceFake.UpdateSimulation(bikesAtStation);
|
||||
}
|
||||
|
||||
ActionText = AppResources.ActivityTextSearchBikes;
|
||||
ActionText = AppResources.ActivityTextCheckBluetoothState;
|
||||
|
||||
// Check location permissions.
|
||||
if (bikesAtStation.GetLockIt().Count > 0
|
||||
|
@ -377,7 +383,8 @@ namespace TINK.ViewModel.BikesAtStation
|
|||
base.IsIdle = value;
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesAtStationVisible)));
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesAtStationText)));
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(ContactSupportHintText)));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Specialized;
|
||||
|
@ -159,7 +159,7 @@ namespace TINK.ViewModel.FindBike
|
|||
|
||||
var lockIdList = bikeCollection
|
||||
.GetLockIt()
|
||||
.Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
|
||||
.Cast<BikeInfo>()
|
||||
.Select(x => x.LockInfo)
|
||||
.ToList();
|
||||
|
||||
|
@ -171,7 +171,7 @@ namespace TINK.ViewModel.FindBike
|
|||
// Check bluetooth and location permission and states
|
||||
ActionText = AppResources.ActivityTextCheckBluetoothState;
|
||||
|
||||
if (bikeCollection.FirstOrDefault(x => x is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBike) != null
|
||||
if (bikeCollection.FirstOrDefault(x => x is BikeInfo btBike) != null
|
||||
&& RuntimePlatform == Device.Android)
|
||||
{
|
||||
// Check location permission
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Specialized;
|
||||
using System.ComponentModel;
|
||||
|
@ -112,7 +112,7 @@ namespace TINK.ViewModel.MyBikes
|
|||
|
||||
var lockIdList = bikesOccupied.Response
|
||||
.GetLockIt()
|
||||
.Cast<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>()
|
||||
.Cast<BikeInfo>()
|
||||
.Select(x => x.LockInfo)
|
||||
.ToList();
|
||||
|
||||
|
@ -124,7 +124,7 @@ namespace TINK.ViewModel.MyBikes
|
|||
// Check bluetooth and location permission and states
|
||||
ActionText = AppResources.ActivityTextCheckBluetoothState;
|
||||
|
||||
if (bikesOccupied.Response.FirstOrDefault(x => x is Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo btBike) != null
|
||||
if (bikesOccupied.Response.FirstOrDefault(x => x is BikeInfo btBike) != null
|
||||
&& RuntimePlatform == Device.Android)
|
||||
{
|
||||
// Check location permission
|
||||
|
@ -233,9 +233,16 @@ namespace TINK.ViewModel.MyBikes
|
|||
base.IsIdle = value;
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsNoBikesOccupiedVisible)));
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(NoBikesOccupiedText)));
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(FlyoutBehavior))); // Hide flyout menu if app is busy. Prevents especially navigation on returning bike.
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Determines if flyout menu is available or not.
|
||||
/// </summary>
|
||||
public FlyoutBehavior FlyoutBehavior => base.IsIdle ? FlyoutBehavior.Flyout : FlyoutBehavior.Disabled;
|
||||
|
||||
|
||||
/// <summary> Create task which updates my bike view model.</summary>
|
||||
private void UpdateTask()
|
||||
{
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using NUnit.Framework;
|
||||
using TINK.Repository.Exception;
|
||||
using TINK.Repository.Request;
|
||||
|
@ -230,8 +231,8 @@ namespace TestShareeLib.Repository.Request
|
|||
{
|
||||
var builder = new RequestBuilderLoggedIn("MyMeranctIt", null /*UI language */, "MySessionCookie");
|
||||
Assert.That(
|
||||
builder.UpateLockingState("12", lock_state.locked, null /* geolocaion */, 15.03, new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.VersionInfo.Builder { FirmwareVersion=13, HardwareVersion=12, LockVersion=14}.Build()),
|
||||
Is.EqualTo("request=booking_update&bike=12&lock_state=locked&voltage=15.03&firmware=HW%2012;FW%2013;Lock%2014&authcookie=MySessionCookieMyMeranctIt"));
|
||||
WebUtility.UrlDecode(builder.UpateLockingState("12", lock_state.locked, null /* geolocaion */, 15.03, new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.VersionInfo.Builder { FirmwareVersion=13, HardwareVersion=12, LockVersion=14}.Build())),
|
||||
Is.EqualTo("request=booking_update&bike=12&lock_state=locked&voltage=15.03&firmware=HW 12;FW 13;Lock 14&authcookie=MySessionCookieMyMeranctIt"));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -12,6 +12,8 @@
|
|||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
<ReleaseVersion>3.0</ReleaseVersion>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
Loading…
Reference in a new issue