Version 3.0.381

This commit is contained in:
Anja 2024-04-09 12:53:23 +02:00
parent f963c0a219
commit 3a363acf3a
1525 changed files with 60589 additions and 125098 deletions

View file

@ -3,19 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TINKLib", "..\TINKLib\TINKLib.csproj", "{B77F4222-0860-4494-A07C-EE8E09FA9983}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedBusinessLogic", "..\SharedBusinessLogic\SharedBusinessLogic.csproj", "{B77F4222-0860-4494-A07C-EE8E09FA9983}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestTINKLib", "..\TestTINKLib\TestTINKLib.csproj", "{730A31A5-6736-43CC-8F84-8FDA5093E283}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedBusinessLogic.Tests", "..\SharedBusinessLogic.Tests\SharedBusinessLogic.Tests.csproj", "{730A31A5-6736-43CC-8F84-8FDA5093E283}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockItShared", "..\LockItShared\LockItShared.csproj", "{3589ED1D-E734-429D-976F-1BEA4371DF14}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockIt.BusinessLogic", "..\LockIt.BusinessLogic\LockIt.BusinessLogic.csproj", "{3589ED1D-E734-429D-976F-1BEA4371DF14}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockItBLE", "..\LockItBLE\LockItBLE.csproj", "{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockIt.BLE", "..\LockIt.BLE\LockIt.BLE.csproj", "{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "LastenradBayern", "TINK\LastenradBayern.shproj", "{8D4F2CDD-32C6-4AA1-A9E1-7B27BDCEB3A5}"
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "LastenradBayern", "ShareeBike\LastenradBayern.shproj", "{8D4F2CDD-32C6-4AA1-A9E1-7B27BDCEB3A5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LastenradBayern.iOS", "TINK.iOS\LastenradBayern.iOS.csproj", "{3A0EF953-1501-4155-B0A0-265EB5FB2975}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LastenradBayern.Android", "ShareeBike\LastenradBayern.Android.shproj", "{0B1AD2F8-7ADA-4C20-B0BD-58F32A224A71}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFramework", "..\TestFramework\TestFramework.csproj", "{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LastenradBayern.iOS", "ShareeBike.iOS\LastenradBayern.iOS.csproj", "{3A0EF953-1501-4155-B0A0-265EB5FB2975}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedBusinessLogic.Tests.Framework", "..\SharedBusinessLogic.Tests.Framework\SharedBusinessLogic.Tests.Framework.csproj", "{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -325,9 +327,9 @@ Global
SolutionGuid = {C6529CD7-C3F7-4E80-89B5-002E2B8E3EB5}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
TINK\LastenradBayern.projitems*{3a0ef953-1501-4155-b0a0-265eb5fb2975}*SharedItemsImports = 4
..\ShareeSharedGuiLib\ShareeSharedGuiLib.projitems*{3a0ef953-1501-4155-b0a0-265eb5fb2975}*SharedItemsImports = 4
TINK\LastenradBayern.projitems*{8d4f2cdd-32c6-4aa1-a9e1-7b27bdceb3a5}*SharedItemsImports = 13
ShareeBike\LastenradBayern.projitems*{3a0ef953-1501-4155-b0a0-265eb5fb2975}*SharedItemsImports = 4
..\SharedGui\SharedGui.projitems*{3a0ef953-1501-4155-b0a0-265eb5fb2975}*SharedItemsImports = 4
ShareeBike\LastenradBayern.projitems*{8d4f2cdd-32c6-4aa1-a9e1-7b27bdceb3a5}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0

View file

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

@ -9,7 +9,7 @@
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TINK.Droid</RootNamespace>
<RootNamespace>ShareeBike.Droid</RootNamespace>
<AssemblyName>LastenradBayern.Android</AssemblyName>
<FileAlignment>512</FileAlignment>
<AndroidApplication>true</AndroidApplication>
@ -97,7 +97,7 @@
<Version>6.3.0.19</Version>
</PackageReference>
<PackageReference Include="Serilog">
<Version>3.0.1</Version>
<Version>3.1.1</Version>
</PackageReference>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
@ -176,16 +176,16 @@
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" />
<PackageReference Include="Xamarin.AndroidX.Core">
<Version>1.12.0.2</Version>
<Version>1.12.0.4</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.6.0.1</Version>
<Version>1.7.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Palette">
<Version>1.0.0.21</Version>
<Version>1.0.0.23</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.3.2</Version>
<Version>1.3.2.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
@ -193,23 +193,23 @@
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.8.0</Version>
<Version>1.8.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Firebase.Common">
<Version>120.3.3.3</Version>
<Version>120.4.2.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2662" />
<PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2612</Version>
<Version>5.0.0.2662</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>5.0.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.2.0.4" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.4" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.5" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.5" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.2.0.6" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.6" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.2.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.7" />
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
@ -253,23 +253,31 @@
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="ViewModel\MyBikes\" />
<Folder Include="View\BikesAtStation\" />
<Folder Include="View\CopriWebView\" />
<Folder Include="View\Login\" />
<AndroidResource Include="Resources\drawable\bike_Cargo_Pedelec_Two.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\bike_Cargo_SoleHumanPowered_Trike.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\bike_Cargo_SoleHumanPowered_Two.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\bike_City_SoleHumanPowered_Two.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LockItBLE\LockItBLE.csproj">
<ProjectReference Include="..\..\LockIt.BLE\LockIt.BLE.csproj">
<Project>{bde9ce26-15cf-47da-a4f6-b6956d02d0fc}</Project>
<Name>LockItBLE</Name>
<Name>LockIt.BLE</Name>
</ProjectReference>
<ProjectReference Include="..\..\LockItShared\LockItShared.csproj">
<ProjectReference Include="..\..\LockIt.BusinessLogic\LockIt.BusinessLogic.csproj">
<Project>{3589ed1d-e734-429d-976f-1bea4371df14}</Project>
<Name>LockItShared</Name>
<Name>LockIt.BusinessLogic</Name>
</ProjectReference>
<ProjectReference Include="..\..\TINKLib\TINKLib.csproj">
<ProjectReference Include="..\..\SharedBusinessLogic\SharedBusinessLogic.csproj">
<Project>{b77f4222-0860-4494-a07c-ee8e09fa9983}</Project>
<Name>TINKLib</Name>
<Name>SharedBusinessLogic</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@ -343,8 +351,8 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\menu_logo.png" />
</ItemGroup>
<Import Project="..\TINK\LastenradBayern.projitems" Label="Shared" Condition="Exists('..\TINK\LastenradBayern.projitems')" />
<Import Project="..\..\ShareeSharedGuiLib\ShareeSharedGuiLib.projitems" Label="Shared" />
<Import Project="..\ShareeBike\LastenradBayern.projitems" Label="Shared" Condition="Exists('..\ShareeBike\LastenradBayern.projitems')" />
<Import Project="..\..\SharedGui\SharedGui.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.Xamarin.Android.targets" Label="MultilingualAppToolkit" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\v$(MultilingualAppToolkitVersion)\Microsoft.Multilingual.Xamarin.Android.targets')" />
<Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.Xamarin.Android.targets')" Label="MultilingualAppToolkit">

View file

@ -1,21 +1,21 @@
using System.Collections.Generic;
using Android.App;
using Android.Content;
using Android.Content.PM;
using Android.Content.Res;
using Android.OS;
using Android.Runtime;
using Android.Util;
using Firebase;
using Java.Interop;
using Java.Security.Acl;
using Plugin.Permissions;
using TINK.Model;
using Xamarin.Essentials;
using Xamarin.Forms.Platform.Android.AppLinks;
using static Xamarin.Essentials.Permissions;
using Xamarin.Essentials;
using Android.Runtime;
using Xamarin.Forms;
namespace TINK.Droid
namespace ShareeBike.Droid
{
[Activity(
Label = "LastenradBayern",
@ -99,7 +99,6 @@ namespace TINK.Droid
{
(Android.Manifest.Permission.BluetoothScan, true),
(Android.Manifest.Permission.BluetoothConnect, true),
//(Android.Manifest.Permission.AccessFineLocation, true)
}.ToArray();
}
@ -114,25 +113,6 @@ namespace TINK.Droid
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
}
/// <summary>
/// Handles opening the dialog to request for permissions.
/// </summary>
//public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
//{
// if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Essentials.Permissions))
// {
// Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
// }
// else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions))
// {
// // Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing.
// // see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details.
// PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
// }
// base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
//}
[Export("TapStation")]
public void TapStation(string stationNr)
{

View file

@ -1,12 +1,12 @@
using System;
using TINK.Droid.Model.Device;
using TINK.Model.Device;
using ShareeBike.Droid.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(AppInfo))]
namespace TINK.Droid.Model.Device
namespace ShareeBike.Droid.Model.Device
{
/// <summary> Holds information about the TINK- app. </summary>
/// <summary> Holds information about the ShareeBike- app. </summary>
public class AppInfo : IAppInfo
{
/// <summary> Holds the the version of the app.</summary>

View file

@ -1,9 +1,9 @@
using TINK.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Essentials;
using Xamarin.Forms;
[assembly: Dependency(typeof(TINK.Droid.Model.Device.Device))]
namespace TINK.Droid.Model.Device
[assembly: Dependency(typeof(ShareeBike.Droid.Model.Device.Device))]
namespace ShareeBike.Droid.Model.Device
{
public class Device : ISmartDevice
{

View file

@ -11,12 +11,12 @@ using Android.Views;
using Android.Widget;
using Javax.Crypto;
using Javax.Crypto.Spec;
using TINK.Droid.Model.Device;
using TINK.Model.Device;
using ShareeBike.Droid.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(TINK.Droid.Model.Device.DroidCipher))]
namespace TINK.Droid.Model.Device
[assembly: Dependency(typeof(ShareeBike.Droid.Model.Device.DroidCipher))]
namespace ShareeBike.Droid.Model.Device
{
public class DroidCipher : ICipher
{

View file

@ -1,10 +1,10 @@
using Android.Content;
using TINK.Droid.Model.Device;
using TINK.Model.Device;
using ShareeBike.Droid.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(ExternalBrowseService))]
namespace TINK.Droid.Model.Device
namespace ShareeBike.Droid.Model.Device
{
public class ExternalBrowseService : IExternalBrowserService
{

View file

@ -10,11 +10,11 @@ using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using TINK.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(TINK.Droid.Model.Device.Gps))]
namespace TINK.Droid.Model.Device
[assembly: Dependency(typeof(ShareeBike.Droid.Model.Device.Gps))]
namespace ShareeBike.Droid.Model.Device
{
public class Gps : IGeolodationDependent
{

View file

@ -1,10 +1,10 @@
using System;
using Serilog;
using TINK.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(TINK.Droid.Model.Device.SpecialFolder))]
namespace TINK.Droid.Model.Device
[assembly: Dependency(typeof(ShareeBike.Droid.Model.Device.SpecialFolder))]
namespace ShareeBike.Droid.Model.Device
{
public class SpecialFolder : ISpecialFolder
{

View file

@ -1,8 +1,8 @@
using Android.Webkit;
using TINK.Model.Device;
using ShareeBike.Model.Device;
[assembly: Xamarin.Forms.Dependency(typeof(TINK.Droid.Model.Device.WebView))]
namespace TINK.Droid.Model.Device
[assembly: Xamarin.Forms.Dependency(typeof(ShareeBike.Droid.Model.Device.WebView))]
namespace ShareeBike.Droid.Model.Device
{
public class WebView : IWebView
{

View file

@ -1,6 +1,6 @@
<?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.376" android:versionCode="376">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.381" android:versionCode="381">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="34" />
<!-- 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. -->

View file

@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Android.App;

View file

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View file

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View file

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View file

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

View file

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View file

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View file

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View file

@ -11,10 +11,10 @@
<item name="windowActionBar">false</item>
<!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette -->
<!-- colorPrimary is used for the default action bar background
Was set to sharee.bike color #009899 until switching to gray for theming reasons (needs to look nice with both thmes sharee.bike and Konrad-sample theme) -->
Was set to sharee.bike color #009899 until switching to gray for theming reasons (needs to look nice with both thmes sharee.bike and Citybike-sample theme) -->
<item name="colorPrimary">#a5a5a5</item>
<!-- colorPrimaryDark is used for the status bar
Was set to sharee.bike like color #006666 until switching to black for theming reasons (needs to look nice with both thmes sharee.bike and Konrad-sample theme) -->
Was set to sharee.bike like color #006666 until switching to black for theming reasons (needs to look nice with both thmes sharee.bike and Citybike-sample theme) -->
<item name="colorPrimaryDark">#262626</item>
<!-- colorAccent is used as the default value for colorControlActivated
which is used to tint widgets

View file

@ -42,43 +42,6 @@
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:714659238786:android:c2d1832deac081f6dab59b",
"android_client_info": {
"package_name": "com.TeilRad.Meinkonrad"
}
},
"oauth_client": [
{
"client_id": "714659238786-d5q3j4u1ohthdflriibd7kl1apb8nrka.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.TeilRad.Meinkonrad",
"certificate_hash": "1b80c66db9ab80a7f87b6171065fdafce59ed1fe"
}
},
{
"client_id": "714659238786-lc3ktb9rh2tmc6pmbn4ntdqduj0sb07d.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAPzBFM3yImmcxgtt4Rx3A3_bRJRUISALw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "714659238786-lc3ktb9rh2tmc6pmbn4ntdqduj0sb07d.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:714659238786:android:503feb0fb8b9966ddab59b",
@ -118,4 +81,4 @@
}
],
"configuration_version": "1"
}
}

View file

@ -1,9 +1,9 @@
using Foundation;
using Foundation;
using UIKit;
using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;
namespace TINK.iOS
namespace ShareeBike.iOS
{
// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to
@ -38,7 +38,7 @@ namespace TINK.iOS
e.NativeView.AccessibilityIdentifier = e.View.AutomationId;
}
};
LoadApplication(new TINK.App());
LoadApplication(new ShareeBike.App());
// Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
Xamarin.FormsGoogleMaps.Init("000000000000000000000000000000000000000");

View file

@ -1,13 +1,13 @@
using System;
using Foundation;
using TINK.iOS.Device;
using TINK.Model.Device;
using ShareeBike.iOS.Device;
using ShareeBike.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(AppInfo))]
namespace TINK.iOS.Device
namespace ShareeBike.iOS.Device
{
/// <summary> Holds information about the TINK- app. </summary>
/// <summary> Holds information about the ShareeBike- app. </summary>
public class AppInfo : IAppInfo
{
/// <summary> Holds the the version of the app.</summary>
@ -40,7 +40,7 @@ namespace TINK.iOS.Device
public Version Version => m_oVersion ?? new Version(0, 9);
/// <summary> Gets the URL to the app store. </summary>
/// <remarks> TINK Url was @"http://itunes.apple.com/de/app/tink-konstanz/id1181519270?mt=8"</remarks>
/// <remarks> ShareeBike Url was @"http://itunes.apple.com/de/app/tink-konstanz/id1181519270?mt=8"</remarks>
/// <value>The store URL.</value>
public string StoreUrl => $"https://itunes.apple.com/de/app/apple-store/{NSBundle.MainBundle.BundleIdentifier}?mt=8";
}

View file

@ -1,10 +1,10 @@
using System;
using System.Runtime.InteropServices;
using TINK.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Essentials;
[assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.Device))]
namespace TINK.iOS.Device
[assembly: Xamarin.Forms.Dependency(typeof(ShareeBike.iOS.Device.Device))]
namespace ShareeBike.iOS.Device
{
public class Device : ISmartDevice
{

View file

@ -1,11 +1,11 @@
using Foundation;
using TINK.iOS.Device;
using TINK.Model.Device;
using ShareeBike.iOS.Device;
using ShareeBike.Model.Device;
using UIKit;
using Xamarin.Forms;
[assembly: Dependency(typeof(ExternalBrowseService))]
namespace TINK.iOS.Device
namespace ShareeBike.iOS.Device
{
public class ExternalBrowseService : IExternalBrowserService
{

View file

@ -0,0 +1,10 @@
using ShareeBike.Model.Device;
[assembly: Xamarin.Forms.Dependency(typeof(ShareeBike.iOS.Device.Gps))]
namespace ShareeBike.iOS.Device
{
public class Gps : IGeolodationDependent
{
public bool IsGeolcationEnabled => true;
}
}

View file

@ -1,9 +1,9 @@
using System;
using TINK.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(TINK.iOS.Device.SpecialFolder))]
namespace TINK.iOS.Device
[assembly: Dependency(typeof(ShareeBike.iOS.Device.SpecialFolder))]
namespace ShareeBike.iOS.Device
{
public class SpecialFolder : ISpecialFolder
{

View file

@ -1,9 +1,9 @@

using Foundation;
using TINK.Model.Device;
using ShareeBike.Model.Device;
[assembly: Xamarin.Forms.Dependency(typeof(TINK.iOS.Device.WebView))]
namespace TINK.iOS.Device
[assembly: Xamarin.Forms.Dependency(typeof(ShareeBike.iOS.Device.WebView))]
namespace ShareeBike.iOS.Device
{
public class WebView : IWebView
{

View file

@ -1,9 +1,9 @@
using System;
using TINK.Model.Device;
using ShareeBike.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(TINK.iOS.Device.IOSCipher))]
namespace TINK.iOS.Device
[assembly: Dependency(typeof(ShareeBike.iOS.Device.IOSCipher))]
namespace ShareeBike.iOS.Device
{
public class IOSCipher : ICipher
{

View file

@ -56,9 +56,9 @@
<key>CFBundleDisplayName</key>
<string>LastenradBayern</string>
<key>CFBundleVersion</key>
<string>376</string>
<string>381</string>
<key>CFBundleShortVersionString</key>
<string>3.0.376</string>
<string>3.0.381</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
</dict>

View file

@ -7,13 +7,14 @@
<ProjectGuid>{3A0EF953-1501-4155-B0A0-265EB5FB2975}</ProjectGuid>
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Exe</OutputType>
<RootNamespace>TINK.iOS</RootNamespace>
<RootNamespace>ShareeBike.iOS</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>LastenradBayern.iOS</AssemblyName>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<ReleaseVersion>3.0</ReleaseVersion>
<ProvisioningType>manual</ProvisioningType>
<MtouchSdkVersion>16.4</MtouchSdkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
@ -25,9 +26,9 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<CodesignProvision></CodesignProvision>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@ -40,7 +41,7 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
<ConsolePause>false</ConsolePause>
<CodesignProvision>LastenradBayern to App Store 3</CodesignProvision>
<CodesignProvision>Provisioning Profile LastenradBayern AppStore</CodesignProvision>
<CodesignKey>Apple Distribution: TeilRad GmbH (LXJD6URCHR)</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@ -56,9 +57,9 @@
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchLink>None</MtouchLink>
<MtouchInterpreter>-all</MtouchInterpreter>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<CodesignProvision>Provisioning_Profile_LastenradBayern_Development</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@ -71,13 +72,12 @@
<ConsolePause>false</ConsolePause>
<CodesignKey>Apple Distribution: TeilRad GmbH (LXJD6URCHR)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>LastenradBayern to App Store 3</CodesignProvision>
<CodesignProvision>Provisioning Profile LastenradBayern AppStore</CodesignProvision>
<IpaIncludeArtwork>
</IpaIncludeArtwork>
<CrashReportingApiKey>
</CrashReportingApiKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchSdkVersion>15.5</MtouchSdkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
<DebugType>none</DebugType>
@ -86,14 +86,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<MtouchArch>ARM64</MtouchArch>
<BuildIpa>True</BuildIpa>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
<CodesignProvision>Provisioning Profile LastenradBayern AdHoc</CodesignProvision>
<CodesignKey>Apple Distribution: TeilRad GmbH (LXJD6URCHR)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchNoSymbolStrip>
</MtouchNoSymbolStrip>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
<DebugType>none</DebugType>
@ -102,9 +106,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<MtouchArch>ARMv7, ARM64</MtouchArch>
<CodesignProvision>VS: com.TeilRad.LastenradBayern Development</CodesignProvision>
<CodesignKey>Apple Development: Oliver Hauff (8SZ7J9P24J)</CodesignKey>
<MtouchArch>ARM64</MtouchArch>
<CodesignProvision>Provisioning Profile LastenradBayern AppStore</CodesignProvision>
<CodesignKey>Apple Distribution: TeilRad GmbH (LXJD6URCHR)</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
@ -136,7 +140,7 @@
<Version>6.3.0.19</Version>
</PackageReference>
<PackageReference Include="Serilog">
<Version>3.0.1</Version>
<Version>3.1.1</Version>
</PackageReference>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
@ -200,7 +204,7 @@
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.8.0</Version>
<Version>1.8.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>5.0.0</Version>
@ -220,7 +224,7 @@
<Version>0.7.124</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>5.0.0.2612</Version>
<Version>5.0.0.2662</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -271,17 +275,17 @@
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LockItBLE\LockItBLE.csproj">
<ProjectReference Include="..\..\LockIt.BLE\LockIt.BLE.csproj">
<Project>{bde9ce26-15cf-47da-a4f6-b6956d02d0fc}</Project>
<Name>LockItBLE</Name>
<Name>LockIt.BLE</Name>
</ProjectReference>
<ProjectReference Include="..\..\LockItShared\LockItShared.csproj">
<ProjectReference Include="..\..\LockIt.BusinessLogic\LockIt.BusinessLogic.csproj">
<Project>{3589ed1d-e734-429d-976f-1bea4371df14}</Project>
<Name>LockItShared</Name>
<Name>LockIt.BusinessLogic</Name>
</ProjectReference>
<ProjectReference Include="..\..\TINKLib\TINKLib.csproj">
<ProjectReference Include="..\..\SharedBusinessLogic\SharedBusinessLogic.csproj">
<Project>{b77f4222-0860-4494-a07c-ee8e09fa9983}</Project>
<Name>TINKLib</Name>
<Name>SharedBusinessLogic</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@ -369,6 +373,30 @@
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iTunesArtwork%402x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_Cargo_Pedelec_Two.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_Cargo_Pedelec_Two.imageset\bike_Cargo_Pedelec_Two.svg">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Trike.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Trike.imageset\bike_Cargo_SoleHumanPowered_Trike.svg">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Two.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Two.imageset\bike_Cargo_SoleHumanPowered_Two.svg">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_City_SoleHumanPowered_Two.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_City_SoleHumanPowered_Two.imageset\bike_City_SoleHumanPowered_Two.svg">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\battery_0_5.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
@ -427,14 +455,18 @@
<Folder Include="Media.xcassets\battery_4_5.imageset\" />
<Folder Include="Media.xcassets\battery_5_5.imageset\" />
<Folder Include="Media.xcassets\battery_undefined.imageset\" />
<Folder Include="Media.xcassets\bike_Cargo_Pedelec_Two.imageset\" />
<Folder Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Trike.imageset\" />
<Folder Include="Media.xcassets\bike_Cargo_SoleHumanPowered_Two.imageset\" />
<Folder Include="Media.xcassets\bike_City_SoleHumanPowered_Two.imageset\" />
<Folder Include="Media.xcassets\menu_logo.imageset\" />
<Folder Include="Media.xcassets\Open_Blue.imageset\" />
<Folder Include="Media.xcassets\Open_Green.imageset\" />
<Folder Include="Media.xcassets\Open_LightBlue.imageset\" />
<Folder Include="Media.xcassets\Open_Red.imageset\" />
</ItemGroup>
<Import Project="..\TINK\LastenradBayern.projitems" Label="Shared" Condition="Exists('..\TINK\LastenradBayern.projitems')" />
<Import Project="..\..\ShareeSharedGuiLib\ShareeSharedGuiLib.projitems" Label="Shared" />
<Import Project="..\ShareeBike\LastenradBayern.projitems" Label="Shared" Condition="Exists('..\ShareeBike\LastenradBayern.projitems')" />
<Import Project="..\..\SharedGui\SharedGui.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.Xamarin.iOS.targets" Label="MultilingualAppToolkit" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\v$(MultilingualAppToolkitVersion)\Microsoft.Multilingual.Xamarin.iOS.targets')" />
<Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.Xamarin.iOS.targets')" Label="MultilingualAppToolkit">

View file

@ -1,6 +1,6 @@
using UIKit;
namespace TINK.iOS
namespace ShareeBike.iOS
{
public class Application
{

View file

@ -0,0 +1,291 @@
{
"images" : [
{
"filename" : "Icon-40.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-60.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "Icon-58.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-87.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "Icon-80.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "Icon-120.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "Icon-120-1.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "Icon-180.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "Icon-20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "Icon-40-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "Icon-58-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-40-2.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "Icon-80-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "Icon-76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"filename" : "Icon-152.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"filename" : "Icon-167.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"idiom" : "car",
"scale" : "2x",
"size" : "60x60"
},
{
"idiom" : "car",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "iTunesArtwork@2x.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
},
{
"idiom" : "watch",
"role" : "notificationCenter",
"scale" : "2x",
"size" : "24x24",
"subtype" : "38mm"
},
{
"idiom" : "watch",
"role" : "notificationCenter",
"scale" : "2x",
"size" : "27.5x27.5",
"subtype" : "42mm"
},
{
"idiom" : "watch",
"role" : "companionSettings",
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "watch",
"role" : "companionSettings",
"scale" : "3x",
"size" : "29x29"
},
{
"idiom" : "watch",
"role" : "notificationCenter",
"scale" : "2x",
"size" : "33x33",
"subtype" : "45mm"
},
{
"idiom" : "watch",
"role" : "appLauncher",
"scale" : "2x",
"size" : "40x40",
"subtype" : "38mm"
},
{
"idiom" : "watch",
"role" : "appLauncher",
"scale" : "2x",
"size" : "44x44",
"subtype" : "40mm"
},
{
"idiom" : "watch",
"role" : "appLauncher",
"scale" : "2x",
"size" : "46x46",
"subtype" : "41mm"
},
{
"idiom" : "watch",
"role" : "appLauncher",
"scale" : "2x",
"size" : "50x50",
"subtype" : "44mm"
},
{
"idiom" : "watch",
"role" : "appLauncher",
"scale" : "2x",
"size" : "51x51",
"subtype" : "45mm"
},
{
"idiom" : "watch",
"role" : "appLauncher",
"scale" : "2x",
"size" : "54x54",
"subtype" : "49mm"
},
{
"idiom" : "watch",
"role" : "quickLook",
"scale" : "2x",
"size" : "86x86",
"subtype" : "38mm"
},
{
"idiom" : "watch",
"role" : "quickLook",
"scale" : "2x",
"size" : "98x98",
"subtype" : "42mm"
},
{
"idiom" : "watch",
"role" : "quickLook",
"scale" : "2x",
"size" : "108x108",
"subtype" : "44mm"
},
{
"idiom" : "watch",
"role" : "quickLook",
"scale" : "2x",
"size" : "117x117",
"subtype" : "45mm"
},
{
"idiom" : "watch",
"role" : "quickLook",
"scale" : "2x",
"size" : "129x129",
"subtype" : "49mm"
},
{
"idiom" : "watch-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

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