Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Arvtesh committed Jan 5, 2020
2 parents 2637089 + fc758fe commit 0cb1892
Show file tree
Hide file tree
Showing 188 changed files with 2,813 additions and 1,747 deletions.
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ root = true

# Use tabs for indentation.
[*]
indent_style = tab
trim_trailing_whitespace = true
charset = utf-8-bom
end_of_line = crlf
insert_final_newline = true
indent_style = tab
# (Please don't specify an indent_size here; that has too many unintended consequences.)

# Code files
Expand Down Expand Up @@ -35,7 +36,6 @@ indent_size = 2
[*.{cs,vb}]
# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true

# Avoid "this." and "Me." if not necessary
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Node.js Package

on:
push:
branches:
- master

jobs:
publish-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
registry-url: https://registry.npmjs.org/
- run: npm publish Packages/UnityFx.Mvc
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

publish-gpr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
registry-url: https://npm.pkg.github.com/
- run: npm publish Packages/UnityFx.Mvc
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
22 changes: 21 additions & 1 deletion Assets/Plugins/UnityFx.Mvc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
# UnityFx.AppStates changelog
# UnityFx.Mvc changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/); this project adheres to [Semantic Versioning](http://semver.org/).

## [0.2.0] - 2020.01.05

### Added
- Added support for generic commands.
- Added view layers support (via `ViewControllerAttribute`).
- Added `IViewControllerResult` interface to tag controllers that have a result value.
- Added `IConfigurable` interfaces.
- Added message box extensions.

### Changed
- Changed the package layout. The code is now splitted into 3 assemblies (`UnityFx.Mvc`, `UnityFx.Mvc.Abstractions` and `UnityFx.Mvc.Extensions`).
- Renamed `IPresenter.PresentAsync` to `Present`. Added a group of `PresentAsync` extension methods returning `Task` instead of `IPresentResult`.
- Renamed `IPresentResult.DismissTask` to `Task`.
- Changed `Present`/`PresentAsync` arguments.
- Changed `IViewFactory` and `IViewControllerFactory` interfaces.
- `IView` now does not inherit `IComponent`.

### Removed
- Removed `IPresentResult.PresentTask`.

## [0.1.0] - 2019.11.14

### Added
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

namespace UnityFx.Mvc
{
[CustomEditor(typeof(ViewFactory))]
[CustomEditor(typeof(UGUIViewFactory))]
public class ViewFactoryEditor : Editor
{
private ViewFactory _viewFactory;
private UGUIViewFactory _viewFactory;

private void OnEnable()
{
_viewFactory = (ViewFactory)target;
_viewFactory = (UGUIViewFactory)target;
}

public override void OnInspectorGUI()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

namespace UnityFx.Mvc
{
[CustomEditor(typeof(ViewFactory.ViewProxy), true)]
[CustomEditor(typeof(UGUIViewFactory.ViewProxy), true)]
public class ViewProxyEditor : Editor
{
private ViewFactory.ViewProxy _viewProxy;
private UGUIViewFactory.ViewProxy _viewProxy;

private void OnEnable()
{
_viewProxy = (ViewFactory.ViewProxy)target;
_viewProxy = (UGUIViewFactory.ViewProxy)target;
}

public override void OnInspectorGUI()
Expand All @@ -23,7 +23,7 @@ public override void OnInspectorGUI()

EditorGUI.BeginDisabledGroup(true);

EditorGUILayout.ObjectField("View", _viewProxy.Component as Component, typeof(Component), true);
EditorGUILayout.ObjectField("View", _viewProxy.View as Component, typeof(Component), true);
EditorGUILayout.Toggle("Modal", _viewProxy.Modal);
EditorGUILayout.Toggle("Exclusive", _viewProxy.Exclusive);

Expand Down
16 changes: 0 additions & 16 deletions Assets/Plugins/UnityFx.Mvc/Editor/Scripts/MenuExtensions.cs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "UnityFx.Mvc.Editor",
"references": [
"UnityFx.Mvc.Abstractions",
"UnityFx.Mvc"
],
"optionalUnityReferences": [],
Expand Down
Loading

0 comments on commit 0cb1892

Please sign in to comment.