Skip to content

Commit 9e37628

Browse files
adrian-miasikadrian-miasik
authored
Merge pull request #108 from adrian-miasik/feature/custom-audio-streaming-assets
Feature: Support for Custom Alarm Sounds (.wav/.mp3)
2 parents fbd7222 + 2c8f74c commit 9e37628

22 files changed

+734
-618
lines changed

‎UnityPomodoro/Assembly-CSharp-Editor.csproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -792,12 +792,12 @@
792792
<Reference Include="Unity.Burst.Editor">
793793
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.Burst.Editor.dll</HintPath>
794794
</Reference>
795-
<Reference Include="Unity.Services.Analytics">
796-
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.Services.Analytics.dll</HintPath>
797-
</Reference>
798795
<Reference Include="Unity.2D.Sprite.Editor">
799796
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.2D.Sprite.Editor.dll</HintPath>
800797
</Reference>
798+
<Reference Include="Unity.Services.Analytics">
799+
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.Services.Analytics.dll</HintPath>
800+
</Reference>
801801
<Reference Include="Unity.RenderPipelines.Core.Runtime">
802802
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.RenderPipelines.Core.Runtime.dll</HintPath>
803803
</Reference>
@@ -844,10 +844,26 @@
844844
<Project>{5540617b-21e6-fa7e-9bee-ca69efbd6d16}</Project>
845845
<Name>LeTai.TrueShadow.Editor</Name>
846846
</ProjectReference>
847+
<ProjectReference Include="QFSW.QC.UI.csproj">
848+
<Project>{f79a2727-34a6-216d-30d3-c273a846673b}</Project>
849+
<Name>QFSW.QC.UI</Name>
850+
</ProjectReference>
851+
<ProjectReference Include="QFSW.QC.ScanRules.csproj">
852+
<Project>{e19baa62-4e52-324b-76e5-0cd6e6b4f649}</Project>
853+
<Name>QFSW.QC.ScanRules</Name>
854+
</ProjectReference>
855+
<ProjectReference Include="QFSW.QC.Editor.csproj">
856+
<Project>{8081bb53-752b-09dc-a2c0-2afcfa3c6a46}</Project>
857+
<Name>QFSW.QC.Editor</Name>
858+
</ProjectReference>
847859
<ProjectReference Include="LeTai.TranslucentImage.csproj">
848860
<Project>{8dd3cfc6-1299-156c-8b44-79d09a054f34}</Project>
849861
<Name>LeTai.TranslucentImage</Name>
850862
</ProjectReference>
863+
<ProjectReference Include="QFSW.QC.Suggestors.csproj">
864+
<Project>{a9e12aec-09e2-b51b-042c-4688c042f427}</Project>
865+
<Name>QFSW.QC.Suggestors</Name>
866+
</ProjectReference>
851867
<ProjectReference Include="LeTai.TrueShadow.Demo.csproj">
852868
<Project>{f85b2b05-3560-7ebc-6133-49a89cfecf45}</Project>
853869
<Name>LeTai.TrueShadow.Demo</Name>
@@ -856,26 +872,18 @@
856872
<Project>{53ab2b38-881a-5624-4d28-b16d6a643548}</Project>
857873
<Name>LeTai.TrueShadow</Name>
858874
</ProjectReference>
859-
<ProjectReference Include="LeTai.TranslucentImage.UniversalRP.csproj">
860-
<Project>{6eee82e8-590d-a914-aacd-18c5f4242353}</Project>
861-
<Name>LeTai.TranslucentImage.UniversalRP</Name>
862-
</ProjectReference>
863-
<ProjectReference Include="LeTai.TranslucentImage.Editor.csproj">
864-
<Project>{2fcf79b6-f632-a61b-c376-f027cb89cda8}</Project>
865-
<Name>LeTai.TranslucentImage.Editor</Name>
866-
</ProjectReference>
867-
<ProjectReference Include="QFSW.QC.Editor.csproj">
868-
<Project>{8081bb53-752b-09dc-a2c0-2afcfa3c6a46}</Project>
869-
<Name>QFSW.QC.Editor</Name>
870-
</ProjectReference>
871-
<ProjectReference Include="QFSW.QC.Suggestors.csproj">
872-
<Project>{a9e12aec-09e2-b51b-042c-4688c042f427}</Project>
873-
<Name>QFSW.QC.Suggestors</Name>
875+
<ProjectReference Include="QFSW.QC.QGUI.csproj">
876+
<Project>{b17e5dc0-e193-106d-c3b8-66c8b3e203c5}</Project>
877+
<Name>QFSW.QC.QGUI</Name>
874878
</ProjectReference>
875879
<ProjectReference Include="QFSW.QC.Serializers.csproj">
876880
<Project>{6cc34e04-b50d-7ebe-8f46-b93ee154f602}</Project>
877881
<Name>QFSW.QC.Serializers</Name>
878882
</ProjectReference>
883+
<ProjectReference Include="LeTai.TranslucentImage.UniversalRP.csproj">
884+
<Project>{6eee82e8-590d-a914-aacd-18c5f4242353}</Project>
885+
<Name>LeTai.TranslucentImage.UniversalRP</Name>
886+
</ProjectReference>
879887
<ProjectReference Include="QFSW.QC.Grammar.csproj">
880888
<Project>{51fa42d4-0de3-1843-ee2f-ab8cb53ec7ff}</Project>
881889
<Name>QFSW.QC.Grammar</Name>
@@ -888,17 +896,9 @@
888896
<Project>{7fd5e3a3-1d48-ed25-2a9b-6437928c7a02}</Project>
889897
<Name>QFSW.QC.Parsers</Name>
890898
</ProjectReference>
891-
<ProjectReference Include="QFSW.QC.UI.csproj">
892-
<Project>{f79a2727-34a6-216d-30d3-c273a846673b}</Project>
893-
<Name>QFSW.QC.UI</Name>
894-
</ProjectReference>
895-
<ProjectReference Include="QFSW.QC.ScanRules.csproj">
896-
<Project>{e19baa62-4e52-324b-76e5-0cd6e6b4f649}</Project>
897-
<Name>QFSW.QC.ScanRules</Name>
898-
</ProjectReference>
899-
<ProjectReference Include="QFSW.QC.QGUI.csproj">
900-
<Project>{b17e5dc0-e193-106d-c3b8-66c8b3e203c5}</Project>
901-
<Name>QFSW.QC.QGUI</Name>
899+
<ProjectReference Include="LeTai.TranslucentImage.Editor.csproj">
900+
<Project>{2fcf79b6-f632-a61b-c376-f027cb89cda8}</Project>
901+
<Name>LeTai.TranslucentImage.Editor</Name>
902902
</ProjectReference>
903903
<ProjectReference Include="QFSW.QC.Editor.Tools.csproj">
904904
<Project>{10ce77e3-20d0-25a3-aaa1-6e6789026b7c}</Project>

‎UnityPomodoro/Assembly-CSharp.csproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -905,12 +905,12 @@
905905
<Reference Include="Unity.Burst.Editor">
906906
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.Burst.Editor.dll</HintPath>
907907
</Reference>
908-
<Reference Include="Unity.Services.Analytics">
909-
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.Services.Analytics.dll</HintPath>
910-
</Reference>
911908
<Reference Include="Unity.2D.Sprite.Editor">
912909
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.2D.Sprite.Editor.dll</HintPath>
913910
</Reference>
911+
<Reference Include="Unity.Services.Analytics">
912+
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.Services.Analytics.dll</HintPath>
913+
</Reference>
914914
<Reference Include="Unity.RenderPipelines.Core.Runtime">
915915
<HintPath>C:\Users\user-am\Documents\git-repositiories\internal\unity-pomodoro\UnityPomodoro\Library\ScriptAssemblies\Unity.RenderPipelines.Core.Runtime.dll</HintPath>
916916
</Reference>
@@ -953,10 +953,26 @@
953953
<Project>{5540617b-21e6-fa7e-9bee-ca69efbd6d16}</Project>
954954
<Name>LeTai.TrueShadow.Editor</Name>
955955
</ProjectReference>
956+
<ProjectReference Include="QFSW.QC.UI.csproj">
957+
<Project>{f79a2727-34a6-216d-30d3-c273a846673b}</Project>
958+
<Name>QFSW.QC.UI</Name>
959+
</ProjectReference>
960+
<ProjectReference Include="QFSW.QC.ScanRules.csproj">
961+
<Project>{e19baa62-4e52-324b-76e5-0cd6e6b4f649}</Project>
962+
<Name>QFSW.QC.ScanRules</Name>
963+
</ProjectReference>
964+
<ProjectReference Include="QFSW.QC.Editor.csproj">
965+
<Project>{8081bb53-752b-09dc-a2c0-2afcfa3c6a46}</Project>
966+
<Name>QFSW.QC.Editor</Name>
967+
</ProjectReference>
956968
<ProjectReference Include="LeTai.TranslucentImage.csproj">
957969
<Project>{8dd3cfc6-1299-156c-8b44-79d09a054f34}</Project>
958970
<Name>LeTai.TranslucentImage</Name>
959971
</ProjectReference>
972+
<ProjectReference Include="QFSW.QC.Suggestors.csproj">
973+
<Project>{a9e12aec-09e2-b51b-042c-4688c042f427}</Project>
974+
<Name>QFSW.QC.Suggestors</Name>
975+
</ProjectReference>
960976
<ProjectReference Include="LeTai.TrueShadow.Demo.csproj">
961977
<Project>{f85b2b05-3560-7ebc-6133-49a89cfecf45}</Project>
962978
<Name>LeTai.TrueShadow.Demo</Name>
@@ -965,26 +981,18 @@
965981
<Project>{53ab2b38-881a-5624-4d28-b16d6a643548}</Project>
966982
<Name>LeTai.TrueShadow</Name>
967983
</ProjectReference>
968-
<ProjectReference Include="LeTai.TranslucentImage.UniversalRP.csproj">
969-
<Project>{6eee82e8-590d-a914-aacd-18c5f4242353}</Project>
970-
<Name>LeTai.TranslucentImage.UniversalRP</Name>
971-
</ProjectReference>
972-
<ProjectReference Include="LeTai.TranslucentImage.Editor.csproj">
973-
<Project>{2fcf79b6-f632-a61b-c376-f027cb89cda8}</Project>
974-
<Name>LeTai.TranslucentImage.Editor</Name>
975-
</ProjectReference>
976-
<ProjectReference Include="QFSW.QC.Editor.csproj">
977-
<Project>{8081bb53-752b-09dc-a2c0-2afcfa3c6a46}</Project>
978-
<Name>QFSW.QC.Editor</Name>
979-
</ProjectReference>
980-
<ProjectReference Include="QFSW.QC.Suggestors.csproj">
981-
<Project>{a9e12aec-09e2-b51b-042c-4688c042f427}</Project>
982-
<Name>QFSW.QC.Suggestors</Name>
984+
<ProjectReference Include="QFSW.QC.QGUI.csproj">
985+
<Project>{b17e5dc0-e193-106d-c3b8-66c8b3e203c5}</Project>
986+
<Name>QFSW.QC.QGUI</Name>
983987
</ProjectReference>
984988
<ProjectReference Include="QFSW.QC.Serializers.csproj">
985989
<Project>{6cc34e04-b50d-7ebe-8f46-b93ee154f602}</Project>
986990
<Name>QFSW.QC.Serializers</Name>
987991
</ProjectReference>
992+
<ProjectReference Include="LeTai.TranslucentImage.UniversalRP.csproj">
993+
<Project>{6eee82e8-590d-a914-aacd-18c5f4242353}</Project>
994+
<Name>LeTai.TranslucentImage.UniversalRP</Name>
995+
</ProjectReference>
988996
<ProjectReference Include="QFSW.QC.Grammar.csproj">
989997
<Project>{51fa42d4-0de3-1843-ee2f-ab8cb53ec7ff}</Project>
990998
<Name>QFSW.QC.Grammar</Name>
@@ -997,17 +1005,9 @@
9971005
<Project>{7fd5e3a3-1d48-ed25-2a9b-6437928c7a02}</Project>
9981006
<Name>QFSW.QC.Parsers</Name>
9991007
</ProjectReference>
1000-
<ProjectReference Include="QFSW.QC.UI.csproj">
1001-
<Project>{f79a2727-34a6-216d-30d3-c273a846673b}</Project>
1002-
<Name>QFSW.QC.UI</Name>
1003-
</ProjectReference>
1004-
<ProjectReference Include="QFSW.QC.ScanRules.csproj">
1005-
<Project>{e19baa62-4e52-324b-76e5-0cd6e6b4f649}</Project>
1006-
<Name>QFSW.QC.ScanRules</Name>
1007-
</ProjectReference>
1008-
<ProjectReference Include="QFSW.QC.QGUI.csproj">
1009-
<Project>{b17e5dc0-e193-106d-c3b8-66c8b3e203c5}</Project>
1010-
<Name>QFSW.QC.QGUI</Name>
1008+
<ProjectReference Include="LeTai.TranslucentImage.Editor.csproj">
1009+
<Project>{2fcf79b6-f632-a61b-c376-f027cb89cda8}</Project>
1010+
<Name>LeTai.TranslucentImage.Editor</Name>
10111011
</ProjectReference>
10121012
<ProjectReference Include="QFSW.QC.Editor.Tools.csproj">
10131013
<Project>{10ce77e3-20d0-25a3-aaa1-6e6789026b7c}</Project>

‎UnityPomodoro/Assets/AdrianMiasik/SVGs/icon-trashcan.svg.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityPomodoro/Assets/AdrianMiasik/SVGs/tomato-icons/tomato-cropped-body.svg.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityPomodoro/Assets/AdrianMiasik/SVGs/tomato-icons/tomato-stem.svg.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityPomodoro/Assets/AdrianMiasik/Scenes/Main.unity‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2174,7 +2174,7 @@ PrefabInstance:
21742174
objectReference: {fileID: 0}
21752175
- target: {fileID: 489833435901344923, guid: 88cf29bd208ddcf4ca1a76e1dd21e99c, type: 3}
21762176
propertyPath: m_SizeDelta.x
2177-
value: 17.183512
2177+
value: 0
21782178
objectReference: {fileID: 0}
21792179
- target: {fileID: 489833435901344923, guid: 88cf29bd208ddcf4ca1a76e1dd21e99c, type: 3}
21802180
propertyPath: m_SizeDelta.y
@@ -2929,7 +2929,7 @@ PrefabInstance:
29292929
objectReference: {fileID: 0}
29302930
- target: {fileID: 489833435901344923, guid: 88cf29bd208ddcf4ca1a76e1dd21e99c, type: 3}
29312931
propertyPath: m_SizeDelta.x
2932-
value: 17.183512
2932+
value: 0
29332933
objectReference: {fileID: 0}
29342934
- target: {fileID: 489833435901344923, guid: 88cf29bd208ddcf4ca1a76e1dd21e99c, type: 3}
29352935
propertyPath: m_SizeDelta.y
@@ -4097,8 +4097,9 @@ MonoBehaviour:
40974097
inWeight: 0.93531495
40984098
outWeight: 0
40994099
m_PreInfinity: 2
4100-
m_PostInfinity: 1
4100+
m_PostInfinity: 2
41014101
m_RotationOrder: 4
4102+
m_delayBetweenRingPulses: 0.6
41024103
m_pauseFadeDuration: 0.1
41034104
m_pauseHoldDuration: 0.75
41044105
m_onSpawnCompletion:
@@ -5797,7 +5798,7 @@ PrefabInstance:
57975798
objectReference: {fileID: 0}
57985799
- target: {fileID: 489833435901344923, guid: 88cf29bd208ddcf4ca1a76e1dd21e99c, type: 3}
57995800
propertyPath: m_SizeDelta.x
5800-
value: 17.183512
5801+
value: 0
58015802
objectReference: {fileID: 0}
58025803
- target: {fileID: 489833435901344923, guid: 88cf29bd208ddcf4ca1a76e1dd21e99c, type: 3}
58035804
propertyPath: m_SizeDelta.y
@@ -9124,7 +9125,7 @@ MonoBehaviour:
91249125
m_dropdown: {fileID: 1252709686}
91259126
m_containerOutline: {fileID: 1252709685}
91269127
m_arrow: {fileID: 1252709683}
9127-
m_alarmSounds:
9128+
m_preInstalledAlarms:
91289129
- {fileID: 8300000, guid: e613d2a8d2d189d48b11b4e8affa1265, type: 3}
91299130
- {fileID: 8300000, guid: fe0b810de398e994c92010dd660dd788, type: 3}
91309131
- {fileID: 8300000, guid: ff072c161d0238047a7abc89ee40b2bf, type: 3}
@@ -9186,7 +9187,7 @@ PrefabInstance:
91869187
objectReference: {fileID: 0}
91879188
- target: {fileID: 489833435901344923, guid: 88cf29bd208ddcf4ca1a76e1dd21e99c, type: 3}
91889189
propertyPath: m_SizeDelta.x
9189-
value: 17.183512
9190+
value: 0
91909191
objectReference: {fileID: 0}
91919192
- target: {fileID: 489833435901344923, guid: 88cf29bd208ddcf4ca1a76e1dd21e99c, type: 3}
91929193
propertyPath: m_SizeDelta.y
@@ -10314,7 +10315,7 @@ RectTransform:
1031410315
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1031510316
m_AnchorMin: {x: 0, y: 0}
1031610317
m_AnchorMax: {x: 1, y: 1}
10317-
m_AnchoredPosition: {x: -2.4996948, y: 2.5}
10318+
m_AnchoredPosition: {x: -2.4997559, y: 2.5}
1031810319
m_SizeDelta: {x: -25, y: -25}
1031910320
m_Pivot: {x: 0.5, y: 0.5}
1032010321
--- !u!224 &1535463478 stripped
@@ -10681,18 +10682,6 @@ PrefabInstance:
1068110682
propertyPath: m_IsActive
1068210683
value: 0
1068310684
objectReference: {fileID: 0}
10684-
- target: {fileID: 114600693638766706, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3}
10685-
propertyPath: _supportedState
10686-
value: 1
10687-
objectReference: {fileID: 0}
10688-
- target: {fileID: 114600693638766706, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3}
10689-
propertyPath: _activateOnStartup
10690-
value: 0
10691-
objectReference: {fileID: 0}
10692-
- target: {fileID: 114600693638766706, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3}
10693-
propertyPath: _initialiseOnStartup
10694-
value: 1
10695-
objectReference: {fileID: 0}
1069610685
- target: {fileID: 143246068027918357, guid: 9ed2a051c32b4fe47a5e4fb95c20b03f, type: 3}
1069710686
propertyPath: m_AnchorMax.y
1069810687
value: 0

0 commit comments

Comments
 (0)