diff --git a/TINK/TINK/App.xaml b/TINK/TINK/App.xaml index beb2c68..ddb09a9 100644 --- a/TINK/TINK/App.xaml +++ b/TINK/TINK/App.xaml @@ -6,6 +6,7 @@ + diff --git a/TINK/TINK/TINK.projitems b/TINK/TINK/TINK.projitems index 3862ac9..6704967 100644 --- a/TINK/TINK/TINK.projitems +++ b/TINK/TINK/TINK.projitems @@ -33,6 +33,10 @@ FeedbackPopup.xaml Code + + FindBikePage.xaml + Code + FlyoutHeader.xaml @@ -314,4 +318,10 @@ MSBuild:UpdateDesignTimeXaml + + + Designer + MSBuild:UpdateDesignTimeXaml + + \ No newline at end of file diff --git a/TINK/TINK/View/FindBike/FindBikePage.xaml b/TINK/TINK/View/FindBike/FindBikePage.xaml new file mode 100644 index 0000000..93ddbdf --- /dev/null +++ b/TINK/TINK/View/FindBike/FindBikePage.xaml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/TINK/TINK/View/FindBike/FindBikePage.xaml.cs b/TINK/TINK/View/FindBike/FindBikePage.xaml.cs new file mode 100644 index 0000000..57bd8af --- /dev/null +++ b/TINK/TINK/View/FindBike/FindBikePage.xaml.cs @@ -0,0 +1,14 @@ +using Xamarin.Forms; +using Xamarin.Forms.Xaml; + +namespace TINK.View.FindBike +{ + [XamlCompilation(XamlCompilationOptions.Compile)] + public partial class FindBikePage : ContentPage + { + public FindBikePage () + { + InitializeComponent (); + } + } +} \ No newline at end of file diff --git a/TINK/TINK/View/RootShell/AppShell.xaml b/TINK/TINK/View/RootShell/AppShell.xaml index 7b87ac3..adc4a20 100644 --- a/TINK/TINK/View/RootShell/AppShell.xaml +++ b/TINK/TINK/View/RootShell/AppShell.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib" xmlns:mappage="clr-namespace:TINK.View.Map" + xmlns:findbike="clr-namespace:TINK.View.FindBike" xmlns:mybikes="clr-namespace:TINK.View.MyBikes" xmlns:account="clr-namespace:TINK.View.Account" xmlns:login="clr-namespace:TINK.View.Login" @@ -27,6 +28,16 @@ + + + + + + + - + diff --git a/TINK/TINK/ViewModel/RootFlyout/RootPageViewModel.cs b/TINK/TINK/ViewModel/RootFlyout/RootPageViewModel.cs index b8bf379..a604d37 100644 --- a/TINK/TINK/ViewModel/RootFlyout/RootPageViewModel.cs +++ b/TINK/TINK/ViewModel/RootFlyout/RootPageViewModel.cs @@ -10,6 +10,7 @@ using TINK.View.Contact; using TINK.View.Info; using TINK.View.Login; using TINK.View.Map; +using TINK.View.FindBike; using TINK.View.MyBikes; using TINK.View.Root; using TINK.View.Settings; @@ -51,6 +52,7 @@ namespace TINK.ViewModel.Root if (App.ModelRoot.ActiveUser.IsLoggedIn) { CheckAddItem(typeof(MyBikesPage)); + CheckAddItem(typeof(FindBikePage)); CheckAddItem(typeof(AccountPage)); } else diff --git a/TINK/TINK/ViewModel/RootMasterDetail/Helper.cs b/TINK/TINK/ViewModel/RootMasterDetail/Helper.cs index 79091dd..8d3555a 100644 --- a/TINK/TINK/ViewModel/RootMasterDetail/Helper.cs +++ b/TINK/TINK/ViewModel/RootMasterDetail/Helper.cs @@ -2,6 +2,7 @@ using TINK.MultilingualResources; using TINK.View.Account; using TINK.View.Contact; +using TINK.View.FindBike; using TINK.View.Info; using TINK.View.Login; using TINK.View.Map; @@ -24,6 +25,10 @@ namespace TINK.ViewModel.MasterDetail { return AppResources.MarkingMapPage; } + else if (type == typeof(FindBikePage)) // Find Bike + { + return AppResources.MarkingFindBike; + } else if (type == typeof(MyBikesPage)) // My Bikes { return AppResources.MarkingMyBikes; @@ -69,6 +74,10 @@ namespace TINK.ViewModel.MasterDetail { return "\uf5a0"; } + else if (type == typeof(FindBikePage)) // My Bikes + { + return "\uf002"; + } else if (type == typeof(MyBikesPage)) // My Bikes { return "\uf206"; diff --git a/TINK/TINK/ViewModel/RootMasterDetail/MasterPageViewModel.cs b/TINK/TINK/ViewModel/RootMasterDetail/MasterPageViewModel.cs index 48b17fd..a82f5fc 100644 --- a/TINK/TINK/ViewModel/RootMasterDetail/MasterPageViewModel.cs +++ b/TINK/TINK/ViewModel/RootMasterDetail/MasterPageViewModel.cs @@ -8,6 +8,7 @@ using TINK.Services.CopriApi.ServerUris; using TINK.View; using TINK.View.Account; using TINK.View.Contact; +using TINK.View.FindBike; using TINK.View.Info; using TINK.View.Login; using TINK.View.Map; @@ -44,6 +45,7 @@ namespace TINK.ViewModel if (App.ModelRoot.ActiveUser.IsLoggedIn) { CheckAddItem(typeof(MyBikesPage)); + CheckAddItem(typeof(FindBikePage)); CheckAddItem(typeof(AccountPage)); } else diff --git a/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs b/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs index 2f10af2..80835fc 100644 --- a/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs +++ b/TINK/TINK/ViewModel/RootShell/AppShellViewModel.cs @@ -15,6 +15,7 @@ namespace TINK.ViewModel.RootShell { // Login state changed. Update related menu entries. PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible))); + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible))); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible))); @@ -56,6 +57,8 @@ namespace TINK.ViewModel.RootShell public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn; + public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn; + public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn; public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn; diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs index 8b88ac1..7ef04a4 100644 --- a/TINKLib/MultilingualResources/AppResources.Designer.cs +++ b/TINKLib/MultilingualResources/AppResources.Designer.cs @@ -1047,6 +1047,15 @@ namespace TINK.MultilingualResources { } } + /// + /// Looks up a localized string similar to Find Bike. + /// + public static string MarkingFindBike { + get { + return ResourceManager.GetString("MarkingFindBike", resourceCulture); + } + } + /// /// Looks up a localized string similar to Logged in as {0}.. /// diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx index 2a14ae4..98a0535 100644 --- a/TINKLib/MultilingualResources/AppResources.de.resx +++ b/TINKLib/MultilingualResources/AppResources.de.resx @@ -604,4 +604,7 @@ Layout Anzeige Radnamen und nummern verbessert. Fehlerbehebung: Radname wird wieder korrekt angezeigt. + + Fahrrad Wählen + \ No newline at end of file diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx index 19d1819..c12350d 100644 --- a/TINKLib/MultilingualResources/AppResources.resx +++ b/TINKLib/MultilingualResources/AppResources.resx @@ -700,4 +700,7 @@ Layout of bike names and id display improved. Bugfix: Bike description is displayed correctly again. + + Find Bike + \ No newline at end of file diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf index f2fd400..826ff44 100644 --- a/TINKLib/MultilingualResources/TINKLib.de.xlf +++ b/TINKLib/MultilingualResources/TINKLib.de.xlf @@ -809,6 +809,10 @@ Layout Anzeige Radnamen und nummern verbessert. Bugfix: Bike description is displayed correctly again. Fehlerbehebung: Radname wird wieder korrekt angezeigt. + + Find Bike + Fahrrad Wählen + diff --git a/TINKLib/ViewModel/FindBike/FindBikeViewModel.cs b/TINKLib/ViewModel/FindBike/FindBikeViewModel.cs new file mode 100644 index 0000000..1e04f28 --- /dev/null +++ b/TINKLib/ViewModel/FindBike/FindBikeViewModel.cs @@ -0,0 +1,7 @@ + +namespace TINK.ViewModel.FindBike +{ + public class FindBikeViewModel + { + } +}