Merged in 123159753/amazfitbiptools/fix (pull request #1)

global correction of namespaces

WatchFace.Parser/Elements/Activity.cs

@@ -1,8 +1,8 @@
-using WatchFace.Elements.ActivityElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.ActivityElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Activity
     {

WatchFace.Parser/Elements/ActivityElements/FormattedNumber.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.ActivityElements
+namespace WatchFace.Parser.Elements.ActivityElements
 {
     public class FormattedNumber
     {

WatchFace.Parser/Elements/AnalogDialFace.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class AnalogDialFace
     {

WatchFace.Parser/Elements/Background.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Background
     {

WatchFace.Parser/Elements/BasicElements/CircleScale.cs

@@ -1,8 +1,8 @@
 using Newtonsoft.Json;
-using WatchFace.JsonConverters;
+using WatchFace.Parser.JsonConverters;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class CircleScale
     {

WatchFace.Parser/Elements/BasicElements/ClockHand.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using WatchFace.JsonConverters;
+using WatchFace.Parser.JsonConverters;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class ClockHand
     {

WatchFace.Parser/Elements/BasicElements/Coordinates.cs

@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class Coordinates
     {

WatchFace.Parser/Elements/BasicElements/Image.cs

@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class Image
     {

WatchFace.Parser/Elements/BasicElements/ImageSet.cs

@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class ImageSet
     {

WatchFace.Parser/Elements/BasicElements/Number.cs

@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class Number
     {

WatchFace.Parser/Elements/BasicElements/Scale.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.BasicElements
 {
     public class Scale
     {

WatchFace.Parser/Elements/Battery.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Battery
     {

WatchFace.Parser/Elements/Date.cs

@@ -1,8 +1,8 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Elements.DateElements;
+using WatchFace.Parser.Elements.DateElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Date
     {

WatchFace.Parser/Elements/DateElements/MonthAndDay.cs

@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.DateElements
+namespace WatchFace.Parser.Elements.DateElements
 {
     public class MonthAndDay
     {

WatchFace.Parser/Elements/DateElements/OneLineMonthAndDay.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.DateElements
+namespace WatchFace.Parser.Elements.DateElements
 {
     public class OneLineMonthAndDay
     {

WatchFace.Parser/Elements/DateElements/SeparateMonthAndDay.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.DateElements
+namespace WatchFace.Parser.Elements.DateElements
 {
     public class SeparateMonthAndDay
     {

WatchFace.Parser/Elements/Scales.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Scales
     {

WatchFace.Parser/Elements/Status.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.StatusElements;
+using WatchFace.Parser.Elements.StatusElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Status
     {

WatchFace.Parser/Elements/StatusElements/Flag.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.StatusElements
+namespace WatchFace.Parser.Elements.StatusElements
 {
     public class Flag
     {

WatchFace.Parser/Elements/StatusElements/Switch.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.StatusElements
+namespace WatchFace.Parser.Elements.StatusElements
 {
     public class Switch
     {

WatchFace.Parser/Elements/Time.cs

@@ -1,8 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.TimeElements;
-using WatchFace.Elements.TimeElements;
+using WatchFace.Parser.Utils;
-using WatchFace.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Time
     {

WatchFace.Parser/Elements/TimeElements/AmPm.cs

@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.TimeElements
+namespace WatchFace.Parser.Elements.TimeElements
 {
     public class AmPm
     {

WatchFace.Parser/Elements/TimeElements/TwoDigits.cs

@@ -1,6 +1,7 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Elements.BasicElements;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.BasicElements
+namespace WatchFace.Parser.Elements.TimeElements
 {
     public class TwoDigits
     {

WatchFace.Parser/Elements/Weather.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.WeatherElements;
+using WatchFace.Parser.Elements.WeatherElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements
+namespace WatchFace.Parser.Elements
 {
     public class Weather
     {

WatchFace.Parser/Elements/WeatherElements/AirPollution.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class AirPollution
     {

WatchFace.Parser/Elements/WeatherElements/OneLineTemperature.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class OneLineTemperature
     {

WatchFace.Parser/Elements/WeatherElements/SeparateTemperature.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class SeparateTemperature
     {

WatchFace.Parser/Elements/WeatherElements/Temperature.cs

@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class Temperature
     {

WatchFace.Parser/Elements/WeatherElements/TemperatureNumber.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class TemperatureNumber
     {

WatchFace.Parser/Elements/WeatherElements/TodayTemperature.cs

@@ -1,6 +1,6 @@
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class TodayTemperature
     {

WatchFace.Parser/Elements/WeatherElements/WeatherIcon.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements.BasicElements;
+using WatchFace.Parser.Elements.BasicElements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace.Elements.WeatherElements
+namespace WatchFace.Parser.Elements.WeatherElements
 {
     public class WeatherIcon
     {

WatchFace.Parser/Exceptions/InvalidParameterException.cs

@@ -1,5 +1,5 @@
 using System;
-using WatchFace.Models;
+using WatchFace.Parser.Models;
 
 namespace WatchFace
 {

WatchFace.Parser/ImageReader.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace
+namespace WatchFace.Parser
 {
     public class ImageReader
     {

WatchFace.Parser/JsonConverters/HexStringJsonConverter.cs

@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace WatchFace.JsonConverters
+namespace WatchFace.Parser.JsonConverters
 {
     public class HexStringJsonConverter : JsonConverter
     {

WatchFace.Parser/Models/Header.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace WatchFace.Models
+namespace WatchFace.Parser.Models
 {
     public class Header
     {

WatchFace.Parser/Models/Parameter.cs

@@ -5,7 +5,7 @@ using System.Text;
 using NLog;
 using NLog.Internal;
 
-namespace WatchFace.Models
+namespace WatchFace.Parser.Models
 {
     public class Parameter
     {

WatchFace.Parser/Models/ParameterFlags.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WatchFace.Models
+namespace WatchFace.Parser.Models
 {
     [Flags]
     public enum ParameterFlags

WatchFace.Parser/Reader.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using NLog;
 using System.Drawing;
-using WatchFace.Models;
+using WatchFace.Parser.Models;
 
-namespace WatchFace
+namespace WatchFace.Parser
 {
     public class Reader
     {

WatchFace.Parser/Utils/BitReader.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace WatchFace.Utils
+namespace WatchFace.Parser.Utils
 {
     public class BitReader
     {

WatchFace.Parser/Utils/BitWriter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace WatchFace.Utils
+namespace WatchFace.Parser.Utils
 {
     public class BitWriter
     {

WatchFace.Parser/Utils/ParametersConverter.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using NLog;
-using WatchFace.Models;
+using WatchFace.Parser.Models;
 
-namespace WatchFace.Utils
+namespace WatchFace.Parser.Utils
 {
     public class ParametersConverter
     {

WatchFace.Parser/Utils/RawParameterAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WatchFace.Utils
+namespace WatchFace.Parser.Utils
 {
     [AttributeUsage(AttributeTargets.Property)]
     public class RawParameterAttribute : Attribute

WatchFace.Parser/WatchFace.cs

@@ -1,7 +1,7 @@
-using WatchFace.Elements;
+using WatchFace.Parser.Elements;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace
+namespace WatchFace.Parser
 {
     public class WatchFace
     {

WatchFace.Parser/Writer.cs

@@ -1,8 +1,8 @@
 using System.IO;
 using NLog;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
 
-namespace WatchFace
+namespace WatchFace.Parser
 {
     public class Writer
     {

WatchFace/Program.cs

@@ -5,7 +5,8 @@ using Newtonsoft.Json;
 using NLog;
 using NLog.Config;
 using NLog.Targets;
-using WatchFace.Utils;
+using WatchFace.Parser.Utils;
+using WatchFace.Parser;
 
 namespace WatchFace
 {
@@ -62,7 +63,7 @@ namespace WatchFace
             ExportConfig(watchFace, Path.Combine(outputDirectory, $"{baseName}.json"));
         }
 
-        private static void WriteWatchFace(string outputFileName, WatchFace watchFace)
+        private static void WriteWatchFace(string outputFileName, Parser.WatchFace watchFace)
         {
             Logger.Debug("Writing watch face to '{0}'", outputFileName);
             try
@@ -100,12 +101,12 @@ namespace WatchFace
             }
         }
 
-        private static WatchFace ParseResources(Reader reader)
+        private static Parser.WatchFace ParseResources(Reader reader)
         {
             Logger.Debug("Parsing parameters...");
             try
             {
-                return ParametersConverter.Parse<WatchFace>(reader.Resources);
+                return ParametersConverter.Parse<Parser.WatchFace>(reader.Resources);
             }
             catch (Exception e)
             {
@@ -141,7 +142,7 @@ namespace WatchFace
             }
         }
 
-        private static WatchFace ReadConfig(string jsonFileName)
+        private static Parser.WatchFace ReadConfig(string jsonFileName)
         {
             Logger.Debug("Reading config...");
             try
@@ -149,7 +150,7 @@ namespace WatchFace
                 using (var fileStream = File.OpenRead(jsonFileName))
                 using (var reader = new StreamReader(fileStream))
                 {
-                    return JsonConvert.DeserializeObject<WatchFace>(reader.ReadToEnd());
+                    return JsonConvert.DeserializeObject<Parser.WatchFace>(reader.ReadToEnd());
                 }
             }
             catch (Exception e)
@@ -159,7 +160,7 @@ namespace WatchFace
             }
         }
 
-        private static void ExportConfig(WatchFace watchFace, string jsonFileName)
+        private static void ExportConfig(Parser.WatchFace watchFace, string jsonFileName)
         {
             Logger.Debug("Exporting config...");
             try