Skip to content

Commit

Permalink
Merge branch 'release/8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
TimLariviere committed Mar 8, 2024
2 parents 263499f + 5511d9f commit 822e0d4
Show file tree
Hide file tree
Showing 66 changed files with 1,562 additions and 6 deletions.
19 changes: 18 additions & 1 deletion Fabulous.MauiControls.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
Expand Down Expand Up @@ -47,6 +47,12 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TicTacComponent", "samples\
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MultipleMvus", "samples\Components\MultipleMvus\MultipleMvus.fsproj", "{C3B4F669-AD4D-4C2F-B053-F5E34E0D9342}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Navigation", "Navigation", "{3A3581BD-4228-49B0-84D5-AF39D620BA34}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "BasicNavigation", "samples\Navigation\BasicNavigation\BasicNavigation.fsproj", "{CE61493B-86CC-49CE-9443-F25F1ECB15C9}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "NavigationPath", "samples\Navigation\NavigationPath\NavigationPath.fsproj", "{5B3F6C4E-82CF-442F-BFB4-216C1CD85700}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -114,6 +120,14 @@ Global
{C3B4F669-AD4D-4C2F-B053-F5E34E0D9342}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3B4F669-AD4D-4C2F-B053-F5E34E0D9342}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3B4F669-AD4D-4C2F-B053-F5E34E0D9342}.Release|Any CPU.Build.0 = Release|Any CPU
{CE61493B-86CC-49CE-9443-F25F1ECB15C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE61493B-86CC-49CE-9443-F25F1ECB15C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE61493B-86CC-49CE-9443-F25F1ECB15C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE61493B-86CC-49CE-9443-F25F1ECB15C9}.Release|Any CPU.Build.0 = Release|Any CPU
{5B3F6C4E-82CF-442F-BFB4-216C1CD85700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B3F6C4E-82CF-442F-BFB4-216C1CD85700}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B3F6C4E-82CF-442F-BFB4-216C1CD85700}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B3F6C4E-82CF-442F-BFB4-216C1CD85700}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{67FB01A1-1A3E-4A3B-83DC-7D63B56FB1A1} = {35A6823C-8312-4F92-818A-5117BB31A569}
Expand All @@ -129,5 +143,8 @@ Global
{2BA5E664-1516-4B35-B5BD-1257A1B6C5A1} = {D3D3AA5A-1A1B-4E2F-92D7-491706251302}
{DF4CDFC2-1BC7-43FE-BE2B-B48AA3202FC6} = {D3D3AA5A-1A1B-4E2F-92D7-491706251302}
{C3B4F669-AD4D-4C2F-B053-F5E34E0D9342} = {D3D3AA5A-1A1B-4E2F-92D7-491706251302}
{3A3581BD-4228-49B0-84D5-AF39D620BA34} = {87C8E9E8-497E-46DB-90FE-4402E0CB230A}
{CE61493B-86CC-49CE-9443-F25F1ECB15C9} = {3A3581BD-4228-49B0-84D5-AF39D620BA34}
{5B3F6C4E-82CF-442F-BFB4-216C1CD85700} = {3A3581BD-4228-49B0-84D5-AF39D620BA34}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion samples/Components/HelloComponent/App.fs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open type Fabulous.Maui.View

module App =
let view () =
Component() { Application() { ContentPage() { Label("Hello Component").center() } } }
Component() { Application(ContentPage() { Label("Hello Component").center() }) }

let createMauiApp () =
MauiApp.CreateBuilder().UseFabulousApp(view).Build()
4 changes: 2 additions & 2 deletions samples/Components/MultipleMvus/App.fs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module Form =

module App =
let view () =
Application() {
Application(
ContentPage() {
(VStack(spacing = 25.) {
Label("App")
Expand Down Expand Up @@ -67,4 +67,4 @@ module App =
.width(250.)
.center()
}
}
)
4 changes: 2 additions & 2 deletions samples/Components/MvuCounter/App.fs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ module App =
Component(program) {
let! model = Mvu.State

Application() {
Application(
ContentPage() {
(VStack() {
Label($"%d{model.Count}").centerTextHorizontal()
Expand All @@ -80,5 +80,5 @@ module App =
})
.center()
}
}
)
}
105 changes: 105 additions & 0 deletions samples/Navigation/BasicNavigation/BasicNavigation.fsproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
<RootNamespace>NavigationSample</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<EnableDefaultItems>false</EnableDefaultItems>

<!-- Display name -->
<ApplicationTitle>NavigationSample</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>org.fabulous.maui.basicnavigation</ApplicationId>
<ApplicationIdGuid>c6c98ddf-a204-4a7e-be03-2829f110f396</ApplicationIdGuid>

<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>

<TargetPlatformIdentifier Condition=" $(TargetPlatformIdentifier) == '' ">$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>

<SupportedOSPlatformVersion Condition="$(TargetPlatformIdentifier) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$(TargetPlatformIdentifier) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$(TargetPlatformIdentifier) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$(TargetPlatformIdentifier) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$(TargetPlatformIdentifier) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$(TargetPlatformIdentifier) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<Compile Include="PageA.fs" />
<Compile Include="PageB.fs" />
<Compile Include="PageC.fs" />
<Compile Include="Sample.fs" />
<Compile Include="MauiProgram.fs" />
</ItemGroup>

<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />

<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />

<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />

<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\*" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
</ItemGroup>

<ItemGroup Condition="$(TargetPlatformIdentifier) == 'android'">
<AndroidResource Include="$(AndroidProjectFolder)Resources/*/*" />
<AndroidResource Remove="$(AndroidProjectFolder)Resources/raw/.*" />
<AndroidResource Update="$(AndroidProjectFolder)Resources/raw/*" />
<AndroidAsset Include="$(AndroidProjectFolder)Assets/**/*" Exclude="$(AndroidProjectFolder)Assets/**/.*/**" />
<AndroidManifest Include="$(AndroidProjectFolder)AndroidManifest.xml" />
<Compile Include="$(AndroidProjectFolder)MainActivity.fs" />
<Compile Include="$(AndroidProjectFolder)MainApplication.fs" />
</ItemGroup>

<ItemGroup Condition="$(TargetPlatformIdentifier) == 'ios'">
<None Include="$(iOSProjectFolder)Info.plist" LogicalName="Info.plist" />
<Compile Include="$(iOSProjectFolder)AppDelegate.fs" />
<Compile Include="$(iOSProjectFolder)Program.fs" />
</ItemGroup>

<ItemGroup Condition="$(TargetPlatformIdentifier) == 'maccatalyst'">
<None Include="$(MacCatalystProjectFolder)Info.plist" LogicalName="Info.plist" />
<Compile Include="$(MacCatalystProjectFolder)AppDelegate.fs" />
<Compile Include="$(MacCatalystProjectFolder)Program.fs" />
</ItemGroup>

<ItemGroup Condition="$(TargetPlatformIdentifier) == 'windows'">
<Manifest Include="$(WindowsProjectFolder)app.manifest" />
<AppxManifest Include="$(WindowsProjectFolder)Package.appxmanifest" />
<Compile Include="$(WindowsProjectFolder)App.fs" />
<Compile Include="$(WindowsProjectFolder)Main.fs" />

<PackageReference Include="FSharp.Maui.WinUICompat" />
</ItemGroup>

<ItemGroup Condition="$(TargetPlatformIdentifier) == 'tizen'">
<TizenManifestFile Include="$(TizenProjectFolder)tizen-manifest.xml" />
<Compile Include="$(TizenProjectFolder)Main.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Fabulous.MauiControls\Fabulous.MauiControls.fsproj" />
</ItemGroup>

</Project>
16 changes: 16 additions & 0 deletions samples/Navigation/BasicNavigation/MauiProgram.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
namespace NavigationSample

open Microsoft.Maui.Hosting
open Fabulous.Maui

type MauiProgram =
static member CreateMauiApp() =
MauiApp
.CreateBuilder()
.UseFabulousApp(Sample.program)
.ConfigureFonts(fun fonts ->
fonts
.AddFont("OpenSans-Regular.ttf", "OpenSansRegular")
.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold")
|> ignore)
.Build()
29 changes: 29 additions & 0 deletions samples/Navigation/BasicNavigation/PageA.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
namespace NavigationSample

open Fabulous.Maui

open type Fabulous.Maui.View

module PageA =
type Model = { Count: int }

type Msg =
| Increment
| Decrement

let init () = { Count = 0 }

let update msg model =
match msg with
| Increment -> { Count = model.Count + 1 }
| Decrement -> { Count = model.Count - 1 }

let view model =
VStack() {
Label("Page A").font(32.).centerTextHorizontal().margin(0., 0., 0., 30.)

Label($"Count: {model.Count}").centerTextHorizontal()

Button("Increment", Increment)
Button("Decrement", Decrement)
}
29 changes: 29 additions & 0 deletions samples/Navigation/BasicNavigation/PageB.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
namespace NavigationSample

open Fabulous.Maui

open type Fabulous.Maui.View

module PageB =
type Model = { Count: int }

type Msg =
| Increment
| Decrement

let init () = { Count = 0 }

let update msg model =
match msg with
| Increment -> { Count = model.Count + 1 }
| Decrement -> { Count = model.Count - 1 }

let view model =
VStack() {
Label("Page B").font(32.).centerTextHorizontal().margin(0., 0., 0., 30.)

Label($"Count: {model.Count}").centerTextHorizontal()

Button("Increment", Increment)
Button("Decrement", Decrement)
}
29 changes: 29 additions & 0 deletions samples/Navigation/BasicNavigation/PageC.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
namespace NavigationSample

open Fabulous.Maui

open type Fabulous.Maui.View

module PageC =
type Model = { Count: int }

type Msg =
| Increment
| Decrement

let init () = { Count = 0 }

let update msg model =
match msg with
| Increment -> { Count = model.Count + 1 }
| Decrement -> { Count = model.Count - 1 }

let view model =
VStack() {
Label("Page C").font(32.).centerTextHorizontal().margin(0., 0., 0., 30.)

Label($"Count: {model.Count}").centerTextHorizontal()

Button("Increment", Increment)
Button("Decrement", Decrement)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace NavigationSample

open Android.App
open Android.Content.PM
open Microsoft.Maui

[<Activity(Theme = "@style/Maui.SplashTheme",
MainLauncher = true,
ConfigurationChanges =
(ConfigChanges.ScreenSize
||| ConfigChanges.Orientation
||| ConfigChanges.UiMode
||| ConfigChanges.ScreenLayout
||| ConfigChanges.SmallestScreenSize
||| ConfigChanges.Density))>]
type MainActivity() =
inherit MauiAppCompatActivity()
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace NavigationSample

open Android.App
open Microsoft.Maui

[<Application>]
type MainApplication(handle, ownership) =
inherit MauiApplication(handle, ownership)

override _.CreateMauiApp() = MauiProgram.CreateMauiApp()
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#512BD4</color>
<color name="colorPrimaryDark">#2B0B98</color>
<color name="colorAccent">#2B0B98</color>
</resources>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace NavigationSample

open Foundation
open Microsoft.Maui

[<Register("AppDelegate")>]
type AppDelegate() =
inherit MauiUIApplicationDelegate()

override this.CreateMauiApp() = MauiProgram.CreateMauiApp()
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/appicon.appiconset</string>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace NavigationSample

open UIKit

module Program =
[<EntryPoint>]
let main args =
UIApplication.Main(args, null, typeof<AppDelegate>)
0
Loading

0 comments on commit 822e0d4

Please sign in to comment.