Skip to content

Add MAUI Hybrid project template to VSIX #23

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

Merged
jacob-l merged 1 commit into from
Jan 29, 2025
Merged

Add MAUI Hybrid project template to VSIX #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...ProjectTemplates/OpenSilverApplication.MauiHybrid/OpenSilverApplication.MauiHybrid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$WindowsTarget$</TargetFrameworks>
<!--#endif-->
<!--#if(mauiPlatformsBasic == '' && windowsTarget != '')-->
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$WindowsTarget$</TargetFrameworks>
<TargetFrameworks>$WindowsTarget$</TargetFrameworks>
<!--#endif-->
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
Expand All @@ -29,10 +29,10 @@
<Nullable>enable</Nullable>

<!-- Display name -->
<ApplicationTitle>OpenSilverApplication.MauiHybrid</ApplicationTitle>
<ApplicationTitle>OpenSilverApplication</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.companyname.opensilverapplication.mauihybrid</ApplicationId>
<ApplicationId>com.companyname.opensilverapplication</ApplicationId>

<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
<title>OpenSilverApplication.MauiHybrid</title>
<title>OpenSilverApplication</title>
<base href="/" />
<link rel="icon" href="data:,">
</head>
Expand Down
103 changes: 56 additions & 47 deletions src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,47 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:OpenSilver.TemplateWizards.AppCustomizationWindow"
WindowStartupLocation="CenterScreen"
ResizeMode="NoResize"
mc:Ignorable="d"
Title="OpenSilver Configuration" Height="600" Width="660" Icon="Icon.ico">
SizeToContent="WidthAndHeight"
ResizeMode="NoResize"
Title="OpenSilver Configuration" Icon="Icon.ico">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="50" />
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="10*"/>
<ColumnDefinition/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="50"/>
</Grid.ColumnDefinitions>

<Grid Grid.Column="1" Grid.Row="1" x:Name="chooseThemesCollection" >
<Grid Grid.Row="1" Grid.Column="1" x:Name="chooseThemesCollection">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock Text="Choose a theme:" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,0,0,20" />
<local:ThemeCollectionView SelectionChanged="ThemeCollectionView_SelectionChanged" Grid.Row="1" />
<TextBlock Text="Choose a theme:" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,0,0,20" />
<local:ThemeCollectionView SelectionChanged="ThemeCollectionView_SelectionChanged" Grid.Row="1" />
</Grid>

<Grid Grid.Row="2" Grid.Column="1" x:Name="DotNetVersionPanel">
<Grid Grid.Row="2" Grid.Column="1" x:Name="DotNetVersionPanel">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Choose a version of .NET:" Grid.ColumnSpan="2" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,0,0,32" />
<StackPanel Grid.Row="1" HorizontalAlignment="Stretch" >
<ComboBox x:Name="DotNetVersionComboBox" >
<TextBlock Text="Choose a version of .NET:" Grid.ColumnSpan="2" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,20,0,32" />
<StackPanel Grid.Row="1" HorizontalAlignment="Stretch">
<ComboBox x:Name="DotNetVersionComboBox">
<ComboBoxItem>.NET 7</ComboBoxItem>
<ComboBoxItem>.NET 8</ComboBoxItem>
<ComboBoxItem IsSelected="True">.NET 9</ComboBoxItem>
Expand All @@ -52,32 +54,46 @@

<Border Background="#EEEEEE" Grid.Row="1" Grid.Column="1" Margin="10,-4,0,0" Padding="10" CornerRadius="10">
<StackPanel >
<TextBlock Text="Notes:"
TextWrapping="Wrap" Foreground="Gray"/>
<TextBlock Text="* .NET 8 requires Visual Studio 2022 v17.8 or newer"
TextWrapping="Wrap" Foreground="Gray"/>
<TextBlock Text="* .NET 9 requires Visual Studio 2022 v17.12 or newer"
TextWrapping="Wrap" Foreground="Gray"/>
<TextBlock Text="Notes:" TextWrapping="Wrap" Foreground="Gray"/>
<TextBlock Text="* .NET 8 requires Visual Studio 2022 v17.8 or newer" TextWrapping="Wrap" Foreground="Gray"/>
<TextBlock Text="* .NET 9 requires Visual Studio 2022 v17.12 or newer" TextWrapping="Wrap" Foreground="Gray"/>
</StackPanel>
</Border>

</Grid>

<Grid Grid.Row="3" Grid.Column="1" x:Name="MauiHybridLauncherPanel">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Text="MAUI Hybrid:" Grid.ColumnSpan="2" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,20,0,10" />
<StackPanel Grid.Row="1" HorizontalAlignment="Stretch">
<TextBlock Text="By default, the OpenSilver application runs in the browser." TextWrapping="Wrap" />
<TextBlock Text="However, you can also choose to run it on additional platforms:" TextWrapping="Wrap" Margin="0,0,0,10" />
<TextBlock Text="Select platforms:" FontWeight="DemiBold" Margin="0,0,0,10"/>
<StackPanel Orientation="Horizontal">
<CheckBox x:Name="MacCheckbox" Content="Mac" Margin="0,0,10,0"/>
<CheckBox x:Name="WindowsCheckbox" Content="Windows" Margin="0,0,10,0"/>
<CheckBox x:Name="IosCheckbox" Content="iOS" Margin="0,0,10,0"/>
<CheckBox x:Name="AndroidCheckbox" Content="Android" Margin="0,0,10,0"/>
</StackPanel>
</StackPanel>
</Grid>

<Grid Margin="20" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom">
<Grid Grid.Row="4" Grid.Column="1" Margin="20,20,20,0" HorizontalAlignment="Right">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="24" />
<ColumnDefinition />
</Grid.ColumnDefinitions>

<Button Grid.Column="0"
Background="#FFFFFF"
Foreground="#5A5A5A"
FontWeight="SemiBold"
HorizontalAlignment="Center"
VerticalAlignment="Center"
IsCancel="True">
<Button Grid.Column="0"
Background="#FFFFFF"
Foreground="#5A5A5A"
FontWeight="SemiBold"
HorizontalAlignment="Center"
VerticalAlignment="Center"
IsCancel="True">
<Button.Resources>
<Style TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="3"/>
Expand All @@ -86,17 +102,15 @@
<TextBlock Margin="5" Text="Back"/>
</Button>

<Button
x:Name="continueBtn"
Grid.Column="2"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Click="ButtonContinue_Click"
Background="#1157FA"
Foreground="#FFFFFF"
FontWeight="SemiBold"
IsEnabled="False"
>
<Button Grid.Column="2"
x:Name="continueBtn"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Click="ButtonContinue_Click"
Background="#1157FA"
Foreground="#FFFFFF"
FontWeight="SemiBold"
IsEnabled="False">
<Button.Resources>
<Style TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="3"/>
Expand All @@ -106,10 +120,5 @@
<TextBlock Margin="5" Text="Continue"/>
</Button>
</Grid>





</Grid>
</Window>
74 changes: 30 additions & 44 deletions src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using OpenSilver.TemplateWizards.AppCustomizationWindow.Models;
using OpenSilver.TemplateWizards.Shared;
using System;
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;

namespace OpenSilver.TemplateWizards.AppCustomizationWindow
{
Expand All @@ -11,15 +10,7 @@ namespace OpenSilver.TemplateWizards.AppCustomizationWindow
/// </summary>
public partial class AppConfigurationWindow : Window
{
public IDictionary<ThemeSelectionEnum, string> Themes { get; set; } = new Dictionary<ThemeSelectionEnum, string>();
public string SelectedTheme { get; set; }
public OpenSilverBuildType OpenSilverBuildType
{
get
{
return OpenSilverBuildType.Stable;
}
}
public string SelectedTheme { get; private set; }

public DotNetVersion DotNetVersion
{
Expand All @@ -39,57 +30,52 @@ public DotNetVersion DotNetVersion
}
}


public AppConfigurationWindow(string openSilverType, bool isBusiness = false)
public MauiHybridPlatform MauiHybridPlatform
{

InitilizeThemes();
InitializeComponent();
if (openSilverType == "Library")
get
{
DotNetVersionPanel.Visibility = Visibility.Collapsed;
MauiHybridPlatform platforms = MauiHybridPlatform.None;

if (IosCheckbox.IsChecked == true)
{
platforms |= MauiHybridPlatform.iOS;
}
if (AndroidCheckbox.IsChecked == true)
{
platforms |= MauiHybridPlatform.Android;
}
if (WindowsCheckbox.IsChecked == true)
{
platforms |= MauiHybridPlatform.Windows;
}
if (MacCheckbox.IsChecked == true)
{
platforms |= MauiHybridPlatform.Mac;
}

return platforms;
}
}

public AppConfigurationWindow(bool isBusiness = false)
{
InitializeComponent();

//Modern theme is deactivated for now, for Business Application projects
if (isBusiness)
{
chooseThemesCollection.Visibility = Visibility.Collapsed;
SelectedTheme = Themes[ThemeSelectionEnum.Classic];
SelectedTheme = ThemeOptions.Classic;
continueBtn.IsEnabled = true;
this.Height = 300;
}
}

private void InitilizeThemes()
{
Themes.Add(ThemeSelectionEnum.Dark, "Dark");
Themes.Add(ThemeSelectionEnum.Light, "Light");
Themes.Add(ThemeSelectionEnum.Classic, "Classic");
}

private void ButtonContinue_Click(object sender, RoutedEventArgs e)
{
DialogResult = true;
Close();
}

private void OnThemSelected(object sender, RoutedEventArgs e)
{

if (sender is RadioButton selectedRadio)
{
try
{
SelectedTheme = Themes[(ThemeSelectionEnum)selectedRadio.Tag];
}
catch
{
throw new InvalidOperationException("Error retrieving selected theme option");
}
}

}

private void ThemeCollectionView_SelectionChanged(object sender, EventArgs e)
{
SelectedTheme = (sender as ThemeOptions).Name;
Expand Down
15 changes: 10 additions & 5 deletions src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
using System.Collections.Generic;
using System.Runtime.CompilerServices;

namespace OpenSilver.TemplateWizards.AppCustomizationWindow.Models
{
public class ThemeOptions
{
public const string Classic = "Classic";
public const string Dark = "Dark";
public const string Light = "Light";

public string ThumbnailUri { get; set; }
public string Name { get; set; }
public string Title { get; set; }
public string BackgroundColor { get; set; }

public static IEnumerable<ThemeOptions> GeThemes()
{
var themes = new List<ThemeOptions>();
themes.Add(new ThemeOptions { Name="Light",Title = "Modern - Light", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/light_theme.png", BackgroundColor = "#FFFFFF" });
themes.Add(new ThemeOptions { Name="Dark",Title = "Modern - Dark", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/dark_theme.png", BackgroundColor = "#111111" });
themes.Add(new ThemeOptions { Name="Classic",Title = "Classic - Silverlight", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/classic_theme.png", BackgroundColor = "#FFFFFF" });
var themes = new List<ThemeOptions>
{
new ThemeOptions { Name = Light, Title = "Modern - Light", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/light_theme.png", BackgroundColor = "#FFFFFF" },
new ThemeOptions { Name = Dark, Title = "Modern - Dark", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/dark_theme.png", BackgroundColor = "#111111" },
new ThemeOptions { Name = Classic, Title = "Classic - Silverlight", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/classic_theme.png", BackgroundColor = "#FFFFFF" }
};
return themes;
}
}
Expand Down
7 changes: 0 additions & 7 deletions src/OpenSilver.TemplateWizards/AppCustomizationWindow/OpenSilverBuildType.cs
View file
Open in desktop

This file was deleted.

Loading