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

Version 3.0.372

Browse source
This commit is contained in:
Anja 2023-09-14 12:28:59 +02:00
parent 6d22dbf40b
commit f1cbab1d0a
97 changed files with 20446 additions and 17572 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -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.10.1.1</Version>
<Version>1.10.1.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.4.0.1</Version>
<Version>1.4.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Palette">
<Version>1.0.0.18</Version>
<Version>1.0.0.19</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.3.0.2</Version>
<Version>1.3.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
@ -193,20 +193,23 @@
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.7</Version>
<Version>1.8.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
<PackageReference Include="Xamarin.Firebase.Common">
<Version>120.3.3.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
<PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2578</Version>
<Version>5.0.0.2612</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.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.2.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.3" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
@ -304,42 +307,42 @@
<AndroidResource Include="Resources\drawable\battery_5_5.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-hdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-mdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\sharee.png">
<AndroidResource Include="Resources\drawable\app_logo.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-hdpi\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-mdpi\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-xhdpi\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\sharee_no_background.png" />
<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" />

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

@ -19,7 +19,7 @@ namespace TINK.Droid
{
[Activity(
Label = "LastenradBayern",
Icon = "@drawable/sharee",
Icon = "@drawable/app_logo",
Theme = "@style/MainTheme",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]

4
LastenradBayern/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.LastenradBayern" android:versionName="3.0.371" android:versionCode="371">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.372" android:versionCode="372">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->
@ -19,7 +19,7 @@
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
<uses-feature android:name="android.hardware.location.network" android:required="false" />
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
<application android:icon="@drawable/sharee" android:label="LastenradBayern" android:allowBackup="false"></application>
<application android:icon="@drawable/app_logo" android:label="LastenradBayern" android:allowBackup="false"></application>
<queries>
<intent>
<action android:name="android.intent.action.VIEW" />

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

File diff suppressed because it is too large Load diff

BIN
LastenradBayern/TINK.Android/Resources/drawable-hdpi/app_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-hdpi/menu_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-mdpi/app_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-mdpi/menu_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-xhdpi/app_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-xhdpi/menu_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-xxhdpi/app_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-xxhdpi/menu_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 58 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-xxxhdpi/app_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable-xxxhdpi/menu_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 86 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable/app_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
LastenradBayern/TINK.Android/Resources/drawable/menu_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

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

@ -56,8 +56,10 @@
<key>CFBundleDisplayName</key>
<string>LastenradBayern</string>
<key>CFBundleVersion</key>
<string>371</string>
<string>372</string>
<key>CFBundleShortVersionString</key>
<string>3.0.371</string>
<string>3.0.372</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
</dict>
</plist>

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

@ -120,7 +120,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.Build" Version="1.0.21" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -200,7 +200,7 @@
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.7</Version>
<Version>1.8.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>5.0.0</Version>
@ -220,7 +220,7 @@
<Version>0.7.124</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>5.0.0.2578</Version>
<Version>5.0.0.2612</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -411,10 +411,10 @@
<ImageAsset Include="Media.xcassets\battery_undefined.imageset\battery_undefined.svg">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\sharee_no_background.imageset\Contents.json">
<ImageAsset Include="Media.xcassets\menu_logo.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\sharee_no_background.imageset\sharee_no_background.pdf">
<ImageAsset Include="Media.xcassets\menu_logo.imageset\menu_logo.pdf">
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
@ -427,11 +427,11 @@
<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\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\" />
<Folder Include="Media.xcassets\sharee_no_background.imageset\" />
</ItemGroup>
<Import Project="..\TINK\LastenradBayern.projitems" Label="Shared" Condition="Exists('..\TINK\LastenradBayern.projitems')" />
<Import Project="..\..\ShareeSharedGuiLib\ShareeSharedGuiLib.projitems" Label="Shared" />

532
LastenradBayern/TINK.iOS/Media.xcassets/menu_logo.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,532 @@
{
"images": [
{
"filename": "menu_logo.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",
"screen-width": ">183"
},
{
"scale": "2x",
"idiom": "watch",
"screen-width": ">183"
},
{
"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",
"screen-width": ">145"
},
{
"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",
"screen-width": ">145"
},
{
"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/menu_logo.imageset/menu_logo.pdf vendored Normal file
View file

Binary file not shown.

8
LastenradBayern/TINK/View/Contact/ContactPage.xaml
View file

@ -145,6 +145,10 @@
Margin="0,0,0,10"
VerticalOptions="End"
Spacing="0">
<StackLayout.GestureRecognizers>
<TapGestureRecognizer
Command="{Binding OnMailAppRelatedRequest}"/>
</StackLayout.GestureRecognizers>
<BoxView
Margin="0,0,0,10"
@ -159,10 +163,6 @@
TextColor="{DynamicResource primary-back-title-color}"
Text="{x:Static resources:AppResources.ActionSendDiagnosis}"
IsEnabled="{Binding IsSendMailAvailable}">
<Label.GestureRecognizers>
<TapGestureRecognizer
Command="{Binding OnMailAppRelatedRequest}"/>
</Label.GestureRecognizers>
</Label>
</StackLayout>

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

@ -18,11 +18,11 @@
HeightRequest="100"
Aspect="AspectFit"
HorizontalOptions="StartAndExpand"
Source="sharee_no_background.png"/>
Source="menu_logo.png"/>
<Label
Grid.Row="1"
Text="Gefördert durch &#x0a;Bayerisches Staatsministerium für &#x0a;Wohnen, Bau und Verkehr"
TextColor="White"
FontSize="Small"/>
</Grid>
</ContentView>
</ContentView>

2
LockItBLE/LockItBLE.csproj
View file

@ -11,7 +11,7 @@
<PackageReference Include="Plugin.BLE" Version="2.1.3" />
<PackageReference Include="Polly" Version="7.2.4" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>

2
Meinkonrad/TINK.Android/MainActivity.cs
View file

@ -19,7 +19,7 @@ namespace TINK.Droid
{
[Activity(
Label = "Mein konrad",
Icon = "@drawable/sharee",
Icon = "@drawable/app_logo",
Theme = "@style/MainTheme",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]

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

@ -77,7 +77,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -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.10.1.1</Version>
<Version>1.10.1.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.4.0.1</Version>
<Version>1.4.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Palette">
<Version>1.0.0.18</Version>
<Version>1.0.0.19</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.3.0.2</Version>
<Version>1.3.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
@ -193,20 +193,23 @@
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.7</Version>
<Version>1.8.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
<PackageReference Include="Xamarin.Firebase.Common">
<Version>120.3.3.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
<PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2578</Version>
<Version>5.0.0.2612</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.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.2.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.3" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
@ -283,27 +286,27 @@
<AndroidAsset Include="Assets\Open_Red.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-hdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-mdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\sharee.png">
<AndroidResource Include="Resources\drawable\app_logo.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\konrad_nobg.png">
<AndroidResource Include="Resources\drawable\menu_logo.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
@ -348,12 +351,12 @@
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\swk_theme.png">
<AndroidResource Include="Resources\drawable\navbar_theme.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\menu_swk_theme.png">
<AndroidResource Include="Resources\drawable\menu_theme.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>

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.371" android:versionCode="371">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.372" android:versionCode="372">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->
@ -19,7 +19,7 @@
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
<uses-feature android:name="android.hardware.location.network" android:required="false" />
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
<application android:icon="@drawable/sharee" android:label="Meinkonrad" android:allowBackup="false"></application>
<application android:icon="@drawable/app_logo" android:label="Meinkonrad" android:allowBackup="false"></application>
<queries>
<intent>
<action android:name="android.intent.action.VIEW" />
@ -35,4 +35,4 @@
</intent>
</queries>
<meta-data android:name="com.google.android.geo.API_KEY" android:value="000000000000000000000000000000000000000" />
</manifest>
</manifest>

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

File diff suppressed because it is too large Load diff

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.5 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 27 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

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

@ -56,8 +56,10 @@
<key>CFBundleDisplayName</key>
<string>Mein konrad</string>
<key>CFBundleVersion</key>
<string>371</string>
<string>372</string>
<key>CFBundleShortVersionString</key>
<string>3.0.371</string>
<string>3.0.372</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
</dict>
</plist>

526
Meinkonrad/TINK.iOS/Media.xcassets/menu_logo.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,526 @@
{
"images" : [
{
"filename" : "menu_logo.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal"
},
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "3x"
},
{
"idiom" : "iphone"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone"
},
{
"idiom" : "iphone",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "1x"
},
{
"idiom" : "iphone",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "2x"
},
{
"idiom" : "iphone",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "3x"
},
{
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"idiom" : "ipad"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad"
},
{
"idiom" : "ipad",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad",
"scale" : "1x"
},
{
"idiom" : "ipad",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad",
"scale" : "2x"
},
{
"idiom" : "car"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "car"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "car"
},
{
"idiom" : "car",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "car",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "car",
"scale" : "2x"
},
{
"idiom" : "car",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "car",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "car",
"scale" : "3x"
},
{
"idiom" : "watch"
},
{
"idiom" : "watch",
"screen-width" : "<=145"
},
{
"idiom" : "watch",
"screen-width" : ">161"
},
{
"idiom" : "watch",
"screen-width" : ">145"
},
{
"idiom" : "watch",
"screen-width" : ">183"
},
{
"idiom" : "watch",
"scale" : "2x"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : "<=145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">161"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">145"
},
{
"idiom" : "watch",
"scale" : "2x",
"screen-width" : ">183"
},
{
"idiom" : "mac"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "mac"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "mac"
},
{
"idiom" : "mac",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "mac",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "mac",
"scale" : "1x"
},
{
"idiom" : "mac",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "mac",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "mac",
"scale" : "2x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

1
Meinkonrad/TINK.iOS/Media.xcassets/menu_logo.imageset/menu_logo.svg vendored Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1755.27 459.04"><defs><style>.a{fill:#e20118;}</style></defs><polygon points="171.66 387.63 83.06 265.25 83.06 387.63 0 387.63 0 0 83.06 0 83.06 232.02 166.13 110.75 263.03 110.75 162.25 249.19 265.8 387.63 171.66 387.63"/><path d="M951.79,528.11v170H868.73V540.29c0-34.33-21.6-50.4-48.18-50.4-30.47,0-51.51,17.73-51.51,57.05V698.11H686V421.23h83v26c15-20.49,42.66-33.78,79.19-33.78,55.94,0,103.56,39.87,103.56,114.63" transform="translate(-82.37 -310.48)"/><path d="M1174.61,415.7v94.13c-34.33-5.54-83.06,8.3-83.06,63.13V698.11h-83.06V421.23h83.06v49.29c11.08-37.1,48.18-54.82,83.06-54.82" transform="translate(-82.37 -310.48)"/><path d="M1411.42,559.67c0-41.53-27.68-67.56-65.89-67.56s-65.89,26-65.89,67.56,27.68,67.56,65.89,67.56,65.89-26,65.89-67.56m83.06-138.44V698.11h-83.06v-26c-18.27,21-45.41,33.78-82.51,33.78-72.53,0-132.34-63.69-132.34-146.19s59.81-146.19,132.34-146.19c37.1,0,64.24,12.74,82.51,33.78v-26Z" transform="translate(-82.37 -310.48)"/><path d="M1754.57,559.66c0-41.53-27.68-67.55-65.89-67.55s-65.89,26-65.89,67.55,27.68,67.57,65.89,67.57,65.89-26,65.89-67.57m83.06-249.18V698.11h-83.06v-26c-18.27,21-45.4,33.78-82.51,33.78-72.53,0-132.33-63.69-132.33-146.2s59.8-146.18,132.33-146.18c37.11,0,64.24,12.74,82.51,33.78V310.48Z" transform="translate(-82.37 -310.48)"/><path class="a" d="M495.22,625c-36,0-63.67-26-63.67-65.34s27.68-65.34,63.67-65.34,63.69,26,63.69,65.34S531.22,625,495.22,625m103,41.33a147.41,147.41,0,1,0-205.87.08l-.08.08,46.65,46.65,56.38,56.37,56.39-56.39h0l46.66-46.66Z" transform="translate(-82.37 -310.48)"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

393
Meinkonrad/TINK.iOS/Media.xcassets/menu_theme.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,393 @@
{
"images" : [
{
"filename" : "menu_theme.pdf",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal"
},
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "3x"
},
{
"idiom" : "iphone"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone"
},
{
"idiom" : "iphone",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "1x"
},
{
"idiom" : "iphone",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "2x"
},
{
"idiom" : "iphone",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "3x"
},
{
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"idiom" : "ipad"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad"
},
{
"idiom" : "ipad",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad",
"scale" : "1x"
},
{
"idiom" : "ipad",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad",
"scale" : "2x"
},
{
"idiom" : "car",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "car",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "car",
"scale" : "2x"
},
{
"idiom" : "car",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "car",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "car",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

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

Binary file not shown.

393
Meinkonrad/TINK.iOS/Media.xcassets/navbar_theme.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,393 @@
{
"images" : [
{
"filename" : "navbar_theme.pdf",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal"
},
{
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "3x"
},
{
"idiom" : "iphone"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone"
},
{
"idiom" : "iphone",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "1x"
},
{
"idiom" : "iphone",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "2x"
},
{
"idiom" : "iphone",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "3x"
},
{
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "1x",
"subtype" : "retina4"
},
{
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "2x",
"subtype" : "retina4"
},
{
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "iphone",
"scale" : "3x",
"subtype" : "retina4"
},
{
"idiom" : "ipad"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad"
},
{
"idiom" : "ipad",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad",
"scale" : "1x"
},
{
"idiom" : "ipad",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "ipad",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "ipad",
"scale" : "2x"
},
{
"idiom" : "car",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "car",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "car",
"scale" : "2x"
},
{
"idiom" : "car",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"idiom" : "car",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "car",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

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

Binary file not shown.

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

@ -121,7 +121,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.Build" Version="1.0.21" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -201,7 +201,7 @@
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.7</Version>
<Version>1.8.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>5.0.0</Version>
@ -221,7 +221,7 @@
<Version>0.7.124</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>5.0.0.2578</Version>
<Version>5.0.0.2612</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -314,16 +314,16 @@
<ImageAsset Include="Media.xcassets\Open_Red.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\swk_theme.imageset\swk_theme.pdf">
<ImageAsset Include="Media.xcassets\navbar_theme.imageset\navbar_theme.pdf">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\swk_theme.imageset\Contents.json">
<ImageAsset Include="Media.xcassets\navbar_theme.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\menu_swk_theme.imageset\menu_swk_theme.pdf">
<ImageAsset Include="Media.xcassets\menu_theme.imageset\menu_theme.pdf">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\menu_swk_theme.imageset\Contents.json">
<ImageAsset Include="Media.xcassets\menu_theme.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\bike_City_SoleHumanPowered_Two.imageset\bike_City_SoleHumanPowered_Two.svg">
@ -440,10 +440,10 @@
<ImageAsset Include="Media.xcassets\menu_mybikes.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\konrad_nobg.imageset\konrad_nobg.svg">
<ImageAsset Include="Media.xcassets\menu_logo.imageset\menu_logo.svg">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\konrad_nobg.imageset\Contents.json">
<ImageAsset Include="Media.xcassets\menu_logo.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-40.png">
@ -500,12 +500,6 @@
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\App-Icon-MeinKonrad_1024.png">
<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\sharee_no_background.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<Folder Include="Media.xcassets\battery_0_5.imageset\" />
@ -519,22 +513,21 @@
<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\konrad_nobg.imageset\" />
<Folder Include="Media.xcassets\menu_account.imageset\" />
<Folder Include="Media.xcassets\menu_bikelocations.imageset\" />
<Folder Include="Media.xcassets\menu_contact.imageset\" />
<Folder Include="Media.xcassets\menu_info.imageset\" />
<Folder Include="Media.xcassets\menu_logo.imageset\" />
<Folder Include="Media.xcassets\menu_looking.imageset\" />
<Folder Include="Media.xcassets\menu_mybikes.imageset\" />
<Folder Include="Media.xcassets\menu_settings.imageset\" />
<Folder Include="Media.xcassets\menu_swk_theme.imageset\" />
<Folder Include="Media.xcassets\menu_theme.imageset\" />
<Folder Include="Media.xcassets\menu_using.imageset\" />
<Folder Include="Media.xcassets\navbar_theme.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\" />
<Folder Include="Media.xcassets\sharee_no_background.imageset\" />
<Folder Include="Media.xcassets\swk_theme.imageset\" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />

4
Meinkonrad/TINK/App.xaml
View file

@ -15,10 +15,10 @@
<x:String x:Key="IconAccount">&#xf007;</x:String>
<x:String x:Key="IconLogin">&#xf2f6;</x:String>
<x:String x:Key="IconSettings">&#xf013;</x:String>
<x:String x:Key="IconFeesAndBikes">&#xf3cd;</x:String>
<x:String x:Key="IconFeesAndBikes">&#xf128;</x:String>
<x:String x:Key="IconContact">&#xf0e0;</x:String>
<x:String x:Key="IconInfo">&#xf05a;</x:String>
<x:String x:Key="IconClose">&#xf410;</x:String>
<x:String x:Key="IconClose">&#xf00d;</x:String>
<x:String x:Key="IconLegalInfo">&#xf129;</x:String>
<!--TogglePasswortEntry-->

8
Meinkonrad/TINK/View/Contact/ContactPage.xaml
View file

@ -149,6 +149,10 @@
Margin="0,0,0,10"
VerticalOptions="End"
Spacing="0">
<StackLayout.GestureRecognizers>
<TapGestureRecognizer
Command="{Binding OnMailAppRelatedRequest}"/>
</StackLayout.GestureRecognizers>
<BoxView
Margin="0,0,0,10"
@ -163,10 +167,6 @@
TextColor="{DynamicResource primary-back-title-color}"
Text="{x:Static resources:AppResources.ActionSendDiagnosis}"
IsEnabled="{Binding IsSendMailAvailable}">
<Label.GestureRecognizers>
<TapGestureRecognizer
Command="{Binding OnMailAppRelatedRequest}"/>
</Label.GestureRecognizers>
</Label>
</StackLayout>

32
Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
View file

@ -54,7 +54,37 @@
<StackLayout
BackgroundColor="White"
Padding="20,0,20,0">
Padding="20,5,20,0">
<!--Bike type-->
<StackLayout Orientation="Horizontal"
HorizontalOptions="Center"
IsVisible="{Binding ActiveFilteredBikeType, Converter={StaticResource Label_Converter}}"
Spacing="0">
<Label
TextColor="DimGray"
Text="{x:Static resources:AppResources.MarkingFindBikeTypeOfBikeText}"/>
<Label
TextColor="{DynamicResource primary-back-title-color}"
FontAttributes="Bold"
Text="{Binding ActiveFilteredBikeType}"/>
<Button
Command="{Binding ShowFilterBikeTypeInfoCommand}"
WidthRequest="24"
HeightRequest="24"
BackgroundColor="Transparent"
BorderWidth="0"
Padding="0"
Margin="5,0,0,0">
<Button.ImageSource>
<FontImageSource
Glyph="{StaticResource InfoCircle}"
Color="DimGray"
FontFamily="FA-S"
Size="20"/>
</Button.ImageSource>
</Button>
</StackLayout>
<Grid
RowDefinitions="Auto,Auto"

2
Meinkonrad/TINK/View/RootShell/FlyoutFooter.xaml
View file

@ -16,7 +16,7 @@
HeightRequest="35"
HorizontalOptions="StartAndExpand"
Aspect="AspectFit"
Source="konrad_nobg.png" />
Source="menu_logo.png" />
<Label
Grid.Row="1"
HorizontalOptions="Start"

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

@ -8,7 +8,7 @@
<RowDefinition Height="80"/>
</Grid.RowDefinitions>
<Image Grid.Row="0"
Source="menu_swk_theme.png"
Source="menu_theme.png"
Aspect="AspectFill"/>
<Label Grid.Row="0"
FontSize="20"

2
TINK/TINK.Android/MainActivity.cs
View file

@ -20,7 +20,7 @@ namespace TINK.Droid
{
[Activity(
Label = "Sharee",
Icon = "@drawable/sharee",
Icon = "@drawable/app_logo",
Theme = "@style/MainTheme",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]

4
TINK/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.hauffware.sharee" android:versionName="3.0.371" android:versionCode="371">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.372" android:versionCode="372">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->
@ -19,7 +19,7 @@
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
<uses-feature android:name="android.hardware.location.network" android:required="false" />
<uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
<application android:icon="@drawable/sharee" android:label="sharee.bike" android:allowBackup="false"></application>
<application android:icon="@drawable/app_logo" android:label="sharee.bike" android:allowBackup="false"></application>
<queries>
<intent>
<action android:name="android.intent.action.VIEW" />

11748
TINK/TINK.Android/Resources/Resource.Designer.cs generated
View file

File diff suppressed because it is too large Load diff

0
TINK/TINK.Android/Resources/drawable-hdpi/sharee.png → TINK/TINK.Android/Resources/drawable-hdpi/app_logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
TINK/TINK.Android/Resources/drawable-hdpi/sharee_no_background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

0
TINK/TINK.Android/Resources/drawable-mdpi/sharee.png → TINK/TINK.Android/Resources/drawable-mdpi/app_logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
TINK/TINK.Android/Resources/drawable-mdpi/sharee_no_background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

0
TINK/TINK.Android/Resources/drawable-xhdpi/sharee.png → TINK/TINK.Android/Resources/drawable-xhdpi/app_logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
TINK/TINK.Android/Resources/drawable-xhdpi/sharee_no_background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.9 KiB

0
TINK/TINK.Android/Resources/drawable-xxhdpi/sharee.png → TINK/TINK.Android/Resources/drawable-xxhdpi/app_logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
TINK/TINK.Android/Resources/drawable-xxhdpi/sharee_no_background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

0
TINK/TINK.Android/Resources/drawable-xxxhdpi/sharee.png → TINK/TINK.Android/Resources/drawable-xxxhdpi/app_logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 55 KiB

BIN
TINK/TINK.Android/Resources/drawable-xxxhdpi/sharee_no_background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.7 KiB

0
TINK/TINK.Android/Resources/drawable/sharee.png → TINK/TINK.Android/Resources/drawable/app_logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
TINK/TINK.Android/Resources/drawable/menu_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
TINK/TINK.Android/Resources/drawable/sharee_no_background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 76 KiB

51
TINK/TINK.Android/TINK.Android.csproj
View file

@ -77,7 +77,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -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.10.1.1</Version>
<Version>1.10.1.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.4.0.1</Version>
<Version>1.4.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Palette">
<Version>1.0.0.18</Version>
<Version>1.0.0.19</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.3.0.2</Version>
<Version>1.3.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
@ -193,20 +193,23 @@
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.7</Version>
<Version>1.8.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
<PackageReference Include="Xamarin.Firebase.Common">
<Version>120.3.3.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
<PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2578</Version>
<Version>5.0.0.2612</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.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.2.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.3" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="118.0.2.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
@ -287,22 +290,22 @@
<AndroidAsset Include="Assets\Open_Red.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-hdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-mdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\sharee.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\app_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\sharee.png">
<AndroidResource Include="Resources\drawable\app_logo.png">
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
</ItemGroup>
@ -340,22 +343,22 @@
<AndroidResource Include="Resources\drawable\battery_5_5.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-hdpi\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-mdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-mdpi\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xhdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-xhdpi\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\menu_logo.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxxhdpi\sharee_no_background.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\menu_logo.png" />
</ItemGroup>
<Import Project="..\TINK\TINK.projitems" Label="Shared" Condition="Exists('..\TINK\TINK.projitems')" />
<Import Project="..\..\ShareeSharedGuiLib\ShareeSharedGuiLib.projitems" Label="Shared" />

6
TINK/TINK.iOS/Info.plist
View file

@ -56,8 +56,10 @@
<key>CFBundleDisplayName</key>
<string>sharee.bike</string>
<key>CFBundleVersion</key>
<string>371</string>
<string>372</string>
<key>CFBundleShortVersionString</key>
<string>3.0.371</string>
<string>3.0.372</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
</dict>
</plist>

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

@ -0,0 +1,528 @@
{
"images": [
{
"filename": "menu_logo.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
TINK/TINK.iOS/Media.xcassets/menu_logo.imageset/menu_logo.pdf vendored Normal file
View file

Binary file not shown.

11
TINK/TINK.iOS/TINK.iOS.csproj
View file

@ -121,7 +121,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.Build" Version="1.0.21" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.3" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -201,7 +201,7 @@
<Version>2.0.6</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.7</Version>
<Version>1.8.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>5.0.0</Version>
@ -221,7 +221,7 @@
<Version>0.7.124</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>5.0.0.2578</Version>
<Version>5.0.0.2612</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -451,10 +451,10 @@
<ImageAsset Include="Media.xcassets\battery_undefined.imageset\battery_undefined.svg">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\sharee_no_background.imageset\Contents.json">
<ImageAsset Include="Media.xcassets\menu_logo.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\sharee_no_background.imageset\ShareeBike NoBackground.pdf">
<ImageAsset Include="Media.xcassets\menu_logo.imageset\menu_logo.pdf">
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
@ -470,6 +470,7 @@
<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\" />

14
TINK/TINK/View/Contact/ContactPage.xaml
View file

@ -148,25 +148,25 @@
Margin="0,0,0,10"
VerticalOptions="End"
Spacing="0">
<StackLayout.GestureRecognizers>
<TapGestureRecognizer
Command="{Binding OnMailAppRelatedRequest}"/>
</StackLayout.GestureRecognizers>
<BoxView
<BoxView
Margin="0,0,0,10"
HeightRequest="1"
WidthRequest="400"
HorizontalOptions="Center"
Color="DimGray"/>
<Label
<Label
TextType="Html"
HorizontalOptions="Center"
TextColor="{DynamicResource primary-back-title-color}"
Text="{x:Static resources:AppResources.ActionSendDiagnosis}"
IsEnabled="{Binding IsSendMailAvailable}">
<Label.GestureRecognizers>
<TapGestureRecognizer
Command="{Binding OnMailAppRelatedRequest}"/>
</Label.GestureRecognizers>
</Label>
</Label>
</StackLayout>

22
TINK/TINK/View/RootShell/FlyoutHeader.xaml
View file

@ -3,20 +3,16 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
BackgroundColor="LightGray"
x:Class="TINK.View.RootShell.FlyoutHeader">
<StackLayout Orientation="Horizontal"
VerticalOptions="Center"
HeightRequest="100">
<Label HorizontalOptions="EndAndExpand"
VerticalOptions="CenterAndExpand"
FontSize="Title"
FontAttributes="Bold"
TextColor="DimGray"
Text="{Binding MasterDetailMenuTitlte}"/>
<Image HeightRequest="90"
WidthRequest="90"
<StackLayout
Orientation="Horizontal"
VerticalOptions="Center"
HeightRequest="80">
<Image
Margin="15"
Aspect="AspectFit"
HeightRequest="50"
HorizontalOptions="StartAndExpand"
VerticalOptions="CenterAndExpand"
Source="sharee_no_background.png"/>
Source="menu_logo.png"/>
</StackLayout>
</ContentView>
</ContentView>

5
TINKLib/Model/WhatsNew.cs
View file

@ -722,6 +722,11 @@ namespace TINK.Model
AppResources.ChangeLog_3_0_371_MK,
new List<AppFlavor> { AppFlavor.MeinKonrad}
},
{
new Version(3, 0, 372),
string.Format("{0} <br /> {1}", AppResources.ChangeLog_PackageUpdates, AppResources.ChangeLog_MinorBugFixes),
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
},
};
/// <summary> Manges the whats new information.</summary>

5
TINKLib/MultilingualResources/AppResources.Designer.cs generated
View file

@ -1452,6 +1452,9 @@ namespace TINK.MultilingualResources {
}
}
/// <summary>
/// Looks up a localized string similar to Changes in the return process: FIRST you must always complete the &quot;Close lock&quot; process. Only THEN you can finish the rental! If your rental was successfully ended, you will see a confirmation dialog..
/// </summary>
public static string ChangeLog_3_0_367_MK_SB {
get {
return ResourceManager.GetString("ChangeLog_3_0_367_MK_SB", resourceCulture);
@ -1836,7 +1839,7 @@ namespace TINK.MultilingualResources {
}
/// <summary>
/// Looks up a localized string similar to Position of lock bolt is unknown. Lock could be closed or open. Please try again!.
/// Looks up a localized string similar to Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again..
/// </summary>
public static string ErrorOpenLockStatusUnknown {
get {

2
TINKLib/MultilingualResources/AppResources.de.resx
View file

@ -966,7 +966,7 @@ Probieren Sie es aus!</value>
<value>- Kleine Verbesserungen.</value>
</data>
<data name="ErrorOpenLockStatusUnknown" xml:space="preserve">
<value>Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Bitte versuchen Sie es erneut!</value>
<value>Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Stellen Sie sicher, dass keine Speiche gegen den Bügel drückt und versuchen Sie es erneut.</value>
</data>
<data name="ErrorOpenLockTitle" xml:space="preserve">
<value>Schloss konnte nicht geöffnet werden!</value>

2
TINKLib/MultilingualResources/AppResources.resx
View file

@ -631,7 +631,7 @@ Error handling improved.</value>
<value>Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.</value>
</data>
<data name="ErrorOpenLockStatusUnknown" xml:space="preserve">
<value>Position of lock bolt is unknown. Lock could be closed or open. Please try again!</value>
<value>Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again.</value>
</data>
<data name="ChangeLog_3_0_236" xml:space="preserve">
<value>Stations names instead descriptions shown on page title.

4
TINKLib/MultilingualResources/TINKLib.de.xlf
View file

@ -1326,8 +1326,8 @@ Probieren Sie es aus!</target>
<target state="translated">- Kleine Verbesserungen.</target>
</trans-unit>
<trans-unit id="ErrorOpenLockStatusUnknown" translate="yes" xml:space="preserve">
<source>Position of lock bolt is unknown. Lock could be closed or open. Please try again!</source>
<target state="translated">Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Bitte versuchen Sie es erneut!</target>
<source>Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again.</source>
<target state="translated">Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Stellen Sie sicher, dass keine Speiche gegen den Bügel drückt und versuchen Sie es erneut.</target>
</trans-unit>
<trans-unit id="ErrorOpenLockTitle" translate="yes" xml:space="preserve">
<source>Lock could not be opened!</source>

4
TINKLib/TINKLib.csproj
View file

@ -49,8 +49,8 @@
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="Xam.Plugin.Connectivity" Version="3.2.0" />
<PackageReference Include="Xam.Plugins.Messaging" Version="5.2.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2612" />
<PackageReference Include="Xamarin.Forms.GoogleMaps" Version="5.0.0" />
</ItemGroup>
<ItemGroup>

2
TINKLib/View/Themes/Konrad.xaml
View file

@ -141,7 +141,7 @@
<Setter Property="Padding" Value="0,12,0,12"/>
</Style>
<Style x:Key="Image-Navbar" TargetType="Image">
<Setter Property="Source" Value="swk_theme.png"/>
<Setter Property="Source" Value="navbar_theme.png"/>
<Setter Property="Aspect" Value="AspectFill"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style>

2
TINKLib/View/Themes/LastenradBayern.xaml
View file

@ -20,7 +20,7 @@
<Setter Property="Grid.Column" Value="1"/>
</Style>
<Style x:Key="Image-Navbar" TargetType="Image">
<Setter Property="Source" Value="swk_theme.png"/>
<Setter Property="Source" Value="navbar_theme.png"/>
<Setter Property="Aspect" Value="AspectFill"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style>

2
TINKLib/View/Themes/ShareeBike.xaml
View file

@ -159,7 +159,7 @@
<Setter Property="Padding" Value="0,12,0,12"/>
</Style>
<Style x:Key="Image-Navbar" TargetType="Image">
<Setter Property="Source" Value="swk_theme.png"/>
<Setter Property="Source" Value="navbar_theme.png"/>
<Setter Property="Aspect" Value="AspectFill"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style>

11
TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs
View file

@ -121,18 +121,21 @@ namespace TINK.ViewModel.Contact
UpdateUrlsAction(urls); // Update main model to prevent duplicate queries.
}
//set font size for html content (necessary for iOS)
string headerString = "<header><meta name='viewport' content='width=device-width, intial-scale=2.0, maximum-scale=5.0, minimum-scale=1.0, user-scalable=no'></header>";
RentBikeText = new HtmlWebViewSource
{
Html = !string.IsNullOrEmpty(FeesResourcePath)
? await ViewModelHelper.GetSource($"https://{HostName}/{FeesResourcePath}", IsSiteCachingOn)
: await Task.FromResult(ViewModelHelper.FromBody("No fees resource available. Resource path is null or empty."))
? headerString + await ViewModelHelper.GetSource($"https://{HostName}/{FeesResourcePath}", IsSiteCachingOn)
: headerString + await Task.FromResult(ViewModelHelper.FromBody("No fees resource available. Resource path is null or empty."))
};
TypesOfBikesText = new HtmlWebViewSource
{
Html = !string.IsNullOrEmpty(BikesResourcePath)
? await ViewModelHelper.GetSource($"https://{HostName}/{BikesResourcePath}" /*"site/bike_info.html"*/, IsSiteCachingOn)
: await Task.FromResult(ViewModelHelper.FromBody("No bikes instruction resource available. Resource path is null or empty."))
? headerString + await ViewModelHelper.GetSource($"https://{HostName}/{BikesResourcePath}" /*"site/bike_info.html"*/, IsSiteCachingOn)
: headerString + await Task.FromResult(ViewModelHelper.FromBody("No bikes instruction resource available. Resource path is null or empty."))
};
FAQ = new HtmlWebViewSource

18
TINKLib/ViewModel/Info/InfoPageViewModel.cs
View file

@ -139,6 +139,9 @@ namespace TINK.ViewModel.Info
UpdateUrlsAction(urls); // Update main model to prevent duplicate queries.
}
//set font size for html content (necessary for iOS)
string headerString = "<header><meta name='viewport' content='width=device-width, intial-scale=2.0, maximum-scale=5.0, minimum-scale=1.0, user-scalable=no'></header>";
// Gets privacy info from server.
async Task<HtmlWebViewSource> GetInfoPrivacy()
{
@ -150,7 +153,7 @@ namespace TINK.ViewModel.Info
// Information to access resource is missing
return new HtmlWebViewSource
{
Html = await Task.FromResult(ViewModelHelper.FromBody("No privacy resource available. Resource path is null or empty."))
Html = headerString + await Task.FromResult(ViewModelHelper.FromBody("No privacy resource available. Resource path is null or empty."))
};
}
@ -158,7 +161,7 @@ namespace TINK.ViewModel.Info
return new HtmlWebViewSource
{
Html = await ViewModelHelper.GetSource(
Html = headerString + await ViewModelHelper.GetSource(
GetUriText(), // "site/privacy.html"
IsSiteCachingOn)
};
@ -175,7 +178,7 @@ namespace TINK.ViewModel.Info
// Information to access resource is missing
return new HtmlWebViewSource
{
Html = await Task.FromResult(ViewModelHelper.FromBody("No impress resource available. Resource path is null or empty."))
Html = headerString + await Task.FromResult(ViewModelHelper.FromBody("No impress resource available. Resource path is null or empty."))
};
}
@ -183,7 +186,7 @@ namespace TINK.ViewModel.Info
return new HtmlWebViewSource
{
Html = await ViewModelHelper.GetSource(
Html = headerString + await ViewModelHelper.GetSource(
GetUriText(), // "site/privacy.html"
IsSiteCachingOn)
};
@ -210,11 +213,14 @@ namespace TINK.ViewModel.Info
string GetUriText()
=> $"https://{hostName}/{agbResourcePath}";
//set font size for html content (necessary for iOS)
string headerString = "<header><meta name='viewport' content='width=device-width, intial-scale=2.0, maximum-scale=5.0, minimum-scale=1.0, user-scalable=no'></header>";
if (string.IsNullOrEmpty(agbResourcePath))
{
return new HtmlWebViewSource
{
Html = await Task.FromResult(ViewModelHelper.FromBody("No terms resource available. Resource path is null or empty."))
Html = headerString + await Task.FromResult(ViewModelHelper.FromBody("No terms resource available. Resource path is null or empty."))
};
}
@ -222,7 +228,7 @@ namespace TINK.ViewModel.Info
return new HtmlWebViewSource
{
Html = await ViewModelHelper.GetSource(
Html = headerString + await ViewModelHelper.GetSource(
GetUriText(), // "agb.html"
isSiteCachingOn)
};

4
TestLockItBLE/TestLockItBLE.csproj
View file

@ -14,10 +14,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
</ItemGroup>
<ItemGroup>

2
TestLockItShared/TestLockItShared.csproj
View file

@ -18,7 +18,7 @@
</PackageReference>
<PackageReference Include="nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
</ItemGroup>
<ItemGroup>

2
TestSharee/TestSharee.csproj
View file

@ -18,7 +18,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
</ItemGroup>

6
TestShareeLib/TestShareeLib.csproj
View file

@ -31,11 +31,11 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
</ItemGroup>
<ItemGroup>

2
TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
View file

@ -953,7 +953,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
locks.Received()[0].OpenAsync(); // Lock must be closed
bikesViewModel.ActionText = string.Empty;
viewService.DisplayAlert("Lock could not be opened!", "Position of lock bolt is unknown. Lock could be closed or open. Please try again!", "OK");
viewService.DisplayAlert("Lock could not be opened!", "Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again.", "OK");
bikesViewModel.ActionText = "Updating...";
pollingManager.StartAsync(); // polling must be restarted again
bikesViewModel.ActionText = string.Empty;

2
TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
View file

@ -340,7 +340,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
locks.Received()[0].OpenAsync(); // Lock must be closed
bikesViewModel.ActionText = "";
viewService.DisplayAlert("Lock could not be opened!", "Position of lock bolt is unknown. Lock could be closed or open. Please try again!", "OK");
viewService.DisplayAlert("Lock could not be opened!", "Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again.", "OK");
bikesViewModel.ActionText = "Updating...";
pollingManager.StartAsync(); // polling must be restarted again
bikesViewModel.ActionText = string.Empty;

2
TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
View file

@ -356,7 +356,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
bikesViewModel.ActionText = string.Empty;
viewService.DisplayAdvancedAlert(
"Lock could not be opened!",
"Position of lock bolt is unknown. Lock could be closed or open. Please try again!",
"Position of lock bolt is unknown. Lock could be closed or open. Make sure that no spoke presses against the lock bolt and try again.",
"Attention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.",
"OK");
bikesViewModel.ActionText = "Updating...";

2
TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj
View file

@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="3.6.1">

5
TestTINKLib/TestTINKLib.csproj
View file

@ -56,7 +56,7 @@
<Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="NSubstitute">
<Version>5.0.0</Version>
<Version>5.1.0</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.13.3</Version>
@ -82,7 +82,7 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.7</Version>
<Version>1.8.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -107,7 +107,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Reference Include="Mono.Android">
<HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\MonoAndroid\v12.0\Mono.Android.dll</HintPath>