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

Version 3.0.354

Browse source
This commit is contained in:
Anja 2022-12-13 10:53:08 +01:00
parent 85321580df
commit 8b460bfebf
51 changed files with 363 additions and 570 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,7 @@
<Version>1.6.3</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="PCLCrypto" Version="2.0.147" />
<PackageReference Include="PCLStorage" Version="1.0.2" />
<PackageReference Include="PInvoke.BCrypt" Version="0.7.124" />
@ -188,16 +188,16 @@
<Version>1.2.1.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.3" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.3</Version>
<Version>1.7.4</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2545" />
<PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2515</Version>
<Version>5.0.0.2545</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>5.0.0</Version>
@ -240,10 +240,6 @@
<EmbeddedResource Include="Resources\Font Awesome 5 Free-Solid-900.otf" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\Location_Button.png">
<SubType>Designer</SubType>
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\Tabbar.axml" />
<AndroidResource Include="Resources\layout\Toolbar.axml" />
<AndroidResource Include="Resources\values\styles.xml">
@ -287,9 +283,6 @@
<ItemGroup>
<AndroidAsset Include="Assets\Open_Red.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Location_Pin.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\battery_undefined.png" />
</ItemGroup>

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

@ -85,10 +85,10 @@ namespace TINK.Droid
}
};
LoadApplication(new App());
await Permissions.RequestAsync<BLEPermissions>();
await Permissions.RequestAsync<Permissions.LocationWhenInUse>();
LoadApplication(new App());
}
//Bluetooth Permission on Android 12 "Detect Devices nearby"

2
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.353" android:versionCode="353">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.354" android:versionCode="354">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->

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

@ -23975,211 +23975,208 @@ namespace TINK.Droid
public const int ic_vol_unmute = 2131165500;
// aapt resource value: 0x7F07013D
public const int Location_Button = 2131165501;
public const int material_cursor_drawable = 2131165501;
// aapt resource value: 0x7F07013E
public const int material_cursor_drawable = 2131165502;
public const int material_ic_calendar_black_24dp = 2131165502;
// aapt resource value: 0x7F07013F
public const int material_ic_calendar_black_24dp = 2131165503;
public const int material_ic_clear_black_24dp = 2131165503;
// aapt resource value: 0x7F070140
public const int material_ic_clear_black_24dp = 2131165504;
public const int material_ic_edit_black_24dp = 2131165504;
// aapt resource value: 0x7F070141
public const int material_ic_edit_black_24dp = 2131165505;
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165505;
// aapt resource value: 0x7F070142
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165506;
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165506;
// aapt resource value: 0x7F070143
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165507;
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165507;
// aapt resource value: 0x7F070144
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165508;
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165508;
// aapt resource value: 0x7F070145
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165509;
public const int material_ic_menu_arrow_down_black_24dp = 2131165509;
// aapt resource value: 0x7F070146
public const int material_ic_menu_arrow_down_black_24dp = 2131165510;
public const int material_ic_menu_arrow_up_black_24dp = 2131165510;
// aapt resource value: 0x7F070147
public const int material_ic_menu_arrow_up_black_24dp = 2131165511;
public const int mr_button_connected_dark = 2131165511;
// aapt resource value: 0x7F070148
public const int mr_button_connected_dark = 2131165512;
public const int mr_button_connected_light = 2131165512;
// aapt resource value: 0x7F070149
public const int mr_button_connected_light = 2131165513;
public const int mr_button_connecting_dark = 2131165513;
// aapt resource value: 0x7F07014A
public const int mr_button_connecting_dark = 2131165514;
public const int mr_button_connecting_light = 2131165514;
// aapt resource value: 0x7F07014B
public const int mr_button_connecting_light = 2131165515;
public const int mr_button_dark = 2131165515;
// aapt resource value: 0x7F07014C
public const int mr_button_dark = 2131165516;
public const int mr_button_dark_static = 2131165516;
// aapt resource value: 0x7F07014D
public const int mr_button_dark_static = 2131165517;
public const int mr_button_light = 2131165517;
// aapt resource value: 0x7F07014E
public const int mr_button_light = 2131165518;
public const int mr_button_light_static = 2131165518;
// aapt resource value: 0x7F07014F
public const int mr_button_light_static = 2131165519;
public const int mr_cast_checkbox = 2131165519;
// aapt resource value: 0x7F070150
public const int mr_cast_checkbox = 2131165520;
public const int mr_cast_group_seekbar_track = 2131165520;
// aapt resource value: 0x7F070151
public const int mr_cast_group_seekbar_track = 2131165521;
public const int mr_cast_mute_button = 2131165521;
// aapt resource value: 0x7F070152
public const int mr_cast_mute_button = 2131165522;
public const int mr_cast_route_seekbar_track = 2131165522;
// aapt resource value: 0x7F070153
public const int mr_cast_route_seekbar_track = 2131165523;
public const int mr_cast_stop = 2131165523;
// aapt resource value: 0x7F070154
public const int mr_cast_stop = 2131165524;
public const int mr_cast_thumb = 2131165524;
// aapt resource value: 0x7F070155
public const int mr_cast_thumb = 2131165525;
public const int mr_dialog_close_dark = 2131165525;
// aapt resource value: 0x7F070156
public const int mr_dialog_close_dark = 2131165526;
public const int mr_dialog_close_light = 2131165526;
// aapt resource value: 0x7F070157
public const int mr_dialog_close_light = 2131165527;
public const int mr_dialog_material_background_dark = 2131165527;
// aapt resource value: 0x7F070158
public const int mr_dialog_material_background_dark = 2131165528;
public const int mr_dialog_material_background_light = 2131165528;
// aapt resource value: 0x7F070159
public const int mr_dialog_material_background_light = 2131165529;
public const int mr_group_collapse = 2131165529;
// aapt resource value: 0x7F07015A
public const int mr_group_collapse = 2131165530;
public const int mr_group_expand = 2131165530;
// aapt resource value: 0x7F07015B
public const int mr_group_expand = 2131165531;
public const int mr_media_pause_dark = 2131165531;
// aapt resource value: 0x7F07015C
public const int mr_media_pause_dark = 2131165532;
public const int mr_media_pause_light = 2131165532;
// aapt resource value: 0x7F07015D
public const int mr_media_pause_light = 2131165533;
public const int mr_media_play_dark = 2131165533;
// aapt resource value: 0x7F07015E
public const int mr_media_play_dark = 2131165534;
public const int mr_media_play_light = 2131165534;
// aapt resource value: 0x7F07015F
public const int mr_media_play_light = 2131165535;
public const int mr_media_stop_dark = 2131165535;
// aapt resource value: 0x7F070160
public const int mr_media_stop_dark = 2131165536;
public const int mr_media_stop_light = 2131165536;
// aapt resource value: 0x7F070161
public const int mr_media_stop_light = 2131165537;
public const int mr_vol_type_audiotrack_dark = 2131165537;
// aapt resource value: 0x7F070162
public const int mr_vol_type_audiotrack_dark = 2131165538;
public const int mr_vol_type_audiotrack_light = 2131165538;
// aapt resource value: 0x7F070163
public const int mr_vol_type_audiotrack_light = 2131165539;
public const int mtrl_dialog_background = 2131165539;
// aapt resource value: 0x7F070164
public const int mtrl_dialog_background = 2131165540;
public const int mtrl_dropdown_arrow = 2131165540;
// aapt resource value: 0x7F070165
public const int mtrl_dropdown_arrow = 2131165541;
public const int mtrl_ic_arrow_drop_down = 2131165541;
// aapt resource value: 0x7F070166
public const int mtrl_ic_arrow_drop_down = 2131165542;
public const int mtrl_ic_arrow_drop_up = 2131165542;
// aapt resource value: 0x7F070167
public const int mtrl_ic_arrow_drop_up = 2131165543;
public const int mtrl_ic_cancel = 2131165543;
// aapt resource value: 0x7F070168
public const int mtrl_ic_cancel = 2131165544;
public const int mtrl_ic_error = 2131165544;
// aapt resource value: 0x7F070169
public const int mtrl_ic_error = 2131165545;
public const int mtrl_navigation_bar_item_background = 2131165545;
// aapt resource value: 0x7F07016A
public const int mtrl_navigation_bar_item_background = 2131165546;
public const int mtrl_popupmenu_background = 2131165546;
// aapt resource value: 0x7F07016B
public const int mtrl_popupmenu_background = 2131165547;
public const int mtrl_popupmenu_background_dark = 2131165547;
// aapt resource value: 0x7F07016C
public const int mtrl_popupmenu_background_dark = 2131165548;
public const int mtrl_tabs_default_indicator = 2131165548;
// aapt resource value: 0x7F07016D
public const int mtrl_tabs_default_indicator = 2131165549;
public const int navigation_empty_icon = 2131165549;
// aapt resource value: 0x7F07016E
public const int navigation_empty_icon = 2131165550;
public const int notification_action_background = 2131165550;
// aapt resource value: 0x7F07016F
public const int notification_action_background = 2131165551;
public const int notification_bg = 2131165551;
// aapt resource value: 0x7F070170
public const int notification_bg = 2131165552;
public const int notification_bg_low = 2131165552;
// aapt resource value: 0x7F070171
public const int notification_bg_low = 2131165553;
public const int notification_bg_low_normal = 2131165553;
// aapt resource value: 0x7F070172
public const int notification_bg_low_normal = 2131165554;
public const int notification_bg_low_pressed = 2131165554;
// aapt resource value: 0x7F070173
public const int notification_bg_low_pressed = 2131165555;
public const int notification_bg_normal = 2131165555;
// aapt resource value: 0x7F070174
public const int notification_bg_normal = 2131165556;
public const int notification_bg_normal_pressed = 2131165556;
// aapt resource value: 0x7F070175
public const int notification_bg_normal_pressed = 2131165557;
public const int notification_icon_background = 2131165557;
// aapt resource value: 0x7F070176
public const int notification_icon_background = 2131165558;
public const int notification_template_icon_bg = 2131165558;
// aapt resource value: 0x7F070177
public const int notification_template_icon_bg = 2131165559;
public const int notification_template_icon_low_bg = 2131165559;
// aapt resource value: 0x7F070178
public const int notification_template_icon_low_bg = 2131165560;
public const int notification_tile_bg = 2131165560;
// aapt resource value: 0x7F070179
public const int notification_tile_bg = 2131165561;
public const int notify_panel_notification_icon_bg = 2131165561;
// aapt resource value: 0x7F07017A
public const int notify_panel_notification_icon_bg = 2131165562;
public const int preference_list_divider_material = 2131165562;
// aapt resource value: 0x7F07017B
public const int preference_list_divider_material = 2131165563;
public const int sharee = 2131165563;
// aapt resource value: 0x7F07017C
public const int sharee = 2131165564;
public const int sharee_no_background = 2131165564;
// aapt resource value: 0x7F07017D
public const int sharee_no_background = 2131165565;
public const int test_custom_background = 2131165565;
// aapt resource value: 0x7F07017E
public const int test_custom_background = 2131165566;
public const int test_level_drawable = 2131165566;
// aapt resource value: 0x7F07017F
public const int test_level_drawable = 2131165567;
public const int tooltip_frame_dark = 2131165567;
// aapt resource value: 0x7F070180
public const int tooltip_frame_dark = 2131165568;
// aapt resource value: 0x7F070181
public const int tooltip_frame_light = 2131165569;
public const int tooltip_frame_light = 2131165568;
static Drawable()
{

2
LastenradBayern/TINK.iOS/AppDelegate.cs
View file

@ -1,4 +1,4 @@
using Foundation;
using Foundation;
using UIKit;
using Xamarin.Forms;

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

@ -55,8 +55,8 @@
<key>CFBundleDisplayName</key>
<string>LastenradBayern</string>
<key>CFBundleVersion</key>
<string>353</string>
<string>354</string>
<key>CFBundleShortVersionString</key>
<string>3.0.353</string>
<string>3.0.354</string>
</dict>
</plist>

28
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="6.0.5" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.0" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -129,14 +129,14 @@
<Version>1.6.3</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="PCLCrypto" Version="2.0.147" />
<PackageReference Include="PCLStorage" Version="1.0.2" />
<PackageReference Include="Plugin.BluetoothLE">
<Version>6.3.0.19</Version>
</PackageReference>
<PackageReference Include="Serilog">
<Version>2.11.0</Version>
<Version>2.12.0</Version>
</PackageReference>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
@ -195,12 +195,12 @@
</PackageReference>
<PackageReference Include="Xam.Plugins.Messaging" Version="5.2.0" />
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.3" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.4</Version>
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.3</Version>
<Version>1.7.4</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.2515</Version>
<Version>5.0.0.2545</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -319,18 +319,6 @@
<ImageAsset Include="Media.xcassets\Open_Red.imageset\StationMarkerOpenRed.pdf">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\Location_Pin.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\Location_Pin.imageset\Location_Pin.pdf">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\Location_Button.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\Location_Button.imageset\Location_Button.pdf">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon-40.png">
<Visible>false</Visible>
</ImageAsset>
@ -447,8 +435,6 @@
<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\Location_Pin.imageset\" />
<Folder Include="Media.xcassets\Location_Button.imageset\" />
<Folder Include="Media.xcassets\sharee_no_background.imageset\" />
</ItemGroup>
<Import Project="..\TINK\LastenradBayern.projitems" Label="Shared" Condition="Exists('..\TINK\LastenradBayern.projitems')" />

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

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;

1
LastenradBayern/TINK/View/Contact/SelectStationPage.xaml
View file

@ -19,7 +19,6 @@
VerticalOptions="FillAndExpand">
<maps:Map WidthRequest="320" HeightRequest="800"
x:Name="MyMap"
IsShowingUser="False"
MapType="Street">
<maps:Map.Behaviors>
<bindings:BindingPinsBehavior Value="{Binding Pins}"/>

21
LastenradBayern/TINK/View/Map/MapPage.xaml
View file

@ -28,7 +28,6 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
IsShowingUser="False"
MapType="Street">
<maps:Map.Behaviors>
<bindings:BindingPinsBehavior Value="{Binding Pins}"/>
@ -89,26 +88,6 @@
</StackLayout>
</Frame>
<!--Center to currentLocation Button-->
<!--<ImageButton
Grid.Row="2"
Grid.ColumnSpan="3"
x:Name="CurrentLocation"
AutomationId ="currentLocaton_button"
Command="{Binding OnCurrentLocationButtonClicked}"
IsVisible="True"
BackgroundColor="Transparent"
BorderWidth="1"
BorderColor="LightGray"
VerticalOptions="End"
HorizontalOptions="Center"
Margin="0,0,0,12"
Source="Location_Button.png"
WidthRequest="40"
HeightRequest="40"
CornerRadius="20">
</ImageButton>-->
<!--While process is running-->
<!--Spinner-->
<ActivityIndicator

2
LockItBLE/LockItBLE.csproj
View file

@ -11,7 +11,7 @@
<PackageReference Include="Plugin.BLE" Version="2.1.3" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.4" />
</ItemGroup>
<ItemGroup>

0
LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs → LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceBase.cs
View file

2
LockItShared/LockItShared.csproj
View file

@ -22,7 +22,7 @@
<Folder Include="Services\BluetoothLock\Crypto\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Serilog" Version="2.12.0" />
</ItemGroup>
<ItemGroup>

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

@ -85,10 +85,10 @@ namespace TINK.Droid
}
};
LoadApplication(new App());
await Permissions.RequestAsync<BLEPermissions>();
await Permissions.RequestAsync<Permissions.LocationWhenInUse>();
await Permissions.RequestAsync<BLEPermissions>();
LoadApplication(new App());
}
//Bluetooth Permission on Android 12 "Detect Devices nearby"

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

@ -86,7 +86,7 @@
<Version>1.6.3</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="PCLCrypto" Version="2.0.147" />
<PackageReference Include="PCLStorage" Version="1.0.2" />
<PackageReference Include="PInvoke.BCrypt" Version="0.7.124" />
@ -188,16 +188,16 @@
<Version>1.2.1.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.3" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.3</Version>
<Version>1.7.4</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2545" />
<PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2515</Version>
<Version>5.0.0.2545</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>5.0.0</Version>
@ -240,10 +240,6 @@
<EmbeddedResource Include="Resources\Font Awesome 5 Free-Solid-900.otf" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\Location_Button.png">
<SubType>Designer</SubType>
<Generator>MSBuild:UpdateGeneratedFiles</Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\Tabbar.axml" />
<AndroidResource Include="Resources\layout\Toolbar.axml" />
<AndroidResource Include="Resources\values\styles.xml">
@ -287,9 +283,6 @@
<ItemGroup>
<AndroidAsset Include="Assets\Open_Red.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Location_Pin.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-hdpi\sharee.png" />
</ItemGroup>

2
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.353" android:versionCode="353">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.354" android:versionCode="354">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->

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

@ -23990,238 +23990,235 @@ namespace TINK.Droid
public const int konrad_nobg = 2131165505;
// aapt resource value: 0x7F070142
public const int Location_Button = 2131165506;
public const int material_cursor_drawable = 2131165506;
// aapt resource value: 0x7F070143
public const int material_cursor_drawable = 2131165507;
public const int material_ic_calendar_black_24dp = 2131165507;
// aapt resource value: 0x7F070144
public const int material_ic_calendar_black_24dp = 2131165508;
public const int material_ic_clear_black_24dp = 2131165508;
// aapt resource value: 0x7F070145
public const int material_ic_clear_black_24dp = 2131165509;
public const int material_ic_edit_black_24dp = 2131165509;
// aapt resource value: 0x7F070146
public const int material_ic_edit_black_24dp = 2131165510;
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165510;
// aapt resource value: 0x7F070147
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165511;
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165511;
// aapt resource value: 0x7F070148
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165512;
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165512;
// aapt resource value: 0x7F070149
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165513;
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165513;
// aapt resource value: 0x7F07014A
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165514;
public const int material_ic_menu_arrow_down_black_24dp = 2131165514;
// aapt resource value: 0x7F07014B
public const int material_ic_menu_arrow_down_black_24dp = 2131165515;
public const int material_ic_menu_arrow_up_black_24dp = 2131165515;
// aapt resource value: 0x7F07014C
public const int material_ic_menu_arrow_up_black_24dp = 2131165516;
public const int menu_account = 2131165516;
// aapt resource value: 0x7F07014D
public const int menu_account = 2131165517;
public const int menu_bikelocations = 2131165517;
// aapt resource value: 0x7F07014E
public const int menu_bikelocations = 2131165518;
public const int menu_contact = 2131165518;
// aapt resource value: 0x7F07014F
public const int menu_contact = 2131165519;
public const int menu_info = 2131165519;
// aapt resource value: 0x7F070150
public const int menu_info = 2131165520;
public const int menu_looking = 2131165520;
// aapt resource value: 0x7F070151
public const int menu_looking = 2131165521;
public const int menu_mybikes = 2131165521;
// aapt resource value: 0x7F070152
public const int menu_mybikes = 2131165522;
public const int menu_settings = 2131165522;
// aapt resource value: 0x7F070153
public const int menu_settings = 2131165523;
public const int menu_swk_theme = 2131165523;
// aapt resource value: 0x7F070154
public const int menu_swk_theme = 2131165524;
public const int menu_using = 2131165524;
// aapt resource value: 0x7F070155
public const int menu_using = 2131165525;
public const int mr_button_connected_dark = 2131165525;
// aapt resource value: 0x7F070156
public const int mr_button_connected_dark = 2131165526;
public const int mr_button_connected_light = 2131165526;
// aapt resource value: 0x7F070157
public const int mr_button_connected_light = 2131165527;
public const int mr_button_connecting_dark = 2131165527;
// aapt resource value: 0x7F070158
public const int mr_button_connecting_dark = 2131165528;
public const int mr_button_connecting_light = 2131165528;
// aapt resource value: 0x7F070159
public const int mr_button_connecting_light = 2131165529;
public const int mr_button_dark = 2131165529;
// aapt resource value: 0x7F07015A
public const int mr_button_dark = 2131165530;
public const int mr_button_dark_static = 2131165530;
// aapt resource value: 0x7F07015B
public const int mr_button_dark_static = 2131165531;
public const int mr_button_light = 2131165531;
// aapt resource value: 0x7F07015C
public const int mr_button_light = 2131165532;
public const int mr_button_light_static = 2131165532;
// aapt resource value: 0x7F07015D
public const int mr_button_light_static = 2131165533;
public const int mr_cast_checkbox = 2131165533;
// aapt resource value: 0x7F07015E
public const int mr_cast_checkbox = 2131165534;
public const int mr_cast_group_seekbar_track = 2131165534;
// aapt resource value: 0x7F07015F
public const int mr_cast_group_seekbar_track = 2131165535;
public const int mr_cast_mute_button = 2131165535;
// aapt resource value: 0x7F070160
public const int mr_cast_mute_button = 2131165536;
public const int mr_cast_route_seekbar_track = 2131165536;
// aapt resource value: 0x7F070161
public const int mr_cast_route_seekbar_track = 2131165537;
public const int mr_cast_stop = 2131165537;
// aapt resource value: 0x7F070162
public const int mr_cast_stop = 2131165538;
public const int mr_cast_thumb = 2131165538;
// aapt resource value: 0x7F070163
public const int mr_cast_thumb = 2131165539;
public const int mr_dialog_close_dark = 2131165539;
// aapt resource value: 0x7F070164
public const int mr_dialog_close_dark = 2131165540;
public const int mr_dialog_close_light = 2131165540;
// aapt resource value: 0x7F070165
public const int mr_dialog_close_light = 2131165541;
public const int mr_dialog_material_background_dark = 2131165541;
// aapt resource value: 0x7F070166
public const int mr_dialog_material_background_dark = 2131165542;
public const int mr_dialog_material_background_light = 2131165542;
// aapt resource value: 0x7F070167
public const int mr_dialog_material_background_light = 2131165543;
public const int mr_group_collapse = 2131165543;
// aapt resource value: 0x7F070168
public const int mr_group_collapse = 2131165544;
public const int mr_group_expand = 2131165544;
// aapt resource value: 0x7F070169
public const int mr_group_expand = 2131165545;
public const int mr_media_pause_dark = 2131165545;
// aapt resource value: 0x7F07016A
public const int mr_media_pause_dark = 2131165546;
public const int mr_media_pause_light = 2131165546;
// aapt resource value: 0x7F07016B
public const int mr_media_pause_light = 2131165547;
public const int mr_media_play_dark = 2131165547;
// aapt resource value: 0x7F07016C
public const int mr_media_play_dark = 2131165548;
public const int mr_media_play_light = 2131165548;
// aapt resource value: 0x7F07016D
public const int mr_media_play_light = 2131165549;
public const int mr_media_stop_dark = 2131165549;
// aapt resource value: 0x7F07016E
public const int mr_media_stop_dark = 2131165550;
public const int mr_media_stop_light = 2131165550;
// aapt resource value: 0x7F07016F
public const int mr_media_stop_light = 2131165551;
public const int mr_vol_type_audiotrack_dark = 2131165551;
// aapt resource value: 0x7F070170
public const int mr_vol_type_audiotrack_dark = 2131165552;
public const int mr_vol_type_audiotrack_light = 2131165552;
// aapt resource value: 0x7F070171
public const int mr_vol_type_audiotrack_light = 2131165553;
public const int mtrl_dialog_background = 2131165553;
// aapt resource value: 0x7F070172
public const int mtrl_dialog_background = 2131165554;
public const int mtrl_dropdown_arrow = 2131165554;
// aapt resource value: 0x7F070173
public const int mtrl_dropdown_arrow = 2131165555;
public const int mtrl_ic_arrow_drop_down = 2131165555;
// aapt resource value: 0x7F070174
public const int mtrl_ic_arrow_drop_down = 2131165556;
public const int mtrl_ic_arrow_drop_up = 2131165556;
// aapt resource value: 0x7F070175
public const int mtrl_ic_arrow_drop_up = 2131165557;
public const int mtrl_ic_cancel = 2131165557;
// aapt resource value: 0x7F070176
public const int mtrl_ic_cancel = 2131165558;
public const int mtrl_ic_error = 2131165558;
// aapt resource value: 0x7F070177
public const int mtrl_ic_error = 2131165559;
public const int mtrl_navigation_bar_item_background = 2131165559;
// aapt resource value: 0x7F070178
public const int mtrl_navigation_bar_item_background = 2131165560;
public const int mtrl_popupmenu_background = 2131165560;
// aapt resource value: 0x7F070179
public const int mtrl_popupmenu_background = 2131165561;
public const int mtrl_popupmenu_background_dark = 2131165561;
// aapt resource value: 0x7F07017A
public const int mtrl_popupmenu_background_dark = 2131165562;
public const int mtrl_tabs_default_indicator = 2131165562;
// aapt resource value: 0x7F07017B
public const int mtrl_tabs_default_indicator = 2131165563;
public const int navigation_empty_icon = 2131165563;
// aapt resource value: 0x7F07017C
public const int navigation_empty_icon = 2131165564;
public const int notification_action_background = 2131165564;
// aapt resource value: 0x7F07017D
public const int notification_action_background = 2131165565;
public const int notification_bg = 2131165565;
// aapt resource value: 0x7F07017E
public const int notification_bg = 2131165566;
public const int notification_bg_low = 2131165566;
// aapt resource value: 0x7F07017F
public const int notification_bg_low = 2131165567;
public const int notification_bg_low_normal = 2131165567;
// aapt resource value: 0x7F070180
public const int notification_bg_low_normal = 2131165568;
public const int notification_bg_low_pressed = 2131165568;
// aapt resource value: 0x7F070181
public const int notification_bg_low_pressed = 2131165569;
public const int notification_bg_normal = 2131165569;
// aapt resource value: 0x7F070182
public const int notification_bg_normal = 2131165570;
public const int notification_bg_normal_pressed = 2131165570;
// aapt resource value: 0x7F070183
public const int notification_bg_normal_pressed = 2131165571;
public const int notification_icon_background = 2131165571;
// aapt resource value: 0x7F070184
public const int notification_icon_background = 2131165572;
public const int notification_template_icon_bg = 2131165572;
// aapt resource value: 0x7F070185
public const int notification_template_icon_bg = 2131165573;
public const int notification_template_icon_low_bg = 2131165573;
// aapt resource value: 0x7F070186
public const int notification_template_icon_low_bg = 2131165574;
public const int notification_tile_bg = 2131165574;
// aapt resource value: 0x7F070187
public const int notification_tile_bg = 2131165575;
public const int notify_panel_notification_icon_bg = 2131165575;
// aapt resource value: 0x7F070188
public const int notify_panel_notification_icon_bg = 2131165576;
public const int preference_list_divider_material = 2131165576;
// aapt resource value: 0x7F070189
public const int preference_list_divider_material = 2131165577;
public const int sharee = 2131165577;
// aapt resource value: 0x7F07018A
public const int sharee = 2131165578;
public const int swk_theme = 2131165578;
// aapt resource value: 0x7F07018B
public const int swk_theme = 2131165579;
public const int test_custom_background = 2131165579;
// aapt resource value: 0x7F07018C
public const int test_custom_background = 2131165580;
public const int test_level_drawable = 2131165580;
// aapt resource value: 0x7F07018D
public const int test_level_drawable = 2131165581;
public const int tooltip_frame_dark = 2131165581;
// aapt resource value: 0x7F07018E
public const int tooltip_frame_dark = 2131165582;
// aapt resource value: 0x7F07018F
public const int tooltip_frame_light = 2131165583;
public const int tooltip_frame_light = 2131165582;
static Drawable()
{

2
Meinkonrad/TINK.iOS/AppDelegate.cs
View file

@ -1,4 +1,4 @@
using Foundation;
using Foundation;
using UIKit;
using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;

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

@ -55,8 +55,8 @@
<key>CFBundleDisplayName</key>
<string>Mein konrad</string>
<key>CFBundleVersion</key>
<string>353</string>
<string>354</string>
<key>CFBundleShortVersionString</key>
<string>3.0.353</string>
<string>3.0.354</string>
</dict>
</plist>

28
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="6.0.5" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.0" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -130,14 +130,14 @@
<Version>1.6.3</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="PCLCrypto" Version="2.0.147" />
<PackageReference Include="PCLStorage" Version="1.0.2" />
<PackageReference Include="Plugin.BluetoothLE">
<Version>6.3.0.19</Version>
</PackageReference>
<PackageReference Include="Serilog">
<Version>2.11.0</Version>
<Version>2.12.0</Version>
</PackageReference>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
@ -196,12 +196,12 @@
</PackageReference>
<PackageReference Include="Xam.Plugins.Messaging" Version="5.2.0" />
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.3" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.4</Version>
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.3</Version>
<Version>1.7.4</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.2515</Version>
<Version>5.0.0.2545</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -317,18 +317,6 @@
</ImageAsset>
<ImageAsset Include="Media.xcassets\Open_Red.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\Location_Pin.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\Location_Pin.imageset\Location_Pin.pdf">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\Location_Button.imageset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\Location_Button.imageset\Location_Button.pdf">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Media.xcassets\swk_theme.imageset\swk_theme.pdf">
<Visible>false</Visible>
@ -549,8 +537,6 @@
<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\Location_Pin.imageset\" />
<Folder Include="Media.xcassets\Location_Button.imageset\" />
<Folder Include="Media.xcassets\sharee_no_background.imageset\" />
<Folder Include="Media.xcassets\swk_theme.imageset\" />
</ItemGroup>

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

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;

2
Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
View file

@ -32,7 +32,7 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
IsShowingUser="False"
MyLocationEnabled="True"
MapType="Street">
<maps:Map.Behaviors>
<bindings:BindingPinsBehavior Value="{Binding Pins}"/>

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

@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
#if USEFLYOUT
using TINK.View.MasterDetail;
@ -25,6 +25,9 @@ namespace TINK.View.Contact
public SelectStationPage()
{
InitializeComponent();
MyMap.UiSettings.MyLocationButtonEnabled = true;
}
/// <summary>
@ -205,4 +208,4 @@ namespace TINK.View.Contact
}
}
}
}
}

20
Meinkonrad/TINK/View/Map/MapPage.xaml
View file

@ -33,7 +33,7 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
IsShowingUser="False"
MyLocationEnabled="True"
MapType="Street">
<maps:Map.Behaviors>
<bindings:BindingPinsBehavior Value="{Binding Pins}"/>
@ -95,24 +95,6 @@
</StackLayout>
</Frame>
<!--Center to currentLocation Button-->
<ImageButton
Grid.RowSpan="3"
Grid.ColumnSpan="3"
x:Name="CurrentLocation"
AutomationId ="currentLocaton_button"
Command="{Binding OnCurrentLocationButtonClicked}"
IsVisible="True"
BackgroundColor="GhostWhite"
VerticalOptions="End"
HorizontalOptions="Center"
Margin="0,0,0,12"
Source="Location_Button.png"
WidthRequest="40"
HeightRequest="40"
CornerRadius="20">
</ImageButton>
<!--Info text-->
<Label
Grid.Row="3"

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

@ -31,6 +31,9 @@ namespace TINK.View.Map
public MapPage()
{
InitializeComponent();
MyMap.UiSettings.MyLocationButtonEnabled = true;
}
/// <summary>

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

@ -85,10 +85,10 @@ namespace TINK.Droid
}
};
LoadApplication(new App());
await Permissions.RequestAsync<BLEPermissions>();
await Permissions.RequestAsync<Permissions.LocationWhenInUse>();
await Permissions.RequestAsync<BLEPermissions>();
LoadApplication(new App());
}
//Bluetooth Permission on Android 12 "Detect Devices nearby"

2
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.353" android:versionCode="353">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.354" android:versionCode="354">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->

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

@ -23987,211 +23987,208 @@ namespace TINK.Droid
public const int ic_vol_unmute = 2131165504;
// aapt resource value: 0x7F070141
public const int Location_Button = 2131165505;
public const int material_cursor_drawable = 2131165505;
// aapt resource value: 0x7F070142
public const int material_cursor_drawable = 2131165506;
public const int material_ic_calendar_black_24dp = 2131165506;
// aapt resource value: 0x7F070143
public const int material_ic_calendar_black_24dp = 2131165507;
public const int material_ic_clear_black_24dp = 2131165507;
// aapt resource value: 0x7F070144
public const int material_ic_clear_black_24dp = 2131165508;
public const int material_ic_edit_black_24dp = 2131165508;
// aapt resource value: 0x7F070145
public const int material_ic_edit_black_24dp = 2131165509;
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165509;
// aapt resource value: 0x7F070146
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165510;
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165510;
// aapt resource value: 0x7F070147
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165511;
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165511;
// aapt resource value: 0x7F070148
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165512;
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165512;
// aapt resource value: 0x7F070149
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165513;
public const int material_ic_menu_arrow_down_black_24dp = 2131165513;
// aapt resource value: 0x7F07014A
public const int material_ic_menu_arrow_down_black_24dp = 2131165514;
public const int material_ic_menu_arrow_up_black_24dp = 2131165514;
// aapt resource value: 0x7F07014B
public const int material_ic_menu_arrow_up_black_24dp = 2131165515;
public const int mr_button_connected_dark = 2131165515;
// aapt resource value: 0x7F07014C
public const int mr_button_connected_dark = 2131165516;
public const int mr_button_connected_light = 2131165516;
// aapt resource value: 0x7F07014D
public const int mr_button_connected_light = 2131165517;
public const int mr_button_connecting_dark = 2131165517;
// aapt resource value: 0x7F07014E
public const int mr_button_connecting_dark = 2131165518;
public const int mr_button_connecting_light = 2131165518;
// aapt resource value: 0x7F07014F
public const int mr_button_connecting_light = 2131165519;
public const int mr_button_dark = 2131165519;
// aapt resource value: 0x7F070150
public const int mr_button_dark = 2131165520;
public const int mr_button_dark_static = 2131165520;
// aapt resource value: 0x7F070151
public const int mr_button_dark_static = 2131165521;
public const int mr_button_light = 2131165521;
// aapt resource value: 0x7F070152
public const int mr_button_light = 2131165522;
public const int mr_button_light_static = 2131165522;
// aapt resource value: 0x7F070153
public const int mr_button_light_static = 2131165523;
public const int mr_cast_checkbox = 2131165523;
// aapt resource value: 0x7F070154
public const int mr_cast_checkbox = 2131165524;
public const int mr_cast_group_seekbar_track = 2131165524;
// aapt resource value: 0x7F070155
public const int mr_cast_group_seekbar_track = 2131165525;
public const int mr_cast_mute_button = 2131165525;
// aapt resource value: 0x7F070156
public const int mr_cast_mute_button = 2131165526;
public const int mr_cast_route_seekbar_track = 2131165526;
// aapt resource value: 0x7F070157
public const int mr_cast_route_seekbar_track = 2131165527;
public const int mr_cast_stop = 2131165527;
// aapt resource value: 0x7F070158
public const int mr_cast_stop = 2131165528;
public const int mr_cast_thumb = 2131165528;
// aapt resource value: 0x7F070159
public const int mr_cast_thumb = 2131165529;
public const int mr_dialog_close_dark = 2131165529;
// aapt resource value: 0x7F07015A
public const int mr_dialog_close_dark = 2131165530;
public const int mr_dialog_close_light = 2131165530;
// aapt resource value: 0x7F07015B
public const int mr_dialog_close_light = 2131165531;
public const int mr_dialog_material_background_dark = 2131165531;
// aapt resource value: 0x7F07015C
public const int mr_dialog_material_background_dark = 2131165532;
public const int mr_dialog_material_background_light = 2131165532;
// aapt resource value: 0x7F07015D
public const int mr_dialog_material_background_light = 2131165533;
public const int mr_group_collapse = 2131165533;
// aapt resource value: 0x7F07015E
public const int mr_group_collapse = 2131165534;
public const int mr_group_expand = 2131165534;
// aapt resource value: 0x7F07015F
public const int mr_group_expand = 2131165535;
public const int mr_media_pause_dark = 2131165535;
// aapt resource value: 0x7F070160
public const int mr_media_pause_dark = 2131165536;
public const int mr_media_pause_light = 2131165536;
// aapt resource value: 0x7F070161
public const int mr_media_pause_light = 2131165537;
public const int mr_media_play_dark = 2131165537;
// aapt resource value: 0x7F070162
public const int mr_media_play_dark = 2131165538;
public const int mr_media_play_light = 2131165538;
// aapt resource value: 0x7F070163
public const int mr_media_play_light = 2131165539;
public const int mr_media_stop_dark = 2131165539;
// aapt resource value: 0x7F070164
public const int mr_media_stop_dark = 2131165540;
public const int mr_media_stop_light = 2131165540;
// aapt resource value: 0x7F070165
public const int mr_media_stop_light = 2131165541;
public const int mr_vol_type_audiotrack_dark = 2131165541;
// aapt resource value: 0x7F070166
public const int mr_vol_type_audiotrack_dark = 2131165542;
public const int mr_vol_type_audiotrack_light = 2131165542;
// aapt resource value: 0x7F070167
public const int mr_vol_type_audiotrack_light = 2131165543;
public const int mtrl_dialog_background = 2131165543;
// aapt resource value: 0x7F070168
public const int mtrl_dialog_background = 2131165544;
public const int mtrl_dropdown_arrow = 2131165544;
// aapt resource value: 0x7F070169
public const int mtrl_dropdown_arrow = 2131165545;
public const int mtrl_ic_arrow_drop_down = 2131165545;
// aapt resource value: 0x7F07016A
public const int mtrl_ic_arrow_drop_down = 2131165546;
public const int mtrl_ic_arrow_drop_up = 2131165546;
// aapt resource value: 0x7F07016B
public const int mtrl_ic_arrow_drop_up = 2131165547;
public const int mtrl_ic_cancel = 2131165547;
// aapt resource value: 0x7F07016C
public const int mtrl_ic_cancel = 2131165548;
public const int mtrl_ic_error = 2131165548;
// aapt resource value: 0x7F07016D
public const int mtrl_ic_error = 2131165549;
public const int mtrl_navigation_bar_item_background = 2131165549;
// aapt resource value: 0x7F07016E
public const int mtrl_navigation_bar_item_background = 2131165550;
public const int mtrl_popupmenu_background = 2131165550;
// aapt resource value: 0x7F07016F
public const int mtrl_popupmenu_background = 2131165551;
public const int mtrl_popupmenu_background_dark = 2131165551;
// aapt resource value: 0x7F070170
public const int mtrl_popupmenu_background_dark = 2131165552;
public const int mtrl_tabs_default_indicator = 2131165552;
// aapt resource value: 0x7F070171
public const int mtrl_tabs_default_indicator = 2131165553;
public const int navigation_empty_icon = 2131165553;
// aapt resource value: 0x7F070172
public const int navigation_empty_icon = 2131165554;
public const int notification_action_background = 2131165554;
// aapt resource value: 0x7F070173
public const int notification_action_background = 2131165555;
public const int notification_bg = 2131165555;
// aapt resource value: 0x7F070174
public const int notification_bg = 2131165556;
public const int notification_bg_low = 2131165556;
// aapt resource value: 0x7F070175
public const int notification_bg_low = 2131165557;
public const int notification_bg_low_normal = 2131165557;
// aapt resource value: 0x7F070176
public const int notification_bg_low_normal = 2131165558;
public const int notification_bg_low_pressed = 2131165558;
// aapt resource value: 0x7F070177
public const int notification_bg_low_pressed = 2131165559;
public const int notification_bg_normal = 2131165559;
// aapt resource value: 0x7F070178
public const int notification_bg_normal = 2131165560;
public const int notification_bg_normal_pressed = 2131165560;
// aapt resource value: 0x7F070179
public const int notification_bg_normal_pressed = 2131165561;
public const int notification_icon_background = 2131165561;
// aapt resource value: 0x7F07017A
public const int notification_icon_background = 2131165562;
public const int notification_template_icon_bg = 2131165562;
// aapt resource value: 0x7F07017B
public const int notification_template_icon_bg = 2131165563;
public const int notification_template_icon_low_bg = 2131165563;
// aapt resource value: 0x7F07017C
public const int notification_template_icon_low_bg = 2131165564;
public const int notification_tile_bg = 2131165564;
// aapt resource value: 0x7F07017D
public const int notification_tile_bg = 2131165565;
public const int notify_panel_notification_icon_bg = 2131165565;
// aapt resource value: 0x7F07017E
public const int notify_panel_notification_icon_bg = 2131165566;
public const int preference_list_divider_material = 2131165566;
// aapt resource value: 0x7F07017F
public const int preference_list_divider_material = 2131165567;
public const int sharee = 2131165567;
// aapt resource value: 0x7F070180
public const int sharee = 2131165568;
public const int sharee_no_background = 2131165568;
// aapt resource value: 0x7F070181
public const int sharee_no_background = 2131165569;
public const int test_custom_background = 2131165569;
// aapt resource value: 0x7F070182
public const int test_custom_background = 2131165570;
public const int test_level_drawable = 2131165570;
// aapt resource value: 0x7F070183
public const int test_level_drawable = 2131165571;
public const int tooltip_frame_dark = 2131165571;
// aapt resource value: 0x7F070184
public const int tooltip_frame_dark = 2131165572;
// aapt resource value: 0x7F070185
public const int tooltip_frame_light = 2131165573;
public const int tooltip_frame_light = 2131165572;
static Drawable()
{

11
TINK/TINK.Android/TINK.Android.csproj
View file

@ -86,7 +86,7 @@
<Version>1.6.3</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="PCLCrypto" Version="2.0.147" />
<PackageReference Include="PCLStorage" Version="1.0.2" />
<PackageReference Include="PInvoke.BCrypt" Version="0.7.124" />
@ -188,16 +188,16 @@
<Version>1.2.1.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.3" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.3</Version>
<Version>1.7.4</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2545" />
<PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2515</Version>
<Version>5.0.0.2545</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>5.0.0</Version>
@ -276,7 +276,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Location_Pin.png" />
<AndroidAsset Include="Assets\Open_Blue.png" />
</ItemGroup>
<ItemGroup>

2
TINK/TINK.iOS/AppDelegate.cs
View file

@ -1,4 +1,4 @@
using Foundation;
using Foundation;
using UIKit;
using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;

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

@ -55,8 +55,8 @@
<key>CFBundleDisplayName</key>
<string>sharee.bike</string>
<key>CFBundleVersion</key>
<string>353</string>
<string>354</string>
<key>CFBundleShortVersionString</key>
<string>3.0.353</string>
<string>3.0.354</string>
</dict>
</plist>

16
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="6.0.5" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.0" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache">
<Version>1.6.3</Version>
@ -130,14 +130,14 @@
<Version>1.6.3</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="PCLCrypto" Version="2.0.147" />
<PackageReference Include="PCLStorage" Version="1.0.2" />
<PackageReference Include="Plugin.BluetoothLE">
<Version>6.3.0.19</Version>
</PackageReference>
<PackageReference Include="Serilog">
<Version>2.11.0</Version>
<Version>2.12.0</Version>
</PackageReference>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
@ -196,12 +196,12 @@
</PackageReference>
<PackageReference Include="Xam.Plugins.Messaging" Version="5.2.0" />
<PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.3" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.4</Version>
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.3</Version>
<Version>1.7.4</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.2515</Version>
<Version>5.0.0.2545</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -478,8 +478,6 @@
<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\Location_Pin.imageset\" />
<Folder Include="Media.xcassets\Location_Button.imageset\" />
<Folder Include="Media.xcassets\sharee_no_background.imageset\" />
</ItemGroup>
<Import Project="..\TINK\TINK.projitems" Label="Shared" Condition="Exists('..\TINK\TINK.projitems')" />

2
TINK/TINK/View/Contact/SelectStationPage.xaml
View file

@ -31,7 +31,7 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
IsShowingUser="False"
MyLocationEnabled="True"
MapType="Street">
<maps:Map.Behaviors>
<bindings:BindingPinsBehavior Value="{Binding Pins}"/>

7
TINK/TINK/View/Contact/SelectStationPage.xaml.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
#if USEFLYOUT
using TINK.View.MasterDetail;
@ -25,6 +25,9 @@ namespace TINK.View.Contact
public SelectStationPage()
{
InitializeComponent();
MyMap.UiSettings.MyLocationButtonEnabled = true;
}
/// <summary>
@ -204,4 +207,4 @@ namespace TINK.View.Contact
}
}
}
}
}

20
TINK/TINK/View/Map/MapPage.xaml
View file

@ -32,7 +32,7 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
IsShowingUser="False"
MyLocationEnabled="True"
MapType="Street">
<maps:Map.Behaviors>
<bindings:BindingPinsBehavior Value="{Binding Pins}"/>
@ -94,24 +94,6 @@
</StackLayout>
</Frame>
<!--Center to currentLocation Button-->
<ImageButton
Grid.RowSpan="3"
Grid.ColumnSpan="3"
x:Name="CurrentLocation"
AutomationId ="currentLocaton_button"
Command="{Binding OnCurrentLocationButtonClicked}"
IsVisible="True"
BackgroundColor="GhostWhite"
VerticalOptions="End"
HorizontalOptions="Center"
Margin="0,0,0,12"
Source="Location_Button.png"
WidthRequest="40"
HeightRequest="40"
CornerRadius="20">
</ImageButton>
<!--Info text-->
<Label
Grid.Row="3"

3
TINK/TINK/View/Map/MapPage.xaml.cs
View file

@ -31,6 +31,9 @@ namespace TINK.View.Map
public MapPage()
{
InitializeComponent();
MyMap.UiSettings.MyLocationButtonEnabled = true;
}
/// <summary>

5
TINKLib/Model/WhatsNew.cs
View file

@ -657,6 +657,11 @@ namespace TINK.Model
AppResources.ChangeLog_3_0_353_MK_SB,
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
},
{
new Version(3, 0, 354),
AppResources.ChangeLog_PackageUpdates,
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
},
};
/// <summary> Manges the whats new information.</summary>

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

@ -756,6 +756,15 @@ namespace TINK.MultilingualResources {
}
}
/// <summary>
/// Looks up a localized string similar to Software packages were updated..
/// </summary>
public static string ChangeLog_PackageUpdates {
get {
return ResourceManager.GetString("ChangeLog_PackageUpdates", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Updated to latest lock firmware..
/// </summary>

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

@ -1108,4 +1108,7 @@ Probieren Sie es aus!</value>
&lt;li/&gt;- Design von Prozessen
&lt;/ul&gt;</value>
</data>
<data name="ChangeLog_PackageUpdates" xml:space="preserve">
<value>Softwarepakete wurden aktualisiert.</value>
</data>
</root>

5
TINKLib/MultilingualResources/AppResources.resx
View file

@ -1198,4 +1198,7 @@ Try it out!</value>
&lt;li/&gt;- Design of processes
&lt;/ul&gt;</value>
</data>
</root>
<data name="ChangeLog_PackageUpdates" xml:space="preserve">
<value>Software packages were updated.</value>
</data>
</root>

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

@ -1516,6 +1516,10 @@ Probieren Sie es aus!</target>
&lt;li/&gt;- Design von Prozessen
<ept id="1">&lt;/ul&gt;</ept></target>
</trans-unit>
<trans-unit id="ChangeLog_PackageUpdates" translate="yes" xml:space="preserve">
<source>Software packages were updated.</source>
<target state="translated">Softwarepakete wurden aktualisiert.</target>
</trans-unit>
</group>
</body>
</file>

6
TINKLib/TINKLib.csproj
View file

@ -26,7 +26,7 @@
<ItemGroup>
<PackageReference Include="MonkeyCache" Version="1.6.3" />
<PackageReference Include="MonkeyCache.FileStore" Version="1.6.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Plugin.BLE" Version="2.1.3" />
<PackageReference Include="Plugin.BluetoothLE" Version="6.3.0.19" />
<PackageReference Include="Plugin.Permissions" Version="6.0.1" />
@ -44,8 +44,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.3" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.4" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2545" />
<PackageReference Include="Xamarin.Forms.GoogleMaps" Version="5.0.0" />
</ItemGroup>
<ItemGroup>

2
TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
View file

@ -152,7 +152,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
SelectedBike.LockInfo.State = LockingState.UnknownDisconnected;
}
BikesViewModel.ActionText = "Returning bike...";
BikesViewModel.ActionText = AppResources.ActivityTextReturningBike;
IsConnected = IsConnectedDelegate();
var feedBackUri = SelectedBike?.OperatorUri;

6
TINKLib/ViewModel/Contact/ContactPageViewModel.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Threading.Tasks;
@ -153,7 +153,9 @@ namespace TINK.ViewModel.Info
await Email.ComposeAsync(new EmailMessage
{
To = new List<string> { MailAddressText },
Cc = APPSUPPORTMAILADDRESS.ToUpper() != MailAddressText.ToUpper() ? new List<string> { APPSUPPORTMAILADDRESS } : new List<string>(),
Cc = APPSUPPORTMAILADDRESS.ToUpper() != MailAddressText.ToUpper() // do not sent copy if same mail adress
&& MailAddressText != "konrad@sharee.bike" // do not sent copy if Meinkonrad
? new List<string> { APPSUPPORTMAILADDRESS } : new List<string>(),
Subject = string.Format(AppResources.SupportmailSubjectAppmail, AppFlavorName)
});

79
TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
View file

@ -189,39 +189,8 @@ namespace TINK.ViewModel.Contact
Pins.Add(l_oPin);
}
//Add blue dot for showing current location of user
var status = await PermissionsService.CheckStatusAsync();
if (status == Status.Granted)
{
Location currentLocation = null;
try
{
currentLocation = await GeolocationService.GetAsync();
}
catch (Exception ex)
{
Log.ForContext<MapPageViewModel>().Error("Getting location failed. {Exception}", ex);
}
if (currentLocation != null)
{
var currentLocationPin = new Pin()
{
Position = new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude),
Label = "currentLocationPin",
Type = PinType.Place,
Tag = "NotClickable",
Icon = BitmapDescriptorFactory.FromBundle(currentLocationPinName)
};
Pins.Add(currentLocationPin);
}
}
}
public string currentLocationPinName = $"Location_Pin{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}";
/// <summary> Update all stations from TINK. </summary>
/// <param name="stationsColorList">List of colors to apply.</param>
private void UpdatePinsColor(IList<Color> stationsColorList)
@ -231,12 +200,6 @@ namespace TINK.ViewModel.Contact
// Update colors of pins.
for (int pinIndex = 0; pinIndex < stationsColorList.Count; pinIndex++)
{
if (Pins[pinIndex].Tag.ToString() == "NotClickable")
{
Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(currentLocationPinName);
}
else
{
var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId)
&& stationId <= CUSTOM_ICONS_COUNT
? $"{stationId}" // there is a station marker with index letter for given station id
@ -255,7 +218,6 @@ namespace TINK.ViewModel.Contact
Pins[pinIndex].Label = stationId.ToString();
Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]);
}
}
Pins[pinIndex].IsVisible = true;
}
@ -487,9 +449,6 @@ namespace TINK.ViewModel.Contact
/// <param name="selectedStationId">Id of station user clicked on.</param>
public async void OnStationClicked(string selectedStationId)
{
//Make shure currentLocationPin can not be clicked
if (selectedStationId != "NotClickable")
{
try
{
Log.ForContext<SelectStationPageViewModel>().Information($"User taped station {selectedStationId}.");
@ -527,11 +486,6 @@ namespace TINK.ViewModel.Contact
"OK");
}
#endif
}
else
{
return;
}
}
/// <summary>
@ -560,26 +514,23 @@ namespace TINK.ViewModel.Contact
var colors = new List<Color>();
foreach (var stationId in stationsId)
{
if (stationId != "NotClickable")
// Get color of given station.
var bikesAtStation = bikesAll.Where(x => x.StationId == stationId).ToList();
if (bikesAtStation.FirstOrDefault(x => x.State.Value.IsOccupied()) != null)
{
// Get color of given station.
var bikesAtStation = bikesAll.Where(x => x.StationId == stationId).ToList();
if (bikesAtStation.FirstOrDefault(x => x.State.Value.IsOccupied()) != null)
{
// There is at least one requested or booked bike
colors.Add(Color.LightBlue);
continue;
}
if (bikesAtStation.ToList().Count > 0)
{
// There is at least one bike available
colors.Add(Color.Green);
continue;
}
colors.Add(Color.Red);
// There is at least one requested or booked bike
colors.Add(Color.LightBlue);
continue;
}
if (bikesAtStation.ToList().Count > 0)
{
// There is at least one bike available
colors.Add(Color.Green);
continue;
}
colors.Add(Color.Red);
}
return colors;

112
TINKLib/ViewModel/Map/MapPageViewModel.cs
View file

@ -201,7 +201,7 @@ namespace TINK.ViewModel.Map
/// <summary>
/// One time setup: Sets pins into map and connects to events.
/// </summary>
public async void InitializePins(StationDictionary stations)
public void InitializePins(StationDictionary stations)
{
// Add pins to stations.
Log.ForContext<MapPageViewModel>().Debug($"Request to draw {stations.Count} pins.");
@ -228,39 +228,8 @@ namespace TINK.ViewModel.Map
Pins.Add(pin);
}
//Add blue dot for showing current location of user
var status = await PermissionsService.CheckStatusAsync();
if (status == Status.Granted)
{
Location currentLocation = null;
try
{
currentLocation = await GeolocationService.GetAsync();
}
catch (Exception ex)
{
Log.ForContext<MapPageViewModel>().Error("Getting location failed. {Exception}", ex);
}
if (currentLocation != null)
{
var currentLocationPin = new Pin()
{
Position = new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude),
Label = "currentLocationPin",
Type = PinType.Place,
Tag = "NotClickable",
Icon = BitmapDescriptorFactory.FromBundle(currentLocationPinName)
};
Pins.Add(currentLocationPin);
}
}
}
public string currentLocationPinName = $"Location_Pin{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}";
/// <summary> Update all stations from TINK. </summary>
/// <param name="stationsColorList">List of colors to apply.</param>
private void UpdatePinsColor(IList<Color> stationsColorList)
@ -270,12 +239,6 @@ namespace TINK.ViewModel.Map
// Update colors of pins.
for (int pinIndex = 0; pinIndex < stationsColorList.Count; pinIndex++)
{
if (Pins[pinIndex].Tag.ToString() == "NotClickable")
{
Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(currentLocationPinName);
}
else
{
var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId)
&& stationId <= CUSTOM_ICONS_COUNT
? $"{stationId}" // there is a station marker with index letter for given station id
@ -294,7 +257,6 @@ namespace TINK.ViewModel.Map
Pins[pinIndex].Label = stationId.ToString();
Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]);
}
}
Pins[pinIndex].IsVisible = true;
}
@ -334,11 +296,6 @@ namespace TINK.ViewModel.Map
return "Red";
}
if (color == Color.Black)
{
return "NotClickable";
}
return color.ToString();
}
@ -694,9 +651,6 @@ namespace TINK.ViewModel.Map
/// <param name="selectedStationId">Id of station user clicked on.</param>
public async void OnStationClicked(string selectedStationId)
{
//Make shure currentLocationPin can not be clicked
if (selectedStationId != "NotClickable")
{
try
{
Log.ForContext<MapPageViewModel>().Information($"User taped station {selectedStationId}.");
@ -732,11 +686,6 @@ namespace TINK.ViewModel.Map
"OK");
}
#endif
}
else
{
return;
}
}
/// <summary>
@ -765,30 +714,23 @@ namespace TINK.ViewModel.Map
var colors = new List<Color>();
foreach (var stationId in stationsId)
{
if (stationId != "NotClickable")
// Get color of given station.
var bikesAtStation = bikesAll.Where(x => x.StationId == stationId).ToList();
if (bikesAtStation.FirstOrDefault(x => x.State.Value.IsOccupied()) != null)
{
// Get color of given station.
var bikesAtStation = bikesAll.Where(x => x.StationId == stationId).ToList();
if (bikesAtStation.FirstOrDefault(x => x.State.Value.IsOccupied()) != null)
{
// There is at least one requested or booked bike
colors.Add(Color.LightBlue);
continue;
}
if (bikesAtStation.ToList().Count > 0)
{
// There is at least one bike available
colors.Add(Color.Green);
continue;
}
colors.Add(Color.Red);
// There is at least one requested or booked bike
colors.Add(Color.LightBlue);
continue;
}
else
if (bikesAtStation.ToList().Count > 0)
{
colors.Add(Color.Black);
// There is at least one bike available
colors.Add(Color.Green);
continue;
}
colors.Add(Color.Red);
}
return colors;
@ -924,7 +866,6 @@ namespace TINK.ViewModel.Map
{
try
{
IsRunning = true;
ActionText = AppResources.ActivityTextCenterMap;
IsMapPageEnabled = false;
@ -961,7 +902,6 @@ namespace TINK.ViewModel.Map
if (currentLocation != null)
{
IsRunning = true;
ActionText = AppResources.ActivityTextCenterMap;
TinkApp.UserMapSpan = MapSpan.FromCenterAndRadius(
@ -972,28 +912,6 @@ namespace TINK.ViewModel.Map
MoveAndScale(m_oMoveToRegionDelegate, TinkApp.ActiveMapSpan);
Pins.Clear();
// Update stations
IsConnected = TinkApp.GetIsConnected();
var resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync();
// Set pins to their positions on map.
ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes;
InitializePins(resultStationsAndBikes.Response.StationsAll);
Log.ForContext<MapPageViewModel>().Verbose("Update of pins done...");
// Update pin colors.
Log.ForContext<MapPageViewModel>().Verbose("Starting update pins color...");
var l_oColors = GetStationColors(
Pins.Select(x => x.Tag.ToString()).ToList(),
resultStationsAndBikes.Response.Bikes);
// Update pins color form count of bikes located at station.
UpdatePinsColor(l_oColors);
Log.ForContext<MapPageViewModel>().Verbose("Update pins color done.");
try
{
// Update bikes at station or my bikes depending on context.
@ -1013,7 +931,6 @@ namespace TINK.ViewModel.Map
}
}
IsRunning = false;
IsMapPageEnabled = true;
Log.ForContext<MapPageViewModel>().Information($"Center to current Position done.");
ActionText = String.Empty;
@ -1030,7 +947,6 @@ namespace TINK.ViewModel.Map
AppResources.MessageAnswerOk);
IsMapPageEnabled = true;
IsRunning = false;
}
}

2
TestLockItBLE/TestLockItBLE.csproj
View file

@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="NSubstitute" Version="4.4.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
</ItemGroup>

2
TestLockItShared/TestLockItShared.csproj
View file

@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
</ItemGroup>

4
TestShareeLib/TestShareeLib.csproj
View file

@ -31,9 +31,9 @@
<ItemGroup>
<PackageReference Include="NSubstitute" Version="4.4.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.4" />
</ItemGroup>
<ItemGroup>

2
TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj
View file

@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="NUnit.Analyzers" Version="3.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

6
TestTINKLib/TestTINKLib.csproj
View file

@ -130,7 +130,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version>
<Version>13.0.2</Version>
</PackageReference>
<PackageReference Include="NSubstitute">
<Version>4.4.0</Version>
@ -139,7 +139,7 @@
<Version>3.13.3</Version>
</PackageReference>
<PackageReference Include="NUnit3TestAdapter">
<Version>4.3.0</Version>
<Version>4.3.1</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
@ -162,7 +162,7 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.3</Version>
<Version>1.7.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>