Skip to content

Commit 53add0d

Browse files
AgustinBonillaAgustinBonilla
committed
Merge branch 'develop' into feature/dot-net-10
2 parents 639aeb3 + 6af1cc8 commit 53add0d

57 files changed

Lines changed: 4168 additions & 3430 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎samples/HorusStudio.Maui.MaterialDesignControls.Sample/App.xaml‎

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
xmlns:converters="clr-namespace:HorusStudio.Maui.MaterialDesignControls.Sample.Converters"
55
xmlns:material="clr-namespace:HorusStudio.Maui.MaterialDesignControls;assembly=HorusStudio.Maui.MaterialDesignControls"
6-
xmlns:views="clr-namespace:HorusStudio.Maui.MaterialDesignControls.Sample.Views"
7-
xmlns:vm="clr-namespace:HorusStudio.Maui.MaterialDesignControls.Sample.ViewModels"
86
x:Class="HorusStudio.Maui.MaterialDesignControls.Sample.App">
97
<Application.Resources>
108
<ResourceDictionary>
@@ -31,65 +29,10 @@
3129
<Setter Property="Type" Value="TitleLarge" />
3230
<Setter Property="Margin" Value="0,36,0,0" />
3331
</Style>
34-
35-
<ControlTemplate x:Key="ControlPageWithTopAppBar"
36-
x:DataType="vm:BaseViewModel">
37-
<Grid
38-
RowDefinitions="Auto,*">
39-
<material:MaterialTopAppBar
40-
AutomationId="topAppBar"
41-
Headline="{TemplateBinding Title}"
42-
Description="{TemplateBinding Subtitle}"
43-
LeadingIconCommand="{TemplateBinding BackCommand}"
44-
LeadingIconIsBusy="{TemplateBinding Path=BackCommand.IsRunning}"
45-
LeadingIcon="ic_back.png"
46-
Type="Large"
47-
48-
TrailingIcons="{TemplateBinding TopBarIcons}"
49-
x:Name="mdcTopBar" />
50-
<ScrollView Grid.Row="1" x:Name="MdcControlPageScroll">
51-
<VerticalStackLayout Style="{StaticResource MainLayout}">
52-
<material:MaterialSegmentedButton
53-
ItemsSource="{TemplateBinding TabItems}"
54-
SelectedItem="{TemplateBinding SelectedTabItem}"
55-
SelectionCommand="{TemplateBinding TabItemsSelection}"
56-
HeightRequest="40"
57-
CornerRadius="20" />
58-
59-
<Grid>
60-
<ContentPresenter IsVisible="{TemplateBinding CustomizationMode, Converter={StaticResource ReverseBoolConverter}}" />
61-
<material:MaterialCard
62-
Style="{StaticResource CardControlContainer}"
63-
IsVisible="{TemplateBinding CustomizationMode}"
64-
Padding="32"
65-
Margin="0,24">
66-
<material:MaterialLabel Text="Soon you will be able to customize controls live" HorizontalOptions="Center" VerticalOptions="Center" />
67-
</material:MaterialCard>
68-
</Grid>
69-
</VerticalStackLayout>
70-
</ScrollView>
71-
</Grid>
72-
</ControlTemplate>
7332

74-
<ControlTemplate x:Key="PageWithTopAppBar"
75-
x:DataType="vm:BaseViewModel">
76-
<Grid
77-
RowDefinitions="Auto,*">
78-
<material:MaterialTopAppBar
79-
Headline="{TemplateBinding Title}"
80-
Description="{TemplateBinding Subtitle}"
81-
LeadingIconCommand="{TemplateBinding BackCommand}"
82-
LeadingIconIsBusy="{TemplateBinding Path=BackCommand.IsRunning}"
83-
LeadingIcon="ic_back.png"
84-
Type="Large"
85-
ScrollViewName="MdcPageScroll" />
86-
<ScrollView Grid.Row="1" x:Name="MdcPageScroll">
87-
<VerticalStackLayout Style="{StaticResource MainLayout}">
88-
<ContentPresenter />
89-
</VerticalStackLayout>
90-
</ScrollView>
91-
</Grid>
92-
</ControlTemplate>
33+
<Style x:Key="OutlinedInputBaseSamples" TargetType="material:MaterialInputBase">
34+
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={x:Static material:MaterialLightTheme.SurfaceContainerLow}, Dark={x:Static material:MaterialDarkTheme.SurfaceContainerLow}}" />
35+
</Style>
9336
</ResourceDictionary>
9437
</Application.Resources>
9538
</Application>

‎samples/HorusStudio.Maui.MaterialDesignControls.Sample/Pages/AboutPage.xaml‎

Lines changed: 65 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
x:Class="HorusStudio.Maui.MaterialDesignControls.Sample.Pages.AboutPage"
1010
x:TypeArguments="vm:AboutViewModel"
1111
x:DataType="vm:AboutViewModel"
12-
ControlTemplate="{StaticResource PageWithTopAppBar}"
1312
BackgroundColor="{AppThemeBinding Light={x:Static material:MaterialLightTheme.Surface}, Dark={x:Static material:MaterialDarkTheme.Surface}}">
1413
<ContentPage.Resources>
1514

@@ -29,69 +28,73 @@
2928

3029
</ContentPage.Resources>
3130

32-
<VerticalStackLayout Spacing="16">
33-
<views:AboutCardView Title="Powered by Horus Studio"
34-
Description="We are a mobile studio development studio that provides world-class design and development solutions."
35-
FirstIconSource="horus_logo.png"
36-
TypeButton="Filled"
37-
Command="{Binding LaunchBrowserCommand}"
38-
CommandParameter="https://www.horus.com.uy/contact"
39-
TextButton="Let’s talk!" />
31+
<views:PageWithTopAppBar>
32+
<views:PageWithTopAppBar.PageContent>
33+
<VerticalStackLayout Spacing="16">
34+
<views:AboutCardView Title="Powered by Horus Studio"
35+
Description="We are a mobile studio development studio that provides world-class design and development solutions."
36+
FirstIconSource="horus_logo.png"
37+
TypeButton="Filled"
38+
Command="{Binding LaunchBrowserCommand}"
39+
CommandParameter="https://www.horus.com.uy/contact"
40+
TextButton="Let’s talk!" />
4041

41-
<views:AboutCardView Title="Based on Material Design"
42-
Description="Material 3 is the latest version of Google’s open-source design system. Design and build beautiful, usable products with Material 3."
43-
FirstIconSource="logo.png"
44-
TypeButton="Tonal"
45-
Command="{Binding LaunchBrowserCommand}"
46-
CommandParameter="https://m3.material.io/"
47-
TextButton="See more" />
42+
<views:AboutCardView Title="Based on Material Design"
43+
Description="Material 3 is the latest version of Google’s open-source design system. Design and build beautiful, usable products with Material 3."
44+
FirstIconSource="logo.png"
45+
TypeButton="Tonal"
46+
Command="{Binding LaunchBrowserCommand}"
47+
CommandParameter="https://m3.material.io/"
48+
TextButton="See more" />
4849

49-
<views:AboutCardView Title="Supported platforms"
50-
Description="Material Design Controls fully support .NET MAUI and Xamarin Forms, ensuring seamless integration with these platforms."
51-
FirstIconSource="maui.png"
52-
SecondIconSource="xamarin.png"
53-
TypeButton="Tonal"
54-
Command="{Binding LaunchBrowserCommand}"
55-
CommandParameter="https://github.com/HorusSoftwareUY"
56-
TextButton="GitHub" />
50+
<views:AboutCardView Title="Supported platforms"
51+
Description="Material Design Controls fully support .NET MAUI and Xamarin Forms, ensuring seamless integration with these platforms."
52+
FirstIconSource="maui.png"
53+
SecondIconSource="xamarin.png"
54+
TypeButton="Tonal"
55+
Command="{Binding LaunchBrowserCommand}"
56+
CommandParameter="https://github.com/HorusSoftwareUY"
57+
TextButton="GitHub" />
5758

58-
<VerticalStackLayout Spacing="0">
59-
<material:MaterialLabel Style="{StaticResource ConnectionsTitle}" Text="Connect With Us" />
59+
<VerticalStackLayout Spacing="0">
60+
<material:MaterialLabel Style="{StaticResource ConnectionsTitle}" Text="Connect With Us" />
6061

61-
<views:ConnectionItemView IconSource="connection_website"
62-
LabelText="Website"
63-
Command="{Binding LaunchBrowserCommand}"
64-
CommandParameter="https://www.horus.com.uy/"/>
65-
66-
<views:ConnectionItemView IconSource="connection_clutch"
67-
LabelText="Clutch"
68-
Command="{Binding LaunchBrowserCommand}"
69-
CommandParameter="https://clutch.co/profile/horus-studio#highlights"/>
70-
71-
<views:ConnectionItemView IconSource="connection_github"
72-
LabelText="Github Material Design Controls"
73-
Command="{Binding LaunchBrowserCommand}"
74-
CommandParameter="https://github.com/HorusSoftwareUY/Maui.MaterialDesignControls"/>
75-
76-
<views:ConnectionItemView IconSource="connection_github"
77-
LabelText="Github Skeleton"
78-
Command="{Binding LaunchBrowserCommand}"
79-
CommandParameter="https://github.com/HorusSoftwareUY/Xamarin.Forms.Skeleton"/>
80-
81-
<views:ConnectionItemView IconSource="connection_linkedin"
82-
LabelText="Linkedin"
83-
Command="{Binding LaunchBrowserCommand}"
84-
CommandParameter="https://www.linkedin.com/company/horus-uy/"/>
85-
86-
<views:ConnectionItemView IconSource="connection_x"
87-
LabelText="X"
88-
Command="{Binding LaunchBrowserCommand}"
89-
CommandParameter="https://x.com/HorusStudioUy"/>
90-
91-
<views:ConnectionItemView IconSource="connection_instagran"
92-
LabelText="Instagram"
93-
Command="{Binding LaunchBrowserCommand}"
94-
CommandParameter="https://www.instagram.com/horus_studio_uy/"/>
95-
</VerticalStackLayout>
96-
</VerticalStackLayout>
62+
<views:ConnectionItemView IconSource="connection_website"
63+
LabelText="Website"
64+
Command="{Binding LaunchBrowserCommand}"
65+
CommandParameter="https://www.horus.com.uy/"/>
66+
67+
<views:ConnectionItemView IconSource="connection_clutch"
68+
LabelText="Clutch"
69+
Command="{Binding LaunchBrowserCommand}"
70+
CommandParameter="https://clutch.co/profile/horus-studio#highlights"/>
71+
72+
<views:ConnectionItemView IconSource="connection_github"
73+
LabelText="Github Material Design Controls"
74+
Command="{Binding LaunchBrowserCommand}"
75+
CommandParameter="https://github.com/HorusSoftwareUY/Maui.MaterialDesignControls"/>
76+
77+
<views:ConnectionItemView IconSource="connection_github"
78+
LabelText="Github Skeleton"
79+
Command="{Binding LaunchBrowserCommand}"
80+
CommandParameter="https://github.com/HorusSoftwareUY/Xamarin.Forms.Skeleton"/>
81+
82+
<views:ConnectionItemView IconSource="connection_linkedin"
83+
LabelText="Linkedin"
84+
Command="{Binding LaunchBrowserCommand}"
85+
CommandParameter="https://www.linkedin.com/company/horus-uy/"/>
86+
87+
<views:ConnectionItemView IconSource="connection_x"
88+
LabelText="X"
89+
Command="{Binding LaunchBrowserCommand}"
90+
CommandParameter="https://x.com/HorusStudioUy"/>
91+
92+
<views:ConnectionItemView IconSource="connection_instagran"
93+
LabelText="Instagram"
94+
Command="{Binding LaunchBrowserCommand}"
95+
CommandParameter="https://www.instagram.com/horus_studio_uy/"/>
96+
</VerticalStackLayout>
97+
</VerticalStackLayout>
98+
</views:PageWithTopAppBar.PageContent>
99+
</views:PageWithTopAppBar>
97100
</local:BaseContentPage>

0 commit comments

Comments
 (0)