Separate ui library (#10)

* Made common project * Amended namespaces * Renamed Pomo-Shiny project Co-authored-by: Sara Gowen <[email protected]>
dynamictulip · Oct 10, 2020 · 25f6271 · 25f6271
1 parent 6066dae
commit 25f6271
Show file tree

Hide file tree

Showing 43 changed files with 133 additions and 87 deletions.
diff --git a/Pomo-Shiny/Styles/Converters.xaml b/Pomo-Shiny/Styles/Converters.xaml
diff --git a/Pomo-Shiny.sln → Ponydoro.sln b/Pomo-Shiny.sln → Ponydoro.sln
@@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29409.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pomo-Shiny", "Pomo-Shiny\Pomo-Shiny.csproj", "{54CD4444-BF93-406E-AB2A-6DF12AE1CEE1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ponydoro_WPF", "Ponydoro_WPF\Ponydoro_WPF.csproj", "{54CD4444-BF93-406E-AB2A-6DF12AE1CEE1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{5EFDA017-91A0-4222-AE35-0B633CBBF65C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{5EFDA017-91A0-4222-AE35-0B633CBBF65C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ponydoro_Common", "Ponydoro_Common\Ponydoro_Common.csproj", "{FD2956BA-8969-40F1-87B9-F472A62C8095}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,10 @@ Global
 		{5EFDA017-91A0-4222-AE35-0B633CBBF65C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EFDA017-91A0-4222-AE35-0B633CBBF65C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EFDA017-91A0-4222-AE35-0B633CBBF65C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD2956BA-8969-40F1-87B9-F472A62C8095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD2956BA-8969-40F1-87B9-F472A62C8095}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD2956BA-8969-40F1-87B9-F472A62C8095}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD2956BA-8969-40F1-87B9-F472A62C8095}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Pomo-Shiny/CountdownTimer.cs → Ponydoro_Common/CountdownTimer.cs b/Pomo-Shiny/CountdownTimer.cs → Ponydoro_Common/CountdownTimer.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Pomo_Shiny
+namespace Ponydoro_Common
 {
     public interface ICountdownTimer
     {

diff --git a/Ponydoro_Common/ISoundProvider.cs b/Ponydoro_Common/ISoundProvider.cs
@@ -0,0 +1,7 @@
+namespace Ponydoro_Common
+{
+    public interface ISoundProvider
+    {
+        void MakeSound();
+    }
+}
diff --git a/Ponydoro_Common/Ponydoro_Common.csproj b/Ponydoro_Common/Ponydoro_Common.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/Pomo-Shiny/TimerFacade.cs → Ponydoro_Common/TimerFacade.cs b/Pomo-Shiny/TimerFacade.cs → Ponydoro_Common/TimerFacade.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 
-namespace Pomo_Shiny
+namespace Ponydoro_Common
 {
     public interface ITimerFacade
     {
@@ -10,7 +10,7 @@ public interface ITimerFacade
     }
 
     [ExcludeFromCodeCoverage]
-    internal class TimerFacade : ITimerFacade
+    public class TimerFacade : ITimerFacade
     {
         private Timer _timer;
 

diff --git a/Pomo-Shiny/App.xaml → Ponydoro_WPF/App.xaml b/Pomo-Shiny/App.xaml → Ponydoro_WPF/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Pomo_Shiny.App"
+<Application x:Class="Ponydoro_WPF.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>

diff --git a/Pomo-Shiny/App.xaml.cs → Ponydoro_WPF/App.xaml.cs b/Pomo-Shiny/App.xaml.cs → Ponydoro_WPF/App.xaml.cs
@@ -3,8 +3,9 @@
 using System.Windows;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Ponydoro_Common;
 
-namespace Pomo_Shiny
+namespace Ponydoro_WPF
 {
     /// <summary>
     ///     Interaction logic for App.xaml

diff --git a/Pomo-Shiny/AppSettings.cs → Ponydoro_WPF/AppSettings.cs b/Pomo-Shiny/AppSettings.cs → Ponydoro_WPF/AppSettings.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Configuration;
-
-namespace Pomo_Shiny
+namespace Ponydoro_WPF
 {
     public class AppSettings
     {

diff --git a/Pomo-Shiny/ApplicationAccessor.cs → Ponydoro_WPF/ApplicationAccessor.cs b/Pomo-Shiny/ApplicationAccessor.cs → Ponydoro_WPF/ApplicationAccessor.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Windows;
 
-namespace Pomo_Shiny
+namespace Ponydoro_WPF
 {
     public interface IApplicationAccessor
     {

diff --git a/...y/Converters/BoolToVisibilityConverter.cs → ...F/Converters/BoolToVisibilityConverter.cs b/...y/Converters/BoolToVisibilityConverter.cs → ...F/Converters/BoolToVisibilityConverter.cs
@@ -3,7 +3,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace Pomo_Shiny.Converters
+namespace Ponydoro_WPF.Converters
 {
     public class BoolToVisibilityConverter : IValueConverter
     {

diff --git a/Pomo-Shiny/MainWindow.xaml → Ponydoro_WPF/MainWindow.xaml b/Pomo-Shiny/MainWindow.xaml → Ponydoro_WPF/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="Pomo_Shiny.MainWindow"
+<Window x:Class="Ponydoro_WPF.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

diff --git a/Pomo-Shiny/MainWindow.xaml.cs → Ponydoro_WPF/MainWindow.xaml.cs b/Pomo-Shiny/MainWindow.xaml.cs → Ponydoro_WPF/MainWindow.xaml.cs
@@ -1,9 +1,8 @@
-using System.Configuration;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Windows;
 using System.Windows.Input;
 
-namespace Pomo_Shiny
+namespace Ponydoro_WPF
 {
     /// <summary>
     ///     Interaction logic for MainWindow.xaml

diff --git a/Pomo-Shiny/MainWindowViewModel.cs → Ponydoro_WPF/MainWindowViewModel.cs b/Pomo-Shiny/MainWindowViewModel.cs → Ponydoro_WPF/MainWindowViewModel.cs
@@ -1,9 +1,10 @@
-using Microsoft.Extensions.Configuration;
-using System;
+using System;
 using System.Windows.Input;
 using Microsoft.Extensions.Options;
+using Ponydoro_Common;
+using Ponydoro_WPF.Mvvm;
 
-namespace Pomo_Shiny
+namespace Ponydoro_WPF
 {
     public class MainWindowViewModel : ObservableObject
     {

diff --git a/Pomo-Shiny/Media/07017109.wav → Ponydoro_WPF/Media/07017109.wav b/Pomo-Shiny/Media/07017109.wav → Ponydoro_WPF/Media/07017109.wav
diff --git a/Pomo-Shiny/Media/07042154.wav → Ponydoro_WPF/Media/07042154.wav b/Pomo-Shiny/Media/07042154.wav → Ponydoro_WPF/Media/07042154.wav
diff --git a/Pomo-Shiny/Media/07042293.wav → Ponydoro_WPF/Media/07042293.wav b/Pomo-Shiny/Media/07042293.wav → Ponydoro_WPF/Media/07042293.wav
diff --git a/Pomo-Shiny/Media/07043261.wav → Ponydoro_WPF/Media/07043261.wav b/Pomo-Shiny/Media/07043261.wav → Ponydoro_WPF/Media/07043261.wav
diff --git a/Pomo-Shiny/Media/07043397.wav → Ponydoro_WPF/Media/07043397.wav b/Pomo-Shiny/Media/07043397.wav → Ponydoro_WPF/Media/07043397.wav
diff --git a/Pomo-Shiny/Media/07050147.wav → Ponydoro_WPF/Media/07050147.wav b/Pomo-Shiny/Media/07050147.wav → Ponydoro_WPF/Media/07050147.wav
diff --git a/Pomo-Shiny/Media/07070150.wav → Ponydoro_WPF/Media/07070150.wav b/Pomo-Shiny/Media/07070150.wav → Ponydoro_WPF/Media/07070150.wav
diff --git a/Pomo-Shiny/Media/unicorn.png → Ponydoro_WPF/Media/unicorn.png b/Pomo-Shiny/Media/unicorn.png → Ponydoro_WPF/Media/unicorn.png
diff --git a/Pomo-Shiny/Media/unicorn2.png → Ponydoro_WPF/Media/unicorn2.png b/Pomo-Shiny/Media/unicorn2.png → Ponydoro_WPF/Media/unicorn2.png
diff --git a/Pomo-Shiny/Media/unicorn2_Pyo_12.ico → Ponydoro_WPF/Media/unicorn2_Pyo_12.ico b/Pomo-Shiny/Media/unicorn2_Pyo_12.ico → Ponydoro_WPF/Media/unicorn2_Pyo_12.ico
diff --git a/Pomo-Shiny/DelegateCommand.cs → Ponydoro_WPF/Mvvm/DelegateCommand.cs b/Pomo-Shiny/DelegateCommand.cs → Ponydoro_WPF/Mvvm/DelegateCommand.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Input;
 
-namespace Pomo_Shiny
+namespace Ponydoro_WPF.Mvvm
 {
     [ExcludeFromCodeCoverage]
     public class DelegateCommand : ICommand

diff --git a/Pomo-Shiny/ObservableObject.cs → Ponydoro_WPF/Mvvm/ObservableObject.cs b/Pomo-Shiny/ObservableObject.cs → Ponydoro_WPF/Mvvm/ObservableObject.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Pomo_Shiny
+namespace Ponydoro_WPF.Mvvm
 {
     [ExcludeFromCodeCoverage]
     public abstract class ObservableObject : INotifyPropertyChanged

diff --git a/Pomo-Shiny/Pomo-Shiny.csproj → Ponydoro_WPF/Ponydoro_WPF.csproj b/Pomo-Shiny/Pomo-Shiny.csproj → Ponydoro_WPF/Ponydoro_WPF.csproj
@@ -3,9 +3,10 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>Pomo_Shiny</RootNamespace>
+    <RootNamespace>Ponydoro_WPF</RootNamespace>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Media/unicorn2_Pyo_12.ico</ApplicationIcon>
+    <AssemblyName>Ponydoro</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,4 +23,8 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.5" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Ponydoro_Common\Ponydoro_Common.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Pomo-Shiny/Properties/Resources.Designer.cs → ...doro_WPF/Properties/Resources.Designer.cs b/Pomo-Shiny/Properties/Resources.Designer.cs → ...doro_WPF/Properties/Resources.Designer.cs
diff --git a/Pomo-Shiny/Properties/Resources.resx → Ponydoro_WPF/Properties/Resources.resx b/Pomo-Shiny/Properties/Resources.resx → Ponydoro_WPF/Properties/Resources.resx
diff --git a/Pomo-Shiny/Properties/Settings.Designer.cs → Ponydoro_WPF/Properties/Settings.Designer.cs b/Pomo-Shiny/Properties/Settings.Designer.cs → Ponydoro_WPF/Properties/Settings.Designer.cs
diff --git a/Pomo-Shiny/Properties/Settings.settings → Ponydoro_WPF/Properties/Settings.settings b/Pomo-Shiny/Properties/Settings.settings → Ponydoro_WPF/Properties/Settings.settings
diff --git a/Pomo-Shiny/SoundProvider.cs → Ponydoro_WPF/SoundProvider.cs b/Pomo-Shiny/SoundProvider.cs → Ponydoro_WPF/SoundProvider.cs
@@ -4,15 +4,11 @@
 using System.IO;
 using System.Linq;
 using System.Media;
-using Pomo_Shiny.Properties;
+using Ponydoro_WPF.Properties;
+using Ponydoro_Common;
 
-namespace Pomo_Shiny
+namespace Ponydoro_WPF
 {
-    public interface ISoundProvider
-    {
-        void MakeSound();
-    }
-
     [ExcludeFromCodeCoverage]
     internal class SoundProvider : ISoundProvider
     {