diff --git a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
index 5137748..107b089 100644
--- a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
+++ b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
@@ -16,7 +16,7 @@
Resources\Resource.Designer.cs
Off
Properties\AndroidManifest.xml
- v12.0
+ v13.0
2G
diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index c766c10..0cbb211 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -9,14 +9,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -38,4 +35,4 @@
-
+
\ No newline at end of file
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index 2576b2f..8fe5a6d 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
CFBundleDisplayName
LastenradBayern
CFBundleVersion
- 368
+ 369
CFBundleShortVersionString
- 3.0.368
+ 3.0.369
diff --git a/LastenradBayern/TINK/LastenradBayern.projitems b/LastenradBayern/TINK/LastenradBayern.projitems
index 93b0c15..f386ef1 100644
--- a/LastenradBayern/TINK/LastenradBayern.projitems
+++ b/LastenradBayern/TINK/LastenradBayern.projitems
@@ -196,40 +196,18 @@
MSBuild:UpdateDesignTimeXaml
-
-
-
Designer
MSBuild:UpdateDesignTimeXaml
-
-
-
-
-
-
-
-
-
-
-
-
-
Designer
MSBuild:Compile
-
-
-
-
-
-
Designer
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
index 1ae9a04..fbb0623 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
@@ -4,77 +4,171 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
x:Class="TINK.View.Contact.ContactPage">
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+ x:Name="PhoneNumberButton"
+ IsVisible="{Binding PhoneNumberText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
+ Text="{Binding PhoneNumberText}"
+ IsEnabled="{Binding IsDoPhoncallAvailable}"
+ Command="{Binding OnPhoneRequest}"/>
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
index c24b533..9c5a4ba 100644
--- a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
+++ b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
@@ -16,7 +16,7 @@
Resources\Resource.Designer.cs
Off
Properties\AndroidManifest.xml
- v12.0
+ v13.0
2G
@@ -302,21 +302,6 @@
MSBuild:UpdateGeneratedFiles
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
MSBuild:UpdateGeneratedFiles
@@ -362,41 +347,11 @@
MSBuild:UpdateGeneratedFiles
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
MSBuild:UpdateGeneratedFiles
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
MSBuild:UpdateGeneratedFiles
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index a953d3a..93dfb60 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -9,14 +9,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -38,4 +35,4 @@
-
+
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Resources/Font Awesome 5 Free-Solid-900.otf b/Meinkonrad/TINK.Android/Resources/Font Awesome 5 Free-Solid-900.otf
deleted file mode 100644
index 8fb28d5..0000000
Binary files a/Meinkonrad/TINK.Android/Resources/Font Awesome 5 Free-Solid-900.otf and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Resources/drawable/konrad_nobg.png b/Meinkonrad/TINK.Android/Resources/drawable/konrad_nobg.png
index 5ccab43..9864fcf 100644
Binary files a/Meinkonrad/TINK.Android/Resources/drawable/konrad_nobg.png and b/Meinkonrad/TINK.Android/Resources/drawable/konrad_nobg.png differ
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index 9220d17..a4b0628 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
CFBundleDisplayName
Mein konrad
CFBundleVersion
- 368
+ 369
CFBundleShortVersionString
- 3.0.368
+ 3.0.369
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/swk_theme.imageset/swk_theme.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/swk_theme.imageset/swk_theme.pdf
index 952b24d..a66df6b 100644
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/swk_theme.imageset/swk_theme.pdf and b/Meinkonrad/TINK.iOS/Media.xcassets/swk_theme.imageset/swk_theme.pdf differ
diff --git a/Meinkonrad/TINK/Meinkonrad.projitems b/Meinkonrad/TINK/Meinkonrad.projitems
index c9d3f76..24eecc6 100644
--- a/Meinkonrad/TINK/Meinkonrad.projitems
+++ b/Meinkonrad/TINK/Meinkonrad.projitems
@@ -201,40 +201,18 @@
MSBuild:UpdateDesignTimeXaml
-
-
-
Designer
MSBuild:UpdateDesignTimeXaml
-
-
-
-
-
-
-
-
-
-
-
-
-
Designer
MSBuild:Compile
-
-
-
-
-
-
Designer
diff --git a/Meinkonrad/TINK/View/Account/AccountPage.xaml b/Meinkonrad/TINK/View/Account/AccountPage.xaml
index 093bd5a..4f78fed 100644
--- a/Meinkonrad/TINK/View/Account/AccountPage.xaml
+++ b/Meinkonrad/TINK/View/Account/AccountPage.xaml
@@ -5,6 +5,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
mc:Ignorable="d"
+ xmlns:conv="clr-namespace:TINK.View"
+ xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
x:Class="TINK.View.Account.AccountPage"
BackgroundColor="{DynamicResource background-color}">
@@ -16,11 +18,19 @@
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
index 58dc1c4..7f99f96 100644
--- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
+++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
@@ -89,7 +89,7 @@
diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
index 2ff3f1e..aa0090e 100644
--- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml
+++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
@@ -21,103 +21,158 @@
-
+
-
+
+
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+ Margin="0,0,0,10"
+ VerticalOptions="End"
+ Spacing="0">
-
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
diff --git a/Meinkonrad/TINK/View/Login/LoginPage.xaml b/Meinkonrad/TINK/View/Login/LoginPage.xaml
index b1ada6e..742928b 100644
--- a/Meinkonrad/TINK/View/Login/LoginPage.xaml
+++ b/Meinkonrad/TINK/View/Login/LoginPage.xaml
@@ -2,6 +2,7 @@
@@ -14,118 +15,137 @@
-
+
+
+
-
+
+
+
+
+ Grid.Row="0">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/Meinkonrad/TINK/View/Login/LoginPage.xaml.cs b/Meinkonrad/TINK/View/Login/LoginPage.xaml.cs
index b1e85fb..95785d6 100644
--- a/Meinkonrad/TINK/View/Login/LoginPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Login/LoginPage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Threading.Tasks;
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.Model.Device;
@@ -18,18 +18,22 @@ namespace TINK.View.Login
public partial class LoginPage : ContentPage, IViewService
#endif
{
+ /// Reference to view model.
+ LoginPageViewModel m_oViewModel = null;
+
+ /// Constructs a login page.
public LoginPage()
{
InitializeComponent();
var l_oModel = App.ModelRoot;
#if !BACKSTYLE
- var l_oViewModel = new LoginPageViewModel(
+ m_oViewModel = new LoginPageViewModel(
l_oModel,
(url) => DependencyService.Get().OpenUrl(url),
this);
- LoginPageView.BindingContext = l_oViewModel;
+ BindingContext = m_oViewModel;
#else
LoginPageView.BindingContext = new LoginPageViewModel(l_oModel.ActiveUser, this, Navigation);
#endif
@@ -120,4 +124,4 @@ namespace TINK.View.Login
public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
}
-}
\ No newline at end of file
+}
diff --git a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
index c37ff91..0f1fa27 100644
--- a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
+++ b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
@@ -46,7 +46,7 @@
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index 54e5733..bb328da 100644
--- a/TINK/TINK.Android/Properties/AndroidManifest.xml
+++ b/TINK/TINK.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -9,14 +9,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/TINK/TINK.Android/TINK.Android.csproj b/TINK/TINK.Android/TINK.Android.csproj
index 471beae..1de4864 100644
--- a/TINK/TINK.Android/TINK.Android.csproj
+++ b/TINK/TINK.Android/TINK.Android.csproj
@@ -16,7 +16,7 @@
Resources\Resource.Designer.cs
Off
Properties\AndroidManifest.xml
- v12.0
+ v13.0
2G
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index df64174..a304081 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
CFBundleDisplayName
sharee.bike
CFBundleVersion
- 368
+ 369
CFBundleShortVersionString
- 3.0.368
+ 3.0.369
diff --git a/TINK/TINK.iOS/Media.xcassets/AppIcons.appiconset/tink2.png b/TINK/TINK.iOS/Media.xcassets/AppIcons.appiconset/tink2.png
deleted file mode 100644
index 6b76f57..0000000
Binary files a/TINK/TINK.iOS/Media.xcassets/AppIcons.appiconset/tink2.png and /dev/null differ
diff --git a/TINK/TINK.iOS/Resources/tink2.png b/TINK/TINK.iOS/Resources/tink2.png
deleted file mode 100644
index b33b28b..0000000
Binary files a/TINK/TINK.iOS/Resources/tink2.png and /dev/null differ
diff --git a/TINK/TINK.iOS/TINK.iOS.csproj b/TINK/TINK.iOS/TINK.iOS.csproj
index ccceed3..058a4a4 100644
--- a/TINK/TINK.iOS/TINK.iOS.csproj
+++ b/TINK/TINK.iOS/TINK.iOS.csproj
@@ -271,9 +271,6 @@
..\..\..\..\.nuget\packages\xamarin.google.ios.maps\2.5.0\lib\Xamarin.iOS10\Google.Maps.dll
-
-
-
{bde9ce26-15cf-47da-a4f6-b6956d02d0fc}
diff --git a/TINK/TINK/Images/Konrad.png b/TINK/TINK/Images/Konrad.png
deleted file mode 100644
index 4b5658a..0000000
Binary files a/TINK/TINK/Images/Konrad.png and /dev/null differ
diff --git a/TINK/TINK/Images/Tink2.png b/TINK/TINK/Images/Tink2.png
deleted file mode 100644
index 0388177..0000000
Binary files a/TINK/TINK/Images/Tink2.png and /dev/null differ
diff --git a/TINK/TINK/Images/belt1_image.4XWCQY_679_382.png b/TINK/TINK/Images/belt1_image.4XWCQY_679_382.png
deleted file mode 100644
index 6433405..0000000
Binary files a/TINK/TINK/Images/belt1_image.4XWCQY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/belt1_image.4XWCQY_793_446.png b/TINK/TINK/Images/belt1_image.4XWCQY_793_446.png
deleted file mode 100644
index 0b6827f..0000000
Binary files a/TINK/TINK/Images/belt1_image.4XWCQY_793_446.png and /dev/null differ
diff --git a/TINK/TINK/Images/belt2_image.X3F1PY_1280_720.png b/TINK/TINK/Images/belt2_image.X3F1PY_1280_720.png
deleted file mode 100644
index 5713063..0000000
Binary files a/TINK/TINK/Images/belt2_image.X3F1PY_1280_720.png and /dev/null differ
diff --git a/TINK/TINK/Images/belt2_image.X3F1PY_679_382.png b/TINK/TINK/Images/belt2_image.X3F1PY_679_382.png
deleted file mode 100644
index 186c8ff..0000000
Binary files a/TINK/TINK/Images/belt2_image.X3F1PY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/belt3_image.DYOXPY_1280_720.png b/TINK/TINK/Images/belt3_image.DYOXPY_1280_720.png
deleted file mode 100644
index 220e362..0000000
Binary files a/TINK/TINK/Images/belt3_image.DYOXPY_1280_720.png and /dev/null differ
diff --git a/TINK/TINK/Images/belt3_image.DYOXPY_679_382.png b/TINK/TINK/Images/belt3_image.DYOXPY_679_382.png
deleted file mode 100644
index c92b7af..0000000
Binary files a/TINK/TINK/Images/belt3_image.DYOXPY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/seat1_image.ZQ65PY_680_382.png b/TINK/TINK/Images/seat1_image.ZQ65PY_680_382.png
deleted file mode 100644
index efb9c09..0000000
Binary files a/TINK/TINK/Images/seat1_image.ZQ65PY_680_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/seat1_image.ZQ65PY_797_448.png b/TINK/TINK/Images/seat1_image.ZQ65PY_797_448.png
deleted file mode 100644
index 8e74cf7..0000000
Binary files a/TINK/TINK/Images/seat1_image.ZQ65PY_797_448.png and /dev/null differ
diff --git a/TINK/TINK/Images/seat2_image.QQZCQY_1280_720.png b/TINK/TINK/Images/seat2_image.QQZCQY_1280_720.png
deleted file mode 100644
index 3b82fc6..0000000
Binary files a/TINK/TINK/Images/seat2_image.QQZCQY_1280_720.png and /dev/null differ
diff --git a/TINK/TINK/Images/seat2_image.QQZCQY_679_382.png b/TINK/TINK/Images/seat2_image.QQZCQY_679_382.png
deleted file mode 100644
index 689de9d..0000000
Binary files a/TINK/TINK/Images/seat2_image.QQZCQY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/seat3_image.NQ5FQY_1280_720.png b/TINK/TINK/Images/seat3_image.NQ5FQY_1280_720.png
deleted file mode 100644
index 4eb4530..0000000
Binary files a/TINK/TINK/Images/seat3_image.NQ5FQY_1280_720.png and /dev/null differ
diff --git a/TINK/TINK/Images/seat3_image.NQ5FQY_679_382.png b/TINK/TINK/Images/seat3_image.NQ5FQY_679_382.png
deleted file mode 100644
index 699e3b8..0000000
Binary files a/TINK/TINK/Images/seat3_image.NQ5FQY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_brake1_image.HZ17PY_678_382.png b/TINK/TINK/Images/trike_brake1_image.HZ17PY_678_382.png
deleted file mode 100644
index a6e112a..0000000
Binary files a/TINK/TINK/Images/trike_brake1_image.HZ17PY_678_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_brake2_image.1YBAQY_1280_720.png b/TINK/TINK/Images/trike_brake2_image.1YBAQY_1280_720.png
deleted file mode 100644
index c68c373..0000000
Binary files a/TINK/TINK/Images/trike_brake2_image.1YBAQY_1280_720.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_brake2_image.1YBAQY_679_382.png b/TINK/TINK/Images/trike_brake2_image.1YBAQY_679_382.png
deleted file mode 100644
index c389545..0000000
Binary files a/TINK/TINK/Images/trike_brake2_image.1YBAQY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_brake3_image.FJM2PY_1280_720.png b/TINK/TINK/Images/trike_brake3_image.FJM2PY_1280_720.png
deleted file mode 100644
index 7c68a90..0000000
Binary files a/TINK/TINK/Images/trike_brake3_image.FJM2PY_1280_720.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_brake3_image.FJM2PY_679_382.png b/TINK/TINK/Images/trike_brake3_image.FJM2PY_679_382.png
deleted file mode 100644
index 3e6bace..0000000
Binary files a/TINK/TINK/Images/trike_brake3_image.FJM2PY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_stand1_image.4HJ5PY_679_382.png b/TINK/TINK/Images/trike_stand1_image.4HJ5PY_679_382.png
deleted file mode 100644
index dc648b2..0000000
Binary files a/TINK/TINK/Images/trike_stand1_image.4HJ5PY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_stand1_image.4HJ5PY_800_450.png b/TINK/TINK/Images/trike_stand1_image.4HJ5PY_800_450.png
deleted file mode 100644
index f2ac458..0000000
Binary files a/TINK/TINK/Images/trike_stand1_image.4HJ5PY_800_450.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_stand2_image.RIX2PY_1280_720.png b/TINK/TINK/Images/trike_stand2_image.RIX2PY_1280_720.png
deleted file mode 100644
index 5a8041f..0000000
Binary files a/TINK/TINK/Images/trike_stand2_image.RIX2PY_1280_720.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_stand2_image.RIX2PY_679_382.png b/TINK/TINK/Images/trike_stand2_image.RIX2PY_679_382.png
deleted file mode 100644
index d8c493b..0000000
Binary files a/TINK/TINK/Images/trike_stand2_image.RIX2PY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_stand3_image.FDR7PY_1280_720.png b/TINK/TINK/Images/trike_stand3_image.FDR7PY_1280_720.png
deleted file mode 100644
index b47d5f1..0000000
Binary files a/TINK/TINK/Images/trike_stand3_image.FDR7PY_1280_720.png and /dev/null differ
diff --git a/TINK/TINK/Images/trike_stand3_image.FDR7PY_679_382.png b/TINK/TINK/Images/trike_stand3_image.FDR7PY_679_382.png
deleted file mode 100644
index 5f769d5..0000000
Binary files a/TINK/TINK/Images/trike_stand3_image.FDR7PY_679_382.png and /dev/null differ
diff --git a/TINK/TINK/Resources/Fonts/Roboto-Bold.ttf b/TINK/TINK/Resources/Fonts/Roboto-Bold.ttf
new file mode 100644
index 0000000..7a876e2
Binary files /dev/null and b/TINK/TINK/Resources/Fonts/Roboto-Bold.ttf differ
diff --git a/TINK/TINK/Resources/Fonts/Roboto-Italic.ttf b/TINK/TINK/Resources/Fonts/Roboto-Italic.ttf
new file mode 100644
index 0000000..55f55ec
Binary files /dev/null and b/TINK/TINK/Resources/Fonts/Roboto-Italic.ttf differ
diff --git a/TINK/TINK/TINK.projitems b/TINK/TINK/TINK.projitems
index 3f3e8de..3a05e39 100644
--- a/TINK/TINK/TINK.projitems
+++ b/TINK/TINK/TINK.projitems
@@ -196,40 +196,18 @@
MSBuild:UpdateDesignTimeXaml
-
-
-
Designer
MSBuild:UpdateDesignTimeXaml
-
-
-
-
-
-
-
-
-
-
-
-
-
Designer
MSBuild:Compile
-
-
-
-
-
-
Designer
@@ -340,4 +318,8 @@
MSBuild:Compile
+
+
+
+
\ No newline at end of file
diff --git a/TINK/TINK/View/Account/AccountPage.xaml b/TINK/TINK/View/Account/AccountPage.xaml
index 1595d18..e485f00 100644
--- a/TINK/TINK/View/Account/AccountPage.xaml
+++ b/TINK/TINK/View/Account/AccountPage.xaml
@@ -3,7 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+ xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+ xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+ xmlns:conv="clr-namespace:TINK.View"
mc:Ignorable="d"
x:Class="TINK.View.Account.AccountPage"
BackgroundColor="{DynamicResource background-color}">
@@ -14,39 +16,49 @@
Text="{x:Static resources:AppResources.MarkingAccount}"/>
+
+
+
+
-
+
+
+
+
+ Padding="10"
+ Margin="0,10,0,5"
+ HorizontalOptions="FillAndExpand"
+ BackgroundColor="White">
+ Padding="10">
+ Text="{Binding LoggedInInfo}" />
+ IsVisible="{Binding IsBookingStateInfoVisible}"
+ Text="{Binding BookingStateInfo}" />
+ Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}"
+ Command="{Binding OnManageAccount}"
+ IsEnabled="{Binding IsLogoutPossible}">
+
+ Style="{StaticResource SecondaryButton}"
+ Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}"
+ Command="{Binding OnLogoutRequest}"
+ IsEnabled="{Binding IsLogoutPossible}">
+
@@ -56,6 +68,13 @@
+
+
+
+
+
diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
index 89bb8ff..643a03a 100644
--- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
+++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
@@ -88,7 +88,7 @@
diff --git a/TINK/TINK/View/Contact/ContactPage.xaml b/TINK/TINK/View/Contact/ContactPage.xaml
index d9c4b68..f52432f 100644
--- a/TINK/TINK/View/Contact/ContactPage.xaml
+++ b/TINK/TINK/View/Contact/ContactPage.xaml
@@ -17,106 +17,161 @@
-
-
-
+
-
+
+
+ Grid.Row="0"
+ Padding="10"
+ Margin="0,10,0,5"
+ HorizontalOptions="FillAndExpand"
+ VerticalOptions="Start"
+ BackgroundColor="White"
+ HasShadow="False">
+ Padding="20">
-
+
+
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+ x:Name="MailAddressButton"
+ IsVisible="{Binding MailAddressText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
+ Text="{Binding MailAddressText}"
+ IsEnabled="{Binding IsSendMailAvailable}"
+ Command="{Binding OnMailToOperatorRequest}"/>
+
+
+
+
+
+
-
+
+ Margin="0,0,0,10"
+ VerticalOptions="End"
+ Spacing="0">
-
-
+
-
+
-
-
+
-
-
-
+
-
-
-
-
-
+
diff --git a/TINK/TINK/View/Login/LoginPage.xaml b/TINK/TINK/View/Login/LoginPage.xaml
index bf81768..dcd146a 100644
--- a/TINK/TINK/View/Login/LoginPage.xaml
+++ b/TINK/TINK/View/Login/LoginPage.xaml
@@ -1,130 +1,150 @@
-
-
+ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+ xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+ xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+ xmlns:conv="clr-namespace:TINK.View"
+ x:Class="TINK.View.Login.LoginPage"
+ BackgroundColor="{DynamicResource background-color}">
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
diff --git a/TINK/TINK/View/Login/LoginPage.xaml.cs b/TINK/TINK/View/Login/LoginPage.xaml.cs
index dfe92fd..95785d6 100644
--- a/TINK/TINK/View/Login/LoginPage.xaml.cs
+++ b/TINK/TINK/View/Login/LoginPage.xaml.cs
@@ -18,18 +18,22 @@ namespace TINK.View.Login
public partial class LoginPage : ContentPage, IViewService
#endif
{
+ /// Reference to view model.
+ LoginPageViewModel m_oViewModel = null;
+
+ /// Constructs a login page.
public LoginPage()
{
InitializeComponent();
var l_oModel = App.ModelRoot;
#if !BACKSTYLE
- var l_oViewModel = new LoginPageViewModel(
+ m_oViewModel = new LoginPageViewModel(
l_oModel,
(url) => DependencyService.Get().OpenUrl(url),
this);
- LoginPageView.BindingContext = l_oViewModel;
+ BindingContext = m_oViewModel;
#else
LoginPageView.BindingContext = new LoginPageViewModel(l_oModel.ActiveUser, this, Navigation);
#endif
diff --git a/TINK/TINK/View/MyBikes/MyBikesPage.xaml b/TINK/TINK/View/MyBikes/MyBikesPage.xaml
index 95ad1a9..6c29148 100644
--- a/TINK/TINK/View/MyBikes/MyBikesPage.xaml
+++ b/TINK/TINK/View/MyBikes/MyBikesPage.xaml
@@ -43,7 +43,7 @@
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index 84fe950..3bc5421 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -702,6 +702,11 @@ namespace TINK.Model
new Version(3, 0, 368),
string.Format("{0}
{1}", AppResources.ChangeLog_PackageUpdates, AppResources.ChangeLog_MinorBugFixes),
new List { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
+ },
+ {
+ new Version(3, 0, 369),
+ AppResources.ChangeLog_3_0_369_MK_SB,
+ new List { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
},
};
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index fa1f100..2816441 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -96,24 +96,6 @@ namespace TINK.MultilingualResources {
}
}
- ///
- /// Looks up a localized string similar to Sent e-mail.
- ///
- public static string ActionContactMailAppReleated {
- get {
- return ResourceManager.GetString("ActionContactMailAppReleated", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Submit rating.
- ///
- public static string ActionContactRate {
- get {
- return ResourceManager.GetString("ActionContactRate", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Give feedback.
///
@@ -204,6 +186,15 @@ namespace TINK.MultilingualResources {
}
}
+ ///
+ /// Looks up a localized string similar to Select another station.
+ ///
+ public static string ActionSelectAnotherStation {
+ get {
+ return ResourceManager.GetString("ActionSelectAnotherStation", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Select station.
///
@@ -213,6 +204,15 @@ namespace TINK.MultilingualResources {
}
}
+ ///
+ /// Looks up a localized string similar to <u>Transfer diagnostic file</u>.
+ ///
+ public static string ActionSendDiagnosis {
+ get {
+ return ResourceManager.GetString("ActionSendDiagnosis", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Auth. expired.
///
@@ -811,6 +811,17 @@ namespace TINK.MultilingualResources {
}
}
+ ///
+ /// Looks up a localized string similar to We have re-designed the contact page:
+ /// <ul><li>Please contact the customer support immediately in case of problems with the bike rental!
+ ///</li><li>To diagnose a problem, you can send us your app usage data via "Transfer diagnostic file". Without your active sending we do not record any of your data!</li></ul>.
+ ///
+ public static string ChangeLog_3_0_369_MK_SB {
+ get {
+ return ResourceManager.GetString("ChangeLog_3_0_369_MK_SB", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to - We have fixed a few minor bugs. Enjoy the ride!.
///
@@ -2023,7 +2034,16 @@ namespace TINK.MultilingualResources {
}
///
- /// Looks up a localized string similar to Contact operator?.
+ /// Looks up a localized string similar to Customer support.
+ ///
+ public static string MarkingContactCustomerSupportTitle {
+ get {
+ return ResourceManager.GetString("MarkingContactCustomerSupportTitle", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to First select the station whose operator you want to contact..
///
public static string MarkingContactNoStationInfoAvailableNoButton {
get {
@@ -2166,6 +2186,15 @@ namespace TINK.MultilingualResources {
}
}
+ ///
+ /// Looks up a localized string similar to Last selected station.
+ ///
+ public static string MarkingLastSelectedStation {
+ get {
+ return ResourceManager.GetString("MarkingLastSelectedStation", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Lock control.
///
@@ -2329,6 +2358,15 @@ namespace TINK.MultilingualResources {
}
}
+ ///
+ /// Looks up a localized string similar to Operator.
+ ///
+ public static string MarkingOperator {
+ get {
+ return ResourceManager.GetString("MarkingOperator", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Is bike okay?.
///
@@ -2976,15 +3014,6 @@ namespace TINK.MultilingualResources {
}
}
- ///
- /// Looks up a localized string similar to Feedback to app development?.
- ///
- public static string MessageRateMail {
- get {
- return ResourceManager.GetString("MessageRateMail", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Connection error when renting the bike!.
///
@@ -3084,15 +3113,6 @@ namespace TINK.MultilingualResources {
}
}
- ///
- /// Looks up a localized string similar to {0}-app releated request.
- ///
- public static string MiscContactMailAppReleatedSubject {
- get {
- return ResourceManager.GetString("MiscContactMailAppReleatedSubject", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Prefix and No., e.g. TR15.
///
@@ -3193,9 +3213,9 @@ namespace TINK.MultilingualResources {
}
///
- /// Looks up a localized string similar to I hereby consent to the transmission of my log file.
+ /// Looks up a localized string similar to I hereby consent to the transmission of my diagnostic file.
///
- ///The log file contains your app usage data as well as system information. The data will only be used for diagnostic purposes or to improve the app and then deleted..
+ ///The diagnostic file contains your app usage data as well as system information. The data will only be used for diagnostic purposes or to improve the app and is then deleted..
///
public static string QuestionSupportmailAttachment {
get {
@@ -3384,7 +3404,7 @@ namespace TINK.MultilingualResources {
}
///
- /// Looks up a localized string similar to {0} request.
+ /// Looks up a localized string similar to {0}-request: station {1}.
///
public static string SupportmailSubjectOperatormail {
get {
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index 85da6ea..a2672c7 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -157,9 +157,6 @@ Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformatio
Fragen? Hinweise?
-
- Rückmeldung an die App-Entwicklung?
-
Warnung
@@ -170,9 +167,9 @@ Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformatio
Ja
- Hiermit stimme ich der Übermittlung meiner Protokolldatei zu.
+ Hiermit stimme ich der Übermittlung meiner Diagnosedatei zu.
-Die Protokolldatei enthält Ihre App-Nutzungsdaten sowie Systeminformationen. Die Daten werden ausschließlich für Diagnosezwecke bzw. Verbesserung der App verwendet und werden anschließend gelöscht.
+Die Diagnosedatei enthält Ihre App-Nutzungsdaten sowie Systeminformationen. Die Daten werden ausschließlich für Diagnosezwecke bzw. Verbesserung der App verwendet und werden anschließend gelöscht.
Frage
@@ -248,9 +245,6 @@ Bitte melden Sie sich erneut an.
Passwort
-
- Bewertung abgeben
-
Anleitung TINK Räder
@@ -605,7 +599,7 @@ Layout Anzeige Radnamen und nummern verbessert.
Bitte Anmelden, um Räder zu reservieren! <font color="blue"><u>Hier</u></font> tippen, um auf Anmeldeseite zu wechseln.
- Betreiber kontaktieren?
+ Wählen Sie zunächst die Station, zu deren Betreiber Sie Kontakt aufnehmen möchten.
Auf der Kontaktseite werden Kontaktinformationen betreiberspezifisch angezeigt.
@@ -907,13 +901,6 @@ Kleinere Fehlerbehebungen.
Rückmeldung geben
-
- E-Mail senden
-
-
- {0}-App Anfrage
- Subject of contact mail to ("Feedback about the app").
-
Verbingungsfehler beim Reservieren des Rads!
@@ -998,7 +985,7 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
{0}-App Anfrage
- {0} Anfrage
+ {0}-Anfrage: Station {1}
Nein, Datei nicht anhängen
@@ -1207,4 +1194,24 @@ Außerdem:<br/>
Standortabfrage fehlgeschlagen
+
+ Kundensupport
+
+
+ Andere Station auswählen
+
+
+ <u>Diagnosedatei übermitteln</u>
+
+
+ Zuletzt ausgewählte Station
+
+
+ Betreiber
+
+
+ Wir haben die Kontakt-Seite neu gestaltet:
+ <ul><li>Bitte kontaktieren Sie bei Problemen bei der Fahrradmiete umgehend den Kundensupport!
+</li><li>Für die Diagnose eines Problems können Sie über "Diagnosedatei übermitteln" Ihre App-Nutzungsdaten an uns senden. Ohne Ihr aktives Zusenden zeichnen wir keine Ihrer Daten auf!</li></ul>
+
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index 1c314ed..f19f10a 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -248,9 +248,6 @@ Please log in again.
Urgent questions?
-
- Feedback to app development?
-
Warning
@@ -267,9 +264,9 @@ Please log in again.
{0} request
- I hereby consent to the transmission of my log file.
+ I hereby consent to the transmission of my diagnostic file.
-The log file contains your app usage data as well as system information. The data will only be used for diagnostic purposes or to improve the app and then deleted.
+The diagnostic file contains your app usage data as well as system information. The data will only be used for diagnostic purposes or to improve the app and is then deleted.
Does your request/comment relate to the {0}-app or to a more general subject?
@@ -328,9 +325,6 @@ The log file contains your app usage data as well as system information. The dat
Location {0}, still {1} min. reserved.
-
- Submit rating
-
Login
@@ -714,7 +708,7 @@ Layout of bike names and id display improved.
Find bike by id functionality added.
- Contact operator?
+ First select the station whose operator you want to contact.
<u>Contact</u> {0}.
@@ -1012,13 +1006,6 @@ Minor bugfixes.
Give feedback
-
- Sent e-mail
-
-
- {0}-app releated request
- Subject of contact mail to ("Feedback about the app").
-
Connection error when reserving the bike!
@@ -1103,7 +1090,7 @@ In addition: Small graphics let you see at a glance what type of bike it is.{0}-app request
- {0} request
+ {0}-request: station {1}
No, do not attach file
@@ -1296,4 +1283,24 @@ Also:<br/>
Location query failed
+
+ Select another station
+
+
+ Customer support
+
+
+ Last selected station
+
+
+ Operator
+
+
+ <u>Transfer diagnostic file</u>
+
+
+ We have re-designed the contact page:
+ <ul><li>Please contact the customer support immediately in case of problems with the bike rental!
+</li><li>To diagnose a problem, you can send us your app usage data via "Transfer diagnostic file". Without your active sending we do not record any of your data!</li></ul>
+
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index 52a4170..5c1d473 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -202,10 +202,6 @@ Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformatio
Fragen? Hinweise?
-
-
- Rückmeldung an die App-Entwicklung?
-
Warnung
@@ -219,12 +215,12 @@ Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformatio
Ja
-
+ Hiermit stimme ich der Übermittlung meiner Diagnosedatei zu.
-Die Protokolldatei enthält Ihre App-Nutzungsdaten sowie Systeminformationen. Die Daten werden ausschließlich für Diagnosezwecke bzw. Verbesserung der App verwendet und werden anschließend gelöscht.
+Die Diagnosedatei enthält Ihre App-Nutzungsdaten sowie Systeminformationen. Die Daten werden ausschließlich für Diagnosezwecke bzw. Verbesserung der App verwendet und werden anschließend gelöscht.
Question
@@ -323,10 +319,6 @@ Bitte melden Sie sich erneut an.
Password
Passwort
-
- Submit rating
- Bewertung abgeben
-
Instructions TINK bikes
Anleitung TINK Räder
@@ -814,8 +806,8 @@ Layout Anzeige Radnamen und nummern verbessert.
Bitte Anmelden, um Räder zu reservieren! <font color="blue"><u>Hier</u></font> tippen, um auf Anmeldeseite zu wechseln.
- Contact operator?
- Betreiber kontaktieren?
+ First select the station whose operator you want to contact.
+ Wählen Sie zunächst die Station, zu deren Betreiber Sie Kontakt aufnehmen möchten.
Bike sharing system operator specific support info displayed on contact page.
@@ -1234,16 +1226,6 @@ Kleinere Fehlerbehebungen.
Give feedback
Rückmeldung geben
-
- Sent e-mail
- E-Mail senden
-
-
- {0}-app releated request
- {0}-App Anfrage
- Subject of contact mail to ("Feedback about the app").
- Please verify the translation’s accuracy as the source string was updated after it was translated.
-
Connection error when reserving the bike!
Verbingungsfehler beim Reservieren des Rads!
@@ -1361,8 +1343,8 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
{0}-App Anfrage
- {0} request
- {0} Anfrage
+ {0}-request: station {1}
+ {0}-Anfrage: Station {1}
No, do not attach file
@@ -1669,6 +1651,34 @@ Außerdem:<br/>
Location query failed
Standortabfrage fehlgeschlagen
+
+ Customer support
+ Kundensupport
+
+
+ Select another station
+ Andere Station auswählen
+
+
+ <u>Transfer diagnostic file</u>
+ <u>Diagnosedatei übermitteln</u>
+
+
+ Last selected station
+ Zuletzt ausgewählte Station
+
+
+ Operator
+ Betreiber
+
+
+ We have re-designed the contact page:
+ <ul><li>Please contact the customer support immediately in case of problems with the bike rental!
+</li><li>To diagnose a problem, you can send us your app usage data via "Transfer diagnostic file". Without your active sending we do not record any of your data!</li></ul>
+ Wir haben die Kontakt-Seite neu gestaltet:
+ <ul><li>Bitte kontaktieren Sie bei Problemen bei der Fahrradmiete umgehend den Kundensupport!
+</li><li>Für die Diagnose eines Problems können Sie über "Diagnosedatei übermitteln" Ihre App-Nutzungsdaten an uns senden. Ohne Ihr aktives Zusenden zeichnen wir keine Ihrer Daten auf!</li></ul>
+