diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj
index 066b400..3b27168 100644
--- a/Borepin/Borepin.Android/Borepin.Android.csproj
+++ b/Borepin/Borepin.Android/Borepin.Android.csproj
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/Borepin/Borepin.Android/MainActivity.cs b/Borepin/Borepin.Android/MainActivity.cs
index ba8f470..b6eb6d7 100644
--- a/Borepin/Borepin.Android/MainActivity.cs
+++ b/Borepin/Borepin.Android/MainActivity.cs
@@ -3,6 +3,7 @@ using Android.Content.PM;
using Avalonia;
using Avalonia.Android;
+using Avalonia.ReactiveUI;
namespace Borepin.Android;
@@ -17,6 +18,7 @@ public class MainActivity : AvaloniaMainActivity
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
return base.CustomizeAppBuilder(builder)
- .WithInterFont();
+ .WithInterFont()
+ .UseReactiveUI();
}
}
diff --git a/Borepin/Borepin.Browser/Borepin.Browser.csproj b/Borepin/Borepin.Browser/Borepin.Browser.csproj
index 39cb343..778eec8 100644
--- a/Borepin/Borepin.Browser/Borepin.Browser.csproj
+++ b/Borepin/Borepin.Browser/Borepin.Browser.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/Borepin/Borepin.Browser/Program.cs b/Borepin/Borepin.Browser/Program.cs
index f8af731..92d589d 100644
--- a/Borepin/Borepin.Browser/Program.cs
+++ b/Borepin/Borepin.Browser/Program.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
using Avalonia;
using Avalonia.Browser;
+using Avalonia.ReactiveUI;
using Borepin;
@@ -12,6 +13,7 @@ internal partial class Program
{
private static async Task Main(string[] args) => await BuildAvaloniaApp()
.WithInterFont()
+ .UseReactiveUI()
.StartBrowserAppAsync("out");
public static AppBuilder BuildAvaloniaApp()
diff --git a/Borepin/Borepin.Desktop/Borepin.Desktop.csproj b/Borepin/Borepin.Desktop/Borepin.Desktop.csproj
index ba64b95..8967d0c 100644
--- a/Borepin/Borepin.Desktop/Borepin.Desktop.csproj
+++ b/Borepin/Borepin.Desktop/Borepin.Desktop.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/Borepin/Borepin.Desktop/Program.cs b/Borepin/Borepin.Desktop/Program.cs
index f1005a8..d4aaaa9 100644
--- a/Borepin/Borepin.Desktop/Program.cs
+++ b/Borepin/Borepin.Desktop/Program.cs
@@ -1,6 +1,7 @@
using System;
using Avalonia;
+using Avalonia.ReactiveUI;
namespace Borepin.Desktop;
@@ -18,6 +19,6 @@ class Program
=> AppBuilder.Configure()
.UsePlatformDetect()
.WithInterFont()
- .LogToTrace();
-
+ .LogToTrace()
+ .UseReactiveUI();
}
diff --git a/Borepin/Borepin.iOS/AppDelegate.cs b/Borepin/Borepin.iOS/AppDelegate.cs
index 8f36678..664bc76 100644
--- a/Borepin/Borepin.iOS/AppDelegate.cs
+++ b/Borepin/Borepin.iOS/AppDelegate.cs
@@ -1,5 +1,6 @@
using Avalonia;
using Avalonia.iOS;
+using Avalonia.ReactiveUI;
using Foundation;
@@ -14,6 +15,7 @@ public partial class AppDelegate : AvaloniaAppDelegate
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
return base.CustomizeAppBuilder(builder)
- .WithInterFont();
+ .WithInterFont()
+ .UseReactiveUI();
}
}
diff --git a/Borepin/Borepin.iOS/Borepin.iOS.csproj b/Borepin/Borepin.iOS/Borepin.iOS.csproj
index abd52fd..491a259 100644
--- a/Borepin/Borepin.iOS/Borepin.iOS.csproj
+++ b/Borepin/Borepin.iOS/Borepin.iOS.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/Borepin/Borepin.sln b/Borepin/Borepin.sln
index 1e4b885..79af000 100644
--- a/Borepin/Borepin.sln
+++ b/Borepin/Borepin.sln
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34607.119
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin", "Borepin\Borepin.csproj", "{47829483-056A-4A5D-A3D8-C6B507103E66}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin", "Borepin\Borepin.csproj", "{8471501A-C23A-44C0-9271-E9B42F4C72D2}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin.Android", "Borepin.Android\Borepin.Android.csproj", "{8AA57851-5DEE-4D96-9D6E-285B232AB772}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin.Android", "Borepin.Android\Borepin.Android.csproj", "{AEE63A7F-3C2D-45ED-AD3A-77D974CF99EE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin.Desktop", "Borepin.Desktop\Borepin.Desktop.csproj", "{A2E3C6E6-FA55-491E-8888-B5D3E84C5BE7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin.Desktop", "Borepin.Desktop\Borepin.Desktop.csproj", "{294083BF-101F-4264-9934-1CD3E36BB8DB}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin.iOS", "Borepin.iOS\Borepin.iOS.csproj", "{D8139E0C-DEE9-4120-A708-D349DE0E19BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin.iOS", "Borepin.iOS\Borepin.iOS.csproj", "{ED0A4E2D-9395-40DA-8446-8F6F6F1BDAB7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin.Browser", "Borepin.Browser\Borepin.Browser.csproj", "{2C7E3F57-7C58-4769-B36A-F347FF3194E9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin.Browser", "Borepin.Browser\Borepin.Browser.csproj", "{24CD9192-40BF-4568-9791-08EC86491AC2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,35 +19,35 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {47829483-056A-4A5D-A3D8-C6B507103E66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {47829483-056A-4A5D-A3D8-C6B507103E66}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {47829483-056A-4A5D-A3D8-C6B507103E66}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {47829483-056A-4A5D-A3D8-C6B507103E66}.Release|Any CPU.Build.0 = Release|Any CPU
- {8AA57851-5DEE-4D96-9D6E-285B232AB772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8AA57851-5DEE-4D96-9D6E-285B232AB772}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8AA57851-5DEE-4D96-9D6E-285B232AB772}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
- {8AA57851-5DEE-4D96-9D6E-285B232AB772}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8AA57851-5DEE-4D96-9D6E-285B232AB772}.Release|Any CPU.Build.0 = Release|Any CPU
- {8AA57851-5DEE-4D96-9D6E-285B232AB772}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {A2E3C6E6-FA55-491E-8888-B5D3E84C5BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A2E3C6E6-FA55-491E-8888-B5D3E84C5BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A2E3C6E6-FA55-491E-8888-B5D3E84C5BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A2E3C6E6-FA55-491E-8888-B5D3E84C5BE7}.Release|Any CPU.Build.0 = Release|Any CPU
- {D8139E0C-DEE9-4120-A708-D349DE0E19BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D8139E0C-DEE9-4120-A708-D349DE0E19BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D8139E0C-DEE9-4120-A708-D349DE0E19BF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
- {D8139E0C-DEE9-4120-A708-D349DE0E19BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D8139E0C-DEE9-4120-A708-D349DE0E19BF}.Release|Any CPU.Build.0 = Release|Any CPU
- {D8139E0C-DEE9-4120-A708-D349DE0E19BF}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {2C7E3F57-7C58-4769-B36A-F347FF3194E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2C7E3F57-7C58-4769-B36A-F347FF3194E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2C7E3F57-7C58-4769-B36A-F347FF3194E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2C7E3F57-7C58-4769-B36A-F347FF3194E9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8471501A-C23A-44C0-9271-E9B42F4C72D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8471501A-C23A-44C0-9271-E9B42F4C72D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8471501A-C23A-44C0-9271-E9B42F4C72D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8471501A-C23A-44C0-9271-E9B42F4C72D2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AEE63A7F-3C2D-45ED-AD3A-77D974CF99EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AEE63A7F-3C2D-45ED-AD3A-77D974CF99EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AEE63A7F-3C2D-45ED-AD3A-77D974CF99EE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+ {AEE63A7F-3C2D-45ED-AD3A-77D974CF99EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AEE63A7F-3C2D-45ED-AD3A-77D974CF99EE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AEE63A7F-3C2D-45ED-AD3A-77D974CF99EE}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {294083BF-101F-4264-9934-1CD3E36BB8DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {294083BF-101F-4264-9934-1CD3E36BB8DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {294083BF-101F-4264-9934-1CD3E36BB8DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {294083BF-101F-4264-9934-1CD3E36BB8DB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {ED0A4E2D-9395-40DA-8446-8F6F6F1BDAB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {ED0A4E2D-9395-40DA-8446-8F6F6F1BDAB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {ED0A4E2D-9395-40DA-8446-8F6F6F1BDAB7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+ {ED0A4E2D-9395-40DA-8446-8F6F6F1BDAB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {ED0A4E2D-9395-40DA-8446-8F6F6F1BDAB7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {ED0A4E2D-9395-40DA-8446-8F6F6F1BDAB7}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {24CD9192-40BF-4568-9791-08EC86491AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {24CD9192-40BF-4568-9791-08EC86491AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {24CD9192-40BF-4568-9791-08EC86491AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {24CD9192-40BF-4568-9791-08EC86491AC2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {92B0F3A1-0811-47E2-B70E-CB056E394DCE}
+ SolutionGuid = {1804B56B-E6D9-4AED-8A8E-5FFB0502584A}
EndGlobalSection
EndGlobal
diff --git a/Borepin/Borepin/App.axaml.cs b/Borepin/Borepin/App.axaml.cs
index 3ea58b4..befd609 100644
--- a/Borepin/Borepin/App.axaml.cs
+++ b/Borepin/Borepin/App.axaml.cs
@@ -1,6 +1,5 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Data.Core.Plugins;
using Avalonia.Markup.Xaml;
using Borepin.ViewModels;
@@ -17,10 +16,6 @@ public partial class App : Application
public override void OnFrameworkInitializationCompleted()
{
- // Line below is needed to remove Avalonia data validation.
- // Without this line you will get duplicate validations from both Avalonia and CT
- BindingPlugins.DataValidators.RemoveAt(0);
-
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
desktop.MainWindow = new MainWindow
diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj
index 62deaec..ec14187 100644
--- a/Borepin/Borepin/Borepin.csproj
+++ b/Borepin/Borepin/Borepin.csproj
@@ -12,12 +12,11 @@
-
-
-
-
-
+
+
+
+
-
+
diff --git a/Borepin/Borepin/ViewModels/MainViewModel.cs b/Borepin/Borepin/ViewModels/MainViewModel.cs
index 4f63011..a597fc6 100644
--- a/Borepin/Borepin/ViewModels/MainViewModel.cs
+++ b/Borepin/Borepin/ViewModels/MainViewModel.cs
@@ -1,6 +1,6 @@
namespace Borepin.ViewModels;
-public partial class MainViewModel : ViewModelBase
+public class MainViewModel : ViewModelBase
{
- public string Greeting => "Welcome to Avalonia!";
+ public string Greeting => "Welcome to FabAccess!";
}
diff --git a/Borepin/Borepin/ViewModels/ViewModelBase.cs b/Borepin/Borepin/ViewModels/ViewModelBase.cs
index 2f2bfd7..e2492a0 100644
--- a/Borepin/Borepin/ViewModels/ViewModelBase.cs
+++ b/Borepin/Borepin/ViewModels/ViewModelBase.cs
@@ -1,7 +1,7 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using ReactiveUI;
namespace Borepin.ViewModels;
-public class ViewModelBase : ObservableObject
+public class ViewModelBase : ReactiveObject
{
}
diff --git a/README.md b/README.md
index fa6001e..46229c1 100644
--- a/README.md
+++ b/README.md
@@ -1,93 +1,4 @@
-# Borepin_tmp
+Borepin
+===
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.com/fabinfra/fabaccess/borepin_tmp.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.com/fabinfra/fabaccess/borepin_tmp/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+FabAccess Client based on Avalonia UI for Desktop, Mobile.
\ No newline at end of file