Merge branch 'release/1.8.0'

adrian-miasik · Jan 28, 2022 · d77387f · d77387f
2 parents f92d010 + 8673fbb
commit d77387f
Show file tree

Hide file tree

Showing 80 changed files with 7,995 additions and 3,040 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
 </p>
 
 <p align="center">
-  <img src="promotional/release-showcase.gif" width="720">
+  <img src="promotional/unity-pomodoro-showcase-longbreak.gif">
 </p>
 
 ## About
@@ -27,7 +27,7 @@ Unity Pomodoro is an open source countdown timer app created in Unity designed p
 
 **Platforms**: Windows, Mac, & Linux
 
-**Version**:  1.6.0
+**Version**:  1.7.1
 
 **Author**:  **[`Adrian Miasik`](https://adrian-miasik.com)**
 
@@ -38,20 +38,21 @@ Want to help? If you're interested in contributing to the project, please see th
 
 &nbsp;
 ## Downloads
-### [Latest Release - v1.6.0](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.6.0)
+### [Latest Release - v1.7.1](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.7.1)
 #### Direct
 - Windows
-  - [64-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.6.0/unity-pomodoro-1.6.0-windows-desktop-64-bit.zip)
-  - [32-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.6.0/unity-pomodoro-1.6.0-windows-desktop-32-bit.zip)
+  - [64-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.7.1/unity-pomodoro-1.7.1-windows-desktop-64-bit.zip)
+  - [32-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.7.1/unity-pomodoro-1.7.1-windows-desktop-32-bit.zip)
 - Mac
-  - [Universal](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.6.0/unity-pomodoro-1.6.0-mac-desktop-universal.zip)
+  - [Universal](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.7.1/unity-pomodoro-1.7.1-mac-desktop-universal.zip)
 - Linux
-  - [64-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.6.0/unity-pomodoro-1.6.0-linux-desktop-64-bit.zip)
+  - [64-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.7.1/unity-pomodoro-1.7.1-linux-desktop-64-bit.zip)
 #### Platform Specific
 - [Microsoft Store (Universal Windows Platform)](https://www.microsoft.com/en-us/p/unity-pomodoro/9nbzqpmx9x7n)
   - The UWP version provides **Windows Notifications** when the timer is complete.
   - The UWP version provides **Windows Launcher** when a user interacts with a URL.
 ### Previous Releases
+- [v1.6.0 - Confirmation Dialogs & 'Mute Audio When Out Of Focus' Settings Option](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.6.0)
 - [v1.5.0 - Settings Panel & Sidebar Animation](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.5.0)
 - [v1.4.0 - Sidebar Navigation](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.4.0)
 - [v1.3.0 - 🎃 Halloween Theme & Digit Format Support](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.3.0)

diff --git a/UnityPomodoro/Assembly-CSharp-Editor.csproj b/UnityPomodoro/Assembly-CSharp-Editor.csproj
@@ -52,9 +52,10 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="Assets\AdrianMiasik\Editor\ClickButtonIconEditor.cs" />
+     <Compile Include="Assets\AdrianMiasik\Editor\ClickButtonSVGIconEditor.cs" />
      <Compile Include="Assets\AdrianMiasik\Editor\ClickButtonEditor.cs" />
      <Compile Include="Assets\AdrianMiasik\Editor\BooleanToggleEditor.cs" />
+     <Compile Include="Assets\AdrianMiasik\Editor\ClickButtonImageIconEditor.cs" />
      <Compile Include="Assets\AdrianMiasik\Editor\ClickButtonTextEditor.cs" />
  <Reference Include="UnityEngine">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2020.3.23f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll</HintPath>

diff --git a/UnityPomodoro/Assembly-CSharp.csproj b/UnityPomodoro/Assembly-CSharp.csproj
@@ -60,32 +60,37 @@
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\ThemeIcon.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Containers\TomatoCounter.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Containers\DigitFormat.cs" />
+     <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\LongBreakSetting.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\CompletionLabel.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Base\ThemeElement.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\AudioMimic.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\AboutPanel.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Items\DoubleDigit.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\ThemeSlider.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\UWP\NotificationManager.cs" />
+     <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\EndTimestampBubble.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Items\SidebarRow.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Items\DigitSeparator.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\ClickButtonText.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Base\Toggle.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\ToggleSlider.cs" />
-     <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\ClickButtonIcon.cs" />
+     <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\ClickButtonSVGIcon.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\ScriptableObjects\ColorScheme.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\PomodoroTimer.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\WriteVersionNumber.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Base\TimerProgress.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Interfaces\IColorHook.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Items\Tomato.cs" />
+     <Compile Include="Assets\AdrianMiasik\Scripts\ScriptableObjects\Settings.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Containers\ThemeIconContainer.cs" />
+     <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\ClickButtonImageIcon.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Containers\Sidebar.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\Background.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\ToggleSprite.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\SettingsPanel.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\DigitFormatDropdown.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\CreditsBubble.cs" />
+     <Compile Include="Assets\AdrianMiasik\Scripts\Components\Specific\SkipButton.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Interfaces\ITimerState.cs" />
      <Compile Include="Assets\AdrianMiasik\Scripts\Components\Core\Helpers\CollectionHelper.cs" />
      <None Include="Assets\TextMesh Pro\Shaders\TMPro.cginc" />