Merge pull request #258 from blackms/master

Refactor Naming
NecronomiconCoding · Jul 23, 2016 · 8a09517 · 8a09517
2 parents ff859cd + e88b93d
commit 8a09517
Show file tree

Hide file tree

Showing 26 changed files with 47 additions and 45 deletions.
diff --git a/Pokemon Go Rocket API.sln → Pokemon Go NecroBot.sln b/Pokemon Go Rocket API.sln → Pokemon Go NecroBot.sln
@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketAPI", "PokemonGo.RocketAPI\PokemonGo.RocketAPI.csproj", "{05D2DA44-1B8E-4CF7-94ED-4D52451CD095}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketAPI.Console", "PokemonGo.RocketAPI.Console\PokemonGo.RocketAPI.Console.csproj", "{1FEA147E-F704-497B-A538-00B053B5F672}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.NecroBot.CLI", "PokemonGo.NecroBot.CLI\PokemonGo.NecroBot.CLI.csproj", "{1FEA147E-F704-497B-A538-00B053B5F672}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketAPI.Logic", "PokemonGo.RocketAPI.Logic\PokemonGo.RocketAPI.Logic.csproj", "{0739E40D-C589-4AEB-93E5-EE8CD6773C60}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.NecroBot.Logic", "PokemonGo.NecroBot.Logic\PokemonGo.NecroBot.Logic.csproj", "{0739E40D-C589-4AEB-93E5-EE8CD6773C60}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/PokemonGo.RocketAPI.Console/App.config → PokemonGo.NecroBot.CLI/App.config b/PokemonGo.RocketAPI.Console/App.config → PokemonGo.NecroBot.CLI/App.config
@@ -20,22 +20,22 @@
   <userSettings>
     <PokemonGo.RocketAPI.Console.UserSettings>
       <setting name="AuthType" serializeAs="String">
-        <value>Google</value>
+        <value>Ptc</value>
       </setting>
       <setting name="PtcUsername" serializeAs="String">
-        <value>username2</value>
+        <value>user1</value>
       </setting>
       <setting name="PtcPassword" serializeAs="String">
-        <value>pw</value>
+        <value>pwd1</value>
       </setting>
       <setting name="GoogleRefreshToken" serializeAs="String">
         <value />
       </setting>
       <setting name="DefaultLatitude" serializeAs="String">
-        <value>52.379189</value>
+        <value>40.800621</value>
       </setting>
       <setting name="DefaultLongitude" serializeAs="String">
-        <value>4.899431</value>
+        <value>-74.001889</value>
       </setting>
       <setting name="DefaultAltitude" serializeAs="String">
         <value>10</value>

diff --git a/...sole/Configs/ConfigPokemonsNotToCatch.txt → ....CLI/Configs/ConfigPokemonsNotToCatch.txt b/...sole/Configs/ConfigPokemonsNotToCatch.txt → ....CLI/Configs/ConfigPokemonsNotToCatch.txt
diff --git a/...onsole/Configs/ConfigPokemonsToEvolve.txt → ...ot.CLI/Configs/ConfigPokemonsToEvolve.txt b/...onsole/Configs/ConfigPokemonsToEvolve.txt → ...ot.CLI/Configs/ConfigPokemonsToEvolve.txt
diff --git a/....Console/Configs/ConfigPokemonsToKeep.txt → ...oBot.CLI/Configs/ConfigPokemonsToKeep.txt b/....Console/Configs/ConfigPokemonsToKeep.txt → ...oBot.CLI/Configs/ConfigPokemonsToKeep.txt
diff --git a/PokemonGo.RocketAPI.Console/ConsoleLogger.cs → PokemonGo.NecroBot.CLI/ConsoleLogger.cs b/PokemonGo.RocketAPI.Console/ConsoleLogger.cs → PokemonGo.NecroBot.CLI/ConsoleLogger.cs
@@ -1,11 +1,12 @@
 #region
 
 using System;
+using PokemonGo.RocketAPI;
 using PokemonGo.RocketAPI.Logging;
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Console
+namespace PokemonGo.NecroBot.CLI
 {
     /// <summary>
     ///     The ConsoleLogger is a simple logger which writes all logs to the Console.
@@ -28,7 +29,7 @@ public ConsoleLogger(LogLevel maxLogLevel)
         ///     Log a specific message by LogLevel. Won't log if the LogLevel is greater than the maxLogLevel set.
         /// </summary>
         /// <param name="message">The message to log. The current time will be prepended.</param>
-        /// <param name="level">Optional. Default <see cref="LogLevel.Info" />.</param>
+        /// <param name="level">Optional. Default <see cref="System.LogLevel.Info" />.</param>
         /// <param name="color">Optional. Default is auotmatic</param>
         public void Write(string message, LogLevel level = LogLevel.Info, ConsoleColor color = ConsoleColor.Black)
         {

diff --git a/...onsole/PokemonGo.RocketAPI.Console.csproj → ...ecroBot.CLI/PokemonGo.NecroBot.CLI.csproj b/...onsole/PokemonGo.RocketAPI.Console.csproj → ...ecroBot.CLI/PokemonGo.NecroBot.CLI.csproj
@@ -69,9 +69,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PokemonGo.RocketAPI.Logic\PokemonGo.RocketAPI.Logic.csproj">
+    <ProjectReference Include="..\PokemonGo.NecroBot.Logic\PokemonGo.NecroBot.Logic.csproj">
       <Project>{0739E40D-C589-4AEB-93E5-EE8CD6773C60}</Project>
-      <Name>PokemonGo.RocketAPI.Logic</Name>
+      <Name>PokemonGo.NecroBot.Logic</Name>
     </ProjectReference>
     <ProjectReference Include="..\PokemonGo.RocketAPI\PokemonGo.RocketAPI.csproj">
       <Project>{05D2DA44-1B8E-4CF7-94ED-4D52451CD095}</Project>

diff --git a/PokemonGo.RocketAPI.Console/Program.cs → PokemonGo.NecroBot.CLI/Program.cs b/PokemonGo.RocketAPI.Console/Program.cs → PokemonGo.NecroBot.CLI/Program.cs
@@ -3,11 +3,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using PokemonGo.RocketAPI;
 using PokemonGo.RocketAPI.Exceptions;
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Console
+namespace PokemonGo.NecroBot.CLI
 {
     internal class Program
     {
@@ -19,15 +20,15 @@ private static void Main(string[] args)
             {
                 try
                 {
-                    new Logic.Logic(new Settings()).Execute().Wait();
+                    new NecroBot.Logic.Logic(new Settings()).Execute().Wait();
                 }
                 catch (PtcOfflineException)
                 {
                     Logger.Write("PTC Servers are probably down OR your credentials are wrong. Try google",
                         LogLevel.Error);
                     Logger.Write("Trying again in 20 seconds...");
                     Thread.Sleep(20000);
-                    new Logic.Logic(new Settings()).Execute().Wait();
+                    new NecroBot.Logic.Logic(new Settings()).Execute().Wait();
                 }
                 catch (AccountNotVerifiedException)
                 {
@@ -37,7 +38,7 @@ private static void Main(string[] args)
                 catch (Exception ex)
                 {
                     Logger.Write($"Unhandled exception: {ex}", LogLevel.Error);
-                    new Logic.Logic(new Settings()).Execute().Wait();
+                    new NecroBot.Logic.Logic(new Settings()).Execute().Wait();
                 }
             });
             System.Console.ReadLine();

diff --git a/...ketAPI.Console/Properties/AssemblyInfo.cs → ...o.NecroBot.CLI/Properties/AssemblyInfo.cs b/...ketAPI.Console/Properties/AssemblyInfo.cs → ...o.NecroBot.CLI/Properties/AssemblyInfo.cs
diff --git a/PokemonGo.RocketAPI.Console/Settings.cs → PokemonGo.NecroBot.CLI/Settings.cs b/PokemonGo.RocketAPI.Console/Settings.cs → PokemonGo.NecroBot.CLI/Settings.cs
@@ -3,12 +3,13 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using PokemonGo.RocketAPI;
 using PokemonGo.RocketAPI.Enums;
 using PokemonGo.RocketAPI.GeneratedCode;
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Console
+namespace PokemonGo.NecroBot.CLI
 {
     public class Settings : ISettings
     {

diff --git a/...ocketAPI.Console/UserSettings.Designer.cs → ...nGo.NecroBot.CLI/UserSettings.Designer.cs b/...ocketAPI.Console/UserSettings.Designer.cs → ...nGo.NecroBot.CLI/UserSettings.Designer.cs
diff --git a/PokemonGo.RocketAPI.Console/UserSettings.cs → PokemonGo.NecroBot.CLI/UserSettings.cs b/PokemonGo.RocketAPI.Console/UserSettings.cs → PokemonGo.NecroBot.CLI/UserSettings.cs
@@ -5,7 +5,7 @@
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Console
+namespace PokemonGo.NecroBot.CLI
 {
     // This class allows you to handle specific events on the settings class:
     //  The SettingChanging event is raised before a setting's value is changed.

diff --git a/...o.RocketAPI.Console/UserSettings.settings → PokemonGo.NecroBot.CLI/UserSettings.settings b/...o.RocketAPI.Console/UserSettings.settings → PokemonGo.NecroBot.CLI/UserSettings.settings
@@ -3,22 +3,22 @@
   <Profiles />
   <Settings>
     <Setting Name="AuthType" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Google</Value>
+      <Value Profile="(Default)">Ptc</Value>
     </Setting>
     <Setting Name="PtcUsername" Type="System.String" Scope="User">
-      <Value Profile="(Default)">username2</Value>
+      <Value Profile="(Default)">user1</Value>
     </Setting>
     <Setting Name="PtcPassword" Type="System.String" Scope="User">
-      <Value Profile="(Default)">pw</Value>
+      <Value Profile="(Default)">pwd1</Value>
     </Setting>
     <Setting Name="GoogleRefreshToken" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="DefaultLatitude" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">52.379189</Value>
+      <Value Profile="(Default)">40.800621</Value>
     </Setting>
     <Setting Name="DefaultLongitude" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">4.899431</Value>
+      <Value Profile="(Default)">-74.001889</Value>
     </Setting>
     <Setting Name="DefaultAltitude" Type="System.Double" Scope="User">
       <Value Profile="(Default)">10</Value>

diff --git a/PokemonGo.RocketAPI.Console/packages.config → PokemonGo.NecroBot.CLI/packages.config b/PokemonGo.RocketAPI.Console/packages.config → PokemonGo.NecroBot.CLI/packages.config
diff --git a/PokemonGo.RocketAPI.Logic/Inventory.cs → PokemonGo.NecroBot.Logic/Inventory.cs b/PokemonGo.RocketAPI.Logic/Inventory.cs → PokemonGo.NecroBot.Logic/Inventory.cs
@@ -8,10 +8,11 @@
 using System.Collections.Concurrent;
 using System;
 using System.Threading;
+using PokemonGo.RocketAPI;
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Logic
+namespace PokemonGo.NecroBot.Logic
 {
     public class Inventory
     {

diff --git a/PokemonGo.RocketAPI.Logic/Logic.cs → PokemonGo.NecroBot.Logic/Logic.cs b/PokemonGo.RocketAPI.Logic/Logic.cs → PokemonGo.NecroBot.Logic/Logic.cs
@@ -10,12 +10,13 @@
 using PokemonGo.RocketAPI.Extensions;
 using PokemonGo.RocketAPI.GeneratedCode;
 using PokemonGo.RocketAPI.Helpers;
-using PokemonGo.RocketAPI.Logic.Utils;
 using System.Device.Location;
+using PokemonGo.NecroBot.Logic.Utils;
+using PokemonGo.RocketAPI;
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Logic
+namespace PokemonGo.NecroBot.Logic
 {
     public class Logic
     {

diff --git a/PokemonGo.RocketAPI.Logic/Navigation.cs → PokemonGo.NecroBot.Logic/Navigation.cs b/PokemonGo.RocketAPI.Logic/Navigation.cs → PokemonGo.NecroBot.Logic/Navigation.cs
@@ -3,12 +3,13 @@
 using System;
 using System.Threading.Tasks;
 using PokemonGo.RocketAPI.GeneratedCode;
-using PokemonGo.RocketAPI.Logic.Utils;
 using System.Device.Location;
+using PokemonGo.NecroBot.Logic.Utils;
+using PokemonGo.RocketAPI;
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Logic
+namespace PokemonGo.NecroBot.Logic
 {
     public class Navigation
     {

diff --git a/...PI.Logic/PokemonGo.RocketAPI.Logic.csproj → ...Bot.Logic/PokemonGo.NecroBot.Logic.csproj b/...PI.Logic/PokemonGo.RocketAPI.Logic.csproj → ...Bot.Logic/PokemonGo.NecroBot.Logic.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{0739E40D-C589-4AEB-93E5-EE8CD6773C60}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PokemonGo.RocketAPI.Logic</RootNamespace>
-    <AssemblyName>PokemonGo.RocketAPI.Logic</AssemblyName>
+    <RootNamespace>PokemonGo.NecroBot.Logic</RootNamespace>
+    <AssemblyName>PokemonGo.NecroBot.Logic</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -48,6 +48,7 @@
     <Compile Include="Inventory.cs" />
     <Compile Include="Logic.cs" />
     <Compile Include="Navigation.cs" />
+    <Compile Include="PokemonInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils\LocationUtils.cs" />
     <Compile Include="Utils\Statistics.cs" />

diff --git a/PokemonGo.RocketAPI/PokemonInfo.cs → PokemonGo.NecroBot.Logic/PokemonInfo.cs b/PokemonGo.RocketAPI/PokemonInfo.cs → PokemonGo.NecroBot.Logic/PokemonInfo.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using PokemonGo.RocketAPI.GeneratedCode;
 
-namespace PokemonGo.RocketAPI
+namespace PokemonGo.NecroBot.Logic
 {
     public struct BaseStats
     {

diff --git a/...ocketAPI.Logic/Properties/AssemblyInfo.cs → ...NecroBot.Logic/Properties/AssemblyInfo.cs b/...ocketAPI.Logic/Properties/AssemblyInfo.cs → ...NecroBot.Logic/Properties/AssemblyInfo.cs
diff --git a/...Go.RocketAPI.Logic/Utils/LocationUtils.cs → ...nGo.NecroBot.Logic/Utils/LocationUtils.cs b/...Go.RocketAPI.Logic/Utils/LocationUtils.cs → ...nGo.NecroBot.Logic/Utils/LocationUtils.cs
@@ -2,11 +2,11 @@
 
 using System;
 using System.Device.Location;
-using static PokemonGo.RocketAPI.Logic.Navigation;
+using static PokemonGo.NecroBot.Logic.Navigation;
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Logic.Utils
+namespace PokemonGo.NecroBot.Logic.Utils
 {
     public static class LocationUtils
     {

diff --git a/...monGo.RocketAPI.Logic/Utils/Statistics.cs → PokemonGo.NecroBot.Logic/Utils/Statistics.cs b/...monGo.RocketAPI.Logic/Utils/Statistics.cs → PokemonGo.NecroBot.Logic/Utils/Statistics.cs
@@ -7,7 +7,7 @@
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Logic.Utils
+namespace PokemonGo.NecroBot.Logic.Utils
 {
     internal class Statistics
     {

diff --git a/...onGo.RocketAPI.Logic/Utils/StringUtils.cs → ...monGo.NecroBot.Logic/Utils/StringUtils.cs b/...onGo.RocketAPI.Logic/Utils/StringUtils.cs → ...monGo.NecroBot.Logic/Utils/StringUtils.cs
@@ -6,7 +6,7 @@
 
 #endregion
 
-namespace PokemonGo.RocketAPI.Logic.Utils
+namespace PokemonGo.NecroBot.Logic.Utils
 {
     public static class StringUtils
     {

diff --git a/PokemonGo.RocketAPI.Logic/app.config → PokemonGo.NecroBot.Logic/app.config b/PokemonGo.RocketAPI.Logic/app.config → PokemonGo.NecroBot.Logic/app.config
diff --git a/PokemonGo.RocketAPI.Logic/packages.config → PokemonGo.NecroBot.Logic/packages.config b/PokemonGo.RocketAPI.Logic/packages.config → PokemonGo.NecroBot.Logic/packages.config
diff --git a/PokemonGo.RocketAPI/PokemonGo.RocketAPI.csproj b/PokemonGo.RocketAPI/PokemonGo.RocketAPI.csproj
@@ -104,7 +104,6 @@
     <Compile Include="Extensions\HttpClientExtensions.cs" />
     <Compile Include="Helpers\RandomHelper.cs" />
     <Compile Include="Helpers\RequestBuilder.cs" />
-    <Compile Include="PokemonInfo.cs" />
     <Compile Include="Resources.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>