global correction of namespaces
parent
34858ae622
commit
3eef84c9e2
|
@ -1,8 +1,8 @@
|
|||
using WatchFace.Elements.ActivityElements;
|
||||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Elements.ActivityElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class Activity
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.ActivityElements
|
||||
namespace WatchFace.Parser.Elements.ActivityElements
|
||||
{
|
||||
public class FormattedNumber
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class AnalogDialFace
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class Background
|
||||
{
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
using Newtonsoft.Json;
|
||||
using WatchFace.JsonConverters;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.JsonConverters;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.BasicElements
|
||||
namespace WatchFace.Parser.Elements.BasicElements
|
||||
{
|
||||
public class CircleScale
|
||||
{
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
using System.Collections.Generic;
|
||||
using Newtonsoft.Json;
|
||||
using WatchFace.JsonConverters;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.JsonConverters;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.BasicElements
|
||||
namespace WatchFace.Parser.Elements.BasicElements
|
||||
{
|
||||
public class ClockHand
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.BasicElements
|
||||
namespace WatchFace.Parser.Elements.BasicElements
|
||||
{
|
||||
public class Coordinates
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.BasicElements
|
||||
namespace WatchFace.Parser.Elements.BasicElements
|
||||
{
|
||||
public class Image
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.BasicElements
|
||||
namespace WatchFace.Parser.Elements.BasicElements
|
||||
{
|
||||
public class ImageSet
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.BasicElements
|
||||
namespace WatchFace.Parser.Elements.BasicElements
|
||||
{
|
||||
public class Number
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class Battery
|
||||
{
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Elements.DateElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Elements.DateElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class Date
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.DateElements
|
||||
namespace WatchFace.Parser.Elements.DateElements
|
||||
{
|
||||
public class MonthAndDay
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.DateElements
|
||||
namespace WatchFace.Parser.Elements.DateElements
|
||||
{
|
||||
public class OneLineMonthAndDay
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.DateElements
|
||||
namespace WatchFace.Parser.Elements.DateElements
|
||||
{
|
||||
public class SeparateMonthAndDay
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class Scales
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.StatusElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.StatusElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class Status
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.StatusElements
|
||||
namespace WatchFace.Parser.Elements.StatusElements
|
||||
{
|
||||
public class Flag
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.StatusElements
|
||||
namespace WatchFace.Parser.Elements.StatusElements
|
||||
{
|
||||
public class Switch
|
||||
{
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Elements.TimeElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.TimeElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class Time
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.TimeElements
|
||||
namespace WatchFace.Parser.Elements.TimeElements
|
||||
{
|
||||
public class AmPm
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.WeatherElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.WeatherElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements
|
||||
namespace WatchFace.Parser.Elements
|
||||
{
|
||||
public class Weather
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.WeatherElements
|
||||
namespace WatchFace.Parser.Elements.WeatherElements
|
||||
{
|
||||
public class AirPollution
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.WeatherElements
|
||||
namespace WatchFace.Parser.Elements.WeatherElements
|
||||
{
|
||||
public class OneLineTemperature
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.WeatherElements
|
||||
namespace WatchFace.Parser.Elements.WeatherElements
|
||||
{
|
||||
public class SeparateTemperature
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.WeatherElements
|
||||
namespace WatchFace.Parser.Elements.WeatherElements
|
||||
{
|
||||
public class Temperature
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.WeatherElements
|
||||
namespace WatchFace.Parser.Elements.WeatherElements
|
||||
{
|
||||
public class TemperatureNumber
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.WeatherElements
|
||||
namespace WatchFace.Parser.Elements.WeatherElements
|
||||
{
|
||||
public class TodayTemperature
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements.BasicElements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements.BasicElements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace.Elements.WeatherElements
|
||||
namespace WatchFace.Parser.Elements.WeatherElements
|
||||
{
|
||||
public class WeatherIcon
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
using System;
|
||||
using WatchFace.Models;
|
||||
using WatchFace.Parser.Models;
|
||||
|
||||
namespace WatchFace
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace WatchFace.JsonConverters
|
||||
namespace WatchFace.Parser.JsonConverters
|
||||
{
|
||||
public class HexStringJsonConverter : JsonConverter
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
namespace WatchFace.Models
|
||||
namespace WatchFace.Parser.Models
|
||||
{
|
||||
public class Header
|
||||
{
|
||||
|
|
|
@ -5,7 +5,7 @@ using System.Text;
|
|||
using NLog;
|
||||
using NLog.Internal;
|
||||
|
||||
namespace WatchFace.Models
|
||||
namespace WatchFace.Parser.Models
|
||||
{
|
||||
public class Parameter
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace WatchFace.Models
|
||||
namespace WatchFace.Parser.Models
|
||||
{
|
||||
[Flags]
|
||||
public enum ParameterFlags
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
|
||||
namespace WatchFace.Utils
|
||||
namespace WatchFace.Parser.Utils
|
||||
{
|
||||
public class BitReader
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
|
||||
namespace WatchFace.Utils
|
||||
namespace WatchFace.Parser.Utils
|
||||
{
|
||||
public class BitWriter
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace WatchFace.Utils
|
||||
namespace WatchFace.Parser.Utils
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Property)]
|
||||
public class RawParameterAttribute : Attribute
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using WatchFace.Elements;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Elements;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace
|
||||
namespace WatchFace.Parser
|
||||
{
|
||||
public class WatchFace
|
||||
{
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
using System.IO;
|
||||
using NLog;
|
||||
using WatchFace.Utils;
|
||||
using WatchFace.Parser.Utils;
|
||||
|
||||
namespace WatchFace
|
||||
namespace WatchFace.Parser
|
||||
{
|
||||
public class Writer
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue