Skip to content

Commit 584035a

Browse files
sylacsylac
authored
Merge pull request #10 from sylac/develop
Develop
2 parents c92e24e + f92071e commit 584035a

29 files changed

+531
-129
lines changed

.github/workflows/build-and-test.yml renamed to .github/workflows/ci-cd.yml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ name: Build and Test
33
on:
44
push:
55
branches: [ "main", "develop"]
6+
tags:
7+
- 'v*'
68
pull_request:
79
branches: [ "main", "develop"]
810

911
jobs:
10-
build:
11-
name: Build and Test
12+
setup:
1213
runs-on: windows-latest
13-
1414
steps:
1515
- name: Checkout code
1616
uses: actions/checkout@v4
@@ -26,6 +26,14 @@ jobs:
2626
- name: Install dependencies
2727
run: dotnet restore
2828

29+
build:
30+
name: Build and Test
31+
runs-on: windows-latest
32+
needs: setup
33+
steps:
34+
- name: Checkout code
35+
uses: actions/checkout@v4
36+
2937
- name: Build
3038
run: dotnet build -c Release
3139

@@ -38,3 +46,21 @@ jobs:
3846
with:
3947
name: TestResults
4048
path: TestResults.trx
49+
50+
release:
51+
name: Release packages
52+
runs-on: windows-latest
53+
needs: [setup, build]
54+
if: startsWith(github.ref, 'refs/tags/v')
55+
steps:
56+
- name: Checkout code
57+
uses: actions/checkout@v4
58+
59+
- name: Build
60+
run: dotnet build -c Release
61+
62+
- name: Package
63+
run: dotnet pack -c Release --no-build --output nupkgs
64+
65+
- name: Publish
66+
run: dotnet nuget push nupkgs/ -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}

‎.github/workflows/release-packages.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ name: Release packages
22

33
on:
44
push:
5-
branches:
6-
- main
75
tags:
8-
- v*
6+
- release-v*
97

108
jobs:
119
build:

‎Sylac.Mvvm.Core/IViewModel.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
public interface IViewModel
44
{
5-
virtual void OnAppearing() { }
5+
void OnNavigatingTo();
6+
void OnNavigatingFrom() { }
7+
void OnNavigatedTo();
8+
void OnNavigatedFrom();
69
}
710

811
public interface IViewModel<out TParam> : IViewModel

‎Sylac.Mvvm.Core/Sylac.Mvvm.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<IsPackable>true</IsPackable>
99
<PackageId>Sylac.Mvvm.Core</PackageId>
1010
<RootNamespace>Sylac.Mvvm</RootNamespace>
11-
<Version>0.1.0</Version>
11+
<Version>0.2.0</Version>
1212
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1313
<Authors>Sylwester Łach</Authors>
1414
<RepositoryUrl>https://github.com/sylac/Sylac.Mvvm</RepositoryUrl>
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
2222
<PackageReference Include="System.Reactive" Version="6.0.1" />
2323
</ItemGroup>
2424

‎Sylac.Mvvm.Example/.editorconfig‎

Lines changed: 254 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,254 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
3+
4+
# C# files
5+
[*.cs]
6+
7+
#### Core EditorConfig Options ####
8+
9+
# Indentation and spacing
10+
indent_size = 4
11+
indent_style = space
12+
tab_width = 4
13+
14+
# New line preferences
15+
end_of_line = crlf
16+
insert_final_newline = false
17+
18+
#### .NET Coding Conventions ####
19+
20+
# Organize usings
21+
dotnet_separate_import_directive_groups = false
22+
dotnet_sort_system_directives_first = false
23+
file_header_template = unset
24+
25+
# this. and Me. preferences
26+
dotnet_style_qualification_for_event = false
27+
dotnet_style_qualification_for_field = false
28+
dotnet_style_qualification_for_method = false
29+
dotnet_style_qualification_for_property = false
30+
31+
# Language keywords vs BCL types preferences
32+
dotnet_style_predefined_type_for_locals_parameters_members = true
33+
dotnet_style_predefined_type_for_member_access = true
34+
35+
# Parentheses preferences
36+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
37+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
38+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
39+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
40+
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members
43+
44+
# Expression-level preferences
45+
dotnet_style_coalesce_expression = true
46+
dotnet_style_collection_initializer = true
47+
dotnet_style_explicit_tuple_names = true
48+
dotnet_style_namespace_match_folder = true
49+
dotnet_style_null_propagation = true
50+
dotnet_style_object_initializer = true
51+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
52+
dotnet_style_prefer_auto_properties = true
53+
dotnet_style_prefer_collection_expression = when_types_loosely_match
54+
dotnet_style_prefer_compound_assignment = true
55+
dotnet_style_prefer_conditional_expression_over_assignment = true
56+
dotnet_style_prefer_conditional_expression_over_return = true
57+
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
58+
dotnet_style_prefer_inferred_anonymous_type_member_names = true
59+
dotnet_style_prefer_inferred_tuple_names = true
60+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
61+
dotnet_style_prefer_simplified_boolean_expressions = true
62+
dotnet_style_prefer_simplified_interpolation = true
63+
64+
# Field preferences
65+
dotnet_style_readonly_field = true
66+
67+
# Parameter preferences
68+
dotnet_code_quality_unused_parameters = all
69+
70+
# Suppression preferences
71+
dotnet_remove_unnecessary_suppression_exclusions = none
72+
73+
# New line preferences
74+
dotnet_style_allow_multiple_blank_lines_experimental = true
75+
dotnet_style_allow_statement_immediately_after_block_experimental = true
76+
77+
#### C# Coding Conventions ####
78+
79+
# var preferences
80+
csharp_style_var_elsewhere = false
81+
csharp_style_var_for_built_in_types = false
82+
csharp_style_var_when_type_is_apparent = false
83+
84+
# Expression-bodied members
85+
csharp_style_expression_bodied_accessors = true:silent
86+
csharp_style_expression_bodied_constructors = false:silent
87+
csharp_style_expression_bodied_indexers = true:silent
88+
csharp_style_expression_bodied_lambdas = true:silent
89+
csharp_style_expression_bodied_local_functions = false:silent
90+
csharp_style_expression_bodied_methods = false:silent
91+
csharp_style_expression_bodied_operators = false:silent
92+
csharp_style_expression_bodied_properties = true:silent
93+
94+
# Pattern matching preferences
95+
csharp_style_pattern_matching_over_as_with_null_check = true
96+
csharp_style_pattern_matching_over_is_with_cast_check = true
97+
csharp_style_prefer_extended_property_pattern = true
98+
csharp_style_prefer_not_pattern = true
99+
csharp_style_prefer_pattern_matching = true
100+
csharp_style_prefer_switch_expression = true
101+
102+
# Null-checking preferences
103+
csharp_style_conditional_delegate_call = true
104+
105+
# Modifier preferences
106+
csharp_prefer_static_anonymous_function = true
107+
csharp_prefer_static_local_function = true
108+
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
109+
csharp_style_prefer_readonly_struct = true
110+
csharp_style_prefer_readonly_struct_member = true
111+
112+
# Code-block preferences
113+
csharp_prefer_braces = true:silent
114+
csharp_prefer_simple_using_statement = true:suggestion
115+
csharp_style_namespace_declarations = file_scoped:suggestion
116+
csharp_style_prefer_method_group_conversion = true:silent
117+
csharp_style_prefer_primary_constructors = true:suggestion
118+
csharp_style_prefer_top_level_statements = true:silent
119+
120+
# Expression-level preferences
121+
csharp_prefer_simple_default_expression = true:suggestion
122+
csharp_style_deconstructed_variable_declaration = true
123+
csharp_style_implicit_object_creation_when_type_is_apparent = true
124+
csharp_style_inlined_variable_declaration = true
125+
csharp_style_prefer_index_operator = true
126+
csharp_style_prefer_local_over_anonymous_function = true:suggestion
127+
csharp_style_prefer_null_check_over_type_check = true:suggestion
128+
csharp_style_prefer_range_operator = true
129+
csharp_style_prefer_tuple_swap = true
130+
csharp_style_prefer_utf8_string_literals = true
131+
csharp_style_throw_expression = true:suggestion
132+
csharp_style_unused_value_assignment_preference = discard_variable
133+
csharp_style_unused_value_expression_statement_preference = discard_variable
134+
135+
# 'using' directive preferences
136+
csharp_using_directive_placement = outside_namespace:silent
137+
138+
# New line preferences
139+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
140+
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
141+
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
142+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
143+
csharp_style_allow_embedded_statements_on_same_line_experimental = true
144+
145+
#### C# Formatting Rules ####
146+
147+
# New line preferences
148+
csharp_new_line_before_catch = true
149+
csharp_new_line_before_else = true
150+
csharp_new_line_before_finally = true
151+
csharp_new_line_before_members_in_anonymous_types = true
152+
csharp_new_line_before_members_in_object_initializers = true
153+
csharp_new_line_before_open_brace = all
154+
csharp_new_line_between_query_expression_clauses = true
155+
156+
# Indentation preferences
157+
csharp_indent_block_contents = true
158+
csharp_indent_braces = false
159+
csharp_indent_case_contents = true
160+
csharp_indent_case_contents_when_block = true
161+
csharp_indent_labels = one_less_than_current
162+
csharp_indent_switch_labels = true
163+
164+
# Space preferences
165+
csharp_space_after_cast = false
166+
csharp_space_after_colon_in_inheritance_clause = true
167+
csharp_space_after_comma = true
168+
csharp_space_after_dot = false
169+
csharp_space_after_keywords_in_control_flow_statements = true
170+
csharp_space_after_semicolon_in_for_statement = true
171+
csharp_space_around_binary_operators = before_and_after
172+
csharp_space_around_declaration_statements = false
173+
csharp_space_before_colon_in_inheritance_clause = true
174+
csharp_space_before_comma = false
175+
csharp_space_before_dot = false
176+
csharp_space_before_open_square_brackets = false
177+
csharp_space_before_semicolon_in_for_statement = false
178+
csharp_space_between_empty_square_brackets = false
179+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
180+
csharp_space_between_method_call_name_and_opening_parenthesis = false
181+
csharp_space_between_method_call_parameter_list_parentheses = false
182+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
183+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
184+
csharp_space_between_method_declaration_parameter_list_parentheses = false
185+
csharp_space_between_parentheses = false
186+
csharp_space_between_square_brackets = false
187+
188+
# Wrapping preferences
189+
csharp_preserve_single_line_blocks = true
190+
csharp_preserve_single_line_statements = true
191+
192+
#### Naming styles ####
193+
194+
# Naming rules
195+
196+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
197+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
198+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
199+
200+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
201+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
202+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
203+
204+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
205+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
206+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
207+
208+
# Symbol specifications
209+
210+
dotnet_naming_symbols.interface.applicable_kinds = interface
211+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
212+
dotnet_naming_symbols.interface.required_modifiers =
213+
214+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
215+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
216+
dotnet_naming_symbols.types.required_modifiers =
217+
218+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
219+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
220+
dotnet_naming_symbols.non_field_members.required_modifiers =
221+
222+
# Naming styles
223+
224+
dotnet_naming_style.pascal_case.required_prefix =
225+
dotnet_naming_style.pascal_case.required_suffix =
226+
dotnet_naming_style.pascal_case.word_separator =
227+
dotnet_naming_style.pascal_case.capitalization = pascal_case
228+
229+
dotnet_naming_style.begins_with_i.required_prefix = I
230+
dotnet_naming_style.begins_with_i.required_suffix =
231+
dotnet_naming_style.begins_with_i.word_separator =
232+
dotnet_naming_style.begins_with_i.capitalization = pascal_case
233+
234+
[*.{cs,vb}]
235+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
236+
tab_width = 4
237+
indent_size = 4
238+
end_of_line = crlf
239+
dotnet_style_coalesce_expression = true:suggestion
240+
dotnet_style_null_propagation = true:suggestion
241+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
242+
dotnet_style_prefer_auto_properties = true:silent
243+
dotnet_style_object_initializer = true:suggestion
244+
dotnet_style_collection_initializer = true:suggestion
245+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
246+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
247+
dotnet_style_prefer_conditional_expression_over_return = true:silent
248+
dotnet_style_explicit_tuple_names = true:suggestion
249+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
250+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
251+
dotnet_style_prefer_compound_assignment = true:suggestion
252+
dotnet_style_prefer_simplified_interpolation = true:suggestion
253+
dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
254+
dotnet_style_namespace_match_folder = true:suggestion

‎Sylac.Mvvm.Example/AppShell.xaml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<Shell x:Class="Sylac.Mvvm.Example.AppShell"
3-
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
5-
xmlns:local="clr-namespace:Sylac.Mvvm.Example"
6-
Title="Sylac.Mvvm.Example"
7-
Shell.FlyoutBehavior="Disabled">
2+
<Shell
3+
x:Class="Sylac.Mvvm.Example.AppShell"
4+
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
5+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
6+
xmlns:pages="clr-namespace:Sylac.Mvvm.Example.Pages"
7+
Title="Sylac.Mvvm.Example"
8+
Shell.FlyoutBehavior="Disabled">
89

9-
<ShellContent Title="Home" ContentTemplate="{DataTemplate local:MainPage}" />
10+
<TabBar>
11+
<Tab Title="Home">
12+
<ShellContent Title="Home" ContentTemplate="{DataTemplate pages:MainPage}" />
13+
</Tab>
14+
<Tab Title="ShellNavigationPage">
15+
<ShellContent Title="Second Tab" ContentTemplate="{DataTemplate pages:ShellTabPage}" />
16+
</Tab>
17+
</TabBar>
1018

1119
</Shell>

0 commit comments

Comments
 (0)