Merge branch 'master' into US-166/location-permission

# Conflicts:
#	TINK/TINK/View/Map/MapPage.xaml.cs
#	TINKLib/ViewModel/Map/MapPageViewModel.cs
#	TestFramework/Services/Permissions/PermissionsMock.cs
#	TestTINKLib/TestTINKLib.csproj
This commit is contained in:
Tobias Reski 2021-11-15 10:06:55 +01:00
commit 30c4e4879b
80 changed files with 2737 additions and 481 deletions

View file

@ -2,13 +2,15 @@
using System;
using TINK.Model;
using TINK.Repository;
using TestFramework.Model.Device;
namespace TestTINKLib.Fixtures.UseCases.ConnectedOffline
{
using NSubstitute;
using TestTINKLib.Mocks.Device;
using TestTINKLib.Mocks.Services;
using TestTINKLib.Model.User.Account;
using TestFramework.Model.Services.Geolocation;
using TestFramework.Model.User.Account;
using TestFramework.Services.BluetoothLock;
using TestFramework.Services.Permissions;
using TINK.Model.Connector;
using TINK.Model.Services.Geolocation;
using TINK.Services;