Merge pull request #6 from Ko1ors/drag&drop

Drag&Drop, Dynamic Settings, ETH Module

ETCModule/ETCLoadModule.cs

@@ -1,6 +1,8 @@
 using ETCModule.Models;
+using ETCModule.Settings;
 using ETCModule.Views;
 using ModularWidget;
+using ModularWidget.Models;
 using Prism.Ioc;
 using Prism.Modularity;
 using Prism.Regions;
@@ -14,16 +16,42 @@ public class ETCLoadModule : IModule
         private readonly string regName = "etcregion";
         private MainUC etcView = new MainUC();
         private EtcInformation etcInfo;
+
+        private readonly AppSettings _appSettings;
+
+        public ETCLoadModule(AppSettings appSettings)
+        {
+            _appSettings = appSettings;
+        }
+
         public void OnInitialized(IContainerProvider containerProvider)
         {
+            InitSettings();
+
             regionManager = containerProvider.Resolve<IRegionManager>();
             Manager.RegionCreated += Manager_RegionCreated;
             Manager.RegionRequest(regName);
-            etcInfo = new EtcInformation();
+            etcInfo = new EtcInformation(_appSettings);
             etcInfo.Completed += UpdateView;
+
             etcInfo.Start();
         }
 
+        private void InitSettings()
+        {
+            var menu = new SettingsMenu(Constants.Menu.MenuKey, "ETC Module Settings");
+            menu.Parameters.Add(new SettingsParameter<string>(Constants.Parameters.Wallet, "ETC Wallet", string.Empty));
+            menu.Parameters.Add(new SettingsParameter<int>(Constants.Parameters.UpdateTime, "Update time (in minutes)", 5));
+
+            if (!_appSettings.MenuExists(menu.Key))
+                _appSettings.AddOrUpdateMenu(menu);
+            foreach (var parameter in menu.Parameters)
+            {
+                if (!_appSettings.ParameterExists(menu.Key, parameter.Key))
+                    _appSettings.AddOrUpdateParameter(menu.Key, parameter);
+            }
+        }
+
         private void UpdateView()
         {
             etcView.Dispatcher.Invoke(() =>

ETCModule/Models/EtcInformation.cs

@@ -1,17 +1,17 @@
 using ETCModule.Data;
+using ETCModule.Settings;
 using ModularWidget;
 using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Threading;
-using System.Windows;
 
 namespace ETCModule.Models
 {
     public class EtcInformation
     {
         private int maxTries = 5;
-        private readonly Object inProgress = new object();
+        private readonly object inProgress = new object();
 
         public event Notify Completed;
 
@@ -21,21 +21,40 @@ public class EtcInformation
         public string lastWalletBalance;
         public EtcPrice lastEtcPrice;
 
-        private readonly string settingsPath = AppDomain.CurrentDomain.BaseDirectory + "etc-settings.json";
         private readonly Double divisor = 1000000000000000000d;
 
+        private System.Timers.Timer timer;
+
+        private readonly AppSettings _appSettings;
+
+        public EtcInformation(AppSettings settings)
+        {
+            _appSettings = settings;
+        }
+
         public void Start()
         {
             LoadSettings();
+            SetTimer();
             Update();
-            Manager.UpdateRequested += Update;
+        }
+
+        private void SetTimer()
+        {
+            var time = _appSettings.Get<int>(Constants.Parameters.UpdateTime);
+            if (time <= 0)
+                time = 5;
+            timer = new System.Timers.Timer(time * 60 * 1000);
+            timer.Elapsed += (s, e) => Update();
+            timer.AutoReset = true;
+            timer.Enabled = true;
         }
 
         private void Update()
         {
             lock (inProgress)
             {
-                if (!String.IsNullOrEmpty(etcWalletAddress))
+                if (!string.IsNullOrEmpty(etcWalletAddress))
                     if (!TryGetEtcWalletBalance())
                         return;
                 if (!TryGetEtcPrice())
@@ -79,33 +98,18 @@ private bool TryGetEtcWalletBalance()
         private string GetNonEmptyEtcWallet()
         {
             string wallet = null;
-            while (String.IsNullOrEmpty(wallet))
+            while (string.IsNullOrEmpty(wallet))
             {
-                wallet = EtcRequest.GetRandomWallets(10).Result.Find(e => !e.Balance.Equals(0) && Convert.ToDouble(e.Balance) / divisor > 1 )?.Address;  
+                wallet = EtcRequest.GetRandomWallets(10).Result.Find(e => !e.Balance.Equals(0) && Convert.ToDouble(e.Balance) / divisor > 1)?.Address;
             }
             return wallet;
         }
 
         private void LoadSettings()
         {
-            if (File.Exists(settingsPath))
-            {
-                etcWalletAddress = File.ReadAllText(settingsPath);
-                switch (etcWalletAddress)
-                {
-                    case "default":
-                        if (AppSettings.isLoaded)
-                            etcWalletAddress = AppSettings.ethWallet;
-                        else
-                            etcWalletAddress = null;
-                        break;
-                    case "random":
-                        etcWalletAddress = GetNonEmptyEtcWallet();
-                        break;
-                }
-            }
-            else
-                File.WriteAllText(settingsPath, etcWalletAddress);
+            etcWalletAddress = _appSettings.Get<string>(Constants.Parameters.Wallet);
+            if (string.Equals(etcWalletAddress, "random", StringComparison.InvariantCultureIgnoreCase))
+                etcWalletAddress = GetNonEmptyEtcWallet();
         }
 
         private void OnComplete()

ETCModule/Settings/Constants.cs

@@ -0,0 +1,16 @@
+namespace ETCModule.Settings
+{
+    public class Constants
+    {
+        public class Menu
+        {
+            public const string MenuKey = "etcModuleSettings";
+        }
+
+        public class Parameters
+        {
+            public const string Wallet = "etcWallet";
+            public const string UpdateTime = "etcUpdateTime";
+        }
+    }
+}

ETCModule/Settings/SettingsExtension.cs

@@ -0,0 +1,17 @@
+using ModularWidget;
+
+namespace ETCModule.Settings
+{
+    internal static class SettingsExtension
+    {
+        public static T Get<T>(this AppSettings settings, string parameterKey)
+        {
+            return settings.Get<T>(Constants.Menu.MenuKey, parameterKey);
+        }
+
+        public static object Get(this AppSettings settings, string parameterKey)
+        {
+            return settings.GetParameter(Constants.Menu.MenuKey, parameterKey)?.Value;
+        }
+    }
+}

ETHModule/Data/BlockReward.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace ETHModule.Data
+{
+    public class BlockReward : Root
+    {
+        [JsonProperty("result")]
+        public BlockRewardResult Result;
+    }
+}

ETHModule/Data/BlockRewardResult.cs

@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace ETHModule.Data
+{
+    public class BlockRewardResult
+    {
+        [JsonProperty("blockNumber")]
+        public string BlockNumber;
+
+        [JsonProperty("timeStamp")]
+        public string TimeStamp;
+
+        [JsonProperty("blockMiner")]
+        public string BlockMiner;
+
+        [JsonProperty("blockReward")]
+        public string BlockReward;
+
+        [JsonProperty("uncles")]
+        public List<object> Uncles;
+
+        [JsonProperty("uncleInclusionReward")]
+        public string UncleInclusionReward;
+    }
+}

ETHModule/Data/ETHCompositeModel.cs

@@ -0,0 +1,13 @@
+namespace ETHModule.Data
+{
+    public class ETHCompositeModel
+    {
+        public EthPrice EthPrice { get; set; }
+
+        public EthGasPrice EthGasPrice { get; set; }
+
+        public double AvgBlockReward { get; set; }
+
+        public double WalletBalance { get; set; }
+    }
+}

ETHModule/Data/EthGasPrice.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace ETHModule.Data
+{
+    public class EthGasPrice : Root
+    {
+        [JsonProperty("result")]
+        public EthGasPriceResult Result;
+    }
+}

ETHModule/Data/EthGasPriceResult.cs

@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+
+namespace ETHModule.Data
+{
+    public class EthGasPriceResult
+    {
+        [JsonProperty("LastBlock")]
+        public string LastBlock;
+
+        [JsonProperty("SafeGasPrice")]
+        public string SafeGasPrice;
+
+        [JsonProperty("ProposeGasPrice")]
+        public string ProposeGasPrice;
+
+        [JsonProperty("FastGasPrice")]
+        public string FastGasPrice;
+    }
+}

ETHModule/Data/EthPrice.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace ETHModule.Data
+{
+    public class EthPrice : Root
+    {
+        [JsonProperty("result")]
+        public EthPriceResult Result;
+    }
+}

ETHModule/Data/EthPriceResult.cs

@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+
+namespace ETHModule.Data
+{
+    public class EthPriceResult
+    {
+        [JsonProperty("ethbtc")]
+        public string Ethbtc;
+
+        [JsonProperty("ethbtc_timestamp")]
+        public string EthbtcTimestamp;
+
+        [JsonProperty("ethusd")]
+        public string Ethusd;
+
+        [JsonProperty("ethusd_timestamp")]
+        public string EthusdTimestamp;
+    }
+}

ETHModule/Data/Root.cs

@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace ETHModule.Data
+{
+    public abstract class Root
+    {
+        [JsonProperty("status")]
+        public string Status;
+
+        [JsonProperty("message")]
+        public string Message;
+    }
+}

ETHModule/Data/WalletBalance.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace ETHModule.Data
+{
+    public class WalletBalance : Root
+    {
+        [JsonProperty("result")]
+        public string Result;
+    }
+}

ETHModule/ETHModule.csproj

@@ -0,0 +1,61 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <OutputType>Library</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\ModularWidget\bin\Debug\Modules\</OutputPath>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\ModularWidget\bin\Release\Modules\</OutputPath>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Images\block-icon.svg" />
+    <None Remove="Images\ethereumLogo.svg" />
+    <None Remove="Images\ethwallet-icon.png" />
+    <None Remove="Images\ethwallet-icon2.png" />
+    <None Remove="Images\gas-icon.svg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ModularWidget\ModularWidget.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Images\block-icon.svg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\ethereumLogo.svg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\ethwallet-icon.png" />
+    <Resource Include="Images\ethwallet-icon2.png" />
+    <Resource Include="Images\gas-icon.svg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="UserControls\BlockRewardUC.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="UserControls\EthPriceUC.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="UserControls\EthWalletBalanceUC.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+    <Page Update="UserControls\GasTrackerUC.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+  </ItemGroup>
+</Project>