Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a TextChanged Event to the EntryCell #227

Merged
merged 14 commits into from
Nov 19, 2018
Merged

Add a TextChanged Event to the EntryCell #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
80d2ec6
Work in progress
londospark Nov 13, 2018
880b615
Load of a different assembly
londospark Nov 13, 2018
1ed8a63
Merge branch 'pr/226-generator-add-support-for-types-with-base-type-i…
londospark Nov 13, 2018
a7ec5c7
This works in WPF - not in Android/iOS however.
londospark Nov 13, 2018
a646dfa
I should commit the changes that I made in Core too.
londospark Nov 13, 2018
3abbbe6
Apply suggestions from code review
TimLariviere Nov 15, 2018
4f708e3
EntryCell now uses PropertyChanged to fire TextChanged event.
londospark Nov 15, 2018
1791140
Merge branch '225-EntryCell' of https://github.com/garethhubball/Fabu…
londospark Nov 15, 2018
9657269
Added the required reference to the sample projects.
londospark Nov 15, 2018
f8de406
Cleanup for PR
londospark Nov 15, 2018
b61a43f
Added the CustomControls NuGet package to the template projects.
londospark Nov 18, 2018
ed9c78e
Moved the custom controls project into the `src` folder.
londospark Nov 18, 2018
5eee8d9
Merge branch 'master' into 225-EntryCell
londospark Nov 18, 2018
095aa0f
Removed TargetSDKVersion again.
londospark Nov 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 35 additions & 17 deletions Fabulous.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1199BA9F
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{13C0EB5D-E38E-4714-9421-77CD9C53A067}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.CustomControls", "src\Fabulous.CustomControls\Fabulous.CustomControls.fsproj", "{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -307,6 +309,22 @@ Global
{9031246B-4B08-47C9-A500-30334A245272}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{9031246B-4B08-47C9-A500-30334A245272}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{9031246B-4B08-47C9-A500-30334A245272}.Release|x86.ActiveCfg = Release|iPhone
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|iPhone.Build.0 = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|x86.ActiveCfg = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|x86.Build.0 = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|Any CPU.Build.0 = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|iPhone.ActiveCfg = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|iPhone.Build.0 = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|x86.ActiveCfg = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|x86.Build.0 = Release|Any CPU
{AC36B11A-383D-45A3-8999-4F6475E9DD13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC36B11A-383D-45A3-8999-4F6475E9DD13}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC36B11A-383D-45A3-8999-4F6475E9DD13}.Debug|iPhone.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -407,22 +425,22 @@ Global
{810EEB40-5042-4946-B695-5B13E9957807}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{810EEB40-5042-4946-B695-5B13E9957807}.Release|x86.ActiveCfg = Release|Any CPU
{810EEB40-5042-4946-B695-5B13E9957807}.Release|x86.Build.0 = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|iPhone.Build.0 = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|x86.ActiveCfg = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Debug|x86.Build.0 = Debug|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|Any CPU.Build.0 = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|iPhone.ActiveCfg = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|iPhone.Build.0 = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|x86.ActiveCfg = Release|Any CPU
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379}.Release|x86.Build.0 = Release|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Debug|iPhone.Build.0 = Debug|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Debug|x86.ActiveCfg = Debug|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Debug|x86.Build.0 = Debug|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Release|Any CPU.Build.0 = Release|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Release|iPhone.ActiveCfg = Release|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Release|iPhone.Build.0 = Release|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Release|x86.ActiveCfg = Release|Any CPU
{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -444,11 +462,11 @@ Global
{13F140D6-2D21-41BE-AC90-4B14D8C16A47} = {12D18417-809C-4CA9-AD3E-474333B181BC}
{5CCD3C0C-3434-434C-B8C2-7FFDEDCC2437} = {12D18417-809C-4CA9-AD3E-474333B181BC}
{9031246B-4B08-47C9-A500-30334A245272} = {12D18417-809C-4CA9-AD3E-474333B181BC}
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379} = {12D18417-809C-4CA9-AD3E-474333B181BC}
{A61655CB-26DF-47E7-BCC0-91FD9A7D83AA} = {FB194A8D-00A6-4416-AA8D-A89C1541935B}
{AC36B11A-383D-45A3-8999-4F6475E9DD13} = {A61655CB-26DF-47E7-BCC0-91FD9A7D83AA}
{13181907-1C53-47C1-BDF0-DBECCC2ED92E} = {A61655CB-26DF-47E7-BCC0-91FD9A7D83AA}
{F557905B-B099-44AB-939C-AB169499A36E} = {A61655CB-26DF-47E7-BCC0-91FD9A7D83AA}
{D83017F5-0B21-4D0C-8C7F-0EBA37E16379} = {12D18417-809C-4CA9-AD3E-474333B181BC}
{10DF5D2F-17FA-43DE-9549-B84E6CF26602} = {E75EAD35-1041-42CC-8AA4-01DB58FA467C}
{23640E46-E830-4AB7-9289-E527F6429435} = {E75EAD35-1041-42CC-8AA4-01DB58FA467C}
{810EEB40-5042-4946-B695-5B13E9957807} = {1199BA9F-BF79-477F-8E25-FD0E0CBC962A}
Expand Down
34 changes: 22 additions & 12 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type ProjectDefinition =
Name: string
Path: IGlobbingPattern
Action: BuildAction
OutputPath: string
OutputPath: string option
}

let release = ReleaseNotes.load "RELEASE_NOTES.MD"
Expand All @@ -50,18 +50,23 @@ let removeIncompatiblePlatformProjects pattern =
pattern

let projects = [
{ Name = "Src"; Path = !! "src/**/*.fsproj"; Action = DotNetPack; OutputPath = buildDir }
{ Name = "Extensions"; Path = !! "extensions/**/*.fsproj"; Action = DotNetPack; OutputPath = buildDir }
{ Name = "Tests"; Path = !! "tests/**/*.fsproj"; Action = MSBuild Release; OutputPath = buildDir + "/tests" }
{ Name = "Templates"; Path = !! "templates/**/*.nuspec"; Action = NuGetPack; OutputPath = buildDir }
{ Name = "Src"; Path = !! "src/**/*.fsproj"; Action = DotNetPack; OutputPath = Some buildDir }
{ Name = "Extensions"; Path = !! "extensions/**/*.fsproj"; Action = DotNetPack; OutputPath = Some buildDir }
{ Name = "Tests"; Path = !! "tests/**/*.fsproj"; Action = MSBuild Release; OutputPath = Some (buildDir + "/tests") }
{ Name = "Templates"; Path = !! "templates/**/*.nuspec"; Action = NuGetPack; OutputPath = Some buildDir }
]
let tools = { Name = "Tools"; Path = !! "tools/**/*.fsproj"; Action = MSBuild Release; OutputPath = buildDir + "/tools" }
let samples = { Name = "Samples"; Path = (!! "samples/**/*.fsproj" |> removeIncompatiblePlatformProjects); Action = MSBuild Debug; OutputPath = buildDir + "/samples" }

let tools = { Name = "Tools"; Path = !! "tools/**/*.fsproj"; Action = MSBuild Release; OutputPath = Some (buildDir + "/tools") }
let samples = { Name = "Samples"; Path = (!! "samples/**/*.fsproj" |> removeIncompatiblePlatformProjects); Action = MSBuild Debug; OutputPath = Some (buildDir + "/samples") }
let customControls = { Name = "CustomControls"; Path = !! "src/Fabulous.CustomControls/*.fsproj"; Action = MSBuild Release; OutputPath = None }


let getOutputDir basePath proj =
let folderName = Path.GetFileNameWithoutExtension(proj)
sprintf "%s/%s/" basePath folderName
match basePath with
| Some path ->
let folderName = Path.GetFileNameWithoutExtension(proj)
sprintf "%s/%s/" path folderName
| None -> ""

let msbuild (buildType: BuildType) (definition: ProjectDefinition) =
let configuration = match buildType with Debug -> "Debug" | Release -> "Release"
Expand All @@ -78,14 +83,14 @@ let dotnetPack (definition: ProjectDefinition) =
{ opt with
Common = { opt.Common with CustomParams = Some "-p:IncludeSourceLink=True" }
Configuration = DotNet.BuildConfiguration.Release
OutputPath = Some definition.OutputPath }) project
OutputPath = definition.OutputPath }) project

let nugetPack (definition: ProjectDefinition) =
for nuspec in definition.Path do
NuGet.NuGetPack (fun opt ->
{ opt with
WorkingDir = "templates"
OutputPath = definition.OutputPath
OutputPath = definition.OutputPath.Value
Version = release.NugetVersion
ReleaseNotes = (String.toLines release.Notes) }) nuspec

Expand Down Expand Up @@ -128,12 +133,16 @@ Target.create "Restore" (fun _ ->
DotNet.restore id "Fabulous.sln"
)

Target.create "BuildCustomControls" (fun _ ->
customControls |> buildProject
)

Target.create "BuildTools" (fun _ ->
tools |> buildProject
)

Target.create "RunGenerator" (fun _ ->
DotNet.exec id (tools.OutputPath + "/Generator/Generator.dll") "tools/Generator/Xamarin.Forms.Core.json src/Fabulous.Core/Xamarin.Forms.Core.fs"
DotNet.exec id (tools.OutputPath.Value + "/Generator/Generator.dll") "tools/Generator/Xamarin.Forms.Core.json src/Fabulous.Core/Xamarin.Forms.Core.fs"
|> (fun x ->
match x.OK with
| true -> ()
Expand Down Expand Up @@ -205,6 +214,7 @@ open Fake.Core.TargetOperators
==> "Restore"
==> "UpdateVersion"
==> "BuildTools"
==> "BuildCustomControls"
==> "RunGenerator"
==> "Build"

Expand Down
1 change: 1 addition & 0 deletions samples/AllControls/AllControls/AllControls.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<EmbeddedResource Include="styles.css" />
<PackageReference Include="FSharp.Core" />
<PackageReference Include="Xamarin.Forms" />
<ProjectReference Include="..\..\..\customControls\Fabulous.CustomControls\Fabulous.CustomControls.fsproj" />
<ProjectReference Include="..\..\..\src\Fabulous.Core\Fabulous.Core.fsproj" />
</ItemGroup>
<Import Project="..\..\..\Packages.targets" />
Expand Down
1 change: 1 addition & 0 deletions samples/CounterApp/CounterApp/CounterApp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\customControls\Fabulous.CustomControls\Fabulous.CustomControls.fsproj" />
<ProjectReference Include="..\..\..\src\Fabulous.Core\Fabulous.Core.fsproj" />
<ProjectReference Include="..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions samples/StaticView/StaticViewCounterApp/StaticViewCounterApp/StaticViewCounterApp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<PackageReference Include="Xamarin.Forms" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\customControls\Fabulous.CustomControls\Fabulous.CustomControls.fsproj" />
<ProjectReference Include="..\..\..\..\src\Fabulous.Core\Fabulous.Core.fsproj" />
</ItemGroup>
<Import Project="..\..\..\..\Packages.targets" />
Expand Down
2 changes: 1 addition & 1 deletion samples/TicTacToe/Droid/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.TicTacToe">
<uses-sdk android:minSdkVersion="19" />
<application android:label="TicTacToe"></application>
Expand Down
1 change: 1 addition & 0 deletions samples/TicTacToe/TicTacToe/TicTacToe.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\customControls\Fabulous.CustomControls\Fabulous.CustomControls.fsproj" />
<ProjectReference Include="..\..\..\src\Fabulous.Core\Fabulous.Core.fsproj" />
<ProjectReference Include="..\..\..\src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/Fabulous.Core/Fabulous.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@
<PackageReference Include="FSharp.Core" />
<PackageReference Include="Xamarin.Forms" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Fabulous.CustomControls\Fabulous.CustomControls.fsproj" />
</ItemGroup>
<Import Project="..\..\Packages.targets" />
</Project>
1 change: 0 additions & 1 deletion src/Fabulous.Core/ViewConverters.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ type ListGroupData<'T>(shortName: string, key:'T, coll: 'T[]) =

member x.Items = coll


type ViewElementCell() =
inherit ViewCell()

Expand Down
Loading