ttt

seanstardev · Jan 16, 2025 · b9b6c7f · b9b6c7f
1 parent 6af8f88
commit b9b6c7f
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/RMVC/IRContract.cs b/RMVC/IRContract.cs
@@ -0,0 +1,5 @@
+namespace RMVC {
+    public interface IRContract {
+
+    }
+}
diff --git a/RMVC/IRViewContract.cs b/RMVC/IRViewContract.cs
diff --git a/RMVC/RCommandExecutorBase.cs b/RMVC/RCommandExecutorBase.cs
@@ -5,7 +5,7 @@ public abstract class RCommandExecutorBase : RActor {
         protected RCommandExecutorBase() {
         }
         protected void ExecuteCommand(RCommandBase command) {
-            rCommander?.Facade.ExecuteCommand(command);
+            rCommander?.Facade?.ExecuteCommand(command);
         }
     }
 }
diff --git a/RMVC/RFacade.cs b/RMVC/RFacade.cs
@@ -94,7 +94,7 @@ public static void Create(Type facadeConcreteType, IRAppShell? appShell = null)
             }
         }
 
-        public static void RegisterView(IRViewContract view) {
+        public static void RegisterView(IRContract view) {
 
             RMediator? foundMediator = null;
 
@@ -125,7 +125,7 @@ public static void RegisterView(IRViewContract view) {
 
             Log("Registered mediator + view: " + foundMediator.GetType().Name + " | " + view.GetType().Name);
         }
-        public static void UnregisterView(IRViewContract view) {
+        public static void UnregisterView(IRContract view) {
 
             RMediator? foundMediator = null;
 

diff --git a/RMVC/RMediator.cs b/RMVC/RMediator.cs
@@ -4,10 +4,10 @@ public abstract class RMediator : RCommandExecutorBase {
 
         public bool IsActive => viewBase != null;
 
-        public IRViewContract? viewBase { get; set; }
+        public IRContract? viewBase { get; set; }
         internal Type viewBaseType { get; private set; }
 
-        internal void UpdateViewBase(IRViewContract viewBase) {
+        internal void UpdateViewBase(IRContract viewBase) {
             OnDisposing();
             this.viewBase = viewBase;
 

diff --git a/Sample/RMVCApp.Sample.Core/Shared/ViewContract/ICounterView.cs b/Sample/RMVCApp.Sample.Core/Shared/ViewContract/ICounterView.cs
@@ -2,7 +2,7 @@
 using System;
 
 namespace RMVCApp.Sample.Core.Shared {
-    public interface ICounterView : IRViewContract {
+    public interface ICounterView : IRContract {
         event Action<int>? SetCounterEvt;
         void SetCounter(int count);
     }

diff --git a/Sample/RMVCApp.Sample.Core/Shared/ViewContract/IHomeView.cs b/Sample/RMVCApp.Sample.Core/Shared/ViewContract/IHomeView.cs
@@ -3,7 +3,7 @@
 using System;
 
 namespace RMVCApp.Sample.Core.Shared {
-    public interface IHomeView : IRViewContract {
+    public interface IHomeView : IRContract {
         event Action<string>? ShowRmvcMessageEvt;
         event Action? RunRmvcProgressTestEvt;
         void SetView();

diff --git a/Sample/RMVCApp.Sample.Core/Shared/ViewContract/IMainView.cs b/Sample/RMVCApp.Sample.Core/Shared/ViewContract/IMainView.cs
@@ -2,7 +2,7 @@
 using static RMVCApp.Sample.Core.Shared.Enums;
 
 namespace RMVCApp.Sample.Core.Shared {
-    public interface IMainView : IRViewContract {
+    public interface IMainView : IRContract {
         void ShowView(ViewEnum viewEnum);
     }
 }
diff --git a/Sample/RMVCApp.Sample.Core/Shared/ViewContract/INavigationView.cs b/Sample/RMVCApp.Sample.Core/Shared/ViewContract/INavigationView.cs
@@ -2,7 +2,7 @@
 using System;
 
 namespace RMVCApp.Sample.Core.Shared {
-    public interface INavigationView : IRViewContract
+    public interface INavigationView : IRContract
     {
         event Action? ShowHomeViewEvt;
         event Action? ShowCounterViewEvt;

diff --git a/Sample/RMVCApp.Sample.Core/Shared/ViewContract/IProgressView.cs b/Sample/RMVCApp.Sample.Core/Shared/ViewContract/IProgressView.cs
@@ -4,7 +4,7 @@
 namespace RMVCApp.Sample.Core.Shared {
 
 
-    public interface IProgressView : IRViewContract {
+    public interface IProgressView : IRContract {
         event Action? AbortProgressEvt;
         void SetProgress(RProgress[] progress);
         void ResetView();

diff --git a/Sample/RMVCApp.Sample.Core/Shared/ViewContract/IWeatherView.cs b/Sample/RMVCApp.Sample.Core/Shared/ViewContract/IWeatherView.cs
@@ -1,7 +1,7 @@
 using RMVC;
 
 namespace RMVCApp.Sample.Core.Shared {
-    public interface IWeatherView : IRViewContract {
+    public interface IWeatherView : IRContract {
         void SetView(WeatherForecastDTO[]? Forecasts);
     }
 }