Atomix to Atomex

.gitlab-ci.yml

@@ -3,7 +3,7 @@ variables:
   NUGET_PACKAGES: 'C:\Tools\Nuget\packages'
   MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe'
   XUNIT_PATH: packages\xunit.runner.console.2.4.1\tools\net461
-  UNITTEST_FOLDER: '.\Atomix.Client.Wpf.Tests\bin\Release\'
+  UNITTEST_FOLDER: '.\Atomex.Client.Wpf.Tests\bin\Release\'
   GIT_SUBMODULE_STRATEGY: normal
 
 stages:
@@ -29,6 +29,6 @@ test:
   only:
     - branches
   script:
-    - '& "$env:XUNIT_PATH\xunit.console.exe" "$env:UNITTEST_FOLDER\Atomix.Client.Wpf.Tests.dll"'
+    - '& "$env:XUNIT_PATH\xunit.console.exe" "$env:UNITTEST_FOLDER\Atomex.Client.Wpf.Tests.dll"'
   dependencies:
     - build 

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "Atomix.Client.Core"]
-	path = Atomix.Client.Core
-	url = ../atomix.client.core.git
+[submodule "Atomex.Client.Core"]
+	path = Atomex.Client.Core
+	url = ../atomex.client.core.git

Atomix.Client.Wpf.Installer/Atomix.Client.Wpf.Installer.wixproj → Atomex.Client.Wpf.Installer/Atomex.Client.Wpf.Installer.wixproj

@@ -6,9 +6,9 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>b799722d-701c-4fda-82b0-c2390f5816a0</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Atomix.Wallet</OutputName>
+    <OutputName>Atomex.Wallet</OutputName>
     <OutputType>Package</OutputType>
-    <DefineConstants>AppDir=..\Atomix.Client.Wpf\bin\$(Configuration)</DefineConstants>
+    <DefineConstants>AppDir=..\Atomex.Client.Wpf\bin\$(Configuration)</DefineConstants>
     <DefineSolutionProperties>false</DefineSolutionProperties>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -22,7 +22,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
-    <HarvestDirectory Include="..\Atomix.Client.Wpf\bin\$(Configuration)">
+    <HarvestDirectory Include="..\Atomex.Client.Wpf\bin\$(Configuration)">
       <GenerateGuidsNow>true</GenerateGuidsNow>
       <DirectoryRefId>INSTALLDIR</DirectoryRefId>
       <ComponentGroupName>App</ComponentGroupName>
@@ -36,8 +36,8 @@
     <WixExtension Include="WixUtilExtension" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Atomix.Client.Wpf\Atomix.Client.Wpf.csproj">
-      <Name>Atomix.Client.Wpf</Name>
+    <ProjectReference Include="..\Atomex.Client.Wpf\Atomex.Client.Wpf.csproj">
+      <Name>Atomex.Client.Wpf</Name>
       <Project>{a2b4dc4c-e075-4a08-89a8-96e2fc38c747}</Project>
       <Private>True</Private>
       <DoNotHarvest>True</DoNotHarvest>

Atomix.Client.Wpf.Installer/Product.wxs → Atomex.Client.Wpf.Installer/Product.wxs

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?define Name = "Atomix Client" ?>
-<?define Manufacturer = "Atomix.me" ?>
+<?define Name = "Atomex Client" ?>
+<?define Manufacturer = "Atomex.me" ?>
 <?define Description = "Multicurrency HD wallet with built-in hybrid exchange based on atomic swap." ?>
 <?define Version = "1.0.5" ?>
 <?define UpgradeCode = "0779aaaa-2411-4948-b5bc-48f81b8c6143" ?>
-<?define ExeName = "Atomix.Client.Wpf.exe" ?>
+<?define ExeName = "Atomex.Client.Wpf.exe" ?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
 		 xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 	<Product Id="*" Language="1033" Name="$(var.Name)" Version="$(var.Version)" 
 					 Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
 
 		<Package InstallerVersion="400" Compressed="yes" Manufacturer="$(var.Manufacturer)"
-						 Description="$(var.Description)" Comments="(c) 2018-2019 Atomix.me"
+						 Description="$(var.Description)" Comments="(c) 2018-2019 Atomex.me"
 						 InstallPrivileges="limited" InstallScope="perUser" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />    
@@ -22,7 +22,7 @@
 		<Icon Id="AppIcon.exe" SourceFile="Resources/appicon.ico" />
 
 		<Property Id="ARPPRODUCTICON" Value="AppIcon.exe" />
-		<Property Id="ARPHELPLINK" Value="https://atomix.me/" />
+		<Property Id="ARPHELPLINK" Value="https://atomex.me/" />
 		<Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />
 		<Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />
 		<Property Id="ALLUSERS" Secure="yes" Value="2" />
@@ -58,7 +58,7 @@
           Id="ApplicationStartMenuShortcut"
           Name="$(var.Name)"
           Description="$(var.Description)"
-          Target="[INSTALLDIR]Atomix.Client.Wpf.exe"
+          Target="[INSTALLDIR]Atomex.Client.Wpf.exe"
           WorkingDirectory="INSTALLDIR" />
         <RemoveFolder
           Id="ApplicationProgramsFolder"
@@ -80,7 +80,7 @@
           Id="ApplicationDesktopShortcut"
           Name="$(var.Name)"
           Description="$(var.Description)"
-          Target="[INSTALLDIR]Atomix.Client.Wpf.exe"
+          Target="[INSTALLDIR]Atomex.Client.Wpf.exe"
           WorkingDirectory="INSTALLDIR" />
         <RemoveFolder
           Id="DesktopFolder"
@@ -102,7 +102,7 @@
     </Feature>
 
 		<CustomAction Id="SetLaunchApp" Execute="immediate"
-								 	Property="WixShellExecTarget" Value="&quot;[INSTALLDIR]Atomix.Client.Wpf.exe&quot;" />
+								 	Property="WixShellExecTarget" Value="&quot;[INSTALLDIR]Atomex.Client.Wpf.exe&quot;" />
 		<CustomAction Id="LaunchApp" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
 
 		<InstallExecuteSequence>

Atomix.Client.Wpf.Tests/Atomix.Client.Wpf.Tests.csproj → Atomex.Client.Wpf.Tests/Atomex.Client.Wpf.Tests.csproj

@@ -10,8 +10,8 @@
     <ProjectGuid>{9C5E4889-B5EA-418A-B1B9-936BC1304504}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Atomix.Client.Wpf.Tests</RootNamespace>
-    <AssemblyName>Atomix.Client.Wpf.Tests</AssemblyName>
+    <RootNamespace>Atomex.Client.Wpf.Tests</RootNamespace>
+    <AssemblyName>Atomex.Client.Wpf.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
@@ -69,9 +69,9 @@
     <Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Atomix.Client.Wpf\Atomix.Client.Wpf.csproj">
+    <ProjectReference Include="..\Atomex.Client.Wpf\Atomex.Client.Wpf.csproj">
       <Project>{a2b4dc4c-e075-4a08-89a8-96e2fc38c747}</Project>
-      <Name>Atomix.Client.Wpf</Name>
+      <Name>Atomex.Client.Wpf</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Atomix.Client.Wpf.Tests/Properties/AssemblyInfo.cs → Atomex.Client.Wpf.Tests/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@
 // Общие сведения об этой сборке предоставляются следующим набором
 // набора атрибутов. Измените значения этих атрибутов, чтобы изменить сведения,
 // связанные со сборкой.
-[assembly: AssemblyTitle("Atomix.Client.Wpf.Tests")]
+[assembly: AssemblyTitle("Atomex.Client.Wpf.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Atomix.Client.Wpf.Tests")]
+[assembly: AssemblyProduct("Atomex.Client.Wpf.Tests")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Atomix.Client.Wpf.Tests/Tests.cs → Atomex.Client.Wpf.Tests/Tests.cs

@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace Atomix.Client.Wpf.Tests
+namespace Atomex.Client.Wpf.Tests
 {
     public class Tests
     {

Atomix.Client.Wpf.sln → Atomex.Client.Wpf.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2018
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atomix.Client.Core", "Atomix.Client.Core\Atomix.Client.Core\Atomix.Client.Core.csproj", "{FE561137-2416-42F2-88AF-86CBD578F6F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atomex.Client.Core", "Atomex.Client.Core\Atomex.Client.Core\Atomex.Client.Core.csproj", "{FE561137-2416-42F2-88AF-86CBD578F6F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atomix.Client.Wpf", "Atomix.Client.Wpf\Atomix.Client.Wpf.csproj", "{A2B4DC4C-E075-4A08-89A8-96E2FC38C747}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atomex.Client.Wpf", "Atomex.Client.Wpf\Atomex.Client.Wpf.csproj", "{A2B4DC4C-E075-4A08-89A8-96E2FC38C747}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atomix.Client.Wpf.Tests", "Atomix.Client.Wpf.Tests\Atomix.Client.Wpf.Tests.csproj", "{9C5E4889-B5EA-418A-B1B9-936BC1304504}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atomex.Client.Wpf.Tests", "Atomex.Client.Wpf.Tests\Atomex.Client.Wpf.Tests.csproj", "{9C5E4889-B5EA-418A-B1B9-936BC1304504}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Atomix.Client.Wpf.Installer", "Atomix.Client.Wpf.Installer\Atomix.Client.Wpf.Installer.wixproj", "{B799722D-701C-4FDA-82B0-C2390F5816A0}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Atomex.Client.Wpf.Installer", "Atomex.Client.Wpf.Installer\Atomex.Client.Wpf.Installer.wixproj", "{B799722D-701C-4FDA-82B0-C2390F5816A0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Atomix.Client.Wpf/App.xaml → Atomex.Client.Wpf/App.xaml

@@ -1,4 +1,4 @@
-<Application x:Class="Atomix.Client.Wpf.App"
+<Application x:Class="Atomex.Client.Wpf.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>

Atomix.Client.Wpf/App.xaml.cs → Atomex.Client.Wpf/App.xaml.cs

@@ -2,22 +2,22 @@
 using System.Linq;
 using System.Reflection;
 using System.Windows;
-using Atomix.MarketData.Bitfinex;
-using Atomix.Subsystems;
-using Atomix.Client.Wpf.Common;
-using Atomix.Client.Wpf.ViewModels;
-using Atomix.Client.Wpf.Views;
-using Atomix.Common.Configuration;
-using Atomix.Core;
-using Atomix.Updates;
+using Atomex.MarketData.Bitfinex;
+using Atomex.Subsystems;
+using Atomex.Client.Wpf.Common;
+using Atomex.Client.Wpf.ViewModels;
+using Atomex.Client.Wpf.Views;
+using Atomex.Common.Configuration;
+using Atomex.Core;
+using Atomex.Updates;
 using Microsoft.Extensions.Configuration;
 using Serilog;
 
-namespace Atomix.Client.Wpf
+namespace Atomex.Client.Wpf
 {
     public partial class App
     {
-        public static IAtomixApp AtomixApp { get; private set; }
+        public static IAtomexApp AtomexApp { get; private set; }
         public static Updater Updater { get; private set; }
 
         private static IConfiguration Configuration { get; } = new ConfigurationBuilder()
@@ -31,7 +31,7 @@ public partial class App
 
         private static Assembly CoreAssembly { get; } = AppDomain.CurrentDomain
             .GetAssemblies()
-            .FirstOrDefault(a => a.GetName().Name == "Atomix.Client.Core");
+            .FirstOrDefault(a => a.GetName().Name == "Atomex.Client.Core");
 
         private static IConfiguration CurrenciesConfiguration { get; } = new ConfigurationBuilder()
             .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
@@ -48,7 +48,7 @@ protected override void OnStartup(StartupEventArgs e)
             base.OnStartup(e);
 
             // ensure there are no other instances of the app
-            //if (!SingleApp.TryStart("AtomixApp"))
+            //if (!SingleApp.TryStart("AtomexApp"))
             //{
             //    Current.Shutdown(300);
             //    return;
@@ -64,8 +64,8 @@ protected override void OnStartup(StartupEventArgs e)
             var currenciesProvider = new CurrenciesProvider(CurrenciesConfiguration);
             var symbolsProvider = new SymbolsProvider(SymbolsConfiguration, currenciesProvider);
 
-            // init Atomix client app
-            AtomixApp = new AtomixApp()
+            // init Atomex client app
+            AtomexApp = new AtomexApp()
                 .UseCurrenciesProvider(currenciesProvider)
                 .UseSymbolsProvider(symbolsProvider)
                 .UseQuotesProvider(new BitfinexQuotesProvider(
@@ -75,20 +75,20 @@ protected override void OnStartup(StartupEventArgs e)
 
             // init app updater
             Updater = new Updater()
-                //.UseLocalBinariesProvider(@"Atomix.Client.Wpf.Installer.msi")
+                //.UseLocalBinariesProvider(@"Atomex.Client.Wpf.Installer.msi")
                 //.UseLocalVersionProvider(@"version.json")
-                .UseHttpMetadataProvider("https://atomix.me/versions.json", TargetPlatform.Windows)
+                .UseHttpMetadataProvider("https://atomex.me/versions.json", TargetPlatform.Windows)
                 .UseMsiProductProvider("0779aaaa-2411-4948-b5bc-48f81b8c6143");
 
             // init & show main view
             var mainView = new MainWindow();
-            mainView.DataContext = new MainViewModel(AtomixApp, mainView, mainView);
+            mainView.DataContext = new MainViewModel(AtomexApp, mainView, mainView);
             mainView.Show();        
-            mainView.ShowStartDialog(new StartViewModel(AtomixApp, mainView));
+            mainView.ShowStartDialog(new StartViewModel(AtomexApp, mainView));
 
             MainWindow = mainView;
 
-            AtomixApp.Start();
+            AtomexApp.Start();
             try { Updater.Start(); }
             catch (TimeoutException) { Log.Error("Failed to start the updater due to timeout"); }
         }
@@ -103,7 +103,7 @@ protected override void OnExit(ExitEventArgs e)
                 return;
             }
 
-            AtomixApp.Stop();
+            AtomexApp.Stop();
             try { Updater.Stop(); }
             catch (TimeoutException) { Log.Error("Failed to stop the updater due to timeout"); }
 

Atomix.Client.Wpf/Atomix.Client.Wpf.csproj → Atomex.Client.Wpf/Atomex.Client.Wpf.csproj

@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{A2B4DC4C-E075-4A08-89A8-96E2FC38C747}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>Atomix.Client.Wpf</RootNamespace>
-    <AssemblyName>Atomix.Client.Wpf</AssemblyName>
+    <RootNamespace>Atomex.Client.Wpf</RootNamespace>
+    <AssemblyName>Atomex.Client.Wpf</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -738,9 +738,9 @@
     <Resource Include="Resources\Images\dash_mask.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Atomix.Client.Core\Atomix.Client.Core\Atomix.Client.Core.csproj">
+    <ProjectReference Include="..\Atomex.Client.Core\Atomex.Client.Core\Atomex.Client.Core.csproj">
       <Project>{FE561137-2416-42F2-88AF-86CBD578F6F0}</Project>
-      <Name>Atomix.Client.Core</Name>
+      <Name>Atomex.Client.Core</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

Atomix.Client.Wpf/Behaviors/PasswordBoxBindingBehavior.cs → Atomex.Client.Wpf/Behaviors/PasswordBoxBindingBehavior.cs

@@ -7,7 +7,7 @@
 using System.Windows.Interactivity;
 using MahApps.Metro.Controls;
 
-namespace Atomix.Client.Wpf.Behaviors
+namespace Atomex.Client.Wpf.Behaviors
 {
     public class PasswordBoxBindingBehavior : Behavior<PasswordBox>
     {

Atomix.Client.Wpf/Behaviors/PasswordBoxHasPasswordBehavior.cs → Atomex.Client.Wpf/Behaviors/PasswordBoxHasPasswordBehavior.cs

@@ -2,7 +2,7 @@
 using System.Windows.Controls;
 using System.Windows.Interactivity;
 
-namespace Atomix.Client.Wpf.Behaviors
+namespace Atomex.Client.Wpf.Behaviors
 {
     public class PasswordBoxHasPasswordBehavior : Behavior<PasswordBox>
     {

Atomix.Client.Wpf/Behaviors/StylizedBehaviorCollection.cs → Atomex.Client.Wpf/Behaviors/StylizedBehaviorCollection.cs

@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Interactivity;
 
-namespace Atomix.Client.Wpf.Behaviors
+namespace Atomex.Client.Wpf.Behaviors
 {
     public class StylizedBehaviorCollection : FreezableCollection<Behavior>
     {

Atomix.Client.Wpf/Behaviors/StylizedBehaviors.cs → Atomex.Client.Wpf/Behaviors/StylizedBehaviors.cs

@@ -3,7 +3,7 @@
 using System.Windows;
 using System.Windows.Interactivity;
 
-namespace Atomix.Client.Wpf.Behaviors
+namespace Atomex.Client.Wpf.Behaviors
 {
     public class StylizedBehaviors
     {

Atomix.Client.Wpf/Behaviors/TextBoxInputBehavior.cs → Atomex.Client.Wpf/Behaviors/TextBoxInputBehavior.cs

@@ -7,7 +7,7 @@
 using System.Windows.Input;
 using System.Windows.Interactivity;
 
-namespace Atomix.Client.Wpf.Behaviors
+namespace Atomex.Client.Wpf.Behaviors
 {
     public class TextBoxInputBehavior : Behavior<TextBox>
     {

Atomix.Client.Wpf/Common/BitmapExtensions.cs → Atomex.Client.Wpf/Common/BitmapExtensions.cs

@@ -3,7 +3,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Atomix.Client.Wpf.Common
+namespace Atomex.Client.Wpf.Common
 {
     public static class BitmapExtensions
     {

Atomix.Client.Wpf/Common/ChildWindowHelper.cs → Atomex.Client.Wpf/Common/ChildWindowHelper.cs

@@ -1,7 +1,7 @@
 using System.Windows;
-using Atomix.Client.Wpf.Controls;
+using Atomex.Client.Wpf.Controls;
 
-namespace Atomix.Client.Wpf.Common
+namespace Atomex.Client.Wpf.Common
 {
     public static class ChildWindowHelper
     {

Atomix.Client.Wpf/Common/Command.cs → Atomex.Client.Wpf/Common/Command.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Input;
 
-namespace Atomix.Client.Wpf.Common
+namespace Atomex.Client.Wpf.Common
 {
     public class Command : ICommand
     {

Atomix.Client.Wpf/Common/DecimalExtensions.cs → Atomex.Client.Wpf/Common/DecimalExtensions.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Atomix.Client.Wpf.Common
+namespace Atomex.Client.Wpf.Common
 {
     public static class DecimalExtensions
     {