roko.li/sharee.bike-App
4
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2024-05-11 12:36:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 3.0.290

Browse source
This commit is contained in:
Oliver Hauff 2022-04-10 17:38:34 +02:00
parent af3c20ea1c
commit ad3cdbcadf
231 changed files with 14555 additions and 7798 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
View file

@ -30,7 +30,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;USEFLYOUT</DefineConstants>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>0</WarningLevel>
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
@ -44,12 +44,15 @@
<BundleAssemblies>false</BundleAssemblies>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<AndroidPackageFormat>aab</AndroidPackageFormat>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;USEFLYOUT</DefineConstants>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>

1
LastenradBayern/TINK.Android/MainActivity.cs
View file

@ -7,6 +7,7 @@ using Java.Interop;
using Plugin.Permissions;
using Xamarin.Forms.Platform.Android.AppLinks;
using Firebase;
using TINK.Model;
namespace TINK.Droid
{

12
LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
View file

@ -1,10 +1,10 @@
<?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.277" android:versionCode="277">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.290" android:versionCode="290">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->
<!-- Notice here that we have the package name of our application as a prefix on the permissions. -->
<permission android:name="com.TeilRad.LastenradBayern.permission.MAPS_RECEIVE" android:protectionLevel="signature" />
<!-- Permission to receive remote notifications from Google Play Services -->
<!-- Notice here that we have the package name of our application as a prefix on the permissions. -->
<permission android:name="com.TeilRad.LastenradBayern.permission.MAPS_RECEIVE" android:protectionLevel="signature" />
<!-- Network connectivity permissions -->
<!-- Access Google based webservices -->
<!-- External storage for caching. -->
@ -21,11 +21,11 @@
<queries>
<intent>
<action android:name="android.intent.action.VIEW" />
<data android:scheme="http"/>
<data android:scheme="http" />
</intent>
<intent>
<action android:name="android.intent.action.VIEW" />
<data android:scheme="https"/>
<data android:scheme="https" />
</intent>
<intent>
<action android:name="android.intent.action.SENDTO" />

2
LastenradBayern/TINK.Android/Properties/AssemblyInfo.cs
View file

@ -34,7 +34,7 @@ using Xamarin.Forms;
[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
#if Debug
#if DEBUG
[assembly: Application(Debuggable =true)]
#else
[assembly: Application(Debuggable = false)]

7270
LastenradBayern/TINK.Android/Resources/Resource.Designer.cs generated
View file

File diff suppressed because it is too large Load diff

14
LastenradBayern/TINK.iOS/Info.plist
View file

@ -37,24 +37,24 @@
<key>XSAppIconAssets</key>
<string>Media.xcassets/AppIcons.appiconset</string>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>Is required to communicate with Bluetooth lock.</string>
<string>Bluetooth access is needed to open and close the locks of the bikes.</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>Is required to communicate with Bluetooth lock.</string>
<string>Bluetooth access is needed to open and close the locks of the bikes.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Is required to show map at current position and pass position to server when returning bike.</string>
<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Is required to show map at current position and pass position to server when returning bike.</string>
<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
<key>MinimumOSVersion</key>
<string>9.0</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Is required to show map at current position and pass position to server when returning bike.</string>
<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
<key>CFBundleIdentifier</key>
<string>com.TeilRad.LastenradBayern</string>
<key>CFBundleDisplayName</key>
<string>LastenradBayern</string>
<key>CFBundleVersion</key>
<string>277</string>
<string>290</string>
<key>CFBundleShortVersionString</key>
<string>3.0.277</string>
<string>3.0.290</string>
</dict>
</plist>

34
LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
View file

@ -20,27 +20,27 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG;USEFLYOUT</DefineConstants>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchArch>i386, x86_64</MtouchArch>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;USEFLYOUT</DefineConstants>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchLink>None</MtouchLink>
<MtouchArch>i386, x86_64</MtouchArch>
<ConsolePause>false</ConsolePause>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@ -48,29 +48,30 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\iPhone\Debug</OutputPath>
<DefineConstants>DEBUG;USEFLYOUT</DefineConstants>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchLink>None</MtouchLink>
<MtouchInterpreter>-all</MtouchInterpreter>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\iPhone\Release</OutputPath>
<DefineConstants>USEFLYOUT</DefineConstants>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<ConsolePause>false</ConsolePause>
<CodesignKey>Apple Distribution: TeilRad GmbH (LXJD6URCHR)</CodesignKey>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>LastenradBayern to App Store 3</CodesignProvision>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<IpaIncludeArtwork>
</IpaIncludeArtwork>
<CrashReportingApiKey>
@ -81,13 +82,12 @@
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
<DefineConstants>USEFLYOUT</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<BuildIpa>True</BuildIpa>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchNoSymbolStrip>
@ -98,12 +98,11 @@
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\iPhone\AppStore</OutputPath>
<DefineConstants>USEFLYOUT</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<CodesignProvision>VS: WildCard Development</CodesignProvision>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchLink>SdkOnly</MtouchLink>
@ -245,6 +244,8 @@
<BundleResource Include="Resources\menu.png" />
<BundleResource Include="Resources\menu%402x.png" />
<BundleResource Include="Resources\menu%403x.png" />
<BundleResource Include="Resources\de.lproj\InfoPlist.strings" />
<BundleResource Include="Resources\en.lproj\InfoPlist.strings" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
@ -1475,6 +1476,12 @@
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iTunesArtwork%402x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\sharee_no_background.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\sharee_no_background.imageset\LastenradBayern-iOS-abgerundet.pdf">
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<Folder Include="Media.xcassets\01_Blue.imageset\" />
@ -1602,6 +1609,7 @@
<Folder Include="Media.xcassets\Open_Green.imageset\" />
<Folder Include="Media.xcassets\Open_LightBlue.imageset\" />
<Folder Include="Media.xcassets\Open_Red.imageset\" />
<Folder Include="Media.xcassets\sharee_no_background.imageset\" />
</ItemGroup>
<Import Project="..\TINK\LastenradBayern.projitems" Label="Shared" Condition="Exists('..\TINK\LastenradBayern.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

528
LastenradBayern/TINK.iOS/Media.xcassets/sharee_no_background.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,528 @@
{
"images": [
{
"filename": "LastenradBayern-iOS-abgerundet.pdf",
"idiom": "universal"
},
{
"scale": "1x",
"idiom": "universal"
},
{
"scale": "2x",
"idiom": "universal"
},
{
"scale": "3x",
"idiom": "universal"
},
{
"idiom": "iphone"
},
{
"scale": "1x",
"idiom": "iphone"
},
{
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"scale": "2x",
"idiom": "iphone"
},
{
"scale": "3x",
"idiom": "iphone"
},
{
"idiom": "ipad"
},
{
"scale": "1x",
"idiom": "ipad"
},
{
"scale": "2x",
"idiom": "ipad"
},
{
"idiom": "watch"
},
{
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"scale": "2x",
"idiom": "watch"
},
{
"idiom": "mac"
},
{
"scale": "1x",
"idiom": "mac"
},
{
"scale": "2x",
"idiom": "mac"
},
{
"idiom": "car"
},
{
"scale": "2x",
"idiom": "car"
},
{
"scale": "3x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "car"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}

BIN
LastenradBayern/TINK.iOS/Media.xcassets/sharee_no_background.imageset/LastenradBayern-iOS-abgerundet.pdf vendored Normal file
View file

Binary file not shown.

16
LastenradBayern/TINK.iOS/Resources/de.lproj/InfoPlist.strings Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>Bluetooth Zugriff wird benötigt, um die Schlösser der Fahrräder zu öffnen und zu schließen.</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>Bluetooth Zugriff wird benötigt, um die Schlösser der Fahrräder zu öffnen und zu schließen.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Der Zugriff auf den Standort wird benötigt, um die Karte an der aktuellen Position anzuzeigen und die Position bei der Rückgabe der Fahrräder an den Server weiterzugeben.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Der Zugriff auf den Standort wird benötigt, um die Karte an der aktuellen Position anzuzeigen und die Position bei der Rückgabe der Fahrräder an den Server weiterzugeben.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Der Zugriff auf den Standort wird benötigt, um die Karte an der aktuellen Position anzuzeigen und die Position bei der Rückgabe der Fahrräder an den Server weiterzugeben.″ </string>
</dict>
</plist>

6
LastenradBayern/TINK.iOS/Resources/en.lproj/InfoPlist.strings Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
</dict>
</plist>

44
LastenradBayern/TINK/App.xaml.cs
View file

@ -17,7 +17,7 @@ using System.Threading;
using TINK.Model.Settings;
using Plugin.Permissions;
using TINK.Services.BluetoothLock.Crypto;
using TINK.Model.Services.Geolocation;
using TINK.Services.Geolocation;
using TINK.Services;
using System.Threading.Tasks;
using TINK.Services.Permissions;
@ -126,11 +126,12 @@ namespace TINK
IStore store = null;
var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON);
if (lastVersion > new Version(3, 0, 250))
if (new Version(3, 0, 290) <= lastVersion)
{
// App versions newer than 3.0.173 stored geolocation service in configuration.
// Force a switch to typeof(GeolocationService) for versions < 3.0.251
GeolocationServicesContainer.SetActive(settings.ActiveGeolocationService);
// Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
// For this reasons a swich of geolocation service is forced when loading configurations from ealier versions.
LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
}
store = new Store();
@ -148,23 +149,26 @@ namespace TINK
m_oModelRoot = new TinkApp(
settings,
store, // Manages user account
(isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(isConnected, activeUri, new Repository.AppContextInfo(MERCHANTID, "LastenradBayern", appInfoService.Version), sessionCookie, mail, expiresAfter),
MERCHANTID,
GeolocationServicesContainer,
null, /* locksService */
DependencyService.Get<ISmartDevice>(),
specialFolders,
new Cipher(),
null, // Permissions, no more used.
isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(isConnected, activeUri, new Repository.AppContextInfo(MERCHANTID, "LastenradBayern", appInfoService.Version), sessionCookie, mail, expiresAfter),
merchantId: MERCHANTID,
bluetoothService: BluetoothService, /* locksService */
locationPermissionsService: PermissionsService,
locationServicesContainer: LocationServicesContainer,
locksService: null,
device: DependencyService.Get<ISmartDevice>(),
specialFolder: specialFolders,
cipher: new Cipher(),
arendiCentral:
#if ARENDI
DependencyService.Get<ICentral>(),
#else
null,
#endif
isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
postAction: (d, obj) => context.Post(d, obj),
currentVersion: appInfoService.Version,
lastVersion: JsonSettingsDictionary.GetAppVersion(settingsJSON),
lastVersion: lastVersion,
whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion());
Log.Debug("Main model successfully constructed.");
@ -311,25 +315,25 @@ namespace TINK
if (_PermissionsService != null)
return _PermissionsService;
_PermissionsService = new Services.Permissions.Essentials.Permissions();
_PermissionsService = new TINK.Services.Permissions.Essentials.Permissions();
return _PermissionsService;
}
}
/// <summary>
/// Service to manage bluetooth stack.
/// </summary>
/// <summary> Service to manage bluetooth stack.</summary>
public static Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService => Plugin.BLE.CrossBluetoothLE.Current;
/// <summary>
/// Service container to manage geolocation services.
/// </summary>
public static IServicesContainer<IGeolocation> GeolocationServicesContainer { get; }
public static IServicesContainer<IGeolocation> LocationServicesContainer { get; }
= new ServicesContainerMutable<IGeolocation>(
new HashSet<IGeolocation> {
new LastKnownGeolocationService(DependencyService.Get<IGeolodationDependent>()),
new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
new GeolocationService(DependencyService.Get<IGeolodationDependent>()) },
new GeolocationAccuracyMediumService(DependencyService.Get<IGeolodationDependent>()),
new GeolocationAccuracyHighService(DependencyService.Get<IGeolodationDependent>()),
new GeolocationAccuracyBestService(DependencyService.Get<IGeolodationDependent>())},
Model.Settings.Settings.DefaultLocationService.FullName);
}
}

2
LastenradBayern/TINK/View/Account/AccountPage.xaml.cs
View file

@ -72,7 +72,7 @@ namespace TINK.View.Account
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays an action sheet.

7
LastenradBayern/TINK/View/Bike/ILockItBike.xaml
View file

@ -56,10 +56,15 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label
Text=
"{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionTariffHeader}"
FontAttributes="Bold"/>
<Label
Text=
"{Binding TariffDescription.Header}"
Grid.ColumnSpan="3"
Grid.Column="1"
Grid.ColumnSpan="2"
FontAttributes="Bold"/>
<Label
Text="{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionFreeTimePerSession}"

4
LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
View file

@ -97,7 +97,7 @@ namespace TINK.View.BikesAtStation
model.SelectedStation,
() => model.GetIsConnected(),
(isConnected) => model.GetConnector(isConnected),
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
model.LocksServices.Active,
model.Polling,
(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
@ -184,7 +184,7 @@ namespace TINK.View.BikesAtStation
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
#if USEFLYOUT

64
LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
View file

@ -1,10 +1,12 @@
using System;
using Serilog;
using System;
using System.Threading.Tasks;
using TINK.Model.Device;
#if USEFLYOUT
using TINK.View.MasterDetail;
#endif
using TINK.ViewModel.Info;
using Xamarin.Essentials;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -17,16 +19,36 @@ namespace TINK.View.Contact
public partial class ContactPage : ContentPage, IViewService
#endif
{
public ContactPage ()
{
InitializeComponent ();
/// <summary> View model to notify view model if page appears. </summary>
private ContactPageViewModel ViewModel { get; set; }
ContactPageView.BindingContext = new ContactPageViewModel(
App.ModelRoot.SelectedStation,
App.ModelRoot.Uris.ActiveUri,
public ContactPage()
{
InitializeComponent();
ViewModel = new ContactPageViewModel(App.ModelRoot.Uris.ActiveUri,
AppInfo.Name,
() => App.CreateAttachment(),
() => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
this);
() => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
this);
ContactPageView.BindingContext = ViewModel;
}
/// <summary> Invoked when page is shown. </summary>
protected async override void OnAppearing()
{
try
{
Log.ForContext<ContentPage>().Verbose("OnAppearing...");
await ViewModel.OnAppearing(App.ModelRoot.SelectedStation);
}
catch (Exception exception)
{
Log.ForContext<ContentPage>().Error("Invoking OnAppearing on view model failed. {Exception}", exception);
return;
}
}
/// <summary> Displays alert message.</summary>
@ -35,10 +57,10 @@ namespace TINK.View.Contact
/// <param name="details">Detailed error description.</param>
/// <param name="cancel">Type of buttons.</param>
public async Task DisplayAdvancedAlert(
string title,
string message,
string details,
string cancel)
string title,
string message,
string details,
string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
/// <summary> Displays detailed alert message.</summary>
@ -49,7 +71,7 @@ namespace TINK.View.Contact
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
#if USEFLYOUT
public void ShowPage(ViewTypes p_oType, string title = null)
@ -78,17 +100,19 @@ namespace TINK.View.Contact
public async Task PushAsync(ViewTypes typeOfPage)
{
#if USEFLYOUT
if (!(Activator.CreateInstance(typeOfPage.GetViewType()) is IDetailPage detailPage))
var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
#else
var page = Activator.CreateInstance(typeOfPage.GetViewType());
#endif
if (page == null)
{
await Task.CompletedTask;
return;
}
// Set reference to navigation object to be able to show page on newly shown detailPage.
detailPage.NavigationMasterDetail = NavigationMasterDetail;
await Navigation.PushAsync((Page)detailPage);
#if USEFLYOUT
page.NavigationMasterDetail = NavigationMasterDetail;
#endif
await Navigation.PushAsync((Page)page);
}
#if USCSHARP9

5
LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs
View file

@ -9,6 +9,7 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.Contact
{
using Serilog;
using TINK.Model;
using TINK.ViewModel.Contact;
[XamlCompilation(XamlCompilationOptions.Compile)]
@ -55,7 +56,7 @@ namespace TINK.View.Contact
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.
@ -140,7 +141,7 @@ namespace TINK.View.Contact
App.ModelRoot,
App.PermissionsService,
App.BluetoothService,
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
(mapspan) => MyMap.MoveToRegion(mapspan),
this,
Navigation);

10
LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
View file

@ -7,12 +7,16 @@
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackLayout>
<WebView x:Name="ManageAccount"
<WebView x:Name="ManageAccount"
HeightRequest="1400"
WidthRequest="1000"
Source="{Binding Uri}" />
</StackLayout>
<ActivityIndicator
x:Name="ActivityIndicatorLoading"
HeightRequest="100"
VerticalOptions="CenterAndExpand"
HorizontalOptions="CenterAndExpand"/>
</Grid>
</ContentPage.Content>
</ContentPage>

29
LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
View file

@ -1,4 +1,5 @@
using TINK.Model.Device;
using Serilog;
using TINK.Model.Device;
using TINK.ViewModel.Login;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -6,17 +7,20 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.CopriWebView
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class ManageAccountPage : ContentPage
{
public ManageAccountPage ()
{
InitializeComponent ();
public partial class ManageAccountPage : ContentPage
{
public ManageAccountPage()
{
InitializeComponent();
ManageAccount.Navigating += (sender, ev) =>
{
if (!ev.Url.ToUpper().EndsWith(".PDF"))
{
// Stay inside web view except for downloading pdf- files.
this.IsEnabled = false;
ActivityIndicatorLoading.IsVisible = true;
ActivityIndicatorLoading.IsRunning = true;
return;
}
@ -25,12 +29,23 @@ namespace TINK.View.CopriWebView
ManageAccount.Navigated += (sender, ev) =>
{
if (ev.Result == WebNavigationResult.Success) return;
if (ev.Result == WebNavigationResult.Success)
{
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
return;
}
Log.ForContext<ManageAccountPage>().Error("Navigation did not succeed.{@Event}{@Sender}", ev, sender);
ManageAccount.Source = new HtmlWebViewSource
{
Html = "<html><b>Kann persönliche Daten nicht anzeigen/ verwalten!</b><br>Verbindung mit Internet ok?</html>"
};
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
};
ManageAccount.BindingContext = new ManageAccountViewModel(

9
LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml
View file

@ -7,12 +7,15 @@
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackLayout>
<WebView x:Name="PasswordForgottenWebView"
<WebView x:Name="PasswordForgottenWebView"
HeightRequest="1400"
WidthRequest="1000"
Source="{Binding Uri}" />
</StackLayout>
<ActivityIndicator
x:Name="ActivityIndicatorLoading"
HeightRequest="100"
VerticalOptions="CenterAndExpand"
HorizontalOptions="CenterAndExpand"/>
</Grid>
</ContentPage.Content>
</ContentPage>

31
LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
View file

@ -1,4 +1,5 @@

using Serilog;
using TINK.ViewModel.CopriWebView;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -6,20 +7,38 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.CopriWebView
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class PasswordForgottenPage : ContentPage
{
public PasswordForgottenPage ()
{
InitializeComponent ();
public partial class PasswordForgottenPage : ContentPage
{
public PasswordForgottenPage()
{
InitializeComponent();
PasswordForgottenWebView.Navigating += (sender, ev) =>
{
this.IsEnabled = false;
ActivityIndicatorLoading.IsVisible = true;
ActivityIndicatorLoading.IsRunning = true;
};
PasswordForgottenWebView.Navigated += (sender, ev) =>
{
if (ev.Result == WebNavigationResult.Success) return;
if (ev.Result == WebNavigationResult.Success)
{
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
return;
}
Log.ForContext<PasswordForgottenPage>().Error("Navigation did not succeed. {@Event}", ev);
PasswordForgottenWebView.Source = new HtmlWebViewSource
{
Html = "<html><b>Kann Passwort vergessen Seite nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>"
};
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
};
PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(

15
LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml
View file

@ -7,12 +7,15 @@
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackLayout>
<WebView x:Name="RegisterView"
HeightRequest="1400"
WidthRequest="1000"
Source="{Binding Uri}" />
</StackLayout>
<WebView x:Name="RegisterView"
HeightRequest="1400"
WidthRequest="1000"
Source="{Binding Uri}" />
<ActivityIndicator
x:Name="ActivityIndicatorLoading"
HeightRequest="100"
VerticalOptions="CenterAndExpand"
HorizontalOptions="CenterAndExpand"/>
</Grid>
</ContentPage.Content>
</ContentPage>

29
LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs
View file

@ -1,4 +1,5 @@

using Serilog;
using TINK.Model.Device;
using TINK.ViewModel.CopriWebView;
using Xamarin.Forms;
@ -7,22 +8,40 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.CopriWebView
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class RegisterPage : ContentPage
{
public RegisterPage()
{
public partial class RegisterPage : ContentPage
{
public RegisterPage()
{
DependencyService.Get<IWebView>().ClearCookies();
InitializeComponent();
RegisterView.Navigating += (sender, ev) =>
{
this.IsEnabled = false;
ActivityIndicatorLoading.IsVisible = true;
ActivityIndicatorLoading.IsRunning = true;
};
RegisterView.Navigated += (sender, ev) =>
{
if (ev.Result == WebNavigationResult.Success) return;
if (ev.Result == WebNavigationResult.Success)
{
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
return;
}
Log.ForContext<RegisterPage>().Error("Navigation did not succeed. {@Event}", ev);
RegisterView.Source = new HtmlWebViewSource
{
Html = "<html><b>Kann Anmeldeseite nicht anzeigen</b>!<br>Verbindung mit Internet ok?</html>"
};
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
};
RegisterView.BindingContext = new RegisterPageViewModel(

5
LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
View file

@ -2,6 +2,7 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using TINK.Model;
using TINK.Model.Device;
using TINK.ViewModel.FindBike;
using Xamarin.CommunityToolkit.Extensions;
@ -46,7 +47,7 @@ namespace TINK.View.FindBike
Device.RuntimePlatform,
() => model.GetIsConnected(),
(isConnected) => model.GetConnector(isConnected),
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
model.LocksServices.Active,
model.Stations,
model.Polling,
@ -104,7 +105,7 @@ namespace TINK.View.FindBike
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.

2
LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
View file

@ -55,7 +55,7 @@ namespace TINK.View.Info.BikeInfo
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.

2
LastenradBayern/TINK/View/Login/LoginPage.xaml.cs
View file

@ -63,7 +63,7 @@ namespace TINK.View.Login
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
#if USEFLYOUT
/// <summary>

5
LastenradBayern/TINK/View/Map/MapPage.xaml.cs
View file

@ -9,6 +9,7 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.Map
{
using Serilog;
using TINK.Model;
using TINK.ViewModel.Map;
[XamlCompilation(XamlCompilationOptions.Compile)]
@ -61,7 +62,7 @@ namespace TINK.View.Map
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.
@ -234,7 +235,7 @@ namespace TINK.View.Map
App.ModelRoot,
App.PermissionsService,
App.BluetoothService,
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
(mapspan) => MyMap.MoveToRegion(mapspan),
this,
Navigation);

2
LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
View file

@ -53,7 +53,7 @@ namespace TINK.View.MiniSurvey
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.

5
LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
View file

@ -11,6 +11,7 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.MyBikes
{
using Serilog;
using TINK.Model;
using TINK.Model.Device;
using TINK.ViewModel.MyBikes;
using Xamarin.CommunityToolkit.Extensions;
@ -63,7 +64,7 @@ namespace TINK.View.MyBikes
Device.RuntimePlatform,
() => model.GetIsConnected(),
(isConnected) => model.GetConnector(isConnected),
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
model.LocksServices.Active,
model.Stations,
model.Polling,
@ -135,7 +136,7 @@ namespace TINK.View.MyBikes
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.

1
LastenradBayern/TINK/View/RootShell/AppShell.xaml
View file

@ -91,6 +91,7 @@
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
<ShellContent
Title="{x:Static resources:AppResources.MarkingFeedbackAndContact}"
Route="ContactPage"
ContentTemplate="{DataTemplate contact:ContactPage}">
<ShellContent.FlyoutIcon>
<FontImageSource Glyph="{StaticResource IconContact}" Color="Black" FontFamily="FA-S" />

10
LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml
View file

@ -10,12 +10,14 @@
<RowDefinition Height="30" />
</Grid.RowDefinitions>
<Image
HeightRequest="140"
Aspect="AspectFit"
Source="sharee_no_background.png" />
HeightRequest="140"
Grid.RowSpan="2"
Aspect="AspectFit"
Source="sharee_no_background.png"/>
<Label
HorizontalOptions="CenterAndExpand"
FontSize="Large"
FontAttributes="Bold"
Grid.Row="1"
Text="{Binding MasterDetailMenuTitlte}"/>
<Label
@ -23,6 +25,6 @@
FontSize="Micro"
HorizontalTextAlignment="Center"
Grid.Row="2"
Text="gefördert vom Bayrischen Staatministerium für Wohnen, Bau und Verkehr"/>
Text="gefördert vom Bayerischen Staatministerium für Wohnen, Bau und Verkehr"/>
</Grid>
</ContentView>

4
LastenradBayern/TINK/View/Settings/SettingsPage.xaml.cs
View file

@ -30,7 +30,7 @@ namespace TINK.View.Settings
m_oViewModel = new SettingsPageViewModel(
l_oModel,
App.GeolocationServicesContainer,
App.LocationServicesContainer,
this);
BindingContext = m_oViewModel;
@ -65,7 +65,7 @@ namespace TINK.View.Settings
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary> Displays alert message.</summary>
/// <param name="p_strTitle">Title of message.</param>

2
LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
View file

@ -43,7 +43,7 @@ namespace TINK.View.WhatsNew.Agb
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary> Invoked when page is shown. </summary>
protected async override void OnAppearing()

2
LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
View file

@ -48,7 +48,7 @@ namespace TINK.View.WhatsNew
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
public Task PopModalAsync()
{

1
LockItBLE/LockItBLE.csproj
View file

@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>TINK</RootNamespace>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<ItemGroup>

45
LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs
View file

@ -18,12 +18,33 @@ namespace TINK.Services.BluetoothLock.BLE
/// <summary> Manages ILockIt- Locks.</summary>
public abstract class LockItByScanServiceBase : LockItServiceBase
{
/// <summary> Service to manage bluetooth stack. </summary>
private IBluetoothLE BluetoothService { get; }
/// <summary> Returns true if location permission is required (Android) but on given. </summary>
private Func<Task<bool>> IsLocationPermissionMissingDelegate {get; }
/// <summary> Returns true if location service is required (Android) and off. </summary>
private Func<bool> IsLocationRequiredAndOffDelegate { get; }
private Func<IDevice, LockInfoAuthTdo, IAdapter, Task<LockItBase>> AuthenticateDelegate { get; set; }
public LockItByScanServiceBase(
ICipher cipher,
Func<IDevice, LockInfoAuthTdo, IAdapter, Task<LockItBase>> authenticateDelegate) : base(cipher)
Func<IDevice, LockInfoAuthTdo, IAdapter, Task<LockItBase>> authenticateDelegate,
IBluetoothLE bluetoothLE,
Func<Task<bool>> isLocationPermissionMissingDelegate,
Func<bool> isLocationRequiredAndOffDelegate) : base(cipher)
{
BluetoothService = bluetoothLE
?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No bluetooth service available.");
IsLocationPermissionMissingDelegate = isLocationPermissionMissingDelegate
?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No location permission missing delegate available.");
IsLocationRequiredAndOffDelegate = isLocationRequiredAndOffDelegate
?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No location .");
AuthenticateDelegate = authenticateDelegate;
}
@ -63,6 +84,28 @@ namespace TINK.Services.BluetoothLock.BLE
if (bleDevice == null)
{
// Try to check why lock was not found.
var bluetoothState = await BluetoothService.GetBluetoothState();
switch (bluetoothState)
{
case BluetoothState.On:
break;
case BluetoothState.Off:
throw new ConnectBluetoothNotOnException();
default:
throw new ConnectBluetoothNotOnException(bluetoothState);
}
if (await IsLocationPermissionMissingDelegate())
{
throw new ConnectLocationPermissionMissingException();
}
if (IsLocationRequiredAndOffDelegate())
{
throw new ConnectLocationOffException();
}
Log.ForContext<LockItByScanServiceBase>().Debug("Can not connect because device was not discovered.");
throw new OutOfReachException();

12
LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs
View file

@ -1,11 +1,17 @@
using TINK.Model.Device;
using Plugin.BLE.Abstractions.Contracts;
using System;
using System.Threading.Tasks;
using TINK.Model.Device;
namespace TINK.Services.BluetoothLock.BLE
{
public class LockItByScanServiceEventBased : LockItByScanServiceBase, ILocksService
{
public LockItByScanServiceEventBased(ICipher cipher) : base(
public LockItByScanServiceEventBased(ICipher cipher, IBluetoothLE bluetoothLE, Func<Task<bool>> isLocationPermissionMissingDelegate, Func<bool> isLocationRequiredAndOffDelegate) : base(
cipher,
(bleDevice, authInfo, adapter) => LockItEventBased.Authenticate(bleDevice, authInfo, adapter, cipher)) { }
(bleDevice, authInfo, adapter) => LockItEventBased.Authenticate(bleDevice, authInfo, adapter, cipher),
bluetoothLE,
isLocationPermissionMissingDelegate,
isLocationRequiredAndOffDelegate) { }
}
}

12
LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs
View file

@ -1,11 +1,17 @@
using TINK.Model.Device;
using Plugin.BLE.Abstractions.Contracts;
using System;
using System.Threading.Tasks;
using TINK.Model.Device;
namespace TINK.Services.BluetoothLock.BLE
{
public class LockItByScanServicePolling : LockItByScanServiceBase, ILocksService
{
public LockItByScanServicePolling(ICipher cipher) : base(
public LockItByScanServicePolling(ICipher cipher, IBluetoothLE bluetoothLE, Func<Task<bool>> isLocationPermissionMissingDelegate, Func<bool> isLocationRequiredAndOffDelegate) : base(
cipher,
(bleDevice, authInfo, adapter) => LockItPolling.Authenticate(bleDevice, authInfo, adapter, cipher)) { }
(bleDevice, authInfo, adapter) => LockItPolling.Authenticate(bleDevice, authInfo, adapter, cipher),
bluetoothLE,
isLocationPermissionMissingDelegate,
isLocationRequiredAndOffDelegate) { }
}
}

6
LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
View file

@ -164,7 +164,7 @@ namespace TINK.Services.BluetoothLock.BLE
if (lockIt == null)
{
// Nothing to do
return LockingState.Disconnected;
return LockingState.UnknownDisconnected;
}
DeviceList.Remove(lockIt);
@ -172,11 +172,11 @@ namespace TINK.Services.BluetoothLock.BLE
if (lockIt.GetDeviceState() == DeviceState.Disconnected)
{
// Nothing to do
return LockingState.Disconnected;
return LockingState.UnknownDisconnected;
}
await lockIt.Disconnect();
return LockingState.Disconnected;
return LockingState.UnknownDisconnected;
}
}
}

0
TINKLib/Services/BluetoothLock/StateChecker.cs → LockItBLE/Services/BluetoothLock/StateChecker.cs
View file

1
LockItShared/LockItShared.csproj
View file

@ -5,6 +5,7 @@
<MultilingualFallbackLanguage>en-GB</MultilingualFallbackLanguage>
<TranslationReport Condition="'$(Configuration)' == 'Release'">true</TranslationReport>
<SuppressPseudoWarning Condition="'$(Configuration)' == 'Debug'">true</SuppressPseudoWarning>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>

13
LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs
View file

@ -8,10 +8,15 @@ namespace TINK.Model.Bike.BluetoothLock
/// <summary> Locking states. </summary>
public enum LockingState
{
Disconnected,
/// <summary> App is not connected to lock.</summary>
UnknownDisconnected,
/// <summary> Lock might be open, closed or something in between..</summary>
Unknown,
/// <summary> Lock might be open, closed or something in between.</summary>
/// <remarks>
/// Under certain circumstances lock reports/ is known to be in this state (genuine ILOCKIT locking state LockitLockingState.Unknown).
/// Example: If bold is blocked it might happen that opening or closing lock leads to state unknown, i.e. might be open, closed or inbetween.
/// </remarks>
UnknownFromHardwareError,
/// <summary> Lock is closed. </summary>
Closed,
@ -42,7 +47,7 @@ namespace TINK.Model.Bike.BluetoothLock
/// <summary> Locking state of bluetooth lock. </summary>
[DataMember]
public LockingState State { get; private set; } = LockingState.Disconnected;
public LockingState State { get; private set; } = LockingState.UnknownDisconnected;
public bool IsIdValid => Id != TextToLockItTypeHelper.INVALIDLOCKID;

21
LockItShared/MultilingualResources/LockItShared.de.xlf
View file

@ -35,8 +35,25 @@
<target state="translated">Schloss ist blockiert.</target>
</trans-unit>
<trans-unit id="ErrorOpenLockBoldWasBlocked" translate="yes" xml:space="preserve">
<source>Bolds was or is blocked.</source>
<target state="new">Bolds was or is blocked.</target>
<source>Bold was or is blocked.</source>
<target state="needs-review-translation">Schloss war oder ist blockiert.</target>
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
</trans-unit>
<trans-unit id="ErrorConnectLockBluetoothNotOnException" translate="yes" xml:space="preserve">
<source>Can not connect to lock. Unexpected bluetooth state {0} detected.</source>
<target state="translated">Kann keine Verbindung zum Schloss herstellen. Unerwarteter Bluetooth-Status {0} erkannt.</target>
</trans-unit>
<trans-unit id="ErrorConnectLockBluetoothOffException" translate="yes" xml:space="preserve">
<source>Can not connect to lock. Bluetooth is off but has to be turned on.</source>
<target state="translated">Kann keine Verbindung zum Schloss herstellen. Bluetooth ist aus und sollte aber angeschalten sein.</target>
</trans-unit>
<trans-unit id="ErrorConnectLockLocationOffException" translate="yes" xml:space="preserve">
<source>Can not connect to lock. Location is off but has to be turned on.</source>
<target state="translated">Kann keine Verbindung zum Schloss herstellen. Standortbestimmung ist deaktiviert, sollte aber aktiviert sein.</target>
</trans-unit>
<trans-unit id="ErrorConnectLockLocationPermissingMissingException" translate="yes" xml:space="preserve">
<source>Can not connect to lock. Location permission is required but not granted. </source>
<target state="translated">Kann keine Verbindung zum Schloss herstellen. Standort-Zugriffserlaubnis muss erteilt sein wurde aber nicht erteilt. </target>
</trans-unit>
</group>
</body>

38
LockItShared/MultilingualResources/Resources.Designer.cs generated
View file

@ -105,6 +105,42 @@ namespace TINK.MultilingualResources {
}
}
/// <summary>
/// Looks up a localized string similar to Can not connect to lock. Unexpected bluetooth state {0} detected..
/// </summary>
internal static string ErrorConnectLockBluetoothNotOnException {
get {
return ResourceManager.GetString("ErrorConnectLockBluetoothNotOnException", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Can not connect to lock. Bluetooth is off but has to be turned on..
/// </summary>
internal static string ErrorConnectLockBluetoothOffException {
get {
return ResourceManager.GetString("ErrorConnectLockBluetoothOffException", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Can not connect to lock. Location is off but has to be turned on..
/// </summary>
internal static string ErrorConnectLockLocationOffException {
get {
return ResourceManager.GetString("ErrorConnectLockLocationOffException", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Can not connect to lock. Location permission is required but not granted. .
/// </summary>
internal static string ErrorConnectLockLocationPermissingMissingException {
get {
return ResourceManager.GetString("ErrorConnectLockLocationPermissingMissingException", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Bold is blocked..
/// </summary>
@ -115,7 +151,7 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to Bolds was or is blocked..
/// Looks up a localized string similar to Bold was or is blocked..
/// </summary>
internal static string ErrorOpenLockBoldWasBlocked {
get {

15
LockItShared/MultilingualResources/Resources.de.resx
View file

@ -33,4 +33,19 @@
<data name="ErrorOpenLockBoldBlocked" xml:space="preserve">
<value>Schloss ist blockiert.</value>
</data>
<data name="ErrorOpenLockBoldWasBlocked" xml:space="preserve">
<value>Schloss war oder ist blockiert.</value>
</data>
<data name="ErrorConnectLockBluetoothNotOnException" xml:space="preserve">
<value>Kann keine Verbindung zum Schloss herstellen. Unerwarteter Bluetooth-Status {0} erkannt.</value>
</data>
<data name="ErrorConnectLockBluetoothOffException" xml:space="preserve">
<value>Kann keine Verbindung zum Schloss herstellen. Bluetooth ist aus und sollte aber angeschalten sein.</value>
</data>
<data name="ErrorConnectLockLocationOffException" xml:space="preserve">
<value>Kann keine Verbindung zum Schloss herstellen. Standortbestimmung ist deaktiviert, sollte aber aktiviert sein.</value>
</data>
<data name="ErrorConnectLockLocationPermissingMissingException" xml:space="preserve">
<value>Kann keine Verbindung zum Schloss herstellen. Standort-Zugriffserlaubnis muss erteilt sein wurde aber nicht erteilt. </value>
</data>
</root>

14
LockItShared/MultilingualResources/Resources.resx
View file

@ -132,11 +132,23 @@
<data name="ErrorCloseLockUnknownPosition" xml:space="preserve">
<value>Lock reports unknown bold position.</value>
</data>
<data name="ErrorConnectLockBluetoothNotOnException" xml:space="preserve">
<value>Can not connect to lock. Unexpected bluetooth state {0} detected.</value>
</data>
<data name="ErrorConnectLockBluetoothOffException" xml:space="preserve">
<value>Can not connect to lock. Bluetooth is off but has to be turned on.</value>
</data>
<data name="ErrorConnectLockLocationOffException" xml:space="preserve">
<value>Can not connect to lock. Location is off but has to be turned on.</value>
</data>
<data name="ErrorConnectLockLocationPermissingMissingException" xml:space="preserve">
<value>Can not connect to lock. Location permission is required but not granted. </value>
</data>
<data name="ErrorOpenLockBoldBlocked" xml:space="preserve">
<value>Bold is blocked.</value>
</data>
<data name="ErrorOpenLockBoldWasBlocked" xml:space="preserve">
<value>Bolds was or is blocked.</value>
<value>Bold was or is blocked.</value>
</data>
<data name="ErrorOpenLockUnexpectedState" xml:space="preserve">
<value>Unexpected locking state "{0}" detected after sending open command.</value>

9
LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
View file

@ -2,9 +2,16 @@
namespace TINK.Services.BluetoothLock.Exception
{
/// <summary>
/// If fired if app is disconnected from bluetooth.
/// </summary>
/// <remarks>
/// Member to determine if app is disconnected: IDevice.State from server Plugin.BLE. If DeviceState.Disconnected exception is fired.
/// All possible states: Disconnected, Connecting, Connected, Limited.
/// </remarks>
public class BluetoothDisconnectedException : StateAwareException
{
public BluetoothDisconnectedException() : base(LockingState.Disconnected, MultilingualResources.Resources.ErrorBluetoothDisconnectedException)
public BluetoothDisconnectedException() : base(LockingState.UnknownDisconnected, MultilingualResources.Resources.ErrorBluetoothDisconnectedException)
{
}
}

17
LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs Normal file
View file

@ -0,0 +1,17 @@

using TINK.MultilingualResources;
namespace TINK.Services.BluetoothLock.Exception
{
/// <summary> Exception which is fired when bluetooth is not on. </summary>
/// <remarks>
/// Member to determine if app is disconnected: IBluetoothLE.State from server Plugin.BLE. If current value is not BluetoothState.On exception is fired.
/// All possible states: Unknown, Unavailable, Unauthorized, TurningOn, On, TurningOff, Off.
/// </remarks>
public class ConnectBluetoothNotOnException : System.Exception
{
public ConnectBluetoothNotOnException() : base(Resources.ErrorConnectLockBluetoothOffException) { }
public ConnectBluetoothNotOnException(object state) : base(string.Format(Resources.ErrorConnectLockBluetoothNotOnException, state.ToString())) { }
}
}

9
LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs Normal file
View file

@ -0,0 +1,9 @@
using TINK.MultilingualResources;
namespace TINK.Services.BluetoothLock.Exception
{
public class ConnectLocationOffException : System.Exception
{
public ConnectLocationOffException() : base(Resources.ErrorConnectLockLocationOffException) { }
}
}

9
LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs Normal file
View file

@ -0,0 +1,9 @@
using TINK.MultilingualResources;
namespace TINK.Services.BluetoothLock.Exception
{
public class ConnectLocationPermissionMissingException : System.Exception
{
public ConnectLocationPermissionMissingException() : base(Resources.ErrorConnectLockLocationPermissingMissingException) { }
}
}

2
LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
View file

@ -5,7 +5,7 @@ namespace TINK.Services.BluetoothLock.Exception
public class CouldntCloseBoldBlockedException : StateAwareException
{
public CouldntCloseBoldBlockedException() : base(
LockingState.Unknown, // Lock is closed in most cases, but this is not guarnteed according to haveltec.
LockingState.UnknownFromHardwareError, // Lock is closed in most cases, but this is not guaranteed according to haveltec.
MultilingualResources.Resources.ErrorCloseLockBoldBlocked)
{
}

2
LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
View file

@ -9,7 +9,7 @@ namespace TINK.Services.BluetoothLock.Exception
public CouldntCloseInconsistentStateExecption(LockingState state) :
base(
state,
state != LockingState.Unknown
state != LockingState.UnknownFromHardwareError
? string.Format(Resources.ErrorCloseLockUnexpectedState, state)
: Resources.ErrorCloseLockUnknownPosition)
{

2
LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
View file

@ -8,7 +8,7 @@ namespace TINK.Services.BluetoothLock.Exception
public class CouldntOpenBoldIsBlockedException : StateAwareException
{
public CouldntOpenBoldIsBlockedException() : base(
LockingState.Unknown,
LockingState.UnknownFromHardwareError,
MultilingualResources.Resources.ErrorOpenLockBoldBlocked)
{
}

2
LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs
View file

@ -8,7 +8,7 @@ namespace TINK.Services.BluetoothLock.Exception
public class CouldntOpenBoldWasBlockedException : StateAwareException
{
public CouldntOpenBoldWasBlockedException() : base(
LockingState.Unknown,
LockingState.UnknownFromHardwareError,
MultilingualResources.Resources.ErrorOpenLockBoldWasBlocked)
{
}

4
LockItShared/Services/BluetoothLock/LockInfoHelper.cs
View file

@ -27,7 +27,7 @@ namespace TINK.Model.Bike.BluetoothLock
continue;
}
var state = lockInfoTdo.State.HasValue ? lockInfoTdo.State.Value.GetLockingState() : LockingState.Disconnected;
var state = lockInfoTdo.State.HasValue ? lockInfoTdo.State.Value.GetLockingState() : LockingState.UnknownDisconnected;
locksInfoUpdated.Add(state != lockInfo.State || lockInfoTdo.Guid != lockInfo.Guid
? new LockInfo.Builder(lockInfo) { Guid = lockInfoTdo.Guid, State = state}.Build() // State has changed, update required.
@ -43,7 +43,7 @@ namespace TINK.Model.Bike.BluetoothLock
{
case LockitLockingState.Unknown:
case LockitLockingState.CouldntOpenBoldBlocked: // Lock is closed in most cases, but this is not guarnteed according to haveltec.
return LockingState.Unknown;
return LockingState.UnknownFromHardwareError;
case LockitLockingState.Open:
case LockitLockingState.CouldntCloseMoving:

1
LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
View file

@ -2,6 +2,7 @@
namespace TINK.Services.BluetoothLock.Tdo
{
/// <summary> Genuine ILOCKIT state.</summary>
public enum LockitLockingState
{
Open = 0x00,

37
Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
View file

@ -30,7 +30,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;USEFLYOUT</DefineConstants>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>0</WarningLevel>
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
@ -44,12 +44,15 @@
<BundleAssemblies>false</BundleAssemblies>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<AndroidPackageFormat>aab</AndroidPackageFormat>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;USEFLYOUT</DefineConstants>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
@ -652,6 +655,36 @@
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\konrad_nobg.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\konrad_nobg.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\konrad_nobg.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\konrad_nobg.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\konrad_nobg.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\konrad_nobg.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<Import Project="..\TINK\Meinkonrad.projitems" Label="Shared" Condition="Exists('..\TINK\Meinkonrad.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ProjectExtensions>

6
Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
View file

@ -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.277" android:versionCode="277">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.290" android:versionCode="290">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->
@ -21,11 +21,11 @@
<queries>
<intent>
<action android:name="android.intent.action.VIEW" />
<data android:scheme="http"/>
<data android:scheme="http" />
</intent>
<intent>
<action android:name="android.intent.action.VIEW" />
<data android:scheme="https"/>
<data android:scheme="https" />
</intent>
<intent>
<action android:name="android.intent.action.SENDTO" />

2
Meinkonrad/TINK.Android/Properties/AssemblyInfo.cs
View file

@ -34,7 +34,7 @@ using Xamarin.Forms;
[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
#if Debug
#if DEBUG
[assembly: Application(Debuggable =true)]
#else
[assembly: Application(Debuggable = false)]

137
Meinkonrad/TINK.Android/Resources/Resource.Designer.cs generated
View file

@ -14,7 +14,7 @@ namespace TINK.Droid
{
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.1.0.11")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
public partial class Resource
{
@ -23924,202 +23924,205 @@ namespace TINK.Droid
public const int ic_vol_unmute = 2131165493;
// aapt resource value: 0x7F070136
public const int material_cursor_drawable = 2131165494;
public const int konrad_nobg = 2131165494;
// aapt resource value: 0x7F070137
public const int material_ic_calendar_black_24dp = 2131165495;
public const int material_cursor_drawable = 2131165495;
// aapt resource value: 0x7F070138
public const int material_ic_clear_black_24dp = 2131165496;
public const int material_ic_calendar_black_24dp = 2131165496;
// aapt resource value: 0x7F070139
public const int material_ic_edit_black_24dp = 2131165497;
public const int material_ic_clear_black_24dp = 2131165497;
// aapt resource value: 0x7F07013A
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165498;
public const int material_ic_edit_black_24dp = 2131165498;
// aapt resource value: 0x7F07013B
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165499;
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165499;
// aapt resource value: 0x7F07013C
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165500;
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165500;
// aapt resource value: 0x7F07013D
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165501;
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165501;
// aapt resource value: 0x7F07013E
public const int material_ic_menu_arrow_down_black_24dp = 2131165502;
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165502;
// aapt resource value: 0x7F07013F
public const int material_ic_menu_arrow_up_black_24dp = 2131165503;
public const int material_ic_menu_arrow_down_black_24dp = 2131165503;
// aapt resource value: 0x7F070140
public const int mr_button_connected_dark = 2131165504;
public const int material_ic_menu_arrow_up_black_24dp = 2131165504;
// aapt resource value: 0x7F070141
public const int mr_button_connected_light = 2131165505;
public const int mr_button_connected_dark = 2131165505;
// aapt resource value: 0x7F070142
public const int mr_button_connecting_dark = 2131165506;
public const int mr_button_connected_light = 2131165506;
// aapt resource value: 0x7F070143
public const int mr_button_connecting_light = 2131165507;
public const int mr_button_connecting_dark = 2131165507;
// aapt resource value: 0x7F070144
public const int mr_button_dark = 2131165508;
public const int mr_button_connecting_light = 2131165508;
// aapt resource value: 0x7F070145
public const int mr_button_dark_static = 2131165509;
public const int mr_button_dark = 2131165509;
// aapt resource value: 0x7F070146
public const int mr_button_light = 2131165510;
public const int mr_button_dark_static = 2131165510;
// aapt resource value: 0x7F070147
public const int mr_button_light_static = 2131165511;
public const int mr_button_light = 2131165511;
// aapt resource value: 0x7F070148
public const int mr_cast_checkbox = 2131165512;
public const int mr_button_light_static = 2131165512;
// aapt resource value: 0x7F070149
public const int mr_cast_group_seekbar_track = 2131165513;
public const int mr_cast_checkbox = 2131165513;
// aapt resource value: 0x7F07014A
public const int mr_cast_mute_button = 2131165514;
public const int mr_cast_group_seekbar_track = 2131165514;
// aapt resource value: 0x7F07014B
public const int mr_cast_route_seekbar_track = 2131165515;
public const int mr_cast_mute_button = 2131165515;
// aapt resource value: 0x7F07014C
public const int mr_cast_stop = 2131165516;
public const int mr_cast_route_seekbar_track = 2131165516;
// aapt resource value: 0x7F07014D
public const int mr_cast_thumb = 2131165517;
public const int mr_cast_stop = 2131165517;
// aapt resource value: 0x7F07014E
public const int mr_dialog_close_dark = 2131165518;
public const int mr_cast_thumb = 2131165518;
// aapt resource value: 0x7F07014F
public const int mr_dialog_close_light = 2131165519;
public const int mr_dialog_close_dark = 2131165519;
// aapt resource value: 0x7F070150
public const int mr_dialog_material_background_dark = 2131165520;
public const int mr_dialog_close_light = 2131165520;
// aapt resource value: 0x7F070151
public const int mr_dialog_material_background_light = 2131165521;
public const int mr_dialog_material_background_dark = 2131165521;
// aapt resource value: 0x7F070152
public const int mr_group_collapse = 2131165522;
public const int mr_dialog_material_background_light = 2131165522;
// aapt resource value: 0x7F070153
public const int mr_group_expand = 2131165523;
public const int mr_group_collapse = 2131165523;
// aapt resource value: 0x7F070154
public const int mr_media_pause_dark = 2131165524;
public const int mr_group_expand = 2131165524;
// aapt resource value: 0x7F070155
public const int mr_media_pause_light = 2131165525;
public const int mr_media_pause_dark = 2131165525;
// aapt resource value: 0x7F070156
public const int mr_media_play_dark = 2131165526;
public const int mr_media_pause_light = 2131165526;
// aapt resource value: 0x7F070157
public const int mr_media_play_light = 2131165527;
public const int mr_media_play_dark = 2131165527;
// aapt resource value: 0x7F070158
public const int mr_media_stop_dark = 2131165528;
public const int mr_media_play_light = 2131165528;
// aapt resource value: 0x7F070159
public const int mr_media_stop_light = 2131165529;
public const int mr_media_stop_dark = 2131165529;
// aapt resource value: 0x7F07015A
public const int mr_vol_type_audiotrack_dark = 2131165530;
public const int mr_media_stop_light = 2131165530;
// aapt resource value: 0x7F07015B
public const int mr_vol_type_audiotrack_light = 2131165531;
public const int mr_vol_type_audiotrack_dark = 2131165531;
// aapt resource value: 0x7F07015C
public const int mtrl_dialog_background = 2131165532;
public const int mr_vol_type_audiotrack_light = 2131165532;
// aapt resource value: 0x7F07015D
public const int mtrl_dropdown_arrow = 2131165533;
public const int mtrl_dialog_background = 2131165533;
// aapt resource value: 0x7F07015E
public const int mtrl_ic_arrow_drop_down = 2131165534;
public const int mtrl_dropdown_arrow = 2131165534;
// aapt resource value: 0x7F07015F
public const int mtrl_ic_arrow_drop_up = 2131165535;
public const int mtrl_ic_arrow_drop_down = 2131165535;
// aapt resource value: 0x7F070160
public const int mtrl_ic_cancel = 2131165536;
public const int mtrl_ic_arrow_drop_up = 2131165536;
// aapt resource value: 0x7F070161
public const int mtrl_ic_error = 2131165537;
public const int mtrl_ic_cancel = 2131165537;
// aapt resource value: 0x7F070162
public const int mtrl_navigation_bar_item_background = 2131165538;
public const int mtrl_ic_error = 2131165538;
// aapt resource value: 0x7F070163
public const int mtrl_popupmenu_background = 2131165539;
public const int mtrl_navigation_bar_item_background = 2131165539;
// aapt resource value: 0x7F070164
public const int mtrl_popupmenu_background_dark = 2131165540;
public const int mtrl_popupmenu_background = 2131165540;
// aapt resource value: 0x7F070165
public const int mtrl_tabs_default_indicator = 2131165541;
public const int mtrl_popupmenu_background_dark = 2131165541;
// aapt resource value: 0x7F070166
public const int navigation_empty_icon = 2131165542;
public const int mtrl_tabs_default_indicator = 2131165542;
// aapt resource value: 0x7F070167
public const int notification_action_background = 2131165543;
public const int navigation_empty_icon = 2131165543;
// aapt resource value: 0x7F070168
public const int notification_bg = 2131165544;
public const int notification_action_background = 2131165544;
// aapt resource value: 0x7F070169
public const int notification_bg_low = 2131165545;
public const int notification_bg = 2131165545;
// aapt resource value: 0x7F07016A
public const int notification_bg_low_normal = 2131165546;
public const int notification_bg_low = 2131165546;
// aapt resource value: 0x7F07016B
public const int notification_bg_low_pressed = 2131165547;
public const int notification_bg_low_normal = 2131165547;
// aapt resource value: 0x7F07016C
public const int notification_bg_normal = 2131165548;
public const int notification_bg_low_pressed = 2131165548;
// aapt resource value: 0x7F07016D
public const int notification_bg_normal_pressed = 2131165549;
public const int notification_bg_normal = 2131165549;
// aapt resource value: 0x7F07016E
public const int notification_icon_background = 2131165550;
public const int notification_bg_normal_pressed = 2131165550;
// aapt resource value: 0x7F07016F
public const int notification_template_icon_bg = 2131165551;
public const int notification_icon_background = 2131165551;
// aapt resource value: 0x7F070170
public const int notification_template_icon_low_bg = 2131165552;
public const int notification_template_icon_bg = 2131165552;
// aapt resource value: 0x7F070171
public const int notification_tile_bg = 2131165553;
public const int notification_template_icon_low_bg = 2131165553;
// aapt resource value: 0x7F070172
public const int notify_panel_notification_icon_bg = 2131165554;
public const int notification_tile_bg = 2131165554;
// aapt resource value: 0x7F070173
public const int preference_list_divider_material = 2131165555;
public const int notify_panel_notification_icon_bg = 2131165555;
// aapt resource value: 0x7F070174
public const int sharee = 2131165556;
public const int preference_list_divider_material = 2131165556;
// aapt resource value: 0x7F070175
public const int test_custom_background = 2131165557;
public const int sharee = 2131165557;
// aapt resource value: 0x7F070176
public const int tooltip_frame_dark = 2131165558;
public const int test_custom_background = 2131165558;
// aapt resource value: 0x7F070177
public const int tooltip_frame_light = 2131165559;
public const int tooltip_frame_dark = 2131165559;
// aapt resource value: 0x7F070178
public const int tooltip_frame_light = 2131165560;
static Drawable()
{

BIN
Meinkonrad/TINK.Android/Resources/drawable-hdpi/konrad_nobg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Meinkonrad/TINK.Android/Resources/drawable-mdpi/konrad_nobg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 897 B

BIN
Meinkonrad/TINK.Android/Resources/drawable-xhdpi/konrad_nobg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
Meinkonrad/TINK.Android/Resources/drawable-xxhdpi/konrad_nobg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
Meinkonrad/TINK.Android/Resources/drawable-xxxhdpi/konrad_nobg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
Meinkonrad/TINK.Android/Resources/drawable/konrad_nobg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

14
Meinkonrad/TINK.iOS/Info.plist
View file

@ -37,24 +37,24 @@
<key>XSAppIconAssets</key>
<string>Media.xcassets/AppIcons.appiconset</string>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>Is required to communicate with Bluetooth lock.</string>
<string>Bluetooth access is needed to open and close the locks of the bikes.</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>Is required to communicate with Bluetooth lock.</string>
<string>Bluetooth access is needed to open and close the locks of the bikes.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Is required to show map at current position and pass position to server when returning bike.</string>
<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Is required to show map at current position and pass position to server when returning bike.</string>
<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
<key>MinimumOSVersion</key>
<string>9.0</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Is required to show map at current position and pass position to server when returning bike.</string>
<string>Location access is needed to show map at current position and pass position to server when returning bikes.</string>
<key>CFBundleIdentifier</key>
<string>com.TeilRad.Meinkonrad</string>
<key>CFBundleDisplayName</key>
<string>Mein konrad</string>
<key>CFBundleVersion</key>
<string>277</string>
<string>290</string>
<key>CFBundleShortVersionString</key>
<string>3.0.277</string>
<string>3.0.290</string>
</dict>
</plist>

528
Meinkonrad/TINK.iOS/Media.xcassets/konrad_nobg.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,528 @@
{
"images": [
{
"filename": "konrad_Logo_4c.pdf",
"idiom": "universal"
},
{
"scale": "1x",
"idiom": "universal"
},
{
"scale": "2x",
"idiom": "universal"
},
{
"scale": "3x",
"idiom": "universal"
},
{
"idiom": "iphone"
},
{
"scale": "1x",
"idiom": "iphone"
},
{
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"scale": "2x",
"idiom": "iphone"
},
{
"scale": "3x",
"idiom": "iphone"
},
{
"idiom": "ipad"
},
{
"scale": "1x",
"idiom": "ipad"
},
{
"scale": "2x",
"idiom": "ipad"
},
{
"idiom": "watch"
},
{
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"scale": "2x",
"idiom": "watch"
},
{
"idiom": "mac"
},
{
"scale": "1x",
"idiom": "mac"
},
{
"scale": "2x",
"idiom": "mac"
},
{
"idiom": "car"
},
{
"scale": "2x",
"idiom": "car"
},
{
"scale": "3x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "car"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}

BIN
Meinkonrad/TINK.iOS/Media.xcassets/konrad_nobg.imageset/konrad_Logo_4c.pdf vendored Normal file
View file

Binary file not shown.

BIN
Meinkonrad/TINK.iOS/Media.xcassets/sharee_no_background.imageset/App-Icon-MeinKonrad_abgerundet.pdf vendored Normal file
View file

Binary file not shown.

528
Meinkonrad/TINK.iOS/Media.xcassets/sharee_no_background.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,528 @@
{
"images": [
{
"filename": "App-Icon-MeinKonrad_abgerundet.pdf",
"idiom": "universal"
},
{
"scale": "1x",
"idiom": "universal"
},
{
"scale": "2x",
"idiom": "universal"
},
{
"scale": "3x",
"idiom": "universal"
},
{
"idiom": "iphone"
},
{
"scale": "1x",
"idiom": "iphone"
},
{
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"scale": "2x",
"idiom": "iphone"
},
{
"scale": "3x",
"idiom": "iphone"
},
{
"idiom": "ipad"
},
{
"scale": "1x",
"idiom": "ipad"
},
{
"scale": "2x",
"idiom": "ipad"
},
{
"idiom": "watch"
},
{
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"scale": "2x",
"idiom": "watch"
},
{
"idiom": "mac"
},
{
"scale": "1x",
"idiom": "mac"
},
{
"scale": "2x",
"idiom": "mac"
},
{
"idiom": "car"
},
{
"scale": "2x",
"idiom": "car"
},
{
"scale": "3x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "1x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "2x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "dark"
}
],
"scale": "3x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "universal"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"subtype": "retina4",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "iphone"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "ipad"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{130,145}",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"screenWidth": "{146,165}",
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "watch"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "1x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "mac"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "2x",
"idiom": "car"
},
{
"appearances": [
{
"appearance": "luminosity",
"value": "light"
}
],
"scale": "3x",
"idiom": "car"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}

26
Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
View file

@ -20,7 +20,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG;USEFLYOUT</DefineConstants>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
@ -34,7 +34,7 @@
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;USEFLYOUT</DefineConstants>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchLink>None</MtouchLink>
@ -48,7 +48,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\iPhone\Debug</OutputPath>
<DefineConstants>DEBUG;USEFLYOUT</DefineConstants>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
@ -64,7 +64,7 @@
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\iPhone\Release</OutputPath>
<DefineConstants>USEFLYOUT</DefineConstants>
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARMv7, ARM64</MtouchArch>
@ -82,7 +82,6 @@
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
<DefineConstants>USEFLYOUT</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
@ -99,7 +98,6 @@
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\iPhone\AppStore</OutputPath>
<DefineConstants>USEFLYOUT</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
@ -244,6 +242,8 @@
<BundleResource Include="Resources\menu.png" />
<BundleResource Include="Resources\menu%402x.png" />
<BundleResource Include="Resources\menu%403x.png" />
<BundleResource Include="Resources\de.lproj\InfoPlist.strings" />
<BundleResource Include="Resources\en.lproj\InfoPlist.strings" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
@ -1474,6 +1474,18 @@
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\App-Icon-MeinKonrad_1024.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\sharee_no_background.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\sharee_no_background.imageset\App-Icon-MeinKonrad_abgerundet.pdf">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\konrad_nobg.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\konrad_nobg.imageset\konrad_Logo_4c.pdf">
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<Folder Include="Media.xcassets\01_Blue.imageset\" />
@ -1600,6 +1612,8 @@
<Folder Include="Media.xcassets\Open_Green.imageset\" />
<Folder Include="Media.xcassets\Open_LightBlue.imageset\" />
<Folder Include="Media.xcassets\Open_Red.imageset\" />
<Folder Include="Media.xcassets\sharee_no_background.imageset\" />
<Folder Include="Media.xcassets\konrad_nobg.imageset\" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />

16
Meinkonrad/TINK.iOS/Resources/de.lproj/InfoPlist.strings Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>Bluetooth Zugriff wird benötigt, um die Schlösser der Fahrräder zu öffnen und zu schließen.</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>Bluetooth Zugriff wird benötigt, um die Schlösser der Fahrräder zu öffnen und zu schließen.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Der Zugriff auf den Standort wird benötigt, um die Karte an der aktuellen Position anzuzeigen und die Position bei der Rückgabe der Fahrräder an den Server weiterzugeben.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Der Zugriff auf den Standort wird benötigt, um die Karte an der aktuellen Position anzuzeigen und die Position bei der Rückgabe der Fahrräder an den Server weiterzugeben.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Der Zugriff auf den Standort wird benötigt, um die Karte an der aktuellen Position anzuzeigen und die Position bei der Rückgabe der Fahrräder an den Server weiterzugeben.″ </string>
</dict>
</plist>

6
Meinkonrad/TINK.iOS/Resources/en.lproj/InfoPlist.strings Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
</dict>
</plist>

45
Meinkonrad/TINK/App.xaml.cs
View file

@ -16,7 +16,7 @@ using Plugin.Connectivity;
using System.Threading;
using TINK.Model.Settings;
using TINK.Services.BluetoothLock.Crypto;
using TINK.Model.Services.Geolocation;
using TINK.Services.Geolocation;
using TINK.Services;
using System.Threading.Tasks;
using TINK.Services.Permissions;
@ -125,11 +125,12 @@ namespace TINK
IStore store = null;
var lastVersion = JsonSettingsDictionary.GetAppVersion(settingsJSON);
if (lastVersion > new Version(3, 0, 250))
if (new Version(3, 0, 290) <= lastVersion)
{
// App versions newer than 3.0.173 stored geolocation service in configuration.
// Force a switch to typeof(GeolocationService) for versions < 3.0.251
GeolocationServicesContainer.SetActive(settings.ActiveGeolocationService);
// Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
// For this a swich of geolocation service is fored when loading configurations of older app versions.
LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
}
store = new Store();
@ -147,23 +148,25 @@ namespace TINK
m_oModelRoot = new TinkApp(
settings,
store, // Manages user account
(isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(isConnected, activeUri, new Repository.AppContextInfo(MERCHANTID, "Meinkonrad", appInfoService.Version), sessionCookie, mail, expiresAfter),
MERCHANTID,
GeolocationServicesContainer,
null, /* locksService */
DependencyService.Get<ISmartDevice>(),
specialFolders,
new Cipher(),
null, // Permissions, no more used.
isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(isConnected, activeUri, new Repository.AppContextInfo(MERCHANTID, "Meinkonrad", appInfoService.Version), sessionCookie, mail, expiresAfter),
merchantId: MERCHANTID,
bluetoothService: BluetoothService, /* locksService */
locationPermissionsService: PermissionsService,
locationServicesContainer: LocationServicesContainer,
locksService: null,
device: DependencyService.Get<ISmartDevice>(),
specialFolder: specialFolders,
cipher: new Cipher(),
arendiCentral:
#if ARENDI
DependencyService.Get<ICentral>(),
#else
null,
#endif
isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
postAction: (d, obj) => context.Post(d, obj),
currentVersion: appInfoService.Version,
lastVersion: JsonSettingsDictionary.GetAppVersion(settingsJSON),
lastVersion: lastVersion,
whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion());
Log.Debug("Main model successfully constructed.");
@ -310,25 +313,25 @@ namespace TINK
if (_PermissionsService != null)
return _PermissionsService;
_PermissionsService = new Services.Permissions.Essentials.Permissions();
_PermissionsService = new TINK.Services.Permissions.Essentials.Permissions();
return _PermissionsService;
}
}
/// <summary>
/// Service to manage bluetooth stack.
/// </summary>
/// <summary> Service to manage bluetooth stack.</summary>
public static Plugin.BLE.Abstractions.Contracts.IBluetoothLE BluetoothService => Plugin.BLE.CrossBluetoothLE.Current;
/// <summary>
/// Service container to manage geolocation services.
/// </summary>
public static IServicesContainer<IGeolocation> GeolocationServicesContainer { get; }
public static IServicesContainer<IGeolocation> LocationServicesContainer { get; }
= new ServicesContainerMutable<IGeolocation>(
new HashSet<IGeolocation> {
new LastKnownGeolocationService(DependencyService.Get<IGeolodationDependent>()),
new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
new GeolocationService(DependencyService.Get<IGeolodationDependent>()) },
new SimulatedGeolocationService(DependencyService.Get<IGeolodationDependent>()),
new GeolocationAccuracyMediumService(DependencyService.Get<IGeolodationDependent>()),
new GeolocationAccuracyHighService(DependencyService.Get<IGeolodationDependent>()),
new GeolocationAccuracyBestService(DependencyService.Get<IGeolodationDependent>())},
Model.Settings.Settings.DefaultLocationService.FullName);
}
}

9
Meinkonrad/TINK/Meinkonrad.projitems
View file

@ -56,6 +56,10 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)View\MiniSurvey\Question\QuestionViewCellTemplateSelector.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\RootShell\FlyoutFooter.xaml.cs">
<DependentUpon>FlyoutFooter.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)View\RootShell\FlyoutHeader.xaml.cs">
<DependentUpon>FlyoutHeader.xaml</DependentUpon>
<SubType>Code</SubType>
@ -332,4 +336,9 @@
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\RootShell\FlyoutFooter.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup>
</Project>

15
Meinkonrad/TINK/View/Account/AccountPage.xaml
View file

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
x:Class="TINK.View.Account.AccountPage">
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
mc:Ignorable="d"
x:Class="TINK.View.Account.AccountPage">
<ContentPage.Content>
<Frame>
<StackLayout>
@ -13,10 +14,10 @@
<Label Text="{Binding LoggedInInfo}" />
<Label IsVisible="{Binding IsBookingStateInfoVisible}"
Text="{Binding BookingStateInfo}" />
<Button Text="Persönliche Daten Verwalten"
<Button Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}"
Command="{Binding OnManageAccount}"
IsEnabled="{Binding IsLogoutPossible}"/>
<Button Text="Abmelden"
<Button Text="{x:Static resources:AppResources.MessageAccountPageManageLogin}"
Command="{Binding OnLogoutRequest}"
IsEnabled="{Binding IsLogoutPossible}"/>
</StackLayout>

2
Meinkonrad/TINK/View/Account/AccountPage.xaml.cs
View file

@ -72,7 +72,7 @@ namespace TINK.View.Account
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays an action sheet.

7
Meinkonrad/TINK/View/Bike/ILockItBike.xaml
View file

@ -56,10 +56,15 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label
Text=
"{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionTariffHeader}"
FontAttributes="Bold"/>
<Label
Text=
"{Binding TariffDescription.Header}"
Grid.ColumnSpan="3"
Grid.Column="1"
Grid.ColumnSpan="2"
FontAttributes="Bold"/>
<Label
Text="{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionFreeTimePerSession}"

4
Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
View file

@ -90,7 +90,7 @@ using TINK.View.MasterDetail;
model.SelectedStation,
() => model.GetIsConnected(),
(isConnected) => model.GetConnector(isConnected),
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
model.LocksServices.Active,
model.Polling,
(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url),
@ -177,7 +177,7 @@ using TINK.View.MasterDetail;
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
#if USEFLYOUT

56
Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
View file

@ -1,10 +1,12 @@
using System;
using Serilog;
using System;
using System.Threading.Tasks;
using TINK.Model.Device;
#if USEFLYOUT
using TINK.View.MasterDetail;
#endif
using TINK.ViewModel.Info;
using Xamarin.Essentials;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -18,16 +20,36 @@ namespace TINK.View.Contact
#endif
{
public ContactPage ()
{
InitializeComponent ();
/// <summary> View model to notify view model if page appears. </summary>
private ContactPageViewModel ViewModel { get; set; }
ContactPageView.BindingContext = new ContactPageViewModel(
App.ModelRoot.SelectedStation,
App.ModelRoot.Uris.ActiveUri,
public ContactPage()
{
InitializeComponent();
ViewModel = new ContactPageViewModel(App.ModelRoot.Uris.ActiveUri,
AppInfo.Name,
() => App.CreateAttachment(),
() => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
this);
() => DependencyService.Get<IExternalBrowserService>().OpenUrl(DependencyService.Get<IAppInfo>().StoreUrl),
this);
ContactPageView.BindingContext = ViewModel;
}
/// <summary> Invoked when page is shown. </summary>
protected async override void OnAppearing()
{
try
{
Log.ForContext<ContentPage>().Verbose("OnAppearing...");
await ViewModel.OnAppearing(App.ModelRoot.SelectedStation);
}
catch (Exception exception)
{
Log.ForContext<ContentPage>().Error("Invoking OnAppearing on view model failed. {Exception}", exception);
return;
}
}
/// <summary> Displays alert message.</summary>
@ -50,7 +72,7 @@ namespace TINK.View.Contact
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
#if USEFLYOUT
public void ShowPage(ViewTypes p_oType, string title = null)
@ -79,17 +101,19 @@ namespace TINK.View.Contact
public async Task PushAsync(ViewTypes typeOfPage)
{
#if USEFLYOUT
if (!(Activator.CreateInstance(typeOfPage.GetViewType()) is IDetailPage detailPage))
var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
#else
var page = Activator.CreateInstance(typeOfPage.GetViewType());
#endif
if (page == null)
{
await Task.CompletedTask;
return;
}
// Set reference to navigation object to be able to show page on newly shown detailPage.
detailPage.NavigationMasterDetail = NavigationMasterDetail;
await Navigation.PushAsync((Page)detailPage);
#if USEFLYOUT
page.NavigationMasterDetail = NavigationMasterDetail;
#endif
await Navigation.PushAsync((Page)page);
}
#if USCSHARP9

4
Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
View file

@ -55,7 +55,7 @@ namespace TINK.View.Contact
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.
@ -140,7 +140,7 @@ namespace TINK.View.Contact
App.ModelRoot,
App.PermissionsService,
App.BluetoothService,
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
(mapspan) => MyMap.MoveToRegion(mapspan),
this,
Navigation);

8
Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml
View file

@ -7,12 +7,16 @@
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackLayout>
<WebView x:Name="ManageAccount"
HeightRequest="1400"
WidthRequest="1000"
Source="{Binding Uri}" />
</StackLayout>
<ActivityIndicator
x:Name="ActivityIndicatorLoading"
HeightRequest="100"
VerticalOptions="CenterAndExpand"
HorizontalOptions="CenterAndExpand"/>
</Grid>
</ContentPage.Content>
</ContentPage>

19
Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
View file

@ -1,4 +1,5 @@
using TINK.Model.Device;
using Serilog;
using TINK.Model.Device;
using TINK.ViewModel.Login;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -17,6 +18,9 @@ namespace TINK.View.CopriWebView
if (!ev.Url.ToUpper().EndsWith(".PDF"))
{
// Stay inside web view except for downloading pdf- files.
this.IsEnabled = false;
ActivityIndicatorLoading.IsVisible = true;
ActivityIndicatorLoading.IsRunning = true;
return;
}
@ -25,12 +29,23 @@ namespace TINK.View.CopriWebView
ManageAccount.Navigated += (sender, ev) =>
{
if (ev.Result == WebNavigationResult.Success) return;
if (ev.Result == WebNavigationResult.Success)
{
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
return;
}
Log.ForContext<ManageAccountPage>().Error("Navigation did not succeed.{@Event}{@Sender}", ev, sender);
ManageAccount.Source = new HtmlWebViewSource
{
Html = "<html><b>Kann persönliche Daten nicht anzeigen/ verwalten!</b><br>Verbindung mit Internet ok?</html>"
};
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
};
ManageAccount.BindingContext = new ManageAccountViewModel(

9
Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml
View file

@ -7,12 +7,15 @@
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackLayout>
<WebView x:Name="PasswordForgottenWebView"
<WebView x:Name="PasswordForgottenWebView"
HeightRequest="1400"
WidthRequest="1000"
Source="{Binding Uri}" />
</StackLayout>
<ActivityIndicator
x:Name="ActivityIndicatorLoading"
HeightRequest="100"
VerticalOptions="CenterAndExpand"
HorizontalOptions="CenterAndExpand"/>
</Grid>
</ContentPage.Content>
</ContentPage>

31
Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
View file

@ -1,4 +1,5 @@

using Serilog;
using TINK.ViewModel.CopriWebView;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -6,20 +7,38 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.CopriWebView
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class PasswordForgottenPage : ContentPage
{
public PasswordForgottenPage ()
{
InitializeComponent ();
public partial class PasswordForgottenPage : ContentPage
{
public PasswordForgottenPage()
{
InitializeComponent();
PasswordForgottenWebView.Navigating += (sender, ev) =>
{
this.IsEnabled = false;
ActivityIndicatorLoading.IsVisible = true;
ActivityIndicatorLoading.IsRunning = true;
};
PasswordForgottenWebView.Navigated += (sender, ev) =>
{
if (ev.Result == WebNavigationResult.Success) return;
if (ev.Result == WebNavigationResult.Success)
{
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
return;
}
Log.ForContext<PasswordForgottenPage>().Error("Navigation did not succeed. {@Event}", ev);
PasswordForgottenWebView.Source = new HtmlWebViewSource
{
Html = "<html><b>Kann Passwort vergessen Seite nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>"
};
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
};
PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(

15
Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml
View file

@ -7,12 +7,15 @@
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackLayout>
<WebView x:Name="RegisterView"
HeightRequest="1400"
WidthRequest="1000"
Source="{Binding Uri}" />
</StackLayout>
<WebView x:Name="RegisterView"
HeightRequest="1400"
WidthRequest="1000"
Source="{Binding Uri}" />
<ActivityIndicator
x:Name="ActivityIndicatorLoading"
HeightRequest="100"
VerticalOptions="CenterAndExpand"
HorizontalOptions="CenterAndExpand"/>
</Grid>
</ContentPage.Content>
</ContentPage>

29
Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs
View file

@ -1,4 +1,5 @@

using Serilog;
using TINK.Model.Device;
using TINK.ViewModel.CopriWebView;
using Xamarin.Forms;
@ -7,22 +8,40 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.CopriWebView
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class RegisterPage : ContentPage
{
public RegisterPage()
{
public partial class RegisterPage : ContentPage
{
public RegisterPage()
{
DependencyService.Get<IWebView>().ClearCookies();
InitializeComponent();
RegisterView.Navigating += (sender, ev) =>
{
this.IsEnabled = false;
ActivityIndicatorLoading.IsVisible = true;
ActivityIndicatorLoading.IsRunning = true;
};
RegisterView.Navigated += (sender, ev) =>
{
if (ev.Result == WebNavigationResult.Success) return;
if (ev.Result == WebNavigationResult.Success)
{
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
return;
}
Log.ForContext<RegisterPage>().Error("Navigation did not succeed. {@Event}", ev);
RegisterView.Source = new HtmlWebViewSource
{
Html = "<html><b>Kann Anmeldeseite nicht anzeigen</b>!<br>Verbindung mit Internet ok?</html>"
};
this.IsEnabled = true;
ActivityIndicatorLoading.IsVisible = false;
ActivityIndicatorLoading.IsRunning = false;
};
RegisterView.BindingContext = new RegisterPageViewModel(

4
Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
View file

@ -46,7 +46,7 @@ namespace TINK.View.FindBike
Device.RuntimePlatform,
() => model.GetIsConnected(),
(isConnected) => model.GetConnector(isConnected),
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
model.LocksServices.Active,
model.Stations,
model.Polling,
@ -104,7 +104,7 @@ namespace TINK.View.FindBike
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.

2
Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
View file

@ -55,7 +55,7 @@ namespace TINK.View.Info.BikeInfo
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.

2
Meinkonrad/TINK/View/Login/LoginPage.xaml.cs
View file

@ -63,7 +63,7 @@ namespace TINK.View.Login
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
#if USEFLYOUT
/// <summary>

4
Meinkonrad/TINK/View/Map/MapPage.xaml.cs
View file

@ -61,7 +61,7 @@ namespace TINK.View.Map
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.
@ -234,7 +234,7 @@ namespace TINK.View.Map
App.ModelRoot,
App.PermissionsService,
App.BluetoothService,
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
(mapspan) => MyMap.MoveToRegion(mapspan),
this,
Navigation);

2
Meinkonrad/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
View file

@ -53,7 +53,7 @@ namespace TINK.View.MiniSurvey
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.

4
Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
View file

@ -63,7 +63,7 @@ namespace TINK.View.MyBikes
Device.RuntimePlatform,
() => model.GetIsConnected(),
(isConnected) => model.GetConnector(isConnected),
App.GeolocationServicesContainer.Active,
App.LocationServicesContainer.Active,
model.LocksServices.Active,
model.Stations,
model.Polling,
@ -135,7 +135,7 @@ namespace TINK.View.MyBikes
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary>
/// Displays alert message.

4
Meinkonrad/TINK/View/RootShell/AppShell.xaml
View file

@ -91,6 +91,7 @@
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
<ShellContent
Title="{x:Static resources:AppResources.MarkingFeedbackAndContact}"
Route="ContactPage"
ContentTemplate="{DataTemplate contact:ContactPage}">
<ShellContent.FlyoutIcon>
<FontImageSource Glyph="{StaticResource IconContact}" Color="Black" FontFamily="FA-S" />
@ -106,4 +107,7 @@
</ShellContent.FlyoutIcon>
</ShellContent>
</FlyoutItem>
<Shell.FlyoutFooter>
<header:FlyoutFooter/>
</Shell.FlyoutFooter>
</Shell>

21
Meinkonrad/TINK/View/RootShell/FlyoutFooter.xaml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="TINK.View.RootShell.FlyoutFooter">
<Grid Padding="5,10">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="30" />
</Grid.RowDefinitions>
<Image
HeightRequest="30"
Aspect="AspectFit"
Source="konrad_nobg.png" />
<Label
HorizontalOptions="CenterAndExpand"
FontSize="Medium"
Grid.Row="1"
TextType="Html"
Text="Powered by &lt;b&gt;Stadtwerke Konstanz&lt;/b&gt;"/>
</Grid>
</ContentView>

20
Meinkonrad/TINK/View/RootShell/FlyoutFooter.xaml.cs Normal file
View file

@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
namespace TINK.View.RootShell
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class FlyoutFooter : ContentView
{
public FlyoutFooter ()
{
InitializeComponent ();
}
}
}

13
Meinkonrad/TINK/View/RootShell/FlyoutHeader.xaml
View file

@ -6,16 +6,11 @@
<Grid Padding="5,10">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="30" />
</Grid.RowDefinitions>
<Image
HeightRequest="140"
Aspect="AspectFit"
Source="sharee_no_background.png" />
<Label
HorizontalOptions="CenterAndExpand"
FontSize="Large"
Grid.Row="1"
Text="{Binding MasterDetailMenuTitlte}"/>
HorizontalOptions="Center"
FontSize="Medium"
Grid.Row="0"
Text="Menu"/>
</Grid>
</ContentView>

4
Meinkonrad/TINK/View/Settings/SettingsPage.xaml.cs
View file

@ -30,7 +30,7 @@ namespace TINK.View.Settings
m_oViewModel = new SettingsPageViewModel(
l_oModel,
App.GeolocationServicesContainer,
App.LocationServicesContainer,
this);
BindingContext = m_oViewModel;
@ -65,7 +65,7 @@ namespace TINK.View.Settings
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary> Displays alert message.</summary>
/// <param name="p_strTitle">Title of message.</param>

2
Meinkonrad/TINK/View/WhatsNew/Agb/AgbPage.xaml.cs
View file

@ -43,7 +43,7 @@ namespace TINK.View.WhatsNew.Agb
/// <param name="cancel">Text of cancel button.</param>
/// <returns>True if user pressed accept.</returns>
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", accept, cancel);
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
/// <summary> Invoked when page is shown. </summary>
protected async override void OnAppearing()

Some files were not shown because too many files have changed in this diff Show more