paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Paul Schneider
2016-11-14 17:55:24 +01:00
parent efa18ea450
commit 9ba8a14fae
18 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BookAStar/BookAStar/Pages/BlogPage.cs → BookAStar/BookAStar/Pages/BlogPages/BlogPage.cs
View File

@ -2,7 +2,7 @@
using Xamarin.Forms;
namespace BookAStar.Pages
namespace BookAStar.Pages.BlogPages
{
public class BlogPage : ContentPage
{

4
BookAStar/BookAStar/Pages/ChatPage.xaml.cs
View File

@ -6,9 +6,9 @@ using Xamarin.Forms;
namespace BookAStar.Pages
{
using Data;
using Model;
using System.Linq;
using ViewModels;
using ViewModels.Messaging;
public partial class ChatPage : TabbedPage
{
public string ChatUser { get; set; }

2
BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml.cs
View File

@ -7,6 +7,8 @@ using XLabs.Platform.Services;
namespace BookAStar.Pages
{
using Data;
using ViewModels.EstimateAndBilling;
public partial class BookQueriesPage : ContentPage
{
public BookQueriesPage()

2
BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml.cs
View File

@ -8,7 +8,7 @@ namespace BookAStar.Pages
using Model;
using Model.Workflow;
using System.Linq;
using ViewModels;
using ViewModels.EstimateAndBilling;
public partial class BookQueryPage : ContentPage
{

1
BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml.cs
View File

@ -1,5 +1,6 @@
using BookAStar.Data;
using BookAStar.ViewModels;
using BookAStar.ViewModels.EstimateAndBilling;
using System;
using System.Collections.Generic;
using Xamarin.Forms;

3
BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml.cs
View File

@ -5,7 +5,8 @@ namespace BookAStar.Pages
{
using Data;
using Model.Workflow;
using ViewModels;
using ViewModels.EstimateAndBilling;
public partial class EditEstimatePage : ContentPage
{

3
BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml → BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml
View File

@ -2,7 +2,7 @@
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
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}"
xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms">
@ -16,7 +16,6 @@
>
<ListView.Header>
<StackLayout Orientation="Horizontal">
<Button x:Name="AddAccountBtn" Text="Connection, ou création d'un compte" />
</StackLayout>
</ListView.Header>

8
BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml.cs → BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml.cs
View File

@ -1,17 +1,15 @@
using BookAStar.Model.Auth.Account;

using System;
using System.Threading.Tasks;
using Xamarin.Forms;
using System.Windows.Input;
using System.Collections.ObjectModel;
using System.Collections.Generic;
using System.ComponentModel;
using BookAStar.Helpers;
using XLabs.Forms.Behaviors;
using System.Diagnostics;
using XLabs.Forms.Controls;
using BookAStar.Model.Auth.Account;
namespace BookAStar.Pages
namespace BookAStar.Pages.UserProfile
{
public partial class AccountChooserPage : ContentPage

3
BookAStar/BookAStar/Pages/User/DashboardPage.xaml → BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml
View File

@ -4,7 +4,7 @@
xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
xmlns:views="clr-namespace:BookAStar.Views;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:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms"
Style="{StaticResource PageStyle}">
@ -52,6 +52,7 @@
<Button Text="{Binding PerformerStatus}" Clicked="OnViewPerformerStatus" />
<Button Text="{Binding UserQueries}" Clicked="OnViewUserQueries"
VisualElement.IsVisible="{Binding UserIsPro}"/>
<Button Text="{Binding UserFilesLabel}" Clicked="OnManageFiles" />
<StackLayout Orientation="Horizontal" VisualElement.IsVisible="{Binding HaveAnUser}">
<Label Text="Recevoir les notifications push" StyleClass="Header" />
<Switch IsToggled="{Binding ReceivePushNotifications, Mode=TwoWay}"

21
BookAStar/BookAStar/Pages/User/DashboardPage.xaml.cs → BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml.cs
View File

@ -1,22 +1,13 @@
using BookAStar.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System;
using Xamarin.Forms;
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 DashboardPage()
{
@ -32,6 +23,10 @@ namespace BookAStar.Pages
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)
{
ShowPage<AccountChooserPage>(null, true);

4
BookAStar/BookAStar/ViewModels/Estimate/BillingLineViewModel.cs → BookAStar/BookAStar/ViewModels/EstimateAndBilling/BillingLineViewModel.cs
View File

@ -4,10 +4,8 @@ using BookAStar.Model.Workflow;
using System;
using System.Globalization;
using System.Windows.Input;
using Xamarin.Forms;
using XLabs.Forms.Mvvm;
namespace BookAStar.ViewModels
namespace BookAStar.ViewModels.EstimateAndBilling
{
public class BillingLineViewModel : EditingViewModel, IBillingLine
{

2
BookAStar/BookAStar/ViewModels/Query/BookQueriesViewModel.cs → BookAStar/BookAStar/ViewModels/EstimateAndBilling/BookQueriesViewModel.cs
View File

@ -1,7 +1,7 @@
using System.Collections.ObjectModel;
using System.Windows.Input;
namespace BookAStar.ViewModels
namespace BookAStar.ViewModels.EstimateAndBilling
{
using Data;
using Model;

2
BookAStar/BookAStar/ViewModels/Query/BookQueryViewModel.cs → BookAStar/BookAStar/ViewModels/EstimateAndBilling/BookQueryViewModel.cs
View File

@ -3,7 +3,7 @@ using System;
using System.Diagnostics;
using XLabs.Forms.Mvvm;
namespace BookAStar.ViewModels
namespace BookAStar.ViewModels.EstimateAndBilling
{
using Data;
using Interfaces;

2
BookAStar/BookAStar/ViewModels/Estimate/EditEstimateViewModel.cs → BookAStar/BookAStar/ViewModels/EstimateAndBilling/EditEstimateViewModel.cs
View File

@ -6,7 +6,7 @@ using Xamarin.Forms;
using BookAStar.Data;
using Newtonsoft.Json;
namespace BookAStar.ViewModels
namespace BookAStar.ViewModels.EstimateAndBilling
{
public class EditEstimateViewModel : EditingViewModel
{

2
BookAStar/BookAStar/ViewModels/Chat/ChatViewModel.cs → BookAStar/BookAStar/ViewModels/Messaging/ChatViewModel.cs
View File

@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
using System.Linq;
using XLabs.Forms.Mvvm;
namespace BookAStar.ViewModels
namespace BookAStar.ViewModels.Messaging
{
using Data;
using Model;

14
BookAStar/BookAStar/ViewModels/Signing/EstimateSignaturePad.cs Normal file
View File

@ -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
{
}
}

15
BookAStar/BookAStar/ViewModels/User/UserLoginViewModel.cs
View File

@ -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; }
}
}

9
BookAStar/BookAStar/ViewModels/User/DashboardViewModel.cs → BookAStar/BookAStar/ViewModels/UserProfile/DashboardViewModel.cs
View File

@ -7,15 +7,20 @@ using XLabs.Forms.Mvvm;
using XLabs.Ioc;
using XLabs.Platform.Services;
namespace BookAStar.ViewModels
namespace BookAStar.ViewModels.UserProfile
{
using Data;
using Helpers;
using Model.Auth.Account;
using Pages;
using Pages.UserProfile;
internal class DashboardViewModel : ViewModel
{
public string UserFilesLabel
{
get; set;
}
int rating;
public int Rating
{