new files, fixes recent refactorings and more

This commit is contained in:
Paul Schneider 2016-10-07 14:36:27 +02:00
commit f9bd1c2511
14 changed files with 200 additions and 130 deletions

View file

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
x:Class="BookAStar.Views.CommandLineEditor"
BackgroundColor="{x:Static local:Constants.BackgroundColor}"
>
<StackLayout>
<Label Text="Description de la ligne de facture"></Label>
<Editor ></Editor>
<StackLayout Orientation="Horizontal">
<Entry Placeholder="Durée de la prestation" Keyboard="Numeric"></Entry>
<Picker>
<Picker.Items>
<x:String>Heures</x:String>
<x:String>Jours</x:String>
<x:String>Minutes</x:String>
</Picker.Items>
</Picker>
</StackLayout>
<Entry Placeholder="Quantité" Text="1"/>
<Entry Placeholder="Prix unitaire" ></Entry>
<Button Text="Valider cette ligne de facture"></Button>
</StackLayout>
</ContentView>

View file

@ -1,18 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xamarin.Forms;
namespace BookAStar.Views
{
public partial class CommandLineEditor : ContentView
{
public CommandLineEditor()
{
InitializeComponent();
}
}
}

View file

@ -1,6 +1,7 @@
using BookAStar.Interfaces;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Reflection.Emit;
using System.Text;
@ -15,19 +16,18 @@ namespace BookAStar.Views
"Markdown", typeof(string), typeof(MarkdownView), null, BindingMode.TwoWay
);
private string markdown;
public string Markdown
{
get
{
return markdown;
return GetValue(MarkdownProperty) as string;
}
set
{
if (markdown != value)
if (Markdown != value)
{
markdown = value;
SetValue(MarkdownProperty, value);
if (Modified != null)
{
Modified.Invoke(this, new EventArgs());
@ -45,10 +45,10 @@ namespace BookAStar.Views
double height = heightConstraint;
if (MinimumWidthRequest>0)
width = widthConstraint > 80 ? widthConstraint < double.MaxValue ? widthConstraint : MinimumWidthRequest : MinimumWidthRequest;
width = widthConstraint > MinimumWidthRequest ? widthConstraint < double.MaxValue ? widthConstraint : MinimumWidthRequest : MinimumWidthRequest;
if (MinimumHeightRequest > 0)
height = heightConstraint > 160 ? heightConstraint < double.MaxValue ? heightConstraint : MinimumHeightRequest : MinimumHeightRequest;
height = heightConstraint > MinimumHeightRequest ? heightConstraint < double.MaxValue ? heightConstraint : MinimumHeightRequest : MinimumHeightRequest;
return base.OnMeasure(width, height);
}