diff --git a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
index 02b7d8d..d7106b1 100644
--- a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
+++ b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
@@ -86,7 +86,7 @@
1.6.3
-
+
@@ -188,16 +188,16 @@
1.2.1.8
-
+
2.0.5
- 1.7.3
+ 1.7.4
-
+
- 5.0.0.2515
+ 5.0.0.2545
5.0.0
@@ -240,10 +240,6 @@
-
- Designer
- MSBuild:UpdateGeneratedFiles
-
@@ -287,9 +283,6 @@
-
-
-
diff --git a/LastenradBayern/TINK.Android/MainActivity.cs b/LastenradBayern/TINK.Android/MainActivity.cs
index d73928b..aefbfcf 100644
--- a/LastenradBayern/TINK.Android/MainActivity.cs
+++ b/LastenradBayern/TINK.Android/MainActivity.cs
@@ -85,10 +85,10 @@ namespace TINK.Droid
}
};
- LoadApplication(new App());
-
await Permissions.RequestAsync();
await Permissions.RequestAsync();
+
+ LoadApplication(new App());
}
//Bluetooth Permission on Android 12 "Detect Devices nearby"
diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index 787dc31..6487f48 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs b/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs
index e62375f..3275cbd 100644
--- a/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs
+++ b/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs
@@ -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()
{
diff --git a/LastenradBayern/TINK.iOS/AppDelegate.cs b/LastenradBayern/TINK.iOS/AppDelegate.cs
index eafc057..4e60104 100644
--- a/LastenradBayern/TINK.iOS/AppDelegate.cs
+++ b/LastenradBayern/TINK.iOS/AppDelegate.cs
@@ -1,4 +1,4 @@
-using Foundation;
+using Foundation;
using UIKit;
using Xamarin.Forms;
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index e1f93ef..2c61032 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -55,8 +55,8 @@
CFBundleDisplayName
LastenradBayern
CFBundleVersion
- 353
+ 354
CFBundleShortVersionString
- 3.0.353
+ 3.0.354
diff --git a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
index c9886b1..fb56822 100644
--- a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
+++ b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
@@ -120,7 +120,7 @@
-
+
1.6.3
@@ -129,14 +129,14 @@
1.6.3
-
+
6.3.0.19
- 2.11.0
+ 2.12.0
@@ -195,12 +195,12 @@
-
+
- 2.0.4
+ 2.0.5
- 1.7.3
+ 1.7.4
5.0.0
@@ -220,7 +220,7 @@
0.7.124
- 5.0.0.2515
+ 5.0.0.2545
@@ -319,18 +319,6 @@
false
-
- false
-
-
- false
-
-
- false
-
-
- false
-
false
@@ -447,8 +435,6 @@
-
-
diff --git a/LastenradBayern/TINK/App.xaml.cs b/LastenradBayern/TINK/App.xaml.cs
index d5844a9..a6b270b 100644
--- a/LastenradBayern/TINK/App.xaml.cs
+++ b/LastenradBayern/TINK/App.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
diff --git a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml
index d883915..b7ecd53 100644
--- a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml
+++ b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml
@@ -19,7 +19,6 @@
VerticalOptions="FillAndExpand">
diff --git a/LastenradBayern/TINK/View/Map/MapPage.xaml b/LastenradBayern/TINK/View/Map/MapPage.xaml
index f4c9deb..05a202f 100644
--- a/LastenradBayern/TINK/View/Map/MapPage.xaml
+++ b/LastenradBayern/TINK/View/Map/MapPage.xaml
@@ -28,7 +28,6 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
- IsShowingUser="False"
MapType="Street">
@@ -89,26 +88,6 @@
-
-
-
-
+
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceBase.cs
similarity index 100%
rename from LockItBLE/Services/BluetoothLock/BLE/LockItByScanService.cs
rename to LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceBase.cs
diff --git a/LockItShared/LockItShared.csproj b/LockItShared/LockItShared.csproj
index 1ce5ae9..3169c5a 100644
--- a/LockItShared/LockItShared.csproj
+++ b/LockItShared/LockItShared.csproj
@@ -22,7 +22,7 @@
-
+
diff --git a/Meinkonrad/TINK.Android/MainActivity.cs b/Meinkonrad/TINK.Android/MainActivity.cs
index 7ae866c..49cf35b 100644
--- a/Meinkonrad/TINK.Android/MainActivity.cs
+++ b/Meinkonrad/TINK.Android/MainActivity.cs
@@ -85,10 +85,10 @@ namespace TINK.Droid
}
};
- LoadApplication(new App());
-
- await Permissions.RequestAsync();
await Permissions.RequestAsync();
+ await Permissions.RequestAsync();
+
+ LoadApplication(new App());
}
//Bluetooth Permission on Android 12 "Detect Devices nearby"
diff --git a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
index 35f5ff7..efd3aae 100644
--- a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
+++ b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
@@ -86,7 +86,7 @@
1.6.3
-
+
@@ -188,16 +188,16 @@
1.2.1.8
-
+
2.0.5
- 1.7.3
+ 1.7.4
-
+
- 5.0.0.2515
+ 5.0.0.2545
5.0.0
@@ -240,10 +240,6 @@
-
- Designer
- MSBuild:UpdateGeneratedFiles
-
@@ -287,9 +283,6 @@
-
-
-
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index beaeb5e..bbadc8b 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs b/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs
index 55af60d..cf3fffb 100644
--- a/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs
+++ b/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs
@@ -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()
{
diff --git a/Meinkonrad/TINK.iOS/AppDelegate.cs b/Meinkonrad/TINK.iOS/AppDelegate.cs
index 318d042..672b083 100644
--- a/Meinkonrad/TINK.iOS/AppDelegate.cs
+++ b/Meinkonrad/TINK.iOS/AppDelegate.cs
@@ -1,4 +1,4 @@
-using Foundation;
+using Foundation;
using UIKit;
using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index 55c2a3a..4c91c1d 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -55,8 +55,8 @@
CFBundleDisplayName
Mein konrad
CFBundleVersion
- 353
+ 354
CFBundleShortVersionString
- 3.0.353
+ 3.0.354
diff --git a/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj b/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
index 1ea3946..20b0cf5 100644
--- a/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
+++ b/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
@@ -121,7 +121,7 @@
-
+
1.6.3
@@ -130,14 +130,14 @@
1.6.3
-
+
6.3.0.19
- 2.11.0
+ 2.12.0
@@ -196,12 +196,12 @@
-
+
- 2.0.4
+ 2.0.5
- 1.7.3
+ 1.7.4
5.0.0
@@ -221,7 +221,7 @@
0.7.124
- 5.0.0.2515
+ 5.0.0.2545
@@ -317,18 +317,6 @@
false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
false
@@ -549,8 +537,6 @@
-
-
diff --git a/Meinkonrad/TINK/App.xaml.cs b/Meinkonrad/TINK/App.xaml.cs
index b56a8fc..2c99d0b 100644
--- a/Meinkonrad/TINK/App.xaml.cs
+++ b/Meinkonrad/TINK/App.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
diff --git a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
index 6e6a31b..a223da7 100644
--- a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
+++ b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
@@ -32,7 +32,7 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
- IsShowingUser="False"
+ MyLocationEnabled="True"
MapType="Street">
diff --git a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
index 772a063..91d7e18 100644
--- a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
@@ -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;
+
}
///
@@ -205,4 +208,4 @@ namespace TINK.View.Contact
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Meinkonrad/TINK/View/Map/MapPage.xaml b/Meinkonrad/TINK/View/Map/MapPage.xaml
index 81d738c..94ea774 100644
--- a/Meinkonrad/TINK/View/Map/MapPage.xaml
+++ b/Meinkonrad/TINK/View/Map/MapPage.xaml
@@ -33,7 +33,7 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
- IsShowingUser="False"
+ MyLocationEnabled="True"
MapType="Street">
@@ -95,24 +95,6 @@
-
-
-
-
-
diff --git a/TINK/TINK.iOS/AppDelegate.cs b/TINK/TINK.iOS/AppDelegate.cs
index 318d042..672b083 100644
--- a/TINK/TINK.iOS/AppDelegate.cs
+++ b/TINK/TINK.iOS/AppDelegate.cs
@@ -1,4 +1,4 @@
-using Foundation;
+using Foundation;
using UIKit;
using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index 111a74a..3c5d40a 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -55,8 +55,8 @@
CFBundleDisplayName
sharee.bike
CFBundleVersion
- 353
+ 354
CFBundleShortVersionString
- 3.0.353
+ 3.0.354
diff --git a/TINK/TINK.iOS/TINK.iOS.csproj b/TINK/TINK.iOS/TINK.iOS.csproj
index c920057..d799e50 100644
--- a/TINK/TINK.iOS/TINK.iOS.csproj
+++ b/TINK/TINK.iOS/TINK.iOS.csproj
@@ -121,7 +121,7 @@
-
+
1.6.3
@@ -130,14 +130,14 @@
1.6.3
-
+
6.3.0.19
- 2.11.0
+ 2.12.0
@@ -196,12 +196,12 @@
-
+
- 2.0.4
+ 2.0.5
- 1.7.3
+ 1.7.4
5.0.0
@@ -221,7 +221,7 @@
0.7.124
- 5.0.0.2515
+ 5.0.0.2545
@@ -478,8 +478,6 @@
-
-
diff --git a/TINK/TINK/View/Contact/SelectStationPage.xaml b/TINK/TINK/View/Contact/SelectStationPage.xaml
index 82cf6d7..2a658a7 100644
--- a/TINK/TINK/View/Contact/SelectStationPage.xaml
+++ b/TINK/TINK/View/Contact/SelectStationPage.xaml
@@ -31,7 +31,7 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
- IsShowingUser="False"
+ MyLocationEnabled="True"
MapType="Street">
diff --git a/TINK/TINK/View/Contact/SelectStationPage.xaml.cs b/TINK/TINK/View/Contact/SelectStationPage.xaml.cs
index 587548d..d1f97d4 100644
--- a/TINK/TINK/View/Contact/SelectStationPage.xaml.cs
+++ b/TINK/TINK/View/Contact/SelectStationPage.xaml.cs
@@ -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;
+
}
///
@@ -204,4 +207,4 @@ namespace TINK.View.Contact
}
}
}
-}
\ No newline at end of file
+}
diff --git a/TINK/TINK/View/Map/MapPage.xaml b/TINK/TINK/View/Map/MapPage.xaml
index 18825c3..e6d9029 100644
--- a/TINK/TINK/View/Map/MapPage.xaml
+++ b/TINK/TINK/View/Map/MapPage.xaml
@@ -32,7 +32,7 @@
WidthRequest="320"
HeightRequest="800"
x:Name="MyMap"
- IsShowingUser="False"
+ MyLocationEnabled="True"
MapType="Street">
@@ -94,24 +94,6 @@
-
-
-
-