refactoring
This commit is contained in:
parent
f2de8d9db5
commit
9b215072e1
18 changed files with 49 additions and 50 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
using Xamarin.Forms;
|
using Xamarin.Forms;
|
||||||
|
|
||||||
namespace BookAStar.Pages
|
namespace BookAStar.Pages.BlogPages
|
||||||
{
|
{
|
||||||
public class BlogPage : ContentPage
|
public class BlogPage : ContentPage
|
||||||
{
|
{
|
||||||
|
|
@ -6,9 +6,9 @@ using Xamarin.Forms;
|
||||||
namespace BookAStar.Pages
|
namespace BookAStar.Pages
|
||||||
{
|
{
|
||||||
using Data;
|
using Data;
|
||||||
using Model;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using ViewModels;
|
using ViewModels.Messaging;
|
||||||
|
|
||||||
public partial class ChatPage : TabbedPage
|
public partial class ChatPage : TabbedPage
|
||||||
{
|
{
|
||||||
public string ChatUser { get; set; }
|
public string ChatUser { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,8 @@ using XLabs.Platform.Services;
|
||||||
namespace BookAStar.Pages
|
namespace BookAStar.Pages
|
||||||
{
|
{
|
||||||
using Data;
|
using Data;
|
||||||
|
using ViewModels.EstimateAndBilling;
|
||||||
|
|
||||||
public partial class BookQueriesPage : ContentPage
|
public partial class BookQueriesPage : ContentPage
|
||||||
{
|
{
|
||||||
public BookQueriesPage()
|
public BookQueriesPage()
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ namespace BookAStar.Pages
|
||||||
using Model;
|
using Model;
|
||||||
using Model.Workflow;
|
using Model.Workflow;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using ViewModels;
|
using ViewModels.EstimateAndBilling;
|
||||||
|
|
||||||
public partial class BookQueryPage : ContentPage
|
public partial class BookQueryPage : ContentPage
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
using BookAStar.Data;
|
using BookAStar.Data;
|
||||||
using BookAStar.ViewModels;
|
using BookAStar.ViewModels;
|
||||||
|
using BookAStar.ViewModels.EstimateAndBilling;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Xamarin.Forms;
|
using Xamarin.Forms;
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,8 @@ namespace BookAStar.Pages
|
||||||
{
|
{
|
||||||
using Data;
|
using Data;
|
||||||
using Model.Workflow;
|
using Model.Workflow;
|
||||||
using ViewModels;
|
using ViewModels.EstimateAndBilling;
|
||||||
|
|
||||||
public partial class EditEstimatePage : ContentPage
|
public partial class EditEstimatePage : ContentPage
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||||
xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
|
xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||||
x:Class="BookAStar.Pages.AccountChooserPage"
|
x:Class="BookAStar.Pages.UserProfile.AccountChooserPage"
|
||||||
Title="Paramètres Booking star" Style="{StaticResource PageStyle}"
|
Title="Paramètres Booking star" Style="{StaticResource PageStyle}"
|
||||||
xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
|
xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
|
||||||
xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms">
|
xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms">
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
>
|
>
|
||||||
<ListView.Header>
|
<ListView.Header>
|
||||||
<StackLayout Orientation="Horizontal">
|
<StackLayout Orientation="Horizontal">
|
||||||
|
|
||||||
<Button x:Name="AddAccountBtn" Text="Connection, ou création d'un compte" />
|
<Button x:Name="AddAccountBtn" Text="Connection, ou création d'un compte" />
|
||||||
</StackLayout>
|
</StackLayout>
|
||||||
</ListView.Header>
|
</ListView.Header>
|
||||||
|
|
@ -1,17 +1,15 @@
|
||||||
using BookAStar.Model.Auth.Account;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Xamarin.Forms;
|
using Xamarin.Forms;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
|
||||||
using BookAStar.Helpers;
|
using BookAStar.Helpers;
|
||||||
using XLabs.Forms.Behaviors;
|
using XLabs.Forms.Behaviors;
|
||||||
using System.Diagnostics;
|
|
||||||
using XLabs.Forms.Controls;
|
using XLabs.Forms.Controls;
|
||||||
|
using BookAStar.Model.Auth.Account;
|
||||||
|
|
||||||
namespace BookAStar.Pages
|
namespace BookAStar.Pages.UserProfile
|
||||||
{
|
{
|
||||||
|
|
||||||
public partial class AccountChooserPage : ContentPage
|
public partial class AccountChooserPage : ContentPage
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
|
xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
|
||||||
xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
|
xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
|
||||||
xmlns:extensions="clr-namespace:BookAStar.Extensions;assembly=BookAStar"
|
xmlns:extensions="clr-namespace:BookAStar.Extensions;assembly=BookAStar"
|
||||||
x:Class="BookAStar.Pages.DashboardPage"
|
x:Class="BookAStar.Pages.UserProfile.DashboardPage"
|
||||||
xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
|
xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
|
||||||
xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms"
|
xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms"
|
||||||
Style="{StaticResource PageStyle}">
|
Style="{StaticResource PageStyle}">
|
||||||
|
|
@ -52,6 +52,7 @@
|
||||||
<Button Text="{Binding PerformerStatus}" Clicked="OnViewPerformerStatus" />
|
<Button Text="{Binding PerformerStatus}" Clicked="OnViewPerformerStatus" />
|
||||||
<Button Text="{Binding UserQueries}" Clicked="OnViewUserQueries"
|
<Button Text="{Binding UserQueries}" Clicked="OnViewUserQueries"
|
||||||
VisualElement.IsVisible="{Binding UserIsPro}"/>
|
VisualElement.IsVisible="{Binding UserIsPro}"/>
|
||||||
|
<Button Text="{Binding UserFilesLabel}" Clicked="OnManageFiles" />
|
||||||
<StackLayout Orientation="Horizontal" VisualElement.IsVisible="{Binding HaveAnUser}">
|
<StackLayout Orientation="Horizontal" VisualElement.IsVisible="{Binding HaveAnUser}">
|
||||||
<Label Text="Recevoir les notifications push" StyleClass="Header" />
|
<Label Text="Recevoir les notifications push" StyleClass="Header" />
|
||||||
<Switch IsToggled="{Binding ReceivePushNotifications, Mode=TwoWay}"
|
<Switch IsToggled="{Binding ReceivePushNotifications, Mode=TwoWay}"
|
||||||
|
|
@ -1,23 +1,14 @@
|
||||||
using BookAStar.ViewModels;
|
using System;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
using Xamarin.Forms;
|
using Xamarin.Forms;
|
||||||
using XLabs.Forms.Behaviors;
|
using XLabs.Forms.Behaviors;
|
||||||
using XLabs.Forms.Controls;
|
|
||||||
using XLabs.Forms.Mvvm;
|
|
||||||
using XLabs.Ioc;
|
|
||||||
using XLabs.Platform.Services;
|
|
||||||
|
|
||||||
namespace BookAStar.Pages
|
namespace BookAStar.Pages.UserProfile
|
||||||
{
|
{
|
||||||
|
using Data;
|
||||||
|
using ViewModels.UserProfile;
|
||||||
public partial class DashboardPage : ContentPage
|
public partial class DashboardPage : ContentPage
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
public DashboardPage()
|
public DashboardPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
@ -32,6 +23,10 @@ namespace BookAStar.Pages
|
||||||
ShowPage<AccountChooserPage>(null, true);
|
ShowPage<AccountChooserPage>(null, true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
public void OnManageFiles(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
ShowPage<UserFiles>(new object[] { new DirectoryInfoViewModel() }, true);
|
||||||
|
}
|
||||||
public void OnViewPerformerStatus(object sender, EventArgs e)
|
public void OnViewPerformerStatus(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
ShowPage<AccountChooserPage>(null, true);
|
ShowPage<AccountChooserPage>(null, true);
|
||||||
|
|
@ -4,10 +4,8 @@ using BookAStar.Model.Workflow;
|
||||||
using System;
|
using System;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using Xamarin.Forms;
|
|
||||||
using XLabs.Forms.Mvvm;
|
|
||||||
|
|
||||||
namespace BookAStar.ViewModels
|
namespace BookAStar.ViewModels.EstimateAndBilling
|
||||||
{
|
{
|
||||||
public class BillingLineViewModel : EditingViewModel, IBillingLine
|
public class BillingLineViewModel : EditingViewModel, IBillingLine
|
||||||
{
|
{
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
|
||||||
namespace BookAStar.ViewModels
|
namespace BookAStar.ViewModels.EstimateAndBilling
|
||||||
{
|
{
|
||||||
using Data;
|
using Data;
|
||||||
using Model;
|
using Model;
|
||||||
|
|
@ -3,7 +3,7 @@ using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using XLabs.Forms.Mvvm;
|
using XLabs.Forms.Mvvm;
|
||||||
|
|
||||||
namespace BookAStar.ViewModels
|
namespace BookAStar.ViewModels.EstimateAndBilling
|
||||||
{
|
{
|
||||||
using Data;
|
using Data;
|
||||||
using Interfaces;
|
using Interfaces;
|
||||||
|
|
@ -6,7 +6,7 @@ using Xamarin.Forms;
|
||||||
using BookAStar.Data;
|
using BookAStar.Data;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
namespace BookAStar.ViewModels
|
namespace BookAStar.ViewModels.EstimateAndBilling
|
||||||
{
|
{
|
||||||
public class EditEstimateViewModel : EditingViewModel
|
public class EditEstimateViewModel : EditingViewModel
|
||||||
{
|
{
|
||||||
|
|
@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using XLabs.Forms.Mvvm;
|
using XLabs.Forms.Mvvm;
|
||||||
|
|
||||||
namespace BookAStar.ViewModels
|
namespace BookAStar.ViewModels.Messaging
|
||||||
{
|
{
|
||||||
using Data;
|
using Data;
|
||||||
using Model;
|
using Model;
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using XLabs.Forms.Mvvm;
|
||||||
|
|
||||||
|
namespace BookAStar.ViewModels.Signing
|
||||||
|
{
|
||||||
|
class EstimateSignaturePad: ViewModel
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using XLabs.Forms.Mvvm;
|
|
||||||
|
|
||||||
namespace BookAStar.ViewModels
|
|
||||||
{
|
|
||||||
class UserLoginViewModel : ViewModel
|
|
||||||
{
|
|
||||||
public string UserName { get; set; }
|
|
||||||
public string Password { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -7,15 +7,20 @@ using XLabs.Forms.Mvvm;
|
||||||
using XLabs.Ioc;
|
using XLabs.Ioc;
|
||||||
using XLabs.Platform.Services;
|
using XLabs.Platform.Services;
|
||||||
|
|
||||||
namespace BookAStar.ViewModels
|
namespace BookAStar.ViewModels.UserProfile
|
||||||
{
|
{
|
||||||
using Data;
|
using Data;
|
||||||
using Helpers;
|
using Helpers;
|
||||||
using Model.Auth.Account;
|
using Model.Auth.Account;
|
||||||
using Pages;
|
using Pages.UserProfile;
|
||||||
|
|
||||||
internal class DashboardViewModel : ViewModel
|
internal class DashboardViewModel : ViewModel
|
||||||
{
|
{
|
||||||
|
public string UserFilesLabel
|
||||||
|
{
|
||||||
|
get; set;
|
||||||
|
}
|
||||||
|
|
||||||
int rating;
|
int rating;
|
||||||
public int Rating
|
public int Rating
|
||||||
{
|
{
|
||||||
Loading…
Add table
Add a link
Reference in a new issue