Skip to content

Commit 7fc648c

Browse files
committed
Reorganization
1 parent f701d05 commit 7fc648c

File tree

67 files changed

+338
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+338
-230
lines changed

Editor/Localization/Drawers/RefreshButtonDrawer.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,31 @@ public static void Draw(LocalizationToolConfiguration localizationToolConfigurat
2121

2222
private static async void ExecuteRefreshQuery(LocalizationToolConfiguration localizationToolConfiguration)
2323
{
24-
TaskResult<List<ValueRange>> spreadsheetValues = await TryDownloadSpreadsheetFromGoogleQuery.Execute(
24+
ITaskResult<List<ValueRange>> spreadsheetValuesResult = await TryDownloadSpreadsheetFromGoogleQuery.Execute(
2525
localizationToolConfiguration,
2626
CancellationToken.None
2727
);
2828

29-
if(!spreadsheetValues.HasResult)
29+
bool hasSpreadsheetValues = spreadsheetValuesResult.TryGetResult(out List<ValueRange> spreadsheetValues);
30+
31+
if (!hasSpreadsheetValues)
3032
{
3133
return;
3234
}
3335

34-
TaskResult<LocalizationData> localizationData = GenerateLocalizationDataFromGoogleSpreadsheetQuery.Execute(
36+
ITaskResult<LocalizationData> localizationDataResult = GenerateLocalizationDataFromGoogleSpreadsheetQuery.Execute(
3537
localizationToolConfiguration,
36-
spreadsheetValues.Value
38+
spreadsheetValues
3739
);
3840

39-
if(!localizationData.HasResult)
41+
bool hasLocalizationDataResult = localizationDataResult.TryGetResult(out LocalizationData localizationData);
42+
43+
if (!hasLocalizationDataResult)
4044
{
4145
return;
4246
}
4347

44-
bool success = await SaveLocalizationDataToDiskQuery.Execute(localizationData.Value, CancellationToken.None);
48+
bool success = await SaveLocalizationDataToDiskQuery.Execute(localizationData, CancellationToken.None);
4549

4650
if(success)
4751
{
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System.Threading;
2+
using System.Threading.Tasks;
3+
4+
namespace Juce.CoreUnity.Animations
5+
{
6+
public interface ITaskAnimation
7+
{
8+
void Execute();
9+
Task Execute(CancellationToken cancellationToken);
10+
Task Execute(bool instantly, CancellationToken cancellationToken);
11+
}
12+
}

Runtime/PointerCallback/GraphicPointer.cs.meta renamed to Runtime/Animations/ITaskAnimation.cs.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.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using Juce.Core.Extensions;
2+
using System.Threading;
3+
using System.Threading.Tasks;
4+
using UnityEngine;
5+
6+
namespace Juce.CoreUnity.Animations
7+
{
8+
public abstract class MonoBehaviourTaskAnimation : MonoBehaviour, ITaskAnimation
9+
{
10+
public void Execute()
11+
{
12+
Execute(instantly: false, CancellationToken.None).RunAsync();
13+
}
14+
15+
public Task Execute(CancellationToken cancellationToken)
16+
{
17+
return Execute(instantly: false, cancellationToken);
18+
}
19+
20+
public virtual Task Execute(bool instantly, CancellationToken cancellationToken)
21+
{
22+
return Task.CompletedTask;
23+
}
24+
}
25+
}

Runtime/Ui/Animations/TaskAnimationMonoBehaviour.cs.meta renamed to Runtime/Animations/MonoBehaviourTaskAnimation.cs.meta

File renamed without changes.

Runtime/PointerCallback.meta renamed to Runtime/Audio/PointerAndSelectableCallbacks.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.

Runtime/Ui/Audio/PointerAndSelectableCallbacksAudioPlayer.cs renamed to Runtime/Audio/PointerAndSelectableCallbacks/PointerAndSelectableCallbacksAudioPlayer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Juce.CoreUnity.PointerCallback;
1+
using Juce.CoreUnity.Pointers.Callbacks;
22
using Juce.CoreUnity.Ui.SelectableCallback;
33
using UnityEngine;
44
using UnityEngine.EventSystems;
55

6-
namespace Juce.CoreUnity.Ui.Audio
6+
namespace Juce.CoreUnity.Audio.PointerAndSelectableCallbacks
77
{
88
public class PointerAndSelectableCallbacksAudioPlayer : MonoBehaviour
99
{

Runtime/Ui/Audio/PointerAndSelectableCallbacksAudioPlayer.cs.meta renamed to Runtime/Audio/PointerAndSelectableCallbacks/PointerAndSelectableCallbacksAudioPlayer.cs.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.

0 commit comments

Comments
 (0)